You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/03/07 12:37:29 UTC
svn commit: r1078749 - in /ofbiz/branches/jackrabbit20100709: .classpath
framework/jcr/config/jackrabbit.xml
framework/jcr/lib/commons-compress-1.1.jar framework/jcr/lib/tagsoup-1.2.jar
framework/jcr/src/org/ofbiz/jcr/JackrabbitContainer.java
Author: sascharodekamp
Date: Mon Mar 7 11:37:29 2011
New Revision: 1078749
URL: http://svn.apache.org/viewvc?rev=1078749&view=rev
Log:
Update - Added two lib which are needed by the new jackrabbit release 2.2.4 (commons-compress, tagsoup), change the jcr container start configuration
Added:
ofbiz/branches/jackrabbit20100709/framework/jcr/lib/commons-compress-1.1.jar (with props)
ofbiz/branches/jackrabbit20100709/framework/jcr/lib/tagsoup-1.2.jar (with props)
Modified:
ofbiz/branches/jackrabbit20100709/.classpath
ofbiz/branches/jackrabbit20100709/framework/jcr/config/jackrabbit.xml
ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/JackrabbitContainer.java
Modified: ofbiz/branches/jackrabbit20100709/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1078749&r1=1078748&r2=1078749&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/.classpath (original)
+++ ofbiz/branches/jackrabbit20100709/.classpath Mon Mar 7 11:37:29 2011
@@ -126,17 +126,17 @@
<classpathentry kind="lib" path="framework/guiapp/lib/XuiCoreSwing-v3.2rc2b.jar"/>
<classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/>
<classpathentry kind="lib" path="framework/jcr/lib/concurrent-1.3.4.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.1.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.1.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jcr-commons-2.1.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-2.1.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.1.0.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.2.4.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.2.4.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jcr-commons-2.2.4.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-2.2.4.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.2.4.jar"/>
<classpathentry kind="lib" path="framework/jcr/lib/jcr-2.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/pdfbox-1.0.0.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/pdfbox-1.3.1.jar"/>
<classpathentry kind="lib" path="framework/jcr/lib/slf4j-api-1.5.8.jar"/>
<classpathentry kind="lib" path="framework/jcr/lib/slf4j-log4j12-1.5.8.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/tika-core-0.6.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/tika-parsers-0.6.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/tika-core-0.8.jar"/>
+ <classpathentry kind="lib" path="framework/jcr/lib/tika-parsers-0.8.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jasper-compiler-5.5.15.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jasper-runtime-5.5.15.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-6.1.11.jar"/>
Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/config/jackrabbit.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/config/jackrabbit.xml?rev=1078749&r1=1078748&r2=1078749&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/config/jackrabbit.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/config/jackrabbit.xml Mon Mar 7 11:37:29 2011
@@ -64,7 +64,7 @@
<!-- <param name="config" value="${rep.home}/access.xml"/> -->
</AccessManager>
- <LoginModule class="org.ofbiz.jackrabbit.OFBizLoginModule"/>
+ <LoginModule class="org.ofbiz.jcr.OFBizLoginModule"/>
</Security>
<!--
Added: ofbiz/branches/jackrabbit20100709/framework/jcr/lib/commons-compress-1.1.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/lib/commons-compress-1.1.jar?rev=1078749&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/branches/jackrabbit20100709/framework/jcr/lib/commons-compress-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/branches/jackrabbit20100709/framework/jcr/lib/tagsoup-1.2.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/lib/tagsoup-1.2.jar?rev=1078749&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/branches/jackrabbit20100709/framework/jcr/lib/tagsoup-1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/JackrabbitContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/JackrabbitContainer.java?rev=1078749&r1=1078748&r2=1078749&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/JackrabbitContainer.java (original)
+++ ofbiz/branches/jackrabbit20100709/framework/jcr/src/org/ofbiz/jcr/JackrabbitContainer.java Mon Mar 7 11:37:29 2011
@@ -61,13 +61,13 @@ public class JackrabbitContainer impleme
@Override
public void init(String[] args, String configFile) throws ContainerException {
- ContainerConfig.Container cc = ContainerConfig.getContainer("jackrabbit", configFile);
+ ContainerConfig.Container cc = ContainerConfig.getContainer("jcr-container", configFile);
String homeDirURL;
try {
homeDirURL = ContainerConfig.getPropertyValue(cc, "repHomeDir", "runtime/data/jackrabbit/");
jndiName = ContainerConfig.getPropertyValue(cc, "jndiName", "jcr/local");
homeDir = new File(homeDirURL);
- URL jackrabbitConfigUrl = FlexibleLocation.resolveLocation(ContainerConfig.getPropertyValue(cc, "configFilePath", "framework/jackrabbit/config/jackrabbit.xml"));
+ URL jackrabbitConfigUrl = FlexibleLocation.resolveLocation(ContainerConfig.getPropertyValue(cc, "configFilePath", "framework/jcr/config/jackrabbit.xml"));
jackrabbitConfigFile = new File(jackrabbitConfigUrl.toURI());
} catch (MalformedURLException e) {