Introduce Agent JCR

ASSIGNED - bug 17: Generalize agent management and registration beyond JMS
https://bugzilla.argeo.org/show_bug.cgi?id=17

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

diff --git a/modules/agent/org.argeo.slc.agent.jcr/.project b/modules/agent/org.argeo.slc.agent.jcr/.project
index f2310ab21295374e253960f711070bba0c2702dd..5aa7b5cceb79a91ca0f1e01456f91bb834b9f382 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jcr/.project
+++ b/modules/agent/org.argeo.slc.agent.jcr/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>org.argeo.slc.server.jcr</name>
+       <name>org.argeo.slc.agent.jcr</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF
index e27a76ff5a4bd7887f1a839de03f27694aefb0d6..15f683298f798557ae1bc26ddd8a6da344c459a4 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF
@@ -1,32 +1,16 @@
 Manifest-Version: 1.0
 Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.jcr
+Bundle-SymbolicName: org.argeo.slc.agent.jcr
 Bundle-Name: Server JCR
 Import-Package: javax.jcr,
  org.argeo.jcr,
- org.argeo.jcr.mvc,
- org.argeo.jcr.spring,
  org.argeo.security,
  org.argeo.security.core,
  org.argeo.security.jcr,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.structure,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.dao.process,
- org.argeo.slc.dao.runtime,
- org.argeo.slc.dao.test,
- org.argeo.slc.dao.test.tree,
  org.argeo.slc.execution,
  org.argeo.slc.jcr,
- org.argeo.slc.jcr.dao,
  org.argeo.slc.jcr.execution,
  org.argeo.slc.process,
  org.argeo.slc.runtime,
  org.argeo.slc.test,
- org.springframework.beans.factory.config,
- org.springframework.osgi.util,
- org.springframework.security;specification-version="2.0.6.RELEASE",
- org.springframework.web.context.request
+ org.springframework.security

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 1bf1809087ed5df4db06ac1ae07076038c9192ec..a6f779f378959f6a2d9202ace91c7f74917c821b 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
@@ -33,19 +33,4 @@
                </service-properties>\r
        </service>\r
        <service ref="agent" interface="org.argeo.slc.runtime.SlcAgent" />\r
-\r
-       <!-- <service interface="org.argeo.slc.dao.process.SlcExecutionDao" -->\r
-       <!-- ref="slcExecutionDao" /> -->\r
-       <!-- <service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao" -->\r
-       <!-- ref="testResultDao" /> -->\r
-       <!-- <service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" -->\r
-       <!-- ref="testResultCollectionDao" /> -->\r
-       <!-- <service interface="org.argeo.slc.dao.test.TestRunDescriptorDao" -->\r
-       <!-- ref="testRunDescriptorDao" /> -->\r
-       <!-- <service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao" -->\r
-       <!-- ref="slcAgentDescriptorDao" /> -->\r
-\r
-       <!-- <service -->\r
-       <!-- interface="org.springframework.web.context.request.WebRequestInterceptor" -->\r
-       <!-- ref="osivInterceptor" /> -->\r
 </beans:beans>
\ No newline at end of file

diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
index ba5e1e16126dec4bdb38343b926e10453e202d0e..0667606f203c447637f63cd395f026dc9227620a 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
+++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
@@ -3,15 +3,6 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <!-- <bean -->\r
-       <!-- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> -->\r
-       <!-- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" \r
-               /> -->\r
-       <!-- <property name="locations"> -->\r
-       <!-- <value>osgibundle:jcr.properties</value> -->\r
-       <!-- </property> -->\r
-       <!-- </bean> -->\r
-\r
        <bean id="agent" class="org.argeo.slc.jcr.execution.JcrAgent"\r
                init-method="init" destroy-method="dispose">\r
                <property name="session" ref="session" />\r
@@ -31,62 +22,4 @@
        <bean class="org.argeo.security.core.SystemExecutionBeanPostProcessor">\r
                <property name="authenticationManager" ref="authenticationManager" />\r
        </bean>\r
-\r
-       <!-- <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr" -->\r
-       <!-- init-method="init"> -->\r
-       <!-- <property name="session" ref="jcrSession" /> -->\r
-       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr" -->\r
-       <!-- init-method="init"> -->\r
-       <!-- <property name="session" ref="jcrSession" /> -->\r
-       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr" -->\r
-       <!-- init-method="init"> -->\r
-       <!-- <property name="session" ref="jcrSession" /> -->\r
-       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider" -->\r
-       <!-- init-method="init"> -->\r
-       <!-- <property name="defaultNodeMapper" ref="nodeMapper" /> -->\r
-       <!-- <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" \r
-               /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr" -->\r
-       <!-- init-method="init"> -->\r
-       <!-- <property name="session" ref="jcrSession" /> -->\r
-       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr" -->\r
-       <!-- init-method="init"> -->\r
-       <!-- <property name="session" ref="jcrSession" /> -->\r
-       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="osivInterceptor" -->\r
-       <!-- class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->\r
-       <!-- <property name="session" ref="jcrSession" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="bundleClassLoader" -->\r
-       <!-- class="org.springframework.osgi.util.BundleDelegatingClassLoader" -->\r
-       <!-- factory-method="createBundleClassLoaderFor"> -->\r
-       <!-- <constructor-arg> -->\r
-       <!-- <bean factory-bean="bundleContext" factory-method="getBundle" /> -->\r
-       <!-- </constructor-arg> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper"> -->\r
-       <!-- <property name="classLoader" ref="bundleClassLoader" /> -->\r
-       <!-- </bean> -->\r
-\r
-       <!-- <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper"> -->\r
-       <!-- <property name="classLoader" ref="bundleClassLoader" /> -->\r
-       <!-- </bean> -->\r
 </beans>
\ No newline at end of file