]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Integrate demo in web
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 4 Mar 2009 18:10:40 +0000 (18:10 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 4 Mar 2009 18:10:40 +0000 (18:10 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@2219 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

77 files changed:
demo/org.argeo.slc.demo.basic/.classpath
demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml [deleted file]
demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml [deleted file]
demo/org.argeo.slc.demo.manager/.classpath
demo/org.argeo.slc.demo.manager/.springBeans
demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml [deleted file]
demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml [deleted file]
demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml [deleted file]
demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml [deleted file]
demo/site/.project [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/basic.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/canonic.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/common.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/imports.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/main.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/osgi.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF [new file with mode: 0644]
demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven [new file with mode: 0644]
demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.deploy/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/conf/jms.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/conf/manager.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/conf/maven.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl [deleted file]
org.argeo.slc.webapp/src/main/webapp/index.jsp
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/style.css [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/style.css [deleted file]
org.argeo.slc.webapp/src/main/webapp/test-amq/send.html [deleted file]
org.argeo.slc.webapp/src/main/webapp/test-amq/send.js [deleted file]
runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java [new file with mode: 0644]
runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java [new file with mode: 0644]
runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java [new file with mode: 0644]
runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java [new file with mode: 0644]
runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java [deleted file]
server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp [deleted file]
server/org.argeo.slc.siteserver/pom.xml

index b5ef387afabc93bc2c852ad9eac7cca6c34252f0..624a6cfe1134b952b68008ae2b62cd10c78a501e 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/resources"/>
        <classpathentry kind="src" path="src/test/java"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
deleted file mode 100644 (file)
index a513e3f..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="basic.spec" parent="slcTemplate.simpleSpec">\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="testedComponentId">\r
-                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
-                                               p:type="integer" />\r
-                               </entry>\r
-                               <entry key="testData1">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:isParameter="true" p:isFrozen="true" />\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:isParameter="true" p:isFrozen="true" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef"\r
-               abstract="true" />\r
-\r
-       <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
-               abstract="true">\r
-               <property name="executionSpec" ref="basic.spec" />\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref bean="echo1" />\r
-                               <bean parent="testRun">\r
-                                       <property name="testDefinition" ref="testDef" />\r
-                                       <property name="testData">\r
-                                               <bean parent="basic.ref">\r
-                                                       <constructor-arg value="testData1" />\r
-                                               </bean>\r
-                                       </property>\r
-                               </bean>\r
-                               <bean parent="testRun">\r
-                                       <property name="testDefinition" ref="testDef" />\r
-                                       <property name="testData" ref="ref1" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="ref1" parent="basic.ref" scope="prototype">\r
-               <constructor-arg value="testData2" />\r
-       </bean>\r
-\r
-\r
-       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="tata" />\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml
deleted file mode 100644 (file)
index ddc7aca..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="canonic.spec" parent="slcTemplate.simpleSpec">\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation">\r
-                                       <bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="displayWithoutControl">\r
-                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
-                                               p:isFrozen="true" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="displayWithControl">\r
-                                       <bean parent="specAttr.primitive" p:value="200" p:isParameter="true"\r
-                                               p:isFrozen="false" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="hide">\r
-                                       <bean parent="specAttr.primitive" p:value="300" p:isParameter="true"\r
-                                               p:isFrozen="false" p:isHidden="true" p:type="integer" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"\r
-               abstract="true">\r
-               <property name="executionSpec" ref="canonic.spec" />\r
-               <property name="executables">\r
-                       <list>\r
-                               <bean parent="task.echo"\r
-                                       p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"\r
-                                       scope="execution">\r
-                                       <aop:scoped-proxy />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
deleted file mode 100644 (file)
index 75f4005..0000000
+++ /dev/null
@@ -1,17 +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="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-               scope="prototype" />
-
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />
-
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-               abstract="true">
-               <property name="testResult" ref="testResult" />
-       </bean>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml
deleted file mode 100644 (file)
index 6bff52f..0000000
+++ /dev/null
@@ -1,12 +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/core/execution/spring.xml" />
-
-       <import
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
deleted file mode 100644 (file)
index 5d84931..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />\r
-\r
-       <bean id="main" parent="slcTemplate.simpleFlow">\r
-               <property name="executionSpec">\r
-                       <bean parent="slcTemplate.simpleSpec">\r
-                               <property name="attributes">\r
-                                       <map>\r
-                                               <entry key="testKey">\r
-                                                       <bean parent="specAttr.primitive" p:value="660" />\r
-                                               </entry>\r
-                                       </map>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref local="echo1" />\r
-                               <ref bean="basic.001" />\r
-                               <ref bean="basic.001" />\r
-                               <ref bean="basic.002" />\r
-                               <ref bean="canonic.001" />\r
-                               <ref bean="canonic.002" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="echo1" parent="task.echo" scope="execution">\r
-               <property name="message"\r
-                       value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
-               <aop:scoped-proxy />\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml
deleted file mode 100644 (file)
index ebc3364..0000000
+++ /dev/null
@@ -1,11 +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.execution.ExecutionModule"\r
-               ref="executionModule" />\r
-</beans:beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
deleted file mode 100644 (file)
index 7571fc9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="basic.001" parent="basic.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="testData1" value-ref="basic.001.testData" />\r
-                               <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">\r
-                                               <aop:scoped-proxy />\r
-                                               <property name="expected" value="tata101" />\r
-                                               <property name="reached" value="tata@{testKey}" />\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-\r
-       <bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"\r
-               scope="execution">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata100" />\r
-               <property name="reached" value="tata@{testedComponentId}" />\r
-       </bean>\r
-\r
-       <bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
deleted file mode 100644 (file)
index 5720d96..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <bean id="basic.002" parent="basic.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="testData1">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                               <property name="expected" value="toto" />\r
-                                               <property name="reached" value="toto" />\r
-                                       </bean>\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                               <property name="expected" value="tata" />\r
-                                               <property name="reached" value="toto" />\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml
deleted file mode 100644 (file)
index 77d4fee..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="canonic.001" parent="canonic.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="1" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml
deleted file mode 100644 (file)
index 5916c08..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="canonic.002" parent="canonic.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="2" />\r
-                               <entry key="displayWithoutControl" value="102" />\r
-                               <entry key="displayWithControl" value="202" />\r
-                               <entry key="hide" value="202" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r
index b5ef387afabc93bc2c852ad9eac7cca6c34252f0..624a6cfe1134b952b68008ae2b62cd10c78a501e 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/resources"/>
        <classpathentry kind="src" path="src/test/java"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
index 15edcfdb85a9dc2bcf0ca2018b9b8fa2ea519e91..c11d814860ade8dba00c82079d3507a8a3952aee 100644 (file)
@@ -7,9 +7,6 @@
        </configSuffixes>
        <enableImports><![CDATA[true]]></enableImports>
        <configs>
-               <config>src/main/resources/conf/manager-osgi.xml</config>
-               <config>src/main/resources/conf/manager.xml</config>
-               <config>src/main/resources/conf/jms.xml</config>
        </configs>
        <configSets>
        </configSets>
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml
deleted file mode 100644 (file)
index d0ab93c..0000000
+++ /dev/null
@@ -1,32 +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"
-       default-lazy-init="false">
-
-       <import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-
-       <bean id="modulesManager.listenerContainer" parent="slcTemplate.jms.listenerContainer">
-               <property name="destination" ref="slcJms.destination.modulesManager.request" />
-               <property name="messageListener">
-                       <bean class="org.argeo.slc.jms.ServiceMessageListenerAdapter">
-                               <property name="methodArguments">
-                                       <map>
-                                               <entry key="getExecutionModuleDescriptor">
-                                                       <list>
-                                                               <value>name</value>
-                                                               <value>version</value>
-                                                       </list>
-                                               </entry>
-                                       </map>
-                               </property>
-
-                               <property name="delegate" ref="modulesManager" />
-                               <property name="defaultResponseDestination" ref="slcJms.destination.modulesManager.response" />
-                               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-                       </bean>
-               </property>
-       </bean>
-
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml
deleted file mode 100644 (file)
index 0b7c972..0000000
+++ /dev/null
@@ -1,13 +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
-       <list id="executionModules" interface="org.argeo.slc.execution.ExecutionModule"\r
-               cardinality="0..N" />\r
-               \r
-       \r
-</beans:beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml
deleted file mode 100644 (file)
index 58c45b6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <bean id="modulesManager" class="org.argeo.slc.core.execution.ModulesManager">\r
-               <property name="executionModules" ref="executionModules" />\r
-       </bean>\r
-\r
-       <bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">\r
-               <property name="urlsToInstall">\r
-                       <bean class="org.argeo.slc.maven.MavenToUrl">\r
-                               <property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />\r
-                               <property name="mavenFiles">\r
-                                       <bean class="org.argeo.slc.maven.DependencyFileLoader">\r
-                                               <property name="dependenciesResource"\r
-                                                       value="classpath:/META-INF/slc/dep/manager.maven" />\r
-                                       </bean>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-               <property name="ignoreUnresolvablePlaceholders" value="true" />\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml
deleted file mode 100644 (file)
index 0fb5c6a..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:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-<!-- 
-       <bean id="mavenManager" class="org.argeo.slc.maven.MavenManager"
-               init-method="init">
-               <property name="remoteRepositories">
-                       <list>
-                               <bean class="org.argeo.slc.maven.RemoteRepository">
-                                       <property name="id" value="central" />
-                                       <property name="url" value="http://repo1.maven.org/maven2" />
-                               </bean>
-                       </list>
-               </property>
-       </bean>
-        -->
-</beans>
\ No newline at end of file
diff --git a/demo/site/.project b/demo/site/.project
new file mode 100644 (file)
index 0000000..3bc0b02
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo.site</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+       </buildSpec>
+       <natures>
+       </natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..b5326e5
--- /dev/null
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)
+Built-By: mbaudier
+Build-Jdk: 1.6.0_0
+Export-Package: conf;version="0.11.3.SNAPSHOT",conf.testCases;version=
+ "0.11.3.SNAPSHOT"
+Tool: Bnd-0.0.255
+Bundle-Name: Argeo SLC Demo Basic Test Module
+Require-Bundle: org.argeo.slc.support.equinox,org.argeo.slc.specs,org.
+ argeo.slc.support.simple,org.springframework.aop,com.springsource.net
+ .sf.cglib,com.springsource.org.aopalliance
+Bundle-Vendor: Argeo
+Bundle-Version: 0.11.3.SNAPSHOT
+Spring-Context: conf/*,conf/testCases/*
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.apache.commons.logging;version="1.1",org.springfra
+ mework.beans.factory.config;version="2.5.6.A"
+Bundle-SymbolicName: org.argeo.slc.demo.basic
+Bundle-DocURL: http://www.argeo.org
+
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
new file mode 100644 (file)
index 0000000..a513e3f
--- /dev/null
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
+\r
+       <bean id="basic.spec" parent="slcTemplate.simpleSpec">\r
+               <property name="attributes">\r
+                       <map>\r
+                               <entry key="testedComponentId">\r
+                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
+                                               p:type="integer" />\r
+                               </entry>\r
+                               <entry key="testData1">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true" />\r
+                               </entry>\r
+                               <entry key="testData2">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true" />\r
+                               </entry>\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef"\r
+               abstract="true" />\r
+\r
+       <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
+               abstract="true">\r
+               <property name="executionSpec" ref="basic.spec" />\r
+               <property name="executables">\r
+                       <list>\r
+                               <ref bean="echo1" />\r
+                               <bean parent="testRun">\r
+                                       <property name="testDefinition" ref="testDef" />\r
+                                       <property name="testData">\r
+                                               <bean parent="basic.ref">\r
+                                                       <constructor-arg value="testData1" />\r
+                                               </bean>\r
+                                       </property>\r
+                               </bean>\r
+                               <bean parent="testRun">\r
+                                       <property name="testDefinition" ref="testDef" />\r
+                                       <property name="testData" ref="ref1" />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="ref1" parent="basic.ref" scope="prototype">\r
+               <constructor-arg value="testData2" />\r
+       </bean>\r
+\r
+\r
+       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="tata" />\r
+       </bean>\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
new file mode 100644 (file)
index 0000000..ddc7aca
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
+\r
+       <bean id="canonic.spec" parent="slcTemplate.simpleSpec">\r
+               <property name="attributes">\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation">\r
+                                       <bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="displayWithoutControl">\r
+                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
+                                               p:isFrozen="true" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="displayWithControl">\r
+                                       <bean parent="specAttr.primitive" p:value="200" p:isParameter="true"\r
+                                               p:isFrozen="false" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="hide">\r
+                                       <bean parent="specAttr.primitive" p:value="300" p:isParameter="true"\r
+                                               p:isFrozen="false" p:isHidden="true" p:type="integer" />\r
+                               </entry>\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"\r
+               abstract="true">\r
+               <property name="executionSpec" ref="canonic.spec" />\r
+               <property name="executables">\r
+                       <list>\r
+                               <bean parent="task.echo"\r
+                                       p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"\r
+                                       scope="execution">\r
+                                       <aop:scoped-proxy />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/common.xml b/demo/site/org.argeo.slc.demo.basic/conf/common.xml
new file mode 100644 (file)
index 0000000..75f4005
--- /dev/null
@@ -0,0 +1,17 @@
+<?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="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
+               scope="prototype" />
+
+       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />
+
+       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
+               abstract="true">
+               <property name="testResult" ref="testResult" />
+       </bean>
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/imports.xml b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
new file mode 100644 (file)
index 0000000..6bff52f
--- /dev/null
@@ -0,0 +1,12 @@
+<?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/core/execution/spring.xml" />
+
+       <import
+               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/main.xml b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
new file mode 100644 (file)
index 0000000..5d84931
--- /dev/null
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
+\r
+       <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />\r
+\r
+       <bean id="main" parent="slcTemplate.simpleFlow">\r
+               <property name="executionSpec">\r
+                       <bean parent="slcTemplate.simpleSpec">\r
+                               <property name="attributes">\r
+                                       <map>\r
+                                               <entry key="testKey">\r
+                                                       <bean parent="specAttr.primitive" p:value="660" />\r
+                                               </entry>\r
+                                       </map>\r
+                               </property>\r
+                       </bean>\r
+               </property>\r
+               <property name="executables">\r
+                       <list>\r
+                               <ref local="echo1" />\r
+                               <ref bean="basic.001" />\r
+                               <ref bean="basic.001" />\r
+                               <ref bean="basic.002" />\r
+                               <ref bean="canonic.001" />\r
+                               <ref bean="canonic.002" />\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="echo1" parent="task.echo" scope="execution">\r
+               <property name="message"\r
+                       value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
+               <aop:scoped-proxy />\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
new file mode 100644 (file)
index 0000000..ebc3364
--- /dev/null
@@ -0,0 +1,11 @@
+<?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.execution.ExecutionModule"\r
+               ref="executionModule" />\r
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml
new file mode 100644 (file)
index 0000000..7571fc9
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
+\r
+       <bean id="basic.001" parent="basic.flowTemplate">\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="testData1" value-ref="basic.001.testData" />\r
+                               <entry key="testData2">\r
+                                       <bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">\r
+                                               <aop:scoped-proxy />\r
+                                               <property name="expected" value="tata101" />\r
+                                               <property name="reached" value="tata@{testKey}" />\r
+                                       </bean>\r
+                               </entry>\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+\r
+       <bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"\r
+               scope="execution">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata100" />\r
+               <property name="reached" value="tata@{testedComponentId}" />\r
+       </bean>\r
+\r
+       <bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">\r
+       </bean>\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml
new file mode 100644 (file)
index 0000000..5720d96
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <bean id="basic.002" parent="basic.flowTemplate">\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="testData1">\r
+                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                               <property name="expected" value="toto" />\r
+                                               <property name="reached" value="toto" />\r
+                                       </bean>\r
+                               </entry>\r
+                               <entry key="testData2">\r
+                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                               <property name="expected" value="tata" />\r
+                                               <property name="reached" value="toto" />\r
+                                       </bean>\r
+                               </entry>\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml
new file mode 100644 (file)
index 0000000..77d4fee
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
+\r
+       <bean id="canonic.001" parent="canonic.flowTemplate">\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="1" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml
new file mode 100644 (file)
index 0000000..5916c08
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
+\r
+       <bean id="canonic.002" parent="canonic.flowTemplate">\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="2" />\r
+                               <entry key="displayWithoutControl" value="102" />\r
+                               <entry key="displayWithControl" value="202" />\r
+                               <entry key="hide" value="202" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..f41bdfb
--- /dev/null
@@ -0,0 +1,4 @@
+Bundle-SymbolicName: org.argeo.slc.demo.deploy
+Bundle-Version: 1.0.0
+Require-Bundle: org.springframework.beans;bundle-version="2.5.6"
+Bundle-ManifestVersion: 2
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
new file mode 100644 (file)
index 0000000..b0ae360
--- /dev/null
@@ -0,0 +1,59 @@
+
+The following files have been resolved:
+   com.jcraft.jzlib:com.springsource.com.jcraft.jzlib:jar:1.0.7:compile
+   com.thoughtworks.xstream:com.springsource.com.thoughtworks.xstream:jar:1.2.2:compile
+   javax.activation:com.springsource.javax.activation:jar:1.1.1:compile
+   javax.ejb:com.springsource.javax.ejb:jar:3.0.0:compile
+   javax.jms:com.springsource.javax.jms:jar:1.1.0:compile
+   javax.servlet:com.springsource.javax.servlet:jar:2.5.0:compile
+   javax.xml.rpc:com.springsource.javax.xml.rpc:jar:1.1.0:compile
+   javax.xml.soap:com.springsource.javax.xml.soap:jar:1.3.0:compile
+   javax.xml.stream:com.springsource.javax.xml.stream:jar:1.0.1:compile
+   net.sourceforge.cglib:com.springsource.net.sf.cglib:jar:2.1.3:compile
+   org.aopalliance:com.springsource.org.aopalliance:jar:1.0.0:compile
+   org.apache.bcel:com.springsource.org.apache.bcel:jar:5.1.0:compile
+   org.apache.camel:com.springsource.org.apache.camel:jar:1.3.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.collections:jar:3.2.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.io:jar:1.4.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.lang:jar:2.1.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.logging:jar:1.1.1:compile
+   org.apache.geronimo.specs:com.springsource.javax.management.j2ee:jar:1.0.1:compile
+   org.apache.log4j:com.springsource.org.apache.log4j:jar:1.2.15:compile
+   org.apache.regexp:com.springsource.org.apache.regexp:jar:1.5.0:compile
+   org.apache.ws:com.springsource.org.apache.ws.commons.schema:jar:1.3.2:compile
+   org.apache.xalan:com.springsource.org.apache.xalan:jar:2.7.0:compile
+   org.apache.xerces:com.springsource.org.apache.xerces:jar:2.8.1:compile
+   org.apache.xml:com.springsource.org.apache.xml.resolver:jar:1.2.0:compile
+   org.apache.xmlcommons:com.springsource.org.apache.xmlcommons:jar:1.3.3:compile
+   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.2:compile
+   org.argeo.dep.osgi:org.argeo.dep.osgi.maven.embedder:jar:2.0.4.argeo.1-SNAPSHOT:compile
+   org.argeo.slc:org.argeo.slc.detached.launcher:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.demo:org.argeo.slc.demo.basic:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.demo:org.argeo.slc.demo.log4j:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.specs:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.activemq:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.castor:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.equinox:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.maven:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.simple:jar:0.11.3-SNAPSHOT:compile
+   org.aspectj:com.springsource.org.aspectj.runtime:jar:1.6.2.RELEASE:compile
+   org.aspectj:com.springsource.org.aspectj.weaver:jar:1.6.2.RELEASE:compile
+   org.codehaus.castor:com.springsource.org.castor:jar:1.2.0:compile
+   org.dbunit:com.springsource.org.dbunit:jar:2.2.0:compile
+   org.eclipse.osgi:org.eclipse.osgi:jar:3.4.2.R34x_v20080826-1230:compile
+   org.junit:com.springsource.junit:jar:3.8.2:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:2.2.0:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:2.2.0:compile
+   org.springframework:org.springframework.aop:jar:2.5.6.A:compile
+   org.springframework:org.springframework.beans:jar:2.5.6.A:compile
+   org.springframework:org.springframework.context:jar:2.5.6.A:compile
+   org.springframework:org.springframework.core:jar:2.5.6.A:compile
+   org.springframework:org.springframework.jms:jar:2.5.6.A:compile
+   org.springframework:org.springframework.transaction:jar:2.5.6.A:compile
+   org.springframework.osgi:org.springframework.osgi.core:jar:1.1.3.RELEASE:compile
+   org.springframework.osgi:org.springframework.osgi.extender:jar:1.1.3.RELEASE:compile
+   org.springframework.osgi:org.springframework.osgi.io:jar:1.1.3.RELEASE:compile
+   org.springframework.ws:org.springframework.oxm:jar:1.5.5.A:compile
+   org.springframework.ws:org.springframework.xml:jar:1.5.5.A:compile
+   org.xmlpull:com.springsource.org.xmlpull:jar:1.1.3.4-O:compile
+
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml b/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml
new file mode 100644 (file)
index 0000000..5a3b94a
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">\r
+               <property name="urlsToInstall">\r
+                       <bean class="org.argeo.slc.maven.MavenToUrl">\r
+                               <property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />\r
+                               <property name="mavenFiles">\r
+                                       <bean class="org.argeo.slc.maven.DependencyFileLoader">\r
+                                               <property name="dependenciesResource"\r
+                                                       value="classpath:/META-INF/slc/dep/manager.maven" />\r
+                                       </bean>\r
+                               </property>\r
+                       </bean>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean\r
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
+               <property name="ignoreUnresolvablePlaceholders" value="true" />\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.deploy/pom.xml b/demo/site/org.argeo.slc.demo.deploy/pom.xml
new file mode 100644 (file)
index 0000000..6f56921
--- /dev/null
@@ -0,0 +1,152 @@
+<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>argeo-slc-demo</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>../..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.demo</groupId>
+       <artifactId>org.argeo.slc.demo.deploy</artifactId>
+       <name>Argeo SLC Demo Deploy</name>
+       <packaging>jar</packaging>
+       <properties></properties>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>META-INF/**</include>
+                               </includes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>manager</id>
+                                               <phase>initialize</phase>
+                                               <goals>
+                                                       <goal>list</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputFile>META-INF/slc/dep/manager.maven</outputFile>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>copy</id>
+                                               <phase>initialize</phase>
+                                               <goals>
+                                                       <goal>copy</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>${project.build.directory}/equinox</outputDirectory>
+                                                       <stripVersion>true</stripVersion>
+                                                       <artifactItems>
+                                                               <artifactItem>
+                                                                       <groupId>org.eclipse.osgi</groupId>
+                                                                       <artifactId>org.eclipse.osgi</artifactId>
+                                                                       <version>${version.equinox}</version>
+                                                               </artifactItem>
+                                                               <artifactItem>
+                                                                       <groupId>org.argeo.slc.runtime</groupId>
+                                                                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                                                                       <version>${project.version}</version>
+                                                               </artifactItem>
+                                                               <artifactItem>
+                                                                       <groupId>org.argeo.slc.runtime</groupId>
+                                                                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                                                                       <version>${project.version}</version>
+                                                                       <type>xml</type>
+                                                                       <classifier>osgiboot</classifier>
+                                                               </artifactItem>
+                                                       </artifactItems>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-antrun-plugin</artifactId>
+                               <configuration>
+                                       <tasks>
+                                               <property name="slc.osgi.locations" refid="maven.compile.classpath" />
+                                               <property name="slc.osgi.start"
+                                                       value="org.springframework.osgi.extender,org.argeo.slc.demo.basic" />
+                                               <ant
+                                                       antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
+
+                                       </tasks>
+                               </configuration>
+                       </plugin>
+
+               </plugins>
+       </build>
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.activemq</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.basic</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.log4j</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+
+               <dependency>
+                       <groupId>com.thoughtworks.xstream</groupId>
+                       <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+                       <version>1.2.2</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.apache.xerces</groupId>
+                       <artifactId>
+                                       com.springsource.org.apache.xerces
+                               </artifactId>
+                       <version>2.8.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.xmlcommons</groupId>
+                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+                       <version>1.3.3</version>
+               </dependency>
+
+       </dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..c4c968a
--- /dev/null
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Export-Package: org.argeo.slc.demo.manager;uses:="org.apache.commons.l
+ ogging";version="0.11.3.SNAPSHOT"
+Tool: Bnd-0.0.255
+Bundle-Name: Argeo SLC Demo Manager
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)
+Require-Bundle: org.springframework.jms,com.springsource.org.castor,or
+ g.argeo.dep.osgi.activemq,org.argeo.slc.support.equinox,org.argeo.slc
+ .support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,or
+ g.springframework.aop,org.springframework.oxm,com.springsource.net.sf
+ .cglib,com.springsource.org.aopalliance,org.argeo.dep.osgi.maven.embe
+ dder
+Bundle-Vendor: Argeo
+Bundle-Version: 0.11.3.SNAPSHOT
+Spring-Context: conf/*
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.apache.commons.logging;version="1.1",org.springfra
+ mework.beans.factory.config;version="2.5.6.A"
+Bundle-SymbolicName: org.argeo.slc.demo.manager
+Bundle-DocURL: http://www.argeo.org
+
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/jms.xml b/demo/site/org.argeo.slc.demo.manager/conf/jms.xml
new file mode 100644 (file)
index 0000000..d0ab93c
--- /dev/null
@@ -0,0 +1,32 @@
+<?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"
+       default-lazy-init="false">
+
+       <import resource="classpath:org/argeo/slc/activemq/spring.xml" />
+
+       <bean id="modulesManager.listenerContainer" parent="slcTemplate.jms.listenerContainer">
+               <property name="destination" ref="slcJms.destination.modulesManager.request" />
+               <property name="messageListener">
+                       <bean class="org.argeo.slc.jms.ServiceMessageListenerAdapter">
+                               <property name="methodArguments">
+                                       <map>
+                                               <entry key="getExecutionModuleDescriptor">
+                                                       <list>
+                                                               <value>name</value>
+                                                               <value>version</value>
+                                                       </list>
+                                               </entry>
+                                       </map>
+                               </property>
+
+                               <property name="delegate" ref="modulesManager" />
+                               <property name="defaultResponseDestination" ref="slcJms.destination.modulesManager.response" />
+                               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+                       </bean>
+               </property>
+       </bean>
+
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml
new file mode 100644 (file)
index 0000000..36419b4
--- /dev/null
@@ -0,0 +1,13 @@
+<?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
+       <list id="executionModules" interface="org.argeo.slc.execution.ExecutionModule"\r
+               cardinality="0..N" />\r
+\r
+       <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/manager.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager.xml
new file mode 100644 (file)
index 0000000..34b9c3d
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+       xsi:schemaLocation="\r
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <bean id="modulesManager" class="org.argeo.slc.core.execution.DefaultModulesManager">\r
+               <property name="executionModules" ref="executionModules" />\r
+       </bean>\r
+<!-- \r
+       <bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">\r
+               <property name="urlsToInstall">\r
+                       <bean class="org.argeo.slc.maven.MavenToUrl">\r
+                               <property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />\r
+                               <property name="mavenFiles">\r
+                                       <bean class="org.argeo.slc.maven.DependencyFileLoader">\r
+                                               <property name="dependenciesResource"\r
+                                                       value="classpath:/META-INF/slc/dep/manager.maven" />\r
+                                       </bean>\r
+                               </property>\r
+                       </bean>\r
+               </property>\r
+       </bean>\r
+ -->\r
+       <bean\r
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
+               <property name="ignoreUnresolvablePlaceholders" value="true" />\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/maven.xml b/demo/site/org.argeo.slc.demo.manager/conf/maven.xml
new file mode 100644 (file)
index 0000000..0fb5c6a
--- /dev/null
@@ -0,0 +1,19 @@
+<?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:p="http://www.springframework.org/schema/p"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<!-- 
+       <bean id="mavenManager" class="org.argeo.slc.maven.MavenManager"
+               init-method="init">
+               <property name="remoteRepositories">
+                       <list>
+                               <bean class="org.argeo.slc.maven.RemoteRepository">
+                                       <property name="id" value="central" />
+                                       <property name="url" value="http://repo1.maven.org/maven2" />
+                               </bean>
+                       </list>
+               </property>
+       </bean>
+        -->
+</beans>
\ No newline at end of file
index 2bd2fed58421ae709316ca4b7d3edd2d6ef349c0..dcd1e6c23f7fac2c945bdc429ca63180215fc066 100644 (file)
@@ -1,28 +1,4 @@
-Bundle-SymbolicName: org.argeo.slc.webapp
+Bundle-Name: SLC RIA
+Fragment-Host: org.argeo.slc.webapp
+Bundle-SymbolicName: org.argeo.slc.ria
 Bundle-Version: 1.0.0
-Import-Package: javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.springframework.osgi.web.context.support,
- org.springframework.web.context,
- org.springframework.web.util,
- org.apache.naming.java
-Bundle-Classpath: .,
- WEB-INF/classes
-Require-Bundle: org.argeo.slc.server,
- org.argeo.slc.support.activemq,
- org.springframework.web,
- org.springframework.web.servlet,
- org.springframework.orm,
- org.springframework.jms,
- org.springframework.oxm,
- org.springframework.ws,
- org.springframework.jdbc,
- org.springframework.context,
- org.springframework.context.support,
- com.springsource.org.castor,
- com.springsource.net.sf.ehcache,
- com.springsource.org.hsqldb,
- com.springsource.org.hibernate,
- com.springsource.org.apache.activemq
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644 (file)
index 97ca543..0000000
+++ /dev/null
@@ -1,21 +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/servletContext.xml" />
-
-       <!--
-               <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
-       -->
-
-       <!--
-       <bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-               <property name="config" value="WEB-INF/activemq.xml" />
-               <property name="start" value="true" />
-       </bean>
--->
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
deleted file mode 100644 (file)
index 34f682a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=WARN, console\r
-\r
-## Levels\r
-# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-\r
-# Spring\r
-log4j.logger.org.springframework=INFO\r
-log4j.logger.org.springframework.transaction=WARN\r
-log4j.logger.org.springframework.orm.hibernate3=WARN\r
-log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN\r
-\r
-# Hibernate\r
-log4j.logger.org.hibernate=WARN\r
-log4j.logger.org.hibernate.stat=INFO\r
-log4j.logger.org.hibernate.SQL=WARN\r
-log4j.logger.org.hibernate.transaction=WARN\r
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
-#log4j.logger.org.hibernate.type=TRACE\r
-\r
-# Active MQ\r
-log4j.logger.org.apache.activemq.web.MessageListenerServlet=WARN\r
-\r
-# EhCache\r
-log4j.logger.net.sf.ehcache=WARN\r
-\r
-## Appenders\r
-# A1 is set to be a ConsoleAppender.\r
-log4j.appender.console=org.apache.log4j.ConsoleAppender\r
-\r
-# A1 uses PatternLayout.\r
-log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
-\r
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml
deleted file mode 100644 (file)
index 3b1714f..0000000
+++ /dev/null
@@ -1,10 +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">
-
-       <import
-               resource="classpath:/org/argeo/slc/server/spring/slc-doc-servlet.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml
deleted file mode 100644 (file)
index 11ae538..0000000
+++ /dev/null
@@ -1,9 +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">
-
-       <import
-               resource="classpath:/org/argeo/slc/server/spring/slc-service-servlet.xml" />
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
deleted file mode 100644 (file)
index 18dce9a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       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
-       <import resource="classpath:/org/argeo/slc/server/spring/slc-ws-servlet.xml"/>
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml
deleted file mode 100644 (file)
index bd7bf35..0000000
+++ /dev/null
@@ -1,142 +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>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>slc-service</servlet-name>
-               <url-pattern>*.service</url-pattern>
-       </servlet-mapping>
-
-       <!-- WS servlet -->
-       <servlet>
-               <servlet-name>slc-ws</servlet-name>
-               <servlet-class>
-                       org.springframework.ws.transport.http.MessageDispatcherServlet</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>slc-ws</servlet-name>
-               <url-pattern>/slcService/*</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>
-
-       <!-- 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>
-
-       <!-- Env refs -->
-       <resource-env-ref>
-               <resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
-               <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
-       </resource-env-ref>
-
-       <!-- 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>
-
-
-       <!-- Active MQ -->
-       <!-- context config -->
-       <context-param>
-               <param-name>org.apache.activemq.brokerURL</param-name>
-               <param-value>vm://localhost</param-value>
-       </context-param>
-
-       <context-param>
-               <param-name>org.apache.activemq.embeddedBroker</param-name>
-               <param-value>false</param-value>
-       </context-param>
-
-       <!-- servlet mappings -->
-       <servlet>
-               <servlet-name>MessageListenerServlet</servlet-name>
-               <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>MessageListenerServlet</servlet-name>
-               <url-pattern>/amq/*</url-pattern>
-       </servlet-mapping>
-
-       <filter>
-               <filter-name>session</filter-name>
-               <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
-       </filter>
-
-       <filter-mapping>
-               <filter-name>session</filter-name>
-               <url-pattern>/amq/*</url-pattern>
-       </filter-mapping>
-</web-app>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644 (file)
index 9de9501..0000000
+++ /dev/null
@@ -1,122 +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>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>slc-service</servlet-name>
-               <url-pattern>*.service</url-pattern>
-       </servlet-mapping>
-
-       <!-- WS servlet -->
-       <servlet>
-               <servlet-name>slc-ws</servlet-name>
-               <servlet-class>
-                       org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>slc-ws</servlet-name>
-               <url-pattern>/slcService/*</url-pattern>
-       </servlet-mapping>
-
-       <!-- XSLT servlet -->
-       <servlet>
-               <servlet-name>xslt</servlet-name>
-               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-       </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>
-       </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>
-
-       <!-- 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>
-
-       <!-- Env refs -->
-       <resource-env-ref>
-               <resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
-               <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
-       </resource-env-ref>
-
-       <!-- 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>
-
-
-       <!-- Active MQ -->
-           <!-- context config -->
-    <context-param>
-        <param-name>org.apache.activemq.brokerURL</param-name>
-        <param-value>vm://localhost</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.activemq.embeddedBroker</param-name>
-        <param-value>false</param-value>
-    </context-param>
-
-    <!-- servlet mappings -->
-    <servlet>
-        <servlet-name>MessageListenerServlet</servlet-name>
-        <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>MessageListenerServlet</servlet-name>
-        <url-pattern>/amq/*</url-pattern>
-    </servlet-mapping>
-    
-    <filter>
-      <filter-name>session</filter-name>
-      <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-      <filter-name>session</filter-name>
-      <url-pattern>/amq/*</url-pattern>
-    </filter-mapping>
-</web-app>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
deleted file mode 100644 (file)
index ddfd925..0000000
+++ /dev/null
@@ -1,29 +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">
-
-       <import
-               resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml" />
-
-       <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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl b/org.argeo.slc.webapp/src/main/webapp/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 1c97269090b6f493f72c02b88f2ea5df3b5dabe0..f7bfec888dcddbec3ba272ba5a68aed995d2814d 100644 (file)
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>\r
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <%@ page language="java" contentType="text/html"%>\r
+Hello World XX!\r
 <%\r
-response.sendRedirect("argeo-ria/index.html");\r
+//response.sendRedirect("argeo-ria/index.html");\r
 %>\r
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml
new file mode 100644 (file)
index 0000000..97ca543
--- /dev/null
@@ -0,0 +1,21 @@
+<?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/servletContext.xml" />
+
+       <!--
+               <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
+       -->
+
+       <!--
+       <bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
+               <property name="config" value="WEB-INF/activemq.xml" />
+               <property name="start" value="true" />
+       </bean>
+-->
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties
new file mode 100644 (file)
index 0000000..34f682a
--- /dev/null
@@ -0,0 +1,35 @@
+# Set root logger level to DEBUG and its only appender to A1.\r
+log4j.rootLogger=WARN, console\r
+\r
+## Levels\r
+# Slc\r
+log4j.logger.org.argeo.slc=DEBUG\r
+\r
+# Spring\r
+log4j.logger.org.springframework=INFO\r
+log4j.logger.org.springframework.transaction=WARN\r
+log4j.logger.org.springframework.orm.hibernate3=WARN\r
+log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN\r
+\r
+# Hibernate\r
+log4j.logger.org.hibernate=WARN\r
+log4j.logger.org.hibernate.stat=INFO\r
+log4j.logger.org.hibernate.SQL=WARN\r
+log4j.logger.org.hibernate.transaction=WARN\r
+#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
+#log4j.logger.org.hibernate.type=TRACE\r
+\r
+# Active MQ\r
+log4j.logger.org.apache.activemq.web.MessageListenerServlet=WARN\r
+\r
+# EhCache\r
+log4j.logger.net.sf.ehcache=WARN\r
+\r
+## Appenders\r
+# A1 is set to be a ConsoleAppender.\r
+log4j.appender.console=org.apache.log4j.ConsoleAppender\r
+\r
+# A1 uses PatternLayout.\r
+log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
+\r
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml
new file mode 100644 (file)
index 0000000..3b1714f
--- /dev/null
@@ -0,0 +1,10 @@
+<?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">
+
+       <import
+               resource="classpath:/org/argeo/slc/server/spring/slc-doc-servlet.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml
new file mode 100644 (file)
index 0000000..11ae538
--- /dev/null
@@ -0,0 +1,9 @@
+<?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">
+
+       <import
+               resource="classpath:/org/argeo/slc/server/spring/slc-service-servlet.xml" />
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml
new file mode 100644 (file)
index 0000000..18dce9a
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       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
+       <import resource="classpath:/org/argeo/slc/server/spring/slc-ws-servlet.xml"/>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml
new file mode 100644 (file)
index 0000000..bd7bf35
--- /dev/null
@@ -0,0 +1,142 @@
+<?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>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>slc-service</servlet-name>
+               <url-pattern>*.service</url-pattern>
+       </servlet-mapping>
+
+       <!-- WS servlet -->
+       <servlet>
+               <servlet-name>slc-ws</servlet-name>
+               <servlet-class>
+                       org.springframework.ws.transport.http.MessageDispatcherServlet</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>slc-ws</servlet-name>
+               <url-pattern>/slcService/*</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>
+
+       <!-- 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>
+
+       <!-- Env refs -->
+       <resource-env-ref>
+               <resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
+               <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
+       </resource-env-ref>
+
+       <!-- 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>
+
+
+       <!-- Active MQ -->
+       <!-- context config -->
+       <context-param>
+               <param-name>org.apache.activemq.brokerURL</param-name>
+               <param-value>vm://localhost</param-value>
+       </context-param>
+
+       <context-param>
+               <param-name>org.apache.activemq.embeddedBroker</param-name>
+               <param-value>false</param-value>
+       </context-param>
+
+       <!-- servlet mappings -->
+       <servlet>
+               <servlet-name>MessageListenerServlet</servlet-name>
+               <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
+               <load-on-startup>1</load-on-startup>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>MessageListenerServlet</servlet-name>
+               <url-pattern>/amq/*</url-pattern>
+       </servlet-mapping>
+
+       <filter>
+               <filter-name>session</filter-name>
+               <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
+       </filter>
+
+       <filter-mapping>
+               <filter-name>session</filter-name>
+               <url-pattern>/amq/*</url-pattern>
+       </filter-mapping>
+</web-app>
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..9de9501
--- /dev/null
@@ -0,0 +1,122 @@
+<?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>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>slc-service</servlet-name>
+               <url-pattern>*.service</url-pattern>
+       </servlet-mapping>
+
+       <!-- WS servlet -->
+       <servlet>
+               <servlet-name>slc-ws</servlet-name>
+               <servlet-class>
+                       org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
+       </servlet>
+
+       <servlet-mapping>
+               <servlet-name>slc-ws</servlet-name>
+               <url-pattern>/slcService/*</url-pattern>
+       </servlet-mapping>
+
+       <!-- XSLT servlet -->
+       <servlet>
+               <servlet-name>xslt</servlet-name>
+               <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+       </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>
+       </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>
+
+       <!-- 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>
+
+       <!-- Env refs -->
+       <resource-env-ref>
+               <resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
+               <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
+       </resource-env-ref>
+
+       <!-- 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>
+
+
+       <!-- Active MQ -->
+           <!-- context config -->
+    <context-param>
+        <param-name>org.apache.activemq.brokerURL</param-name>
+        <param-value>vm://localhost</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>org.apache.activemq.embeddedBroker</param-name>
+        <param-value>false</param-value>
+    </context-param>
+
+    <!-- servlet mappings -->
+    <servlet>
+        <servlet-name>MessageListenerServlet</servlet-name>
+        <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>MessageListenerServlet</servlet-name>
+        <url-pattern>/amq/*</url-pattern>
+    </servlet-mapping>
+    
+    <filter>
+      <filter-name>session</filter-name>
+      <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
+    </filter>
+    
+    <filter-mapping>
+      <filter-name>session</filter-name>
+      <url-pattern>/amq/*</url-pattern>
+    </filter-mapping>
+</web-app>
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml
new file mode 100644 (file)
index 0000000..ddfd925
--- /dev/null
@@ -0,0 +1,29 @@
+<?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">
+
+       <import
+               resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml" />
+
+       <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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl
new file mode 100644 (file)
index 0000000..e9989bd
--- /dev/null
@@ -0,0 +1,51 @@
+<?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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl
new file mode 100644 (file)
index 0000000..87d6371
--- /dev/null
@@ -0,0 +1,10 @@
+<?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
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/style.css b/org.argeo.slc.webapp/src/main/webapp/old/style.css
new file mode 100644 (file)
index 0000000..102b4ee
--- /dev/null
@@ -0,0 +1,174 @@
+/* Generic Selectors */\r
+body {\r
+       font-family: sans-serif;\r
+       font-size: 12px;\r
+       color: black;\r
+       background-color: white;\r
+}\r
+\r
+li {\r
+       list-style-type: none;\r
+}\r
+\r
+h1 {\r
+       font-family: sans-serif;\r
+       font-size: 16px;\r
+       font-weight: bold;\r
+       color: #000000;\r
+       padding: 0px 0px 5px 0px;\r
+       margin: 0px;\r
+}\r
+\r
+h2 {\r
+       font-family: sans-serif;\r
+       font-size: 14px;\r
+       font-weight: bold;\r
+       color: #000000;\r
+       padding: 5px 0px 5px 0px;\r
+       margin: 0px;\r
+       margin-top: 5px;\r
+}\r
+\r
+/* Special titles */\r
+h3.executionStep{\r
+       font-family: sans-serif;\r
+       font-size: 10px;\r
+       font-style: italic;\r
+       color: #000000;\r
+       padding: 5px 0px 5px 0px;\r
+       margin: 0px;\r
+       margin-top: 5px;\r
+}\r
+\r
+table,form {\r
+       margin: 0px;\r
+}\r
+\r
+img {\r
+       border: none;\r
+}\r
+\r
+div {\r
+       font-size: 100%;\r
+}\r
+\r
+tr.list:hover {\r
+       background-color: lightgrey;\r
+}\r
+\r
+td.list {\r
+       border-top: 1px solid lighgrey;\r
+       padding: 2px 20px 2px 2px;\r
+       padding-right: 15px;\r
+}\r
+\r
+th {\r
+       font-size: 12px;\r
+       padding: 2px 20px 2px 2px;\r
+       vertical-align: top;\r
+       text-align: left;\r
+}\r
+\r
+td {\r
+       font-size: 12px;\r
+       padding: 1px;\r
+       vertical-align: middle;\r
+       text-align: left;\r
+}\r
+\r
+.passed {\r
+       color: green;\r
+}\r
+\r
+.failed {
+       color: red;
+}
+
+.error {
+       color: purple;
+}
+
+/**************** Navigation ****************/\r
+td.nav1 {\r
+       padding: 5px 0px 0px 0px;\r
+       font-size: 12px;\r
+       font-weight: bold;\r
+}\r
+\r
+td.nav2 {\r
+       padding: 0px 0px 0px 5px;\r
+       font-size: 12px;\r
+}\r
+\r
+/**************** Forms ****************/\r
+input.submit {\r
+       border: solid 1px grey;\r
+       background-color: lightgrey;\r
+       align: right;\r
+}\r
+\r
+input.submit:hover {\r
+       border: solid 1px #3399FF;\r
+       background-color: white;\r
+       color: #3399FF;\r
+}\r
+\r
+input.std {\r
+       border: solid 1px lightgrey;\r
+       padding: 1px;\r
+       margin: 2px;\r
+}\r
+\r
+.formError {\r
+       color: red;\r
+       padding: 1px;\r
+       margin: 2px;\r
+       font-weight: bold;\r
+}\r
+\r
+/**************** Pseudo classes ****************/\r
+a:link {\r
+       color: #0066CC;\r
+       text-decoration: none;\r
+}\r
+\r
+a:visited {\r
+       color: #0066CC;\r
+       text-decoration: none;\r
+}\r
+\r
+a:hover {\r
+       color: #3399FF;\r
+       text-decoration: none;\r
+}\r
+\r
+/************************* ID's *************************/\r
+#main {\r
+       position: absolute;\r
+       margin-left: 120px;\r
+       padding-top: 110px;\r
+}\r
+\r
+#navigation {\r
+       position: absolute;\r
+       width: 100px;\r
+       height: 800px;\r
+       border-right: 1px solid #0066CC;\r
+       font-weight: normal;\r
+       margin-top: 110px;\r
+       margin-left: 10px;\r
+}\r
+\r
+#banner {\r
+       position: absolute;\r
+       width: 400px;\r
+       height: 100px;\r
+}\r
+\r
+#upperRight {\r
+       position: absolute;\r
+       top: 0;\r
+       right: 0;\r
+       margin-top: 20px;\r
+       margin-right: 10px;\r
+}
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html
new file mode 100644 (file)
index 0000000..4449fcb
--- /dev/null
@@ -0,0 +1,7 @@
+<html>
+<head>
+<script type="text/javascript" src="../amq/amq.js"></script>
+<script type="text/javascript">amq.uri='../amq';</script>
+<script type="text/javascript" src="send.js"></script>
+</head>
+</html>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js
new file mode 100644 (file)
index 0000000..8210c6a
--- /dev/null
@@ -0,0 +1,3 @@
+amq.sendMessage('topic://agent.c6fb85cc-200e-41f1-9b63-fade5cad0f14.newExecution','<slc:slc-execution uuid="b0b68669-b598-4518-8ae3-c9c3190e87b4"><slc:status>STARTED</slc:status><slc:type>slcAnt</slc:type><slc:host>localhost</slc:host><slc:user>user</slc:user><slc:attributes><slc:attribute name="ant.file">/test</slc:attribute></slc:attributes></slc:slc-execution>');
+alert('Message sent!');
+document.write('Message sent');
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/style.css b/org.argeo.slc.webapp/src/main/webapp/style.css
deleted file mode 100644 (file)
index 102b4ee..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Generic Selectors */\r
-body {\r
-       font-family: sans-serif;\r
-       font-size: 12px;\r
-       color: black;\r
-       background-color: white;\r
-}\r
-\r
-li {\r
-       list-style-type: none;\r
-}\r
-\r
-h1 {\r
-       font-family: sans-serif;\r
-       font-size: 16px;\r
-       font-weight: bold;\r
-       color: #000000;\r
-       padding: 0px 0px 5px 0px;\r
-       margin: 0px;\r
-}\r
-\r
-h2 {\r
-       font-family: sans-serif;\r
-       font-size: 14px;\r
-       font-weight: bold;\r
-       color: #000000;\r
-       padding: 5px 0px 5px 0px;\r
-       margin: 0px;\r
-       margin-top: 5px;\r
-}\r
-\r
-/* Special titles */\r
-h3.executionStep{\r
-       font-family: sans-serif;\r
-       font-size: 10px;\r
-       font-style: italic;\r
-       color: #000000;\r
-       padding: 5px 0px 5px 0px;\r
-       margin: 0px;\r
-       margin-top: 5px;\r
-}\r
-\r
-table,form {\r
-       margin: 0px;\r
-}\r
-\r
-img {\r
-       border: none;\r
-}\r
-\r
-div {\r
-       font-size: 100%;\r
-}\r
-\r
-tr.list:hover {\r
-       background-color: lightgrey;\r
-}\r
-\r
-td.list {\r
-       border-top: 1px solid lighgrey;\r
-       padding: 2px 20px 2px 2px;\r
-       padding-right: 15px;\r
-}\r
-\r
-th {\r
-       font-size: 12px;\r
-       padding: 2px 20px 2px 2px;\r
-       vertical-align: top;\r
-       text-align: left;\r
-}\r
-\r
-td {\r
-       font-size: 12px;\r
-       padding: 1px;\r
-       vertical-align: middle;\r
-       text-align: left;\r
-}\r
-\r
-.passed {\r
-       color: green;\r
-}\r
-\r
-.failed {
-       color: red;
-}
-
-.error {
-       color: purple;
-}
-
-/**************** Navigation ****************/\r
-td.nav1 {\r
-       padding: 5px 0px 0px 0px;\r
-       font-size: 12px;\r
-       font-weight: bold;\r
-}\r
-\r
-td.nav2 {\r
-       padding: 0px 0px 0px 5px;\r
-       font-size: 12px;\r
-}\r
-\r
-/**************** Forms ****************/\r
-input.submit {\r
-       border: solid 1px grey;\r
-       background-color: lightgrey;\r
-       align: right;\r
-}\r
-\r
-input.submit:hover {\r
-       border: solid 1px #3399FF;\r
-       background-color: white;\r
-       color: #3399FF;\r
-}\r
-\r
-input.std {\r
-       border: solid 1px lightgrey;\r
-       padding: 1px;\r
-       margin: 2px;\r
-}\r
-\r
-.formError {\r
-       color: red;\r
-       padding: 1px;\r
-       margin: 2px;\r
-       font-weight: bold;\r
-}\r
-\r
-/**************** Pseudo classes ****************/\r
-a:link {\r
-       color: #0066CC;\r
-       text-decoration: none;\r
-}\r
-\r
-a:visited {\r
-       color: #0066CC;\r
-       text-decoration: none;\r
-}\r
-\r
-a:hover {\r
-       color: #3399FF;\r
-       text-decoration: none;\r
-}\r
-\r
-/************************* ID's *************************/\r
-#main {\r
-       position: absolute;\r
-       margin-left: 120px;\r
-       padding-top: 110px;\r
-}\r
-\r
-#navigation {\r
-       position: absolute;\r
-       width: 100px;\r
-       height: 800px;\r
-       border-right: 1px solid #0066CC;\r
-       font-weight: normal;\r
-       margin-top: 110px;\r
-       margin-left: 10px;\r
-}\r
-\r
-#banner {\r
-       position: absolute;\r
-       width: 400px;\r
-       height: 100px;\r
-}\r
-\r
-#upperRight {\r
-       position: absolute;\r
-       top: 0;\r
-       right: 0;\r
-       margin-top: 20px;\r
-       margin-right: 10px;\r
-}
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html
deleted file mode 100644 (file)
index 4449fcb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-<script type="text/javascript" src="../amq/amq.js"></script>
-<script type="text/javascript">amq.uri='../amq';</script>
-<script type="text/javascript" src="send.js"></script>
-</head>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js
deleted file mode 100644 (file)
index 8210c6a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-amq.sendMessage('topic://agent.c6fb85cc-200e-41f1-9b63-fade5cad0f14.newExecution','<slc:slc-execution uuid="b0b68669-b598-4518-8ae3-c9c3190e87b4"><slc:status>STARTED</slc:status><slc:type>slcAnt</slc:type><slc:host>localhost</slc:host><slc:user>user</slc:user><slc:attributes><slc:attribute name="ant.file">/test</slc:attribute></slc:attributes></slc:slc-execution>');
-alert('Message sent!');
-document.write('Message sent');
\ No newline at end of file
index 7b02c785ab3db7f719be98039e63869411c5dc0f..c4b06be060168721426524ea2a2f046cee4c54d1 100644 (file)
@@ -24,17 +24,25 @@ public class Activator implements BundleActivator {
        public final static String PROP_SLC_OSGI_LOCATIONS = "slc.osgi.locations";
        public final static String PROP_SLC_MAVEN_DEPENDENCY_FILE = "slc.maven.dependencyFile";
 
-       private static Boolean debug = true;
+       private static Boolean debug = false;
 
        public void start(BundleContext bundleContext) throws Exception {
-               installUrls(bundleContext, getDevLocationsUrls());
+               try {
+                       info("SLC OSGi bootstrap starting...");
+                       installUrls(bundleContext, getDevLocationsUrls());
 
-               installUrls(bundleContext, getLocationsUrls());
+                       installUrls(bundleContext, getLocationsUrls());
 
-               List<String> urls = getMavenUrls();
-               installUrls(bundleContext, urls);
+                       List<String> urls = getMavenUrls();
+                       installUrls(bundleContext, urls);
 
-               startBundles(bundleContext);
+                       startBundles(bundleContext);
+
+                       info("SLC OSGi bootstrap completed");
+               } catch (Exception e) {
+                       e.printStackTrace();
+                       throw e;
+               }
        }
 
        public void stop(BundleContext context) throws Exception {
@@ -49,12 +57,14 @@ public class Activator implements BundleActivator {
                                if (installedBundles.containsKey(url)) {
                                        Bundle bundle = installedBundles.get(url);
                                        // bundle.update();
-                                       info("Bundle " + bundle.getSymbolicName()
-                                                       + " already installed from " + url);
+                                       if (debug)
+                                               debug("Bundle " + bundle.getSymbolicName()
+                                                               + " already installed from " + url);
                                } else {
                                        Bundle bundle = bundleContext.installBundle(url);
-                                       info("Installed bundle " + bundle.getSymbolicName()
-                                                       + " from " + url);
+                                       if (debug)
+                                               debug("Installed bundle " + bundle.getSymbolicName()
+                                                               + " from " + url);
                                }
                        } catch (BundleException e) {
                                warn("Could not install bundle from " + url + ": "
@@ -123,8 +133,16 @@ public class Activator implements BundleActivator {
                        String base, String currentPath, String pattern) {
                if (currentPath == null) {
                        // Init
-                       File[] files = new File(base.replace('/', File.separatorChar))
-                                       .listFiles();
+                       File baseDir = new File(base.replace('/', File.separatorChar));
+                       File[] files = baseDir.listFiles();
+
+                       if (files == null) {
+                               warn("Base dir " + baseDir + " has no children, exists="
+                                               + baseDir.exists() + ", isDirectory="
+                                               + baseDir.isDirectory());
+                               return;
+                       }
+
                        for (File file : files)
                                if (file.isDirectory())
                                        match(matcher, matched, base, file.getName(), pattern);
@@ -152,8 +170,10 @@ public class Activator implements BundleActivator {
                                                        match(matcher, matched, base, newCurrentPath,
                                                                        pattern);
                                                } else {
-                                                       debug(newCurrentPath
-                                                                       + " does not start match with " + pattern);
+                                                       if (debug)
+                                                               debug(newCurrentPath
+                                                                               + " does not start match with "
+                                                                               + pattern);
 
                                                }
                                        }
@@ -181,7 +201,7 @@ public class Activator implements BundleActivator {
 
                                mavenFiles.add(convert(line));
                        } catch (Exception e) {
-                               System.err.println("Could not load line " + line);
+                               warn("Could not load line " + line);
                        }
                }
 
@@ -260,15 +280,16 @@ public class Activator implements BundleActivator {
        }
 
        private static void info(Object obj) {
-               System.out.println("#INFO " + obj);
+               System.out.println("# INFO " + obj);
        }
 
        private static void debug(Object obj) {
-               System.out.println("#DBUG " + obj);
+               if (debug)
+                       System.out.println("# DBUG " + obj);
        }
 
        private static void warn(Object obj) {
-               System.err.println("#WARN " + obj);
+               System.err.println("# WARN " + obj);
        }
 
        static class MavenFile {
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java
new file mode 100644 (file)
index 0000000..b6a64b2
--- /dev/null
@@ -0,0 +1,32 @@
+package org.argeo.slc.web.mvc.execution;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.argeo.slc.execution.ExecutionModuleDescriptor;\r
+import org.argeo.slc.execution.ExecutionModulesManager;\r
+import org.argeo.slc.web.mvc.AbstractServiceController;\r
+import org.springframework.web.servlet.ModelAndView;\r
+\r
+/** . */\r
+public class GetModuleDescriptor extends AbstractServiceController {\r
+       private ExecutionModulesManager modulesManager;\r
+\r
+       @Override\r
+       protected void handleServiceRequest(HttpServletRequest request,\r
+                       HttpServletResponse response, ModelAndView modelAndView)\r
+                       throws Exception {\r
+\r
+               String moduleName = request.getParameter("moduleName");\r
+               String version = request.getParameter("version");\r
+\r
+               ExecutionModuleDescriptor md = modulesManager\r
+                               .getExecutionModuleDescriptor(moduleName, version);\r
+               modelAndView.addObject(md);\r
+       }\r
+\r
+       public void setModulesManager(ExecutionModulesManager modulesManager) {\r
+               this.modulesManager = modulesManager;\r
+       }\r
+\r
+}\r
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
new file mode 100644 (file)
index 0000000..32cf138
--- /dev/null
@@ -0,0 +1,42 @@
+package org.argeo.slc.web.mvc.execution;\r
+\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+import org.argeo.slc.execution.ExecutionModule;\r
+import org.argeo.slc.execution.ExecutionModuleDescriptor;\r
+import org.argeo.slc.execution.ExecutionModulesManager;\r
+import org.argeo.slc.msg.ObjectList;\r
+import org.argeo.slc.web.mvc.AbstractServiceController;\r
+import org.springframework.web.servlet.ModelAndView;\r
+\r
+/** . */\r
+public class ListModulesDescriptors extends AbstractServiceController {\r
+       private ExecutionModulesManager modulesManager;\r
+\r
+       @Override\r
+       protected void handleServiceRequest(HttpServletRequest request,\r
+                       HttpServletResponse response, ModelAndView modelAndView)\r
+                       throws Exception {\r
+\r
+               List<ExecutionModule> modules = modulesManager.listExecutionModules();\r
+\r
+               List<ExecutionModuleDescriptor> descriptors = new ArrayList<ExecutionModuleDescriptor>();\r
+               for (ExecutionModule module : modules) {\r
+                       ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();\r
+                       md.setName(module.getName());\r
+                       md.setVersion(module.getVersion());\r
+                       descriptors.add(md);\r
+               }\r
+\r
+               modelAndView.addObject(new ObjectList(descriptors));\r
+       }\r
+\r
+       public void setModulesManager(ExecutionModulesManager modulesManager) {\r
+               this.modulesManager = modulesManager;\r
+       }\r
+\r
+}\r
index c245ecabdaf956266206f4cba0127abf21316857..7a8a88a8dc13650927ed2d72cb7881e9a9e22a2c 100644 (file)
                <constructor-arg ref="slcExecutionDao" />
        </bean>
 
+       <bean name="/getExecutionDescriptor.service"
+               class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">
+               <property name="modulesManager" ref="modulesManager" />
+       </bean>
+
+       <bean name="/listModulesDescriptors.service"
+               class="org.argeo.slc.web.mvc.execution.ListModulesDescriptors">
+               <property name="modulesManager" ref="modulesManager" />
+       </bean>
+
        <bean id="handlerMapping"
                class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
                <property name="interceptors">
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java
new file mode 100644 (file)
index 0000000..8182f88
--- /dev/null
@@ -0,0 +1,10 @@
+package org.argeo.slc.execution;
+
+import java.util.List;
+
+public interface ExecutionModulesManager {
+       public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+                       String moduleName, String version);
+
+       public List<ExecutionModule> listExecutionModules();
+}
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
new file mode 100644 (file)
index 0000000..b55a9c3
--- /dev/null
@@ -0,0 +1,42 @@
+package org.argeo.slc.core.execution;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.argeo.slc.execution.ExecutionModule;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionModulesManager;
+import org.springframework.util.Assert;
+
+public class DefaultModulesManager implements ExecutionModulesManager {
+       private List<ExecutionModule> executionModules = new ArrayList<ExecutionModule>();
+
+       public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+                       String moduleName, String version) {
+               ExecutionModule module = null;
+               for (ExecutionModule moduleT : executionModules) {
+                       if (moduleT.getName().equals(moduleName)) {
+                               // TODO: check version
+                               module = moduleT;
+                               break;
+                       }
+               }
+
+               Assert.notNull(module);
+
+               return module.getDescriptor();
+       }
+       
+       
+
+       public List<ExecutionModule> listExecutionModules() {
+               return executionModules;
+       }
+
+
+
+       public void setExecutionModules(List<ExecutionModule> executionModules) {
+               this.executionModules = executionModules;
+       }
+
+}
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java
deleted file mode 100644 (file)
index 0f677eb..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.argeo.slc.core.execution;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.argeo.slc.execution.ExecutionModule;
-import org.argeo.slc.execution.ExecutionModuleDescriptor;
-import org.springframework.util.Assert;
-
-public class ModulesManager {
-       private List<ExecutionModule> executionModules = new ArrayList<ExecutionModule>();
-
-       public ExecutionModuleDescriptor getExecutionModuleDescriptor(
-                       String moduleName, String version) {
-               ExecutionModule module = null;
-               for (ExecutionModule moduleT : executionModules) {
-                       if(moduleT.getName().equals(moduleName)){
-                               // TODO: check version
-                               module = moduleT;
-                               break;
-                       }
-               }
-               
-               Assert.notNull(module);
-               
-               return module.getDescriptor();
-       }
-
-       public void setExecutionModules(List<ExecutionModule> executionModules) {
-               this.executionModules = executionModules;
-       }
-
-}
index 0bde8b4b2b9b075096719b72da055184b78fdab6..6c4dd861ae3ebd95f9f6be9eeab5de2b36c1fb63 100644 (file)
@@ -6,9 +6,9 @@ log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
 log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
 log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
 
-log4j.logger.org.springframework=INFO
+log4j.logger.org.springframework=WARN
 
-log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.catalina=WARN
 
 ## Appenders
 # console is set to be a ConsoleAppender.
index 6426dc9b77daf21975b839403bb61013093ee4b0..002e6d9a78a9322cefbe0ed01978087360b05167 100644 (file)
@@ -20,4 +20,7 @@
        <reference interface="org.hibernate.SessionFactory"\r
                id="sessionFactory" />\r
 \r
+       <reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
+               id="modulesManager" />\r
+\r
 </beans:beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp
deleted file mode 100644 (file)
index 1c97269..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>\r
-<%@ page language="java" contentType="text/html"%>\r
-<%\r
-response.sendRedirect("argeo-ria/index.html");\r
-%>\r
index e81a7480039601b905699be6b427fefae5c18af8..6611adab2a42eb7854ea8dbdbdbfddbc30f7f0f3 100644 (file)
                                                                        <type>xml</type>
                                                                        <classifier>osgiboot</classifier>
                                                                </artifactItem>
+                                                               <!--  For Hibernate -->
+                                                               <artifactItem>
+                                                                       <groupId>org.objectweb.asm</groupId>
+                                                                       <artifactId>com.springsource.org.objectweb.asm</artifactId>
+                                                                       <version>1.5.3</version>
+                                                               </artifactItem>
+                                                               <artifactItem>
+                                                                       <groupId>org.objectweb.asm</groupId>
+                                                                       <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+                                                                       <version>1.5.3</version>
+                                                               </artifactItem>
                                                        </artifactItems>
                                                </configuration>
                                        </execution>
                                <configuration>
                                        <tasks>
                                        
+                                               <property name="equinoxDir" location="${project.build.directory}/equinox" />
+                                               
                                                <property name="mavenClasspath" refid="maven.compile.classpath" />
+                                               <!--  
                                                <property name="jar.asm.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3.jar" />
                                                <property name="jar.asm.attrs.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" />
-                                               <property name="slc.osgi.locations" value="${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
+                                               -->
+                                               <property name="jar.asm.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
+                                               <property name="jar.asm.attrs.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
+                                               
+                                               <property name="bundle.argeo.ria" location="../../org.argeo.slc.webapp/src/main/webapp" />
+                               
+                                               <property name="slc.osgi.locations" value="${bundle.argeo.ria}${path.separator}${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
                                                
                                                <property name="slc.osgi.devBases"
-                                                       value="${user.dir}/bundles" />
+                                                       value="${user.dir}/bundles,${user.dir}/../../demo/site" />
                                                <property name="slc.osgi.devPatterns"
                                                        value="*" />
                                                <property name="slc.osgi.start"
-                                                       value="org.springframework.osgi.catalina.start.osgi,org.springframework.bundle.osgi.extender,org.springframework.bundle.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp" />
+                                                       value="org.springframework.osgi.catalina.start.osgi,org.springframework.bundle.osgi.extender,org.springframework.bundle.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
 
                                                <property name="javaCommand"
                                                        location="${java.home}${file.separator}bin${file.separator}java" />
                                                <ant
-                                                       antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
+                                                       antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
 
                                        </tasks>
                                </configuration>
                        <version>${project.version}</version>
                </dependency>
 
+
+       <!-- For demo -->
+                       <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.activemq</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+       
        </dependencies>
 
        <repositories>