Remove unused SLC configs
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 10 Sep 2009 09:08:58 +0000 (09:08 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 10 Sep 2009 09:08:58 +0000 (09:08 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@2893 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

41 files changed:
server/modules/.project
server/modules/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml [deleted file]
server/modules/org.argeo.slc.server.activemq/activemq.properties [deleted file]
server/modules/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml [deleted file]
server/modules/org.argeo.slc.server.agentproxy/agentproxy.properties [deleted file]
server/modules/org.argeo.slc.server.castor/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.hibernate/META-INF/spring/db.xml [deleted file]
server/modules/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml [deleted file]
server/modules/org.argeo.slc.server.jms/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.jms/META-INF/spring/jms.xml [deleted file]
server/modules/org.argeo.slc.server.main/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.main/META-INF/spring/eclipseUpdateSite.xml [deleted file]
server/modules/org.argeo.slc.server.main/META-INF/spring/main.xml [deleted file]
server/modules/org.argeo.slc.server.main/META-INF/spring/manager.xml [deleted file]
server/modules/org.argeo.slc.server.main/META-INF/spring/osgi.xml [deleted file]
server/modules/org.argeo.slc.server.services/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml [deleted file]
server/modules/org.argeo.slc.server.services/META-INF/spring/services.xml [deleted file]
server/modules/org.argeo.slc.server.services/services.properties [deleted file]
server/modules/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/osgi.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/provisioning-servlet.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/security.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/web.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl [deleted file]
server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl [deleted file]
server/modules/pom.xml

index c8893ab94b2cb6b7139d03d265de2fd615c75fc3..d681768dc0235571f416e0e93cb6f44b9b06f5a0 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>org.argeo.slc.modules.server</name>
+       <name>org.argeo.server.modules</name>
        <comment></comment>
        <projects>
        </projects>
diff --git a/server/modules/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index ae6c4a1..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.activemq
-Import-Package: javax.jms,org.apache.activemq,org.springframework.jms.
- connection,org.springframework.oxm,org.argeo.slc.jms,org.springframew
- ork.jms.support.converter,org.springframework.beans.factory.config
diff --git a/server/modules/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml b/server/modules/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml
deleted file mode 100644 (file)
index 04869ba..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <service ref="jmsConnectionFactory" interface="javax.jms.ConnectionFactory" />\r
-\r
-<!-- \r
-       <service ref="jmsTransactionManager"\r
-               interface="org.springframework.transaction.PlatformTransactionManager" />\r
- -->\r
-       <service ref="jmsCastorMessageConverter"\r
-               interface="org.springframework.jms.support.converter.MessageConverter" />\r
-\r
-       <reference id="marshaller" interface="org.springframework.oxm.Marshaller" />\r
-       <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />\r
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/server/modules/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
deleted file mode 100644 (file)
index b171590..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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="ignoreUnresolvablePlaceholders" value="true" />
-               <property name="locations">
-                       <value>osgibundle:activemq.properties
-                       </value>
-               </property>
-       </bean>
-
-       <!-- Connection Factory -->
-       <bean id="jmsConnectionFactory"
-               class="org.springframework.jms.connection.CachingConnectionFactory">
-               <property name="targetConnectionFactory">
-                       <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-                               <property name="brokerURL">
-                                       <value>${slc.server.jms.url}</value>
-                               </property>
-                       </bean>
-               </property>
-       </bean>
-
-
-       <!--
-               <bean id="jmsTransactionManager"
-               class="org.springframework.jms.connection.JmsTransactionManager">
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-               </bean>
-       -->
-
-
-       <bean id="jmsCastorMessageConverter" class="org.argeo.slc.jms.MarshallerMessageConverter">
-               <property name="marshaller" ref="marshaller" />
-               <property name="unmarshaller" ref="unmarshaller" />
-       </bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.activemq/activemq.properties b/server/modules/org.argeo.slc.server.activemq/activemq.properties
deleted file mode 100644 (file)
index d1afbfa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-slc.server.jms.url=tcp://localhost:61616
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 9953da4..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.agentproxy
-Import-Package: org.argeo.slc.jms,org.argeo.slc.activemq,org.apache.ac
- tivemq.command,org.springframework.jms.core,javax.jms,org.springframe
- work.jms.support.converter,org.springframework.beans.factory.config,o
- rg.argeo.slc.runtime
diff --git a/server/modules/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml b/server/modules/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml
deleted file mode 100644 (file)
index 923a654..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
-       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">
-
-       <osgi:reference id="jmsMessageConverter"
-               interface="org.springframework.jms.support.converter.MessageConverter" />
-       <osgi:reference id="jmsConnectionFactory" interface="javax.jms.ConnectionFactory" />
-
-       <osgi:service ref="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml b/server/modules/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml
deleted file mode 100644 (file)
index 4cb24da..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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">
-
-       <import resource="classpath:org/argeo/slc/activemq/destinations.xml" />
-
-       <bean
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
-               <property name="locations">
-                       <value>osgibundle:agentproxy.properties
-                       </value>
-               </property>
-       </bean>
-
-       <!-- Agent Factory -->
-       <bean id="agentFactory" class="org.argeo.slc.jms.JmsAgentProxyFactory">
-               <property name="jmsTemplate">
-                       <bean class="org.springframework.jms.core.JmsTemplate">
-                               <property name="connectionFactory" ref="jmsConnectionFactory" />
-                               <property name="messageConverter" ref="jmsMessageConverter" />
-                               <property name="receiveTimeout" value="${slc.server.jms.agentProxy.timeout}" />
-                       </bean>
-               </property>
-               <property name="requestDestination" ref="slcJms.destination.agent.request" />
-               <property name="responseDestination" ref="slcJms.destination.agent.response" />
-               <property name="pingAllDestination" ref="slcJms.destination.agent.pingAll" />
-       </bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.agentproxy/agentproxy.properties b/server/modules/org.argeo.slc.server.agentproxy/agentproxy.properties
deleted file mode 100644 (file)
index b003c43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-slc.server.jms.agentProxy.timeout=20000
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.castor/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.castor/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 74a75b2..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.castor
-Import-Package: org.springframework.oxm,org.argeo.slc.castor,org.sprin
- gframework.oxm.castor
diff --git a/server/modules/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml b/server/modules/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml
deleted file mode 100644 (file)
index aaacff8..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
-       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">
-
-       <import resource="classpath:org/argeo/slc/castor/spring.xml" />
-
-       <osgi:service ref="slcDefault.castor.marshaller">
-               <osgi:interfaces>
-                       <value>org.springframework.oxm.Marshaller
-                       </value>
-                       <value>org.springframework.oxm.Unmarshaller
-                       </value>
-               </osgi:interfaces>
-       </osgi:service>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index b6c54fd..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.hibernate
-Import-Package: org.argeo.slc.hibernate,org.hibernate,org.springframew
- ork.orm.hibernate3,org.argeo.slc.runtime,org.argeo.slc.process,org.ar
- geo.slc.test,org.argeo.slc.core.attachment,org.argeo.slc.core.test,or
- g.argeo.slc.core.test.tree,org.argeo.slc.core.structure,org.argeo.slc
- .core.structure.tree,org.argeo.slc.dao.runtime,org.argeo.slc.dao.proc
- ess,org.argeo.slc.dao.test,org.argeo.slc.dao.test.tree,org.argeo.slc.
- hibernate.test.tree,org.argeo.slc.hibernate.runtime,org.argeo.slc.hib
- ernate.process,org.argeo.slc.hibernate.test,org.springframework.aop,o
- rg.springframework.aop.framework,org.aopalliance.aop,org.springframew
- ork.transaction
diff --git a/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml b/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml
deleted file mode 100644 (file)
index 381fae8..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\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.process.SlcExecutionDao"\r
-               ref="slcExecutionDao" />\r
-       <service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"\r
-               ref="slcAgentDescriptorDao" />\r
-\r
-       <reference id="sessionFactory" interface="org.hibernate.SessionFactory" />\r
-\r
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/db.xml b/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
deleted file mode 100644 (file)
index 7345ebd..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-       default-lazy-init="false">
-
-       <import resource="classpath:/org/argeo/slc/hibernate/dao.xml" />
-
-       <!-- DAOs -->
-       <bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
-               <property name="sessionFactory" ref="sessionFactory" />
-               <property name="allowCreate" value="false" />
-       </bean>
-
-       <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
-               <property name="hibernateTemplate" ref="hibernateTemplate" />
-       </bean>
-
-       <bean id="testResultCollectionDao" parent="slcTemplates.dao.testResultCollectionDao">
-               <property name="hibernateTemplate" ref="hibernateTemplate" />
-       </bean>
-
-       <bean id="testRunDescriptorDao" parent="slcTemplates.dao.testRunDescriptorDao">
-               <property name="hibernateTemplate" ref="hibernateTemplate" />
-       </bean>
-
-       <bean id="slcExecutionDao" parent="slcTemplates.dao.slcExecutionDao">
-               <property name="hibernateTemplate" ref="hibernateTemplate" />
-       </bean>
-
-       <bean id="slcAgentDescriptorDao" parent="slcTemplates.dao.slcAgentDescriptorDao">
-               <property name="hibernateTemplate" ref="hibernateTemplate" />
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml b/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml
deleted file mode 100644 (file)
index f951380..0000000
+++ /dev/null
@@ -1,14 +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">
-
-
-       <service ref="hibernateTransactionManager"
-               interface="org.springframework.transaction.PlatformTransactionManager" />
-
-
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml b/server/modules/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml
deleted file mode 100644 (file)
index 7d03b64..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <!-- Transaction -->
-       <bean id="hibernateTransactionManager"
-               class="org.springframework.orm.hibernate3.HibernateTransactionManager"
-               lazy-init="false">
-               <property name="sessionFactory" ref="sessionFactory" />
-       </bean>
-
-       <!-- DAO transactions -->
-       <aop:config>
-               <aop:pointcut id="daoProcessMethods"
-                       expression="execution(* org.argeo.slc.dao.process.*.*(..))" />
-               <aop:advisor advice-ref="daoAdvice" pointcut-ref="daoProcessMethods" />
-       </aop:config>
-
-       <aop:config>
-               <aop:pointcut id="daoRuntimeMethods"
-                       expression="execution(* org.argeo.slc.dao.runtime.*.*(..))" />
-               <aop:advisor advice-ref="daoAdvice" pointcut-ref="daoRuntimeMethods" />
-       </aop:config>
-
-       <aop:config>
-               <aop:pointcut id="daoTestMethods"
-                       expression="execution(* org.argeo.slc.dao.test.*.*(..))" />
-               <aop:advisor advice-ref="daoAdvice" pointcut-ref="daoTestMethods" />
-       </aop:config>
-
-       <aop:config>
-               <aop:pointcut id="daoTestTreeMethods"
-                       expression="execution(* org.argeo.slc.dao.test.tree.*.*(..))" />
-               <aop:advisor advice-ref="daoAdvice" pointcut-ref="daoTestTreeMethods" />
-       </aop:config>
-
-       <tx:advice id="daoAdvice" transaction-manager="hibernateTransactionManager">
-               <tx:attributes>
-                       <tx:method name="get*" propagation="REQUIRED" read-only="true" />
-                       <tx:method name="list*" propagation="REQUIRED" read-only="true" />
-                       <tx:method name="*" propagation="REQUIRED" />
-               </tx:attributes>
-       </tx:advice>
-
-       <aop:config>
-               <aop:pointcut id="pointcut.services.allMethods"
-                       expression="execution(* org.argeo.slc.services.*.*.*(..))" />
-               <aop:advisor advice-ref="advice.allMethodsRequired"
-                       pointcut-ref="pointcut.services.allMethods" />
-       </aop:config>
-
-       <tx:advice id="advice.allMethodsRequired"
-               transaction-manager="hibernateTransactionManager">
-               <tx:attributes>
-                       <tx:method name="*" propagation="REQUIRED" />
-               </tx:attributes>
-       </tx:advice>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.jms/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 46c15a7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core,org.argeo.slc.s
- erver,org.argeo.slc.support.activemq,org.springframework.core,org.spr
- ingframework.context,org.springframework.beans,org.springframework.ox
- m,org.springframework.jms,com.springsource.org.castor,org.argeo.dep.o
- sgi.activemq
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.jms
-Import-Package: javax.jms,javax.management.j2ee.statistics,org.apache.
- commons.logging,org.springframework.transaction
diff --git a/server/modules/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml b/server/modules/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
deleted file mode 100644 (file)
index 2bcb5b1..0000000
+++ /dev/null
@@ -1,28 +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">
-
-       <reference id="agentService" interface="org.argeo.slc.services.AgentService" />
-       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
-       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-
-       <reference id="jmsConnectionFactory" interface="javax.jms.ConnectionFactory" />
-       <reference id="jmsMessageConverter"
-               interface="org.springframework.jms.support.converter.MessageConverter" />
-
-       <reference id="attachmentsStorage"
-               interface="org.argeo.slc.core.attachment.AttachmentsStorage" />
-
-       <service ref="jmsEventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />
-       <service ref="jmsEventPublisher" interface="org.argeo.slc.msg.event.SlcEventPublisher" />
-
-       <!--
-               <reference id="jmsTransactionManager"
-               interface="org.springframework.transaction.PlatformTransactionManager"
-               bean-name="jmsTransactionManager" />
-       -->
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/server/modules/org.argeo.slc.server.jms/META-INF/spring/jms.xml
deleted file mode 100644 (file)
index d50dfda..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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">
-
-       <import resource="classpath:org/argeo/slc/activemq/destinations.xml" />
-
-       <!-- Attachments -->
-
-       <bean id="attachmentStorage.jmsContainer.add" parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.attachment.add" />
-               <property name="messageListener">
-                       <bean class="org.argeo.slc.jms.JmsAttachmentListener">
-                               <property name="attachmentsStorage" ref="attachmentsStorage" />
-                       </bean>
-               </property>
-       </bean>
-
-       <!-- Events -->
-       <bean id="jmsEventListener" class="org.argeo.slc.jms.JmsSlcEventListener"
-               init-method="init" destroy-method="close">
-               <property name="jmsConnectionFactory">
-                       <!--
-                               Need its own connection factory in order to set client ids (not
-                               possible on pool)
-                       -->
-                       <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-                               <property name="brokerURL">
-                                       <value>vm://localhost</value>
-                               </property>
-                       </bean>
-               </property>
-               <property name="eventsDestination" ref="slcJms.destination.events" />
-               <property name="messageConverter" ref="jmsMessageConverter" />
-       </bean>
-
-       <bean id="jmsEventPublisher" class="org.argeo.slc.jms.JmsSlcEventPublisher">
-               <property name="jmsTemplate" ref="jmsTemplate" />
-               <property name="eventsDestination" ref="slcJms.destination.events" />
-       </bean>
-
-       <!-- Agent Service -->
-       <bean id="agentService.jmsContainer.register" parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.agent.register" />
-               <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="agentService" />
-                               <property name="defaultListenerMethod" value="register" />
-                       </bean>
-               </property>
-       </bean>
-
-       <bean id="agentService.jmsContainer.unregister" parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.agent.unregister" />
-               <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="agentService" />
-                               <property name="defaultListenerMethod" value="unregister" />
-                       </bean>
-               </property>
-       </bean>
-
-       <bean parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.execution.event" />
-               <property name="messageListener">
-                       <bean class="org.argeo.slc.jms.JmsExecutionHandler">
-                               <property name="messageConverter" ref="jmsMessageConverter" />
-                               <property name="serviceMsgHandler">
-                                       <bean class="org.argeo.slc.services.ServiceMsgHandler">
-                                               <property name="slcExecutionService" ref="slcExecutionService" />
-                                               <property name="testManagerService" ref="testManagerService" />
-                                       </bean>
-                               </property>
-                       </bean>
-               </property>
-       </bean>
-
-       <!-- Common -->
-       <bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-               <property name="messageConverter" ref="jmsMessageConverter" />
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-       </bean>
-
-       <!-- Templates -->
-       <bean id="listenerContainer"
-               class="org.springframework.jms.listener.DefaultMessageListenerContainer"
-               abstract="true">
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-               <!--
-                       <property name="transactionManager" ref="jmsTransactionManager" />
-               -->
-       </bean>
-
-       <bean id="listenerAdapterCastor"
-               class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
-               abstract="true">
-               <property name="messageConverter" ref="jmsMessageConverter" />
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.main/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.main/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index e3d3f85..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.specs,org.argeo.slc.support.equinox
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-Name: SLC Server Main
-Bundle-SymbolicName: org.argeo.slc.server.main
-Import-Package: org.argeo.slc.build,org.argeo.slc.osgi.build
diff --git a/server/modules/org.argeo.slc.server.main/META-INF/spring/eclipseUpdateSite.xml b/server/modules/org.argeo.slc.server.main/META-INF/spring/eclipseUpdateSite.xml
deleted file mode 100644 (file)
index 6e8775c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean id="eclipseUpdateSite" class="org.argeo.slc.osgi.build.EclipseUpdateSite">
-               <property name="features">
-                       <list>
-                               <bean class="org.argeo.slc.osgi.build.EclipseUpdateSiteFeature">
-                                       <property name="name" value="org.argeo.slc.dep.agent" />
-                               </bean>
-                               <bean class="org.argeo.slc.osgi.build.EclipseUpdateSiteFeature">
-                                       <property name="name" value="org.argeo.slc.dep.detached" />
-                               </bean>
-                       </list>
-               </property>
-       </bean>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.main/META-INF/spring/main.xml b/server/modules/org.argeo.slc.server.main/META-INF/spring/main.xml
deleted file mode 100644 (file)
index 927a928..0000000
+++ /dev/null
@@ -1,30 +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">
-
-       <bundle id="activemq.broker" symbolic-name="org.argeo.slc.server.activemq.broker"
-               action="start" />
-       <bundle id="castor" symbolic-name="org.argeo.slc.server.castor"
-               action="start" />
-       <bundle id="activemq" symbolic-name="org.argeo.slc.server.activemq"
-               action="start" />
-       <bundle id="agentProxy" symbolic-name="org.argeo.slc.server.agentproxy"
-               action="start" />
-       <bundle id="hibernate" symbolic-name="org.argeo.slc.server.hibernate"
-               action="start" />
-       <bundle id="services" symbolic-name="org.argeo.slc.server.services"
-               action="start" />
-       <bundle id="jms" symbolic-name="org.argeo.slc.server.jms"
-               action="start" />
-
-       <bundle id="spring.osgi.web.extender" symbolic-name="org.springframework.osgi.web.extender"
-               action="start" />
-       <bundle id="catalina" symbolic-name="org.argeo.dep.osgi.catalina.start"
-               action="start" />
-       <bundle id="webapp" symbolic-name="org.argeo.slc.webapp" action="start" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.main/META-INF/spring/manager.xml b/server/modules/org.argeo.slc.server.main/META-INF/spring/manager.xml
deleted file mode 100644 (file)
index bf342bb..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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 id="dynamicRuntime" class="org.argeo.slc.equinox.EquinoxRuntime" />
-       <bean id="modularDistribution" class="org.argeo.slc.osgi.build.OsgiRuntimeModularDistribution">
-               <property name="eclipseUpdateSite" ref="eclipseUpdateSite" />
-       </bean>
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.main/META-INF/spring/osgi.xml b/server/modules/org.argeo.slc.server.main/META-INF/spring/osgi.xml
deleted file mode 100644 (file)
index 50237f4..0000000
+++ /dev/null
@@ -1,11 +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">
-
-       <service ref="dynamicRuntime" interface="org.argeo.slc.deploy.DynamicRuntime" />
-       <service ref="modularDistribution" interface="org.argeo.slc.build.ModularDistribution" />
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.services/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.server.services/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index d0a902d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-Name: SLC Server Services
-Bundle-SymbolicName: org.argeo.slc.server.services
-Import-Package: org.aopalliance.aop,org.argeo.slc.core.attachment,org.
- argeo.slc.dao.process,org.argeo.slc.dao.runtime,org.argeo.slc.dao.tes
- t,org.argeo.slc.dao.test.tree,org.argeo.slc.msg.event,org.argeo.slc.m
- sg.process,org.argeo.slc.process,org.argeo.slc.runtime,org.argeo.slc.
- services,org.argeo.slc.services.impl,org.hibernate.jdbc,org.springfra
- mework.aop,org.springframework.aop.framework,org.springframework.bean
- s.factory.config
diff --git a/server/modules/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml b/server/modules/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
deleted file mode 100644 (file)
index af5d86f..0000000
+++ /dev/null
@@ -1,38 +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">
-
-       <service ref="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
-       <service ref="agentService" interface="org.argeo.slc.services.AgentService" />
-       <service ref="slcExecutionService"
-               interface="org.argeo.slc.services.SlcExecutionService" />
-       <service ref="attachmentsStorage"
-               interface="org.argeo.slc.core.attachment.AttachmentsStorage" />
-
-       <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
-               id="testResultDao" />
-       <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
-               id="testResultCollectionDao" />
-       <reference interface="org.argeo.slc.dao.test.TestRunDescriptorDao"
-               id="testRunDescriptorDao" />
-       <reference interface="org.argeo.slc.dao.process.SlcExecutionDao"
-               id="slcExecutionDao" />
-       <reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
-               id="slcAgentDescriptorDao" />
-
-       <!--
-               <reference id="transactionManager"
-               interface="org.springframework.transaction.PlatformTransactionManager"
-               />
-       -->
-
-       <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />
-
-       <list id="eventPublishers" interface="org.argeo.slc.msg.event.SlcEventPublisher"
-               cardinality="0..N" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.services/META-INF/spring/services.xml b/server/modules/org.argeo.slc.server.services/META-INF/spring/services.xml
deleted file mode 100644 (file)
index e9f1745..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
-               <property name="locations">
-                       <value>osgibundle:services.properties
-                       </value>
-               </property>
-       </bean>
-
-       <!-- Attachments -->
-       <bean id="attachmentsStorage" class="org.argeo.slc.core.attachment.FileAttachmentsStorage"></bean>
-
-       <!-- Events -->
-       <aop:aspectj-autoproxy />
-
-       <bean id="eventPublisherAspect" class="org.argeo.slc.services.EventPublisherAspect">
-               <property name="eventPublishers" ref="eventPublishers" />
-       </bean>
-
-       <!-- Services -->
-       <bean id="testManagerService" class="org.argeo.slc.services.impl.TestManagerServiceImpl">
-               <constructor-arg ref="testResultDao" />
-               <constructor-arg ref="testRunDescriptorDao" />
-               <constructor-arg ref="slcExecutionDao" />
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
-
-       <bean id="agentService" class="org.argeo.slc.services.impl.AgentServiceImpl">
-               <constructor-arg ref="slcAgentDescriptorDao" />
-               <constructor-arg ref="agentFactory" />
-               <property name="pingCycle" value="${slc.server.services.pingCycle}" />
-       </bean>
-
-       <bean id="slcExecutionService"
-               class="org.argeo.slc.services.impl.SlcExecutionServiceImpl">
-               <constructor-arg ref="slcExecutionDao" />
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.server.services/services.properties b/server/modules/org.argeo.slc.server.services/services.properties
deleted file mode 100644 (file)
index 2814c6d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-slc.server.services.pingCycle=60000
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/modules/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index e5bba08..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ClassPath: WEB-INF/classes
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-Name: SLC Webapp
-Web-ContextPath: org.argeo.slc.webapp
-Bundle-SymbolicName: org.argeo.slc.webapp
-Import-Package: net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.refl
- ect,org.aopalliance.aop,org.argeo.slc.build,org.argeo.slc.core.attach
- ment,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,o
- rg.argeo.slc.deploy,org.argeo.slc.msg.event,org.argeo.slc.runtime,org
- .argeo.slc.services,org.argeo.slc.web.mvc,org.argeo.slc.web.mvc.attac
- hment,org.argeo.slc.web.mvc.event,org.argeo.slc.web.mvc.execution,org
- .argeo.slc.web.mvc.management,org.argeo.slc.web.mvc.process,org.argeo
- .slc.web.mvc.provisioning,org.argeo.slc.web.mvc.result,org.argeo.slc.
- web.mvc.runtime,org.hibernate,org.hibernate.hql.ast,org.hibernate.jdb
- c,org.springframework.aop,org.springframework.aop.framework,org.sprin
- gframework.aop.scope,org.springframework.beans.factory.support,org.sp
- ringframework.orm.hibernate3.support,org.springframework.osgi.web.con
- text.support,org.springframework.oxm,org.springframework.security.con
- text,org.springframework.security.providers,org.springframework.secur
- ity.ui.webapp,org.springframework.security.userdetails.memory,org.spr
- ingframework.transaction,org.springframework.web.context,org.springfr
- amework.web.context.request,org.springframework.web.context.support,o
- rg.springframework.web.filter,org.springframework.web.servlet,org.spr
- ingframework.web.servlet.handler,org.springframework.web.servlet.mvc
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
deleted file mode 100644 (file)
index fcea0a1..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <!--
-               <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
-       -->
-       <import resource="security.xml" />
-
-       <import resource="osgi.xml" />
-
-       <!-- Hibernate instrumentation-->
-       <bean id="osivInterceptor"
-               class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-               <property name="sessionFactory" ref="sessionFactory" />
-       </bean>
-
-
-       <!--  Properties -->
-       <bean
-               class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
-               lazy-init="false">
-               <property name="contextOverride" value="true" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
-       </bean>
-
-       <!-- Web Services transactions -->
-       <aop:config>
-               <aop:pointcut id="epMethods"
-                       expression="execution(* org.springframework.web.servlet.mvc.Controller.handleRequest(..))" />
-               <aop:advisor advice-ref="epAdvice" pointcut-ref="epMethods" />
-       </aop:config>
-
-       <tx:advice id="epAdvice" transaction-manager="hibernateTransactionManager">
-               <tx:attributes>
-                       <tx:method name="*" propagation="REQUIRED" />
-               </tx:attributes>
-       </tx:advice>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
deleted file mode 100644 (file)
index ae5bfea..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean name="/resultView.xls" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="resultExcelView" />
-       </bean>
-
-       <bean name="resultExcelView" class="org.argeo.slc.web.mvc.result.ResultExcelView">
-       </bean>
-
-       <bean name="/resultView.pdf" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="resultPdfView" />
-       </bean>
-
-       <bean name="resultPdfView" class="org.argeo.slc.web.mvc.result.ResultPdfView">
-       </bean>
-
-       <bean
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                               <ref bean="osivInterceptor" />
-                       </list>
-               </property>
-       </bean>
-
-
-       <bean id="viewResolverXls"
-               class="org.springframework.web.servlet.view.BeanNameViewResolver">
-       </bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
deleted file mode 100644 (file)
index 79eba0f..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <reference id="marshaller" interface="org.springframework.oxm.Marshaller" />\r
-       <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />\r
-\r
-       <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r
-               id="testResultDao" />\r
-       <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
-               id="testResultCollectionDao" />\r
-       <reference interface="org.argeo.slc.dao.test.TestRunDescriptorDao"\r
-               id="testRunDescriptorDao" />\r
-       <reference interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
-               id="slcExecutionDao" />\r
-       <reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"\r
-               id="slcAgentDescriptorDao" />\r
-\r
-       <reference interface="org.hibernate.SessionFactory" id="sessionFactory" />\r
-\r
-       <!--\r
-               <reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
-               id="modulesManager" />\r
-       -->\r
-       <reference id="testManagerService"\r
-               interface="org.argeo.slc.services.TestManagerService" />\r
-       <reference id="agentService" interface="org.argeo.slc.services.AgentService" />\r
-       <reference id="slcExecutionService"\r
-               interface="org.argeo.slc.services.SlcExecutionService" />\r
-\r
-       <reference id="hibernateTransactionManager"\r
-               interface="org.springframework.transaction.PlatformTransactionManager"\r
-               bean-name="hibernateTransactionManager" />\r
-\r
-       <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
-\r
-       <reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />\r
-\r
-       <reference id="attachmentsStorage"\r
-               interface="org.argeo.slc.core.attachment.AttachmentsStorage" />\r
-\r
-       <!-- Runtime -->\r
-       <reference id="dynamicRuntime" interface="org.argeo.slc.deploy.DynamicRuntime" />\r
-\r
-       <!-- Provisioning -->\r
-       <set id="modularDistributions" interface="org.argeo.slc.build.ModularDistribution"\r
-               cardinality="0..N" />\r
-\r
-</beans:beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/provisioning-servlet.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/provisioning-servlet.xml
deleted file mode 100644 (file)
index bc2df74..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean name="getBundleHandler" class="org.argeo.slc.web.mvc.provisioning.BundleHandler">
-       </bean>
-
-       <bean name="updateSiteHandler"
-               class="org.argeo.slc.web.mvc.provisioning.EclipseUpdateSiteHandler">
-       </bean>
-
-       <bean name="availableDistributions"
-               class="org.argeo.slc.web.mvc.provisioning.AvailableDistributions">
-               <property name="modularDistributions" ref="modularDistributions" />
-       </bean>
-
-       <bean name="availableModulesHtml"
-               class="org.argeo.slc.web.mvc.provisioning.AvailableModulesHtml" />
-       <bean name="availableModulesPlain"
-               class="org.argeo.slc.web.mvc.provisioning.AvailableModulesPlain" />
-       <bean name="availableModulesOsgiBoot"
-               class="org.argeo.slc.web.mvc.provisioning.AvailableModulesOsgiBoot" />
-
-       <!-- MVC -->
-       <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                               <ref local="modularDistributionInterceptor" />
-                       </list>
-               </property>
-               <property name="mappings">
-                       <value>
-                               /*/*/modules.html=availableModulesHtml
-                               /*/*/modules=availableModulesPlain
-                               /*/*/modularDistribution=availableModulesOsgiBoot
-                               /*/*/site.xml=updateSiteHandler
-                       </value>
-               </property>
-       </bean>
-
-       <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                               <ref local="modularDistributionInterceptor" />
-                               <ref local="eclipseUpdateSiteInterceptor" />
-                       </list>
-               </property>
-               <property name="mappings">
-                       <value>
-                               /*/*/plugins/*=getBundleHandler
-                               /*/*/features/*=getBundleHandler
-                       </value>
-               </property>
-       </bean>
-
-       <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                               <ref local="modularDistributionInterceptor" />
-                               <ref local="bundleJarInterceptor" />
-                       </list>
-               </property>
-               <property name="mappings">
-                       <value>
-                               /*/*/*.jar=getBundleHandler
-                       </value>
-               </property>
-       </bean>
-
-       <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                       </list>
-               </property>
-               <property name="mappings">
-                       <value>
-                               /distributions=availableDistributions
-                       </value>
-               </property>
-       </bean>
-
-       <bean id="modularDistributionInterceptor"
-               class="org.argeo.slc.web.mvc.provisioning.ModularDistributionInterceptor">
-               <property name="modularDistributions" ref="modularDistributions" />
-       </bean>
-
-       <bean id="eclipseUpdateSiteInterceptor"
-               class="org.argeo.slc.web.mvc.provisioning.EclipseUpdateSiteInterceptor" />
-
-       <bean id="bundleJarInterceptor" class="org.argeo.slc.web.mvc.provisioning.BundleJarInterceptor" />
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/ria-servlet.xml
deleted file mode 100644 (file)
index 484aae9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean name="/getCredentials.ria" class="org.argeo.slc.web.mvc.management.GetCredentials" />
-
-       <!-- MVC -->
-       <bean id="handlerMapping"
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/security.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/security.xml
deleted file mode 100644 (file)
index 35397ad..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-       xmlns:beans="http://www.springframework.org/schema/beans" 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.0.xsd
-              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-
-       <http realm="User Interface" >
-               <intercept-url pattern="/**" access="ROLE_USER,ROLE_ADMIN" />
-               <http-basic />
-               <anonymous />
-       </http>
-
-       <authentication-provider>
-               <user-service>
-                       <user name="mbaudier" password="mbaudier" authorities="ROLE_USER,ROLE_ADMIN" />
-                       <user name="cdujeu" password="cdujeu" authorities="ROLE_USER" />
-                       <user name="test" password="test" authorities="ROLE_USER" />
-                       <user name="demo" password="demo" authorities="ROLE_USER" />
-               </user-service>
-       </authentication-provider>
-
-</beans:beans>
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
deleted file mode 100644 (file)
index c381a31..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean name="/isServerReady.service" class="org.argeo.slc.web.mvc.management.IsServerReady">
-       </bean>
-
-       <bean name="/getResult.service" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-       </bean>
-
-       <bean name="/addResultToCollection.service"
-               class="org.argeo.slc.web.mvc.result.AddResultToCollectionController">
-               <constructor-arg ref="testManagerService" />
-       </bean>
-
-       <bean name="/removeResultFromCollection.service"
-               class="org.argeo.slc.web.mvc.result.RemoveResultFromCollectionController">
-               <constructor-arg ref="testResultCollectionDao" />
-               <constructor-arg ref="testManagerService" />
-       </bean>
-
-       <bean name="/listCollectionRefs.service"
-               class="org.argeo.slc.web.mvc.result.ResultCollectionReferencesController">
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
-
-       <bean name="/listResultAttributes.service"
-               class="org.argeo.slc.web.mvc.result.ListResultAttributesController">
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
-
-       <bean name="/listResults.service" class="org.argeo.slc.web.mvc.result.ListResultsController">
-               <constructor-arg ref="testResultCollectionDao" />
-       </bean>
-
-       <bean name="/copyCollectionToCollection.service"
-               class="org.argeo.slc.web.mvc.result.CopyCollectionToCollectionController">
-               <constructor-arg ref="testResultCollectionDao" />
-               <constructor-arg ref="testManagerService" />
-       </bean>
-
-       <bean name="/listAgents.service" class="org.argeo.slc.web.mvc.runtime.ListAgentsController">
-               <constructor-arg ref="slcAgentDescriptorDao" />
-       </bean>
-
-       <bean name="/cleanAgents.service" class="org.argeo.slc.web.mvc.runtime.CleanAgentsController">
-               <constructor-arg ref="slcAgentDescriptorDao" />
-       </bean>
-
-       <bean name="/listSlcExecutions.service"
-               class="org.argeo.slc.web.mvc.process.ListSlcExecutionsController">
-               <constructor-arg ref="slcExecutionDao" />
-       </bean>
-
-       <bean name="/getSlcExecution.service" class="org.argeo.slc.web.mvc.process.GetSlcExecution">
-               <property name="slcExecutionDao" ref="slcExecutionDao" />
-               <property name="unmarshaller" ref="unmarshaller" />
-               <property name="attachmentsStorage" ref="attachmentsStorage" />
-       </bean>
-
-       <bean name="/newSlcExecution.service"
-               class="org.argeo.slc.web.mvc.process.NewSlcExecutionController">
-               <property name="agentFactory" ref="agentFactory" />
-               <property name="unmarshaller" ref="unmarshaller" />
-               <property name="marshaller" ref="marshaller" />
-               <property name="slcExecutionService" ref="slcExecutionService" />
-               <property name="attachmentsStorage" ref="attachmentsStorage" />
-       </bean>
-
-       <bean name="/getExecutionDescriptor.service" class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">
-               <property name="agentFactory" ref="agentFactory" />
-       </bean>
-
-       <bean name="/listModulesDescriptors.service"
-               class="org.argeo.slc.web.mvc.execution.ListModulesDescriptors">
-               <property name="agentFactory" ref="agentFactory" />
-       </bean>
-
-       <!-- Events -->
-       <bean name="/addEventListener.service"
-               class="org.argeo.slc.web.mvc.event.AddEventListenerController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
-       </bean>
-
-       <bean name="/removeEventListener.service"
-               class="org.argeo.slc.web.mvc.event.RemoveEventListenerController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
-       </bean>
-
-       <bean name="/pollEvent.service" class="org.argeo.slc.web.mvc.event.PollEventController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
-               <property name="eventListener" ref="eventListener" />
-       </bean>
-
-       <bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
-               scope="session">
-               <aop:scoped-proxy />
-       </bean>
-
-       <!-- Attachements -->
-       <bean name="/getAttachment.service" class="org.argeo.slc.web.mvc.attachment.GetAttachmentHandler">
-               <property name="attachmentsStorage" ref="attachmentsStorage" />
-       </bean>
-
-       <!-- Management -->
-       <bean name="/shutdownRuntime.service" class="org.argeo.slc.web.mvc.management.ShutdownRuntime">
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
-       </bean>
-
-       <!-- Provisioning -->
-       <bean name="/listModularDistributions.service"
-               class="org.argeo.slc.web.mvc.provisioning.ListModularDistributions">
-               <property name="modularDistributions" ref="modularDistributions" />
-       </bean>
-
-       <bean name="/installModule.service" class="org.argeo.slc.web.mvc.management.InstallModule">
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
-       </bean>
-
-       <bean name="/uninstallModule.service" class="org.argeo.slc.web.mvc.management.UninstallModule">
-               <property name="dynamicRuntime" ref="dynamicRuntime" />
-       </bean>
-
-       <!-- MVC -->
-       <bean id="handlerMapping"
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                               <ref bean="osivInterceptor" />
-                       </list>
-               </property>
-       </bean>
-
-       <bean id="viewResolver" class="org.argeo.slc.web.mvc.MarshallerViewResolver">
-               <constructor-arg ref="marshaller" />
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/web.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/web.xml
deleted file mode 100644 (file)
index f224ae5..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-       version="2.5">
-
-       <display-name>SLC Web Application</display-name>
-
-       <!-- SERVICE servlet -->
-       <servlet>
-               <servlet-name>slc-service</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>slc-service</servlet-name>
-               <url-pattern>*.service</url-pattern>
-       </servlet-mapping>
-
-       <!-- XSLT servlet -->
-       <servlet>
-               <servlet-name>xslt</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>xslt</servlet-name>
-               <url-pattern>*.xslt</url-pattern>
-       </servlet-mapping>
-
-       <!-- DOC servlet -->
-       <servlet>
-               <servlet-name>doc</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>doc</servlet-name>
-               <url-pattern>*.xls</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>doc</servlet-name>
-               <url-pattern>*.pdf</url-pattern>
-       </servlet-mapping>
-
-       <!-- PROVISIONING servlet -->
-       <servlet>
-               <servlet-name>provisioning</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-       <servlet-mapping>
-               <servlet-name>provisioning</servlet-name>
-               <url-pattern>/dist/*</url-pattern>
-       </servlet-mapping>
-
-       <!-- RIA servlet -->
-       <servlet>
-               <servlet-name>ria</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-       <servlet-mapping>
-               <servlet-name>ria</servlet-name>
-               <url-pattern>*.ria</url-pattern>
-       </servlet-mapping>
-
-       <!-- General -->
-       <context-param>
-               <param-name>contextConfigLocation</param-name>
-               <param-value>/WEB-INF/applicationContext.xml</param-value>
-       </context-param>
-
-       <listener>
-               <display-name>Spring Context</display-name>
-               <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-       </listener>
-       <context-param>
-               <param-name>contextClass</param-name>
-               <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-       </context-param>
-
-       <!--  Security -->
-       <filter>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-       </filter>
-
-       <filter-mapping>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <url-pattern>/*</url-pattern>
-       </filter-mapping>
-
-       <!--
-               Log4j configContext loader config <listener>
-               <display-name>Log4j</display-name>
-               <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-               </listener> <context-param>
-               <param-name>log4jConfigLocation</param-name>
-               <param-value>/WEB-INF/classes/log4j.properties</param-value>
-               </context-param> <context-param>
-               <param-name>log4jRefreshInterval</param-name>
-               <param-value>5000</param-value> </context-param>
-       -->
-</web-app>
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml b/server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
deleted file mode 100644 (file)
index 0853254..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <bean
-               class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
-               <property name="interceptors">
-                       <list>
-                               <ref bean="osivInterceptor" />
-                       </list>
-               </property>
-       </bean>
-
-
-       <bean id="viewResolverXslt" class="org.argeo.slc.web.mvc.XsltMarshallerViewResolver">
-               <property name="viewClass">
-                       <value>org.argeo.slc.web.mvc.XsltMarshallerView
-                       </value>
-               </property>
-               <property name="prefix">
-                       <value>WEB-INF/xslt/</value>
-               </property>
-               <property name="suffix">
-                       <value>.xsl</value>
-               </property>
-               <property name="marshaller" ref="marshaller" />
-       </bean>
-
-
-       <bean name="/resultView.xslt" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="resultView" />
-       </bean>
-
-       <bean name="/resultViewXml.xslt" class="org.argeo.slc.web.mvc.result.GetResultController">
-               <constructor-arg ref="testResultDao" />
-               <property name="viewName" value="viewXml" />
-       </bean>
-
-       <bean name="/resultCollectionViewXml.xslt"
-               class="org.argeo.slc.web.mvc.result.GetResultCollectionController">
-               <constructor-arg ref="testResultCollectionDao" />
-               <property name="viewName" value="viewXml" />
-       </bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl b/server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl
deleted file mode 100644 (file)
index e9989bd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<xsl:stylesheet version="1.0"\r
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
-       xmlns:slc="http://argeo.org/projects/slc/schemas"\r
-       exclude-result-prefixes="slc">\r
-\r
-       <xsl:output method="html" omit-xml-declaration="yes" />
-       
-\r
-       <xsl:template match="/">\r
-               <html>\r
-                       <head>\r
-                               <title>Result</title>\r
-                       </head>\r
-                       <body style="font-family: sans-serif">\r
-                               <h1>\r
-                                       Result\r
-                                       <xsl:value-of select="slc:tree-test-result/@uuid" />\r
-                               </h1>\r
-                               <xsl:for-each\r
-                                       select="slc:tree-test-result/slc:result-parts/slc:result-part">\r
-                                       <h2>\r
-                                               <xsl:value-of select="@path" />\r
-                                       </h2>\r
-                                       <table>\r
-                                               <xsl:for-each\r
-                                                       select="slc:part-sub-list/slc:parts/slc:simple-result-part">\r
-                                                       <tr>\r
-                                                               <xsl:choose>\r
-                                                                       <xsl:when\r
-                                                                               test="slc:status = 'PASSED' ">\r
-                                                                               <td style="color:green">\r
-                                                                                       <xsl:value-of\r
-                                                                                               select="slc:message" />\r
-                                                                               </td>\r
-                                                                       </xsl:when>\r
-                                                                       <xsl:otherwise>\r
-                                                                               <td style="color:red">\r
-                                                                                       <xsl:value-of\r
-                                                                                               select="slc:message" />\r
-                                                                               </td>\r
-                                                                       </xsl:otherwise>\r
-                                                               </xsl:choose>\r
-                                                       </tr>\r
-                                               </xsl:for-each>\r
-                                       </table>\r
-                               </xsl:for-each>\r
-                       </body>\r
-               </html>\r
-       </xsl:template>\r
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl b/server/modules/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl
deleted file mode 100644 (file)
index 87d6371..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<xsl:stylesheet version="1.0"\r
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
-       xmlns:slc="http://argeo.org/projects/slc/schemas"\r
-       exclude-result-prefixes="slc">\r
-\r
-       <xsl:template match="/">
-               <xsl:copy-of select="*"/>\r
-       </xsl:template>\r
-</xsl:stylesheet>
\ No newline at end of file
index a5e926cc6dcdfe0e1142e61350dc7a0d883cacd7..62f8264b23c1f86269325095a702d25e49fed7e2 100644 (file)
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.argeo.slc</groupId>
-               <artifactId>modules</artifactId>
-               <version>0.12.1-SNAPSHOT</version>
+               <groupId>org.argeo.commons</groupId>
+               <version>0.1.1-SNAPSHOT</version>
+               <artifactId>server</artifactId>
                <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.modules</groupId>
-       <artifactId>server</artifactId>
+       <groupId>org.argeo.server</groupId>
+       <artifactId>modules</artifactId>
        <packaging>bundles</packaging>
        <name>SLC Modules Server</name>
        <build>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <extensions>true</extensions>
                                <configuration>
-                                       <bundlesPomArtifactId>org.argeo.slc.modules.server.bundles</bundlesPomArtifactId>
+                                       <bundlesPomArtifactId>org.argeo.server.modules</bundlesPomArtifactId>
                                </configuration>
                        </plugin>
                </plugins>
        </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.server</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
 </project>
\ No newline at end of file