svn commit: r963120 - in /ofbiz/branches/jackrabbit20100709/framework: base/config/ofbiz-containers.xml jackrabbit/config/jackrabbit.xml jackrabbit/config/repository.xml jackrabbit/src/org/ofbiz/jackrabbit/JackrabbitContainer.java

[adrianc]

Author: adrianc
Date: Sun Jul 11 18:43:52 2010
New Revision: 963120

URL: http://svn.apache.org/viewvc?rev=963120&view=rev
Log:
Some minor changes to the Jackrabbit integration:

1. Renamed repository.xml to jackrabbit.xml - since the file is specific to Jackrabbit and we want to support other JCR repositories too.

2. Made the container more generic.

Added:
    ofbiz/branches/jackrabbit20100709/framework/jackrabbit/config/jackrabbit.xml
      - copied unchanged from r962854, ofbiz/branches/jackrabbit20100709/framework/jackrabbit/config/repository.xml
Removed:
    ofbiz/branches/jackrabbit20100709/framework/jackrabbit/config/repository.xml
Modified:
    ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml
    ofbiz/branches/jackrabbit20100709/framework/jackrabbit/src/org/ofbiz/jackrabbit/JackrabbitContainer.java

Modified: ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml?rev=963120&r1=963119&r2=963120&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml Sun Jul 11 18:43:52 2010
@@ -98,7 +98,7 @@ under the License.
     -->
     <container name="jackrabbit" class="org.ofbiz.jackrabbit.JackrabbitContainer">
         <property name="repHomeDir" value="runtime/data/jackrabbit/"/>
-        <property name="configFilePath" value="framework/jackrabbit/config/repository.xml"/>
+        <property name="configFilePath" value="framework/jackrabbit/config/jackrabbit.xml"/>
     </container>
 
     <container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer">

Modified: ofbiz/branches/jackrabbit20100709/framework/jackrabbit/src/org/ofbiz/jackrabbit/JackrabbitContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jackrabbit/src/org/ofbiz/jackrabbit/JackrabbitContainer.java?rev=963120&r1=963119&r2=963120&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jackrabbit/src/org/ofbiz/jackrabbit/JackrabbitContainer.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jackrabbit/src/org/ofbiz/jackrabbit/JackrabbitContainer.java Sun Jul 11 18:43:52 2010
@@ -25,6 +25,7 @@ import java.net.URL;
 
 import javax.jcr.Credentials;
 import javax.jcr.LoginException;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
@@ -51,7 +52,7 @@ public class JackrabbitContainer impleme
     private static File homeDir = null;
     private static File jackrabbitConfigFile = null;
 
-    private static TransientRepository repository;
+    private static Repository repository;
     private static Session session;
 
     @Override
@@ -61,7 +62,7 @@ public class JackrabbitContainer impleme
         try {
             homeDirURL = ContainerConfig.getPropertyValue(cc, "repHomeDir", "runtime/data/jackrabbit/");
             homeDir = new File(homeDirURL);
-            URL jackrabbitConfigUrl = FlexibleLocation.resolveLocation(ContainerConfig.getPropertyValue(cc, "configFilePath", "framework/jackrabbit/config/repository.xml"));
+            URL jackrabbitConfigUrl = FlexibleLocation.resolveLocation(ContainerConfig.getPropertyValue(cc, "configFilePath", "framework/jackrabbit/config/jackrabbit.xml"));
             jackrabbitConfigFile = new File(jackrabbitConfigUrl.toURI());
             
         } catch (MalformedURLException e) {
@@ -95,7 +96,8 @@ public class JackrabbitContainer impleme
             session.logout();
         }
         if (repository != null) {
-            repository.shutdown();
+            // Not needed - Jackrabbit shuts down when the session is closed
+//            repository.shutdown();
         }
     }