svn commit: r889133 - /jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java

[se...@apache.org]

Author: sebastien
Date: Thu Dec 10 08:26:29 2009
New Revision: 889133

URL: http://svn.apache.org/viewvc?rev=889133&view=rev
Log:
JCR-2421 Unable to create repository using jackrabbit-webapp because a directory called "jackrabbit" already exists

Modified:
    jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java?rev=889133&r1=889132&r2=889133&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/Installer.java Thu Dec 10 08:26:29 2009
@@ -136,8 +136,10 @@
         File home = new File(repHome);
         File config = new File(repXml);
         if ("new".equals(mode)) {
-            if (home.exists()) {
-                log.error("Trying to install new repository home '{}' but already exists", repHome);
+            // Test internal folder repository existence and not home because home is already created
+            // by org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet
+            if (new File(home, "repository").exists()) {
+                log.error("Trying to install new repository home '{}' but it already contain a repository", repHome);
                 return C_HOME_EXISTS;
             }
             if (config.exists()) {
@@ -218,4 +220,4 @@
         out.close();
     }
 
-}
\ No newline at end of file
+}