You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2015/03/13 15:04:32 UTC
svn commit: r1666454 - in /jackrabbit/oak/trunk: ./ oak-blob-cloud/
oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/
oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/
oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/ oak-b...
Author: amitj
Date: Fri Mar 13 14:04:31 2015
New Revision: 1666454
URL: http://svn.apache.org/r1666454
Log:
OAK-2625: Copy Jackrabbit 2 S3 related classes
Moved classes from org.apache.jackrabbit.aws.ext.ds to org.apache.jackrabbit.oak.blob.cloud.aws.s3
Added module to oak-blob-cloud to reactor pom
Updated jackrabbit version from 2.9.0 to 2.9.1
Added:
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3DataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3RequestDecorator.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3RequestDecorator.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3TestDataStore.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/S3TestDataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestAll.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/TestAll.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSAsyncTouch.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSSES3.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSmallCache.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSmallCache.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3Ds.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DsCacheOff.java (contents, props changed)
- copied, changed from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DsCacheOff.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/logback-test.xml (with props)
Removed:
jackrabbit/oak/trunk/oak-blob-cloud/README.txt
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3RequestDecorator.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java
jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3DataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/TestAll.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/S3TestDataStore.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSAsyncTouch.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSmallCache.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3Ds.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DsCacheOff.java
jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/log4j.properties
jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/repository_sample.xml
Modified:
jackrabbit/oak/trunk/oak-blob-cloud/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/pom.xml
Modified: jackrabbit/oak/trunk/oak-blob-cloud/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/pom.xml?rev=1666454&r1=1666453&r2=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/pom.xml Fri Mar 13 14:04:31 2015
@@ -1,109 +1,155 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- ====================================================================== -->
- <!-- P R O J E C T D E S C R I P T I O N -->
- <!-- ====================================================================== -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
+ <artifactId>oak-parent</artifactId>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-parent</artifactId>
- <version>2.9-SNAPSHOT</version>
- <relativePath>../jackrabbit-parent/pom.xml</relativePath>
+ <version>1.1-SNAPSHOT</version>
+ <relativePath>../oak-parent/pom.xml</relativePath>
</parent>
- <artifactId>jackrabbit-aws-ext</artifactId>
- <name>Jackrabbit AWS Extension</name>
- <description>Jackrabbit extenstion to Amazon Webservices</description>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>oak-blob-cloud</artifactId>
+ <name>Oak Cloud Blob Store</name>
<packaging>bundle</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.jackrabbit.oak.blob.cloud.s3</Export-Package>
+ <DynamicImport-Package>sun.io</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/cloud/**/TestAll.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>logback-test.xml</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>
+ src/test/resources/org/apache/jackrabbit/oak/util/test.json
+ </exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<!-- ====================================================================== -->
<!-- D E P E N D E N C I E S -->
<!-- ====================================================================== -->
<dependencies>
+ <!-- Optional OSGi dependencies, used only when running within OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bndlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JCR and Jackrabbit dependencies -->
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- <version>1.9.22</version>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-data</artifactId>
- <version>${project.version}</version>
+ <version>${jackrabbit.version}</version>
</dependency>
+
+ <!-- Amazon AWS dependency -->
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-data</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.9.11</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
<!-- Test dependencies -->
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-data</artifactId>
+ <version>${jackrabbit.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/aws/**/TestAll.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>org.apache.jackrabbit.aws.ext.ds</Export-Package>
- <DynamicImport-Package>sun.io</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>.checkstyle</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3Backend.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java Fri Mar 13 14:04:31 2015
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
-
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -32,10 +31,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-
-import org.apache.jackrabbit.aws.ext.S3Constants;
-import org.apache.jackrabbit.aws.ext.S3RequestDecorator;
-import org.apache.jackrabbit.aws.ext.Utils;
import org.apache.jackrabbit.core.data.AsyncTouchCallback;
import org.apache.jackrabbit.core.data.AsyncTouchResult;
import org.apache.jackrabbit.core.data.AsyncUploadCallback;
@@ -89,9 +84,8 @@ public class S3Backend implements Backen
private Properties properties;
private Date startTime;
-
- private ThreadPoolExecutor asyncWriteExecuter;
+ private ThreadPoolExecutor asyncWriteExecuter;
private S3RequestDecorator s3ReqDecorator;
/**
@@ -132,7 +126,6 @@ public class S3Backend implements Backen
LOG.debug("init");
this.store = store;
s3ReqDecorator = new S3RequestDecorator(prop);
-
s3service = Utils.openService(prop);
if (bucket == null || "".equals(bucket.trim())) {
bucket = prop.getProperty(S3Constants.S3_BUCKET);
@@ -146,14 +139,14 @@ public class S3Backend implements Backen
} else {
s3Region = Region.fromValue(region);
}
-
+
if (!s3service.doesBucketExist(bucket)) {
s3service.createBucket(bucket, s3Region);
LOG.info("Created bucket [{}] in [{}] ", bucket, region);
} else {
LOG.info("Using bucket [{}] in [{}] ", bucket, region);
}
-
+
int writeThreads = 10;
String writeThreadsStr = prop.getProperty(S3Constants.S3_WRITE_THREADS);
if (writeThreadsStr != null) {
@@ -163,14 +156,14 @@ public class S3Backend implements Backen
tmx = new TransferManager(s3service,
(ThreadPoolExecutor) Executors.newFixedThreadPool(writeThreads,
new NamedThreadFactory("s3-transfer-manager-worker")));
-
+
int asyncWritePoolSize = 10;
String maxConnsStr = prop.getProperty(S3Constants.S3_MAX_CONNS);
if (maxConnsStr != null) {
asyncWritePoolSize = Integer.parseInt(maxConnsStr)
- writeThreads;
}
-
+
asyncWriteExecuter = (ThreadPoolExecutor) Executors.newFixedThreadPool(
asyncWritePoolSize, new NamedThreadFactory("s3-write-worker"));
String renameKeyProp = prop.getProperty(S3Constants.S3_RENAME_KEYS);
@@ -299,7 +292,7 @@ public class S3Backend implements Backen
retVal, (System.currentTimeMillis() - start) });
return retVal;
}
-
+
@Override
public void touchAsync(final DataIdentifier identifier,
final long minModifiedDate, final AsyncTouchCallback callback)
@@ -528,7 +521,7 @@ public class S3Backend implements Backen
// order is important here
&& s3service.getObjectMetadata(bucket,
s3ObjSumm.getKey()).getLastModified().getTime() < min) {
-
+
LOG.debug("add id [{}] to delete lists",
s3ObjSumm.getKey());
@@ -659,7 +652,7 @@ public class S3Backend implements Backen
identifier);
} else {
up.waitForUploadResult();
- LOG.debug("synchronous upload to identifier [{}] completed.", identifier);
+ LOG.debug("synchronous upload to identifier [{}] completed.", identifier);
if (callback != null) {
callback.onSuccess(new AsyncUploadResult(
identifier, file));
@@ -670,7 +663,7 @@ public class S3Backend implements Backen
asyncUpRes.setException(e2);
if (callback != null) {
callback.onAbort(asyncUpRes);
- }
+ }
throw new DataStoreException("Could not upload " + key, e2);
}
}
@@ -795,7 +788,7 @@ public class S3Backend implements Backen
}
return key.substring(0, 4) + key.substring(5);
}
-
+
/**
* The class renames object key in S3 in a thread.
@@ -820,6 +813,7 @@ public class S3Backend implements Backen
LOG.error(" Exception in renaming [{}] to [{}] ",
new Object[] { ie, oldKey, newS3Key });
}
+
} finally {
if (contextClassLoader != null) {
Thread.currentThread().setContextClassLoader(
@@ -843,7 +837,7 @@ public class S3Backend implements Backen
private DataIdentifier identifier;
private AsyncUploadCallback callback;
-
+
private Upload upload;
public S3UploadProgressListener(Upload upload, DataIdentifier identifier, File file,
@@ -878,9 +872,9 @@ public class S3Backend implements Backen
}
}
}
-
+
/**
- * This class implements {@link Runnable} interface to upload {@link File}
+ * This class implements {@link Runnable} interface to upload {@link java.io.File}
* to S3 asynchronously.
*/
private class AsyncUploadJob implements Runnable {
@@ -909,4 +903,6 @@ public class S3Backend implements Backen
}
}
+
+
}
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3Constants.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java Fri Mar 13 14:04:31 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
/**
* Defined Amazon S3 constants.
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3DataStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3DataStore.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/ds/S3DataStore.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java Fri Mar 13 14:04:31 2015
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.util.Properties;
-
import org.apache.jackrabbit.core.data.Backend;
import org.apache.jackrabbit.core.data.CachingDataStore;
+
/**
* An Amazon S3 data store.
*/
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3DataStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3RequestDecorator.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3RequestDecorator.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3RequestDecorator.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3RequestDecorator.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3RequestDecorator.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/S3RequestDecorator.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3RequestDecorator.java Fri Mar 13 14:04:31 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.util.Properties;
@@ -35,7 +35,7 @@ public class S3RequestDecorator {
this.dataEncryption = dataEncryption.valueOf(props.getProperty(S3Constants.S3_ENCRYPTION));
}
}
-
+
/**
* Set encryption in {@link PutObjectRequest}
*/
@@ -77,7 +77,7 @@ public class S3RequestDecorator {
}
/**
- * Enum to indicate S3 encryption mode
+ * Enum to indicate S3 encryption mode
*
*/
private enum DataEncryption {
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3RequestDecorator.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java Fri Mar 13 14:04:31 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.File;
import java.io.FileInputStream;
@@ -133,7 +133,7 @@ public final class Utils {
*
* @param fileName the properties file name
* @return the properties
- * @throws IOException if the file doesn't exist
+ * @throws java.io.IOException if the file doesn't exist
*/
public static Properties readConfig(String fileName) throws IOException {
boolean delete = false;
@@ -184,5 +184,4 @@ public final class Utils {
cc.setMaxErrorRetry(maxErrorRetry);
return cc;
}
-
}
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/Utils.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3TestDataStore.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/S3TestDataStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3TestDataStore.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3TestDataStore.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/S3TestDataStore.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/S3TestDataStore.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3TestDataStore.java Fri Mar 13 14:04:31 2015
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.util.Properties;
-
import org.apache.jackrabbit.core.data.Backend;
/**
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3TestDataStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestAll.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/TestAll.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestAll.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestAll.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/TestAll.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/TestAll.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestAll.java Fri Mar 13 14:04:31 2015
@@ -15,17 +15,11 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import org.apache.jackrabbit.aws.ext.ds.TestS3Ds;
-import org.apache.jackrabbit.aws.ext.ds.TestS3DSAsyncTouch;
-import org.apache.jackrabbit.aws.ext.ds.TestS3DsCacheOff;
-import org.apache.jackrabbit.aws.ext.ds.TestS3DSWithSSES3;
-import org.apache.jackrabbit.aws.ext.ds.TestS3DSWithSmallCache;
import org.apache.jackrabbit.core.data.TestCaseBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSAsyncTouch.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSAsyncTouch.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSAsyncTouch.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java Fri Mar 13 14:04:31 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.IOException;
@@ -23,23 +23,22 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.data.CachingDataStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
- * Test {@link CachingDataStore} with
- * {@link CachingDataStore#setTouchAsync(boolean) set to true. It requires
+ * Test {@link org.apache.jackrabbit.core.data.CachingDataStore} with
+ * {@link org.apache.jackrabbit.core.data.CachingDataStore#setTouchAsync(boolean) set to true. It requires
* to pass aws config file via system property. For e.g.
* -Dconfig=/opt/cq/aws.properties. Sample aws properties located at
* src/test/resources/aws.properties
*/
public class TestS3DSAsyncTouch extends TestS3Ds {
- protected static final Logger LOG = LoggerFactory.getLogger(TestS3DSAsyncTouch.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(TestS3DSAsyncTouch.class);
public TestS3DSAsyncTouch() throws IOException {
config = System.getProperty(CONFIG);
memoryBackend = false;
noCache = false;
}
-
+
protected CachingDataStore createDataStore() throws RepositoryException {
ds = new S3TestDataStore(props);
ds.setConfig(config);
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSAsyncTouch.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSSES3.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSSES3.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSSES3.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSSES3.java Fri Mar 13 14:04:31 2015
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.aws.ext.S3Constants;
import org.apache.jackrabbit.core.data.CachingDataStore;
import org.apache.jackrabbit.core.data.DataRecord;
import org.slf4j.Logger;
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSSES3.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSmallCache.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSmallCache.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSmallCache.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSmallCache.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSmallCache.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DSWithSmallCache.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSmallCache.java Fri Mar 13 14:04:31 2015
@@ -14,33 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.IOException;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.data.CachingDataStore;
-import org.apache.jackrabbit.core.data.LocalCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
- * Test {@link CachingDataStore} with S3Backend and with very small size (@link
- * {@link LocalCache}. It requires to pass aws config file via system property.
+ * Test {@link org.apache.jackrabbit.core.data.CachingDataStore} with S3Backend and with very small size (@link
+ * {@link org.apache.jackrabbit.core.data.LocalCache}. It requires to pass aws config file via system property.
* For e.g. -Dconfig=/opt/cq/aws.properties. Sample aws properties located at
* src/test/resources/aws.properties
*/
public class TestS3DSWithSmallCache extends TestS3Ds {
protected static final Logger LOG = LoggerFactory.getLogger(TestS3DSWithSmallCache.class);
-
public TestS3DSWithSmallCache() throws IOException {
config = System.getProperty(CONFIG);
memoryBackend = false;
noCache = false;
}
-
+
protected CachingDataStore createDataStore() throws RepositoryException {
ds = new S3TestDataStore(props);
ds.setConfig(config);
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DSWithSmallCache.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3Ds.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3Ds.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3Ds.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java Fri Mar 13 14:04:31 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,8 +24,6 @@ import java.util.Properties;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.aws.ext.S3Constants;
-import org.apache.jackrabbit.aws.ext.Utils;
import org.apache.jackrabbit.core.data.Backend;
import org.apache.jackrabbit.core.data.CachingDataStore;
import org.apache.jackrabbit.core.data.TestCaseBase;
@@ -39,7 +37,7 @@ import com.amazonaws.services.s3.model.S
import com.amazonaws.services.s3.transfer.TransferManager;
/**
- * Test {@link CachingDataStore} with S3Backend and local cache on. It requires
+ * Test {@link org.apache.jackrabbit.core.data.CachingDataStore} with S3Backend and local cache on. It requires
* to pass aws config file via system property. For e.g.
* -Dconfig=/opt/cq/aws.properties. Sample aws properties located at
* src/test/resources/aws.properties
@@ -73,10 +71,10 @@ public class TestS3Ds extends TestCaseBa
deleteBucket();
super.tearDown();
} catch ( Exception ignore ) {
-
+
}
}
-
+
protected CachingDataStore createDataStore() throws RepositoryException {
ds = new S3TestDataStore(props);
ds.setConfig(config);
@@ -99,18 +97,16 @@ public class TestS3Ds extends TestCaseBa
String bucket = ((S3Backend)backend).getBucket();
deleteBucket(bucket);
}
-
public void deleteBucket(String bucket) throws Exception {
LOG.info("deleting bucket [" + bucket + "]");
Properties props = Utils.readConfig(config);
AmazonS3Client s3service = Utils.openService(props);
TransferManager tmx = new TransferManager(s3service);
-
if (s3service.doesBucketExist(bucket)) {
for (int i = 0; i < 4; i++) {
tmx.abortMultipartUploads(bucket, startTime);
ObjectListing prevObjectListing = s3service.listObjects(bucket);
- while (prevObjectListing != null) {
+ while (prevObjectListing != null ) {
List<DeleteObjectsRequest.KeyVersion> deleteList = new ArrayList<DeleteObjectsRequest.KeyVersion>();
for (S3ObjectSummary s3ObjSumm : prevObjectListing.getObjectSummaries()) {
deleteList.add(new DeleteObjectsRequest.KeyVersion(
@@ -128,12 +124,11 @@ public class TestS3Ds extends TestCaseBa
}
s3service.deleteBucket(bucket);
LOG.info("bucket [ " + bucket + "] deleted");
-
} else {
LOG.info("bucket [" + bucket + "] doesn't exists");
}
- tmx.shutdownNow();
- s3service.shutdown();
+ tmx.shutdownNow();
+ s3service.shutdown();
}
}
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DsCacheOff.java (from r1666426, jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DsCacheOff.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DsCacheOff.java?p2=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DsCacheOff.java&p1=jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DsCacheOff.java&r1=1666426&r2=1666454&rev=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/aws/ext/ds/TestS3DsCacheOff.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DsCacheOff.java Fri Mar 13 14:04:31 2015
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.aws.ext.ds;
+package org.apache.jackrabbit.oak.blob.cloud.aws.s3;
import java.io.IOException;
-import org.apache.jackrabbit.core.data.CachingDataStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Test {@link CachingDataStore} with S3Backend and local cache Off. It requires
+ * Test {@link org.apache.jackrabbit.core.data.CachingDataStore} with S3Backend and local cache Off. It requires
* to pass aws config file via system property. For e.g.
* -Dconfig=/opt/cq/aws.properties. Sample aws properties located at
* src/test/resources/aws.properties
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3DsCacheOff.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/logback-test.xml?rev=1666454&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/logback-test.xml (added)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/logback-test.xml Fri Mar 13 14:04:31 2015
@@ -0,0 +1,42 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<configuration>
+
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="file" class="ch.qos.logback.core.FileAppender">
+ <file>target/unit-tests.log</file>
+ <encoder>
+ <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.apache.jackrabbit.core.data" level="INFO"/>
+ <logger name="org.apache.jackrabbit.oak.blob.cloud.s3" level="INFO"/>
+
+ <root level="INFO">
+ <!--
+ <appender-ref ref="console"/>
+ -->
+ <appender-ref ref="file"/>
+ </root>
+
+</configuration>
Propchange: jackrabbit/oak/trunk/oak-blob-cloud/src/test/resources/logback-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1666454&r1=1666453&r2=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Fri Mar 13 14:04:31 2015
@@ -42,7 +42,7 @@
<project.reporting.outputEncoding>
${project.build.sourceEncoding}
</project.reporting.outputEncoding>
- <jackrabbit.version>2.9.0</jackrabbit.version>
+ <jackrabbit.version>2.9.1</jackrabbit.version>
<mongo.host>127.0.0.1</mongo.host>
<mongo.port>27017</mongo.port>
<mongo.db>MongoMKDB</mongo.db>
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1666454&r1=1666453&r2=1666454&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Fri Mar 13 14:04:31 2015
@@ -39,6 +39,7 @@
<module>oak-parent</module>
<module>oak-commons</module>
<module>oak-blob</module>
+ <module>oak-blob-cloud</module>
<module>oak-mk-api</module>
<module>oak-mk</module>
<module>oak-mk-remote</module>