Load JCR CND files with OSGi bundle context

git-svn-id: https://svn.argeo.org/slc/trunk@4879 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties
index 8663b458eacaf1fe40308c30ede0c610fcc93ec9..438c286c1df44d98cabee56748f37d4598f31968 100644 (file)
--- a/demo/slc_demo_rcp.properties
+++ b/demo/slc_demo_rcp.properties
@@ -1,8 +1,10 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
-org.argeo.security.dao.jackrabbit,\
+org.argeo.node.repofactory.jackrabbit,\
 org.argeo.node.repo.jackrabbit,\
-org.argeo.slc.client.rcp,\
+org.argeo.security.dao.os,\
+org.argeo.slc.node.jackrabbit,\
+org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
 org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
@@ -16,3 +18,5 @@ log4j.configuration=file:../../log4j.properties
 
 argeo.node.repo.home=data/noderepo
 argeo.node.repo.dburl=jdbc:h2:data/h2/noderepo_db
+
+#argeo.node.repo.uri=http://localrepo:7070/org.argeo.jcr.webapp/remoting/node

diff --git a/dist/slc-server/src/main/rpm/etc/slc-server/log4j.properties b/dist/slc-server/src/main/rpm/etc/slc-server/log4j.properties
index 5646e20d53954347a2deef8960cbb96c7ffa47a0..adaaa0c877d7c3ed70420438cbe67b558ba3c91b 100644 (file)
--- a/dist/slc-server/src/main/rpm/etc/slc-server/log4j.properties
+++ b/dist/slc-server/src/main/rpm/etc/slc-server/log4j.properties
@@ -7,6 +7,10 @@ log4j.logger.org.argeo=INFO
 #log4j.logger.org.hibernate=DEBUG
 #log4j.logger.org.apache.activemq=DEBUG
 
+log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR
+log4j.logger.org.apache.directory.server.core.schema.SchemaService=ERROR
+log4j.logger.org.springframework.security.SpringSecurityMessageSource=ERROR
+
 log4j.logger.org.apache.directory.server.core.partition=ERROR
 log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
 

diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml
deleted file mode 100644 (file)
index 33be2ea..0000000
--- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <beans:description>Starts required bundles</beans:description>
-
-       <!-- BUNDLES TO START -->
-       <!-- Node repository -->
-       <bundle id="node.repo.jackrabbit" symbolic-name="org.argeo.node.repo.jackrabbit"
-               action="start" />
-       <bundle id="node.repofactory.jackrabbit" symbolic-name="org.argeo.node.repofactory.jackrabbit"
-               action="start" />
-       <bundle id="security.dao.jackrabbit" symbolic-name="org.argeo.security.dao.jackrabbit"
-               action="start" />
-
-       <!-- SLC Runtime -->
-       <bundle id="slc.node.jackrabbit" symbolic-name="org.argeo.slc.node.jackrabbit"
-               action="start" />
-       <bundle id="slc.agent" symbolic-name="org.argeo.slc.agent"
-               action="start" />
-       <bundle id="slc.agent.jcr" symbolic-name="org.argeo.slc.agent.jcr"
-               action="start" />
-
-       <!-- UI Components -->
-       <bundle id="slc.client.ui" symbolic-name="org.argeo.slc.client.ui"
-               action="start" />
-</beans:beans>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
index bfe2ecb32243deeef5d07bf2b809ba31c2c0182d..62fca103cab6695e74ad633ebfe57bb4971247dc 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
+++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
@@ -13,11 +13,12 @@
        <reference id="repository" interface="javax.jcr.Repository"\r
                filter="(argeo.jcr.repository.alias=slc)" />\r
 \r
-       <reference id="modulesManager"\r
-               interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
        <reference id="authenticationManager"\r
                interface="org.springframework.security.AuthenticationManager" />\r
 \r
+       <reference id="modulesManager"\r
+               interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
+\r
        <!-- SERVICES -->\r
        <!-- Deprecated -->\r
        <service ref="resultListener"\r

diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF
index c49eabdcc08dc81ca9af24d558743a03e59b531b..e2da416a009936875ab4159bda5bf6711a546e69 100644 (file)
--- a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Vendor: Argeo
 Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
  org.argeo.jackrabbit,
- org.argeo.jcr,
- org.argeo.security,
+ org.argeo.security.core,
  org.argeo.security.jackrabbit,
  org.argeo.slc.jcr,
  org.argeo.slc.repo,
  org.postgresql;version="[8.3.0,9.0.0)",
- org.springframework.beans.factory.config;version="2.5.6.SEC01"
+ org.springframework.beans.factory.config;version="2.5.6.SEC01",
+ org.springframework.security;version="2.0.6.RELEASE"

diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
index 233b009526864991cb004dbd706d50ee37bc4fdb..8900311540523480c61bb3815d8c264a08c8f036 100644 (file)
--- a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
+++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
@@ -10,9 +10,11 @@
        http://www.springframework.org/schema/util/spring-util-2.5.xsd">\r
 \r
        <!-- REFERENCES -->\r
-       <reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />\r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=${argeo.node.repo.alias})" />\r
+               filter="(argeo.jcr.repository.alias=node)" />\r
+\r
+       <reference id="authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
 \r
        <!-- SERVICES -->\r
        <service ref="jcrRepository" interface="javax.jcr.Repository">\r

diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
index 7b9f4e674b2d99a44c82f38535314d6d079eac8e..e5aeb2b2bccfb16fa05b4a6dcf60ad8805432103 100644 (file)
--- a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
+++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
@@ -12,20 +12,21 @@
        </bean>
 
        <bean id="jcrRepository" class="org.argeo.jackrabbit.JackrabbitContainer"
-               init-method="init" destroy-method="dispose">
-               <property name="repository" ref="nodeRepository" />
-               <property name="namespaces">
-                       <map>
-                               <entry key="slc" value="http://www.argeo.org/ns/slc" />
-                       </map>
-               </property>
+               init-method="init" destroy-method="destroy">
                <property name="cndFiles">
                        <list>
-                               <value>classpath:/org/argeo/slc/jcr/slc.cnd</value>
-                               <value>classpath:/org/argeo/slc/repo/repo.cnd</value>
+                               <value>/org/argeo/slc/jcr/slc.cnd</value>
+                               <value>/org/argeo/slc/repo/repo.cnd</value>
                        </list>
                </property>
-               <property name="systemExecutor" ref="systemExecutionService" />
+               <property name="repository" ref="nodeRepository" />
+               <property name="bundleContext" ref="bundleContext" />
+       </bean>
+
+       <bean
+               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
+               <description><![CDATA[Executes initialization with a system authentication]]></description>
+               <property name="authenticationManager" ref="authenticationManager" />
        </bean>
 
 </beans>
\ No newline at end of file