Author: tdraier
Date: Thu Nov 22 18:14:49 2007
New Revision: 19268
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19268&repname=
=3Djahia
Log:
set mount points, allow multiple jackrabbits providers
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/JCRStoreService.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/impl/jackrabbit/JackrabbitStoreProvider.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/=
spring/applicationcontext-services.xml
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/content/JCRStoreService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/content/JCRStoreServ=
ice.java&rev=3D19268&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/JCRStoreService.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/JCRStoreService.java Thu Nov 22 18:14:49 2007
@@ -6,10 +6,8 @@
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.utils.JahiaTools;
=
-import javax.jcr.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Iterator;
+import javax.jcr.RepositoryException;
+import java.util.*;
=
/**
* Created by IntelliJ IDEA.
@@ -58,6 +56,14 @@
this.mainStoreProvider =3D mainStoreProvider;
}
=
+ public Map getMountPoints() {
+ return mountPoints;
+ }
+
+ public void setMountPoints(Map mountPoints) {
+ this.mountPoints =3D mountPoints;
+ }
+
public JCRFileNodeWrapper getFileNodeWrapper(String path, JahiaUser us=
er) {
if (path.startsWith("/")) {
for (Iterator iterator =3D mountPoints.keySet().iterator(); it=
erator.hasNext();) {
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/content/impl/jackrabbit/JackrabbitStoreProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/content/impl/jackrab=
bit/JackrabbitStoreProvider.java&rev=3D19268&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/impl/jackrabbit/JackrabbitStoreProvider.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/content/impl/jackrabbit/JackrabbitStoreProvider.java Thu Nov 22 18:14:=
49 2007
@@ -44,16 +44,7 @@
private static org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(JackrabbitStoreProvider.class);
=
- static private JackrabbitStoreProvider instance =3D null;
-
- protected JackrabbitStoreProvider() {
- }
-
- public synchronized static JackrabbitStoreProvider getInstance() {
- if (instance =3D=3D null) {
- instance =3D new JackrabbitStoreProvider();
- }
- return instance;
+ public JackrabbitStoreProvider() {
}
=
public void stop() {
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-IN=
F/etc/spring/applicationcontext-services.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/spring/applicationcontext=
-services.xml&rev=3D19268&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/=
spring/applicationcontext-services.xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/webapp/WEB-INF/etc/=
spring/applicationcontext-services.xml Thu Nov 22 18:14:49 2007
@@ -861,7 +861,7 @@
</property>
</bean>
=
- <bean id=3D"DefaulJCRStoreProvider" class=3D"org.jahia.services.conten=
t.impl.jackrabbit.JackrabbitStoreProvider" parent=3D"jahiaServiceTemplate" =
factory-method=3D"getInstance">
+ <bean id=3D"DefaulJCRStoreProvider" class=3D"org.jahia.services.conten=
t.impl.jackrabbit.JackrabbitStoreProvider" parent=3D"jahiaServiceTemplate" >
<property name=3D"key">
<value>default</value>
</property>
@@ -870,12 +870,33 @@
</property>
</bean>
=
+ <!--
+ <bean id=3D"SecondJCRStoreProvider" class=3D"org.jahia.services.conten=
t.impl.jackrabbit.JackrabbitStoreProvider" parent=3D"jahiaServiceTemplate" >
+ <property name=3D"key">
+ <value>jcr2</value>
+ </property>
+ <property name=3D"repositoryName">
+ <value>java:comp/env/jcr2/repository</value>
+ </property>
+ </bean>
+ -->
+
<bean id=3D"JCRStoreService" parent=3D"proxyTemplate">
<property name=3D"target">
<bean class=3D"org.jahia.services.content.JCRStoreService" par=
ent=3D"jahiaServiceTemplate" factory-method=3D"getInstance">
<property name=3D"mainStoreProvider">
<ref bean=3D"DefaulJCRStoreProvider" /> =
=
</property>
+ <property name=3D"mountPoints">
+ <map>
+<!--
+ <entry>
+ <key><value>/second</value></key>
+ <ref bean=3D"SecondJCRStoreProvider"/>
+ </entry>
+-->
+ </map>
+ </property>
</bean>
</property>
</bean>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
