Author: jukka
Date: Wed Jan 13 13:54:12 2010
New Revision: 898753
URL: http://svn.apache.org/viewvc?rev=898753&view=rev
Log:
2.0: Merged revisions 897983, 897992 and 898715 (JCR-2360 and JCR-2451)
Added:
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/org/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/org/apache/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/ConformanceTest.java
- copied unchanged from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/ConformanceTest.java
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
- copied unchanged from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/resources/
- copied from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/resources/log4j.properties
- copied unchanged from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/log4j.properties
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/test/resources/repositoryStubImpl.properties
- copied unchanged from r898715, jackrabbit/trunk/jackrabbit-jcr2dav/src/test/resources/repositoryStubImpl.properties
Modified:
jackrabbit/branches/2.0/ (props changed)
jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
jackrabbit/branches/2.0/jackrabbit-jcr2dav/pom.xml
jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java
Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 13 13:54:12 2010
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,898042,898677,898699
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992,898042,898677,898699,898715
Modified: jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory?rev=898753&r1=898752&r2=898753&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
(original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr-commons/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
Wed Jan 13 13:54:12 2010
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.jackrabbit.commons.GenericRepositoryFactory
+org.apache.jackrabbit.commons.JndiRepositoryFactory
Modified: jackrabbit/branches/2.0/jackrabbit-jcr2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr2dav/pom.xml?rev=898753&r1=898752&r2=898753&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr2dav/pom.xml (original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr2dav/pom.xml Wed Jan 13 13:54:12 2010
@@ -32,6 +32,47 @@
<artifactId>jackrabbit-jcr2dav</artifactId>
<name>Jackrabbit JCR to WebDAV</name>
+ <profiles>
+ <profile>
+ <id>integration</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx256m</argLine>
+ <fork>true</fork>
+ <systemProperties>
+ <property>
+ <name>jackrabbit.test.integration</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>known.issues</name>
+ <value>
+ foo#bar
+ </value>
+ </property>
+ <property>
+ <name>derby.system.durability</name>
+ <value>test</value>
+ </property>
+ <property>
+ <name>derby.storage.fileSyncTransactionLog</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>javax.jcr</groupId>
@@ -47,6 +88,35 @@
<artifactId>jackrabbit-spi2dav</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-tests</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-server</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java?rev=898753&r1=898752&r2=898753&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-jcr2dav/src/main/java/org/apache/jackrabbit/jcr2dav/Jcr2davRepositoryFactory.java
Wed Jan 13 13:54:12 2010
@@ -25,10 +25,9 @@
import javax.jcr.RepositoryException;
import javax.jcr.RepositoryFactory;
-import org.apache.jackrabbit.commons.GenericRepositoryFactory;
import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.jackrabbit.jcr2spi.RepositoryImpl;
import org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory;
+import org.apache.jackrabbit.jcr2spi.RepositoryImpl;
import org.apache.jackrabbit.spi.RepositoryServiceFactory;
import org.apache.jackrabbit.spi2dav.Spi2davRepositoryServiceFactory;
import org.apache.jackrabbit.spi2davex.Spi2davexRepositoryServiceFactory;
@@ -101,9 +100,16 @@
private Repository getRepository(
RepositoryServiceFactory factory, Map parameters)
throws RepositoryException {
- return RepositoryImpl.create(
- new Jcr2spiRepositoryFactory.RepositoryConfigImpl(
- factory, parameters));
+ try {
+ return RepositoryImpl.create(
+ new Jcr2spiRepositoryFactory.RepositoryConfigImpl(
+ factory, parameters));
+ } catch (RepositoryException e) {
+ // Unable to connect to the specified repository.
+ // Most likely the server is either not running or
+ // the given URI does not point to a valid davex server.
+ return null;
+ }
}
}
|