Skip to content

J
jio
Commit fd52a421 authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

Merge remote-tracking branch 's3/master' into s3storage 

Conflicts:
	Gruntfile.js
	Makefile
	README.md
	complex_queries.js
	examples/example.html
	examples/jio_dashboard.html
	jio.js
	package.json
	src/jio.storage/cryptstorage.js
	src/jio.storage/davstorage.js
	src/jio.storage/erp5storage.js
	src/jio.storage/gidstorage.js
	src/jio.storage/indexstorage.js
	src/jio.storage/localstorage.js
	src/jio.storage/replicaterevisionstorage.js
	src/jio.storage/replicatestorage.js
	src/jio.storage/revisionstorage.js
	src/jio.storage/s3storage.js
	src/jio.storage/xwikistorage.js
	src/jio/core/globals.js
	src/jio/core/restCommandRejecter.js
	src/jio/core/restCommandResolver.js
	src/jio/core/util.js
	src/jio/features/jobChecker.js
	src/jio/features/jobExecuter.js
	src/jio/features/jobQueue.js
	src/jio/features/jobRetry.js
	src/jio/intro.js
	test/jio.storage/davstorage.tests.js
	test/jio.storage/gidstorage.tests.js
	test/jio.storage/indexstorage.tests.js
	test/jio.storage/localstorage.tests.js
	test/jio.storage/replicaterevisionstorage.tests.js
	test/jio.storage/revisionstorage.tests.js
	test/jio.storage/s3storage.tests.js
	test/jio.storage/splitstorage.tests.js
	test/jio.storage/xwikistorage.tests.js
	test/jio/tests.js
	test/queries/tests.js
	test/run-qunit.js
	test/tests.html
	test/tests.require.js
parents 5fd24a93 a8b327e0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4735 additions and 902 deletions
src/jio.storage/multisplitstorage.js 0 → 100644
View file @ fd52a421
This diff is collapsed.
src/jio.storage/s3storage.js
View file @ fd52a421
This diff is collapsed.
src/jio.storage/splitstorage.tests.js 0 → 100644
View file @ fd52a421
This diff is collapsed.
test/jio.storage/multi.split.s3storage.tests.js 0 → 100644
View file @ fd52a421
This diff is collapsed.
test/jio.storage/s3.multi.split.storage.livetests.html 0 → 100644
View file @ fd52a421
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>JIO S3 Storage Qunit Live Tests</title>
<link rel="stylesheet" href="../../lib/qunit/qunit.css" />
<script src="../../lib/qunit/qunit.js"></script>
<script src="../../lib/rsvp/rsvp-custom.js"></script>
<script src="../../lib/jquery/jquery.min.js"></script>
<script src="../../src/sha256.amd.js"></script>
<script src="../../jio.js"></script>
<script src="../../complex_queries.js"></script>
<script src="../../src/sha1.amd.js"></script>
<script src="../../src/jio.storage/s3storage.js"></script>
<script src="../../src/jio.storage/multisplitstorage.js"></script>
<script src="../jio/util.js"></script>
</head>
<body>
<script>
var s3storage_spec = {};
console.log(location.href);
location.href.split('?')[1].split('&').forEach(function (item) {
s3storage_spec[item.split('=')[0]] = decodeURI(item.split('=').slice(1).join('=')).
replace(/%3A/ig, ':').replace(/%2F/ig, '/');
});
</script>
<h3>JIO initialization</h3>
<form method="get" action="">
<input type="hidden" name="type" value="s3"/>
<input type="text" name="url" placeholder="URL" value="https://jiobucket.s3.amazonaws.com"/>
<input type="text" name="server" placeholder="Bucket" value="jiobucket"/>
<input type="text" name="AWSIdentifier" placeholder="AWSIdentifier" value="AKIAJLNYGVLTV66RHPEQ"/>
<input type="password" name="password" placeholder="Password" value="/YHoa5r2X6EUHfvP31jdYx6t75h81pAjIZ4Mt94y"/>
<input type="submit" value="Run Tests"/>
</form>
<br />
<div id="qunit"></div>
<!--<script src="s3storage.tests.js"></script>-->
<script src="multi.split.s3storage.tests.js"></script>
</body>
</html>
test/jio.storage/s3.split.storage.livetests.html 0 → 100644
View file @ fd52a421
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>JIO S3 Storage Qunit Live Tests</title>
<link rel="stylesheet" href="../../lib/qunit/qunit.css" />
<script src="../../lib/qunit/qunit.js"></script>
<script src="../../lib/rsvp/rsvp-custom.js"></script>
<script src="../../lib/jquery/jquery.min.js"></script>
<script src="../../src/sha256.amd.js"></script>
<script src="../../jio.js"></script>
<script src="../../complex_queries.js"></script>
<script src="../../src/sha1.amd.js"></script>
<script src="../../src/jio.storage/s3storage.js"></script>
<script src="../../src/jio.storage/splitstorage.js"></script>
<script src="../jio/util.js"></script>
</head>
<body>
<script>
var s3storage_spec = {};
console.log(location.href);
location.href.split('?')[1].split('&').forEach(function (item) {
s3storage_spec[item.split('=')[0]] = decodeURI(item.split('=').slice(1).join('=')).
replace(/%3A/ig, ':').replace(/%2F/ig, '/');
});
</script>
<h3>JIO initialization</h3>
<form method="get" action="">
<input type="hidden" name="type" value="s3"/>
<input type="text" name="url" placeholder="URL" value="https://jiobucket.s3.amazonaws.com"/>
<input type="text" name="server" placeholder="Bucket" value="jiobucket"/>
<input type="text" name="AWSIdentifier" placeholder="AWSIdentifier" value="AKIAJLNYGVLTV66RHPEQ"/>
<input type="password" name="password" placeholder="Password" value="/YHoa5r2X6EUHfvP31jdYx6t75h81pAjIZ4Mt94y"/>
<input type="submit" value="Run Tests"/>
</form>
<br />
<div id="qunit"></div>
<!--<script src="s3storage.tests.js"></script>-->
<script src="split.s3storage.tests.js"></script>
</body>
</html>
test/jio.storage/s3storage.livetests.html 0 → 100644
View file @ fd52a421
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>JIO S3 Storage Qunit Live Tests</title>
<link rel="stylesheet" href="../../lib/qunit/qunit.css" />
<script src="../../lib/qunit/qunit.js"></script>
<script src="../../lib/rsvp/rsvp-custom.js"></script>
<script src="../../lib/jquery/jquery.min.js"></script>
<script src="../../src/sha256.amd.js"></script>
<script src="../../jio.js"></script>
<script src="../../complex_queries.js"></script>
<script src="../../src/sha1.amd.js"></script>
<script src="../../src/jio.storage/s3storage.js"></script>
<script src="../jio/util.js"></script>
</head>
<body>
<script>
var s3storage_spec = {};
console.log(location.href);
location.href.split('?')[1].split('&').forEach(function (item) {
s3storage_spec[item.split('=')[0]] = decodeURI(item.split('=').slice(1).join('=')).
replace(/%3A/ig, ':').replace(/%2F/ig, '/');
});
</script>
<h3>JIO initialization</h3>
<form method="get" action="">
<input type="hidden" name="type" value="s3"/>
<input type="text" name="url" placeholder="URL" value="https://jiobucket.s3.amazonaws.com"/>
<input type="text" name="server" placeholder="Bucket" value="jiobucket"/>
<input type="text" name="AWSIdentifier" placeholder="AWSIdentifier" value="AKIAJLNYGVLTV66RHPEQ"/>
<input type="password" name="password" placeholder="Password" value="/YHoa5r2X6EUHfvP31jdYx6t75h81pAjIZ4Mt94y"/>
<input type="submit" value="Run Tests"/>
</form>
<br />
<div id="qunit"></div>
<script src="s3storage.tests.js"></script>
</body>
</html>
test/jio.storage/s3storage.tests.js
View file @ fd52a421
This diff is collapsed.
test/jio.storage/split.s3storage.tests.js 0 → 100644
View file @ fd52a421
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7