From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 20 Apr 2011 07:56:43 +0000 (+0000)
Subject: Introduce Agent JCR
X-Git-Tag: argeo-slc-2.1.7~972
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=fc10594ca9f7d0e844d8755f8a2ef052b86e675a;hp=01aba9d28d7626c71e93773bd568aa78c1cee1c8;p=gpl%2Fargeo-slc.git

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 f2310ab21..5aa7b5cce 100644
--- 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 e27a76ff5..15f683298 100644
--- 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 1bf180908..a6f779f37 100644
--- 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>
 	</service>
 	<service ref="agent" interface="org.argeo.slc.runtime.SlcAgent" />
-
-	<!-- <service interface="org.argeo.slc.dao.process.SlcExecutionDao" -->
-	<!-- ref="slcExecutionDao" /> -->
-	<!-- <service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao" -->
-	<!-- ref="testResultDao" /> -->
-	<!-- <service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" -->
-	<!-- ref="testResultCollectionDao" /> -->
-	<!-- <service interface="org.argeo.slc.dao.test.TestRunDescriptorDao" -->
-	<!-- ref="testRunDescriptorDao" /> -->
-	<!-- <service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao" -->
-	<!-- ref="slcAgentDescriptorDao" /> -->
-
-	<!-- <service -->
-	<!-- interface="org.springframework.web.context.request.WebRequestInterceptor" -->
-	<!-- ref="osivInterceptor" /> -->
 </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 ba5e1e161..0667606f2 100644
--- 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"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<!-- <bean -->
-	<!-- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> -->
-	<!-- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" 
-		/> -->
-	<!-- <property name="locations"> -->
-	<!-- <value>osgibundle:jcr.properties</value> -->
-	<!-- </property> -->
-	<!-- </bean> -->
-
 	<bean id="agent" class="org.argeo.slc.jcr.execution.JcrAgent"
 		init-method="init" destroy-method="dispose">
 		<property name="session" ref="session" />
@@ -31,62 +22,4 @@
 	<bean class="org.argeo.security.core.SystemExecutionBeanPostProcessor">
 		<property name="authenticationManager" ref="authenticationManager" />
 	</bean>
-
-	<!-- <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="defaultNodeMapper" ref="nodeMapper" /> -->
-	<!-- <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" 
-		/> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="osivInterceptor" -->
-	<!-- class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="bundleClassLoader" -->
-	<!-- class="org.springframework.osgi.util.BundleDelegatingClassLoader" -->
-	<!-- factory-method="createBundleClassLoaderFor"> -->
-	<!-- <constructor-arg> -->
-	<!-- <bean factory-bean="bundleContext" factory-method="getBundle" /> -->
-	<!-- </constructor-arg> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper"> -->
-	<!-- <property name="classLoader" ref="bundleClassLoader" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper"> -->
-	<!-- <property name="classLoader" ref="bundleClassLoader" /> -->
-	<!-- </bean> -->
 </beans>
\ No newline at end of file