From 4810532845c8a54c04a850c7db3a9fe00e8ebc6a Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 4 Mar 2009 18:10:40 +0000 Subject: [PATCH 1/1] Integrate demo in web git-svn-id: https://svn.argeo.org/slc/trunk@2219 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/org.argeo.slc.demo.basic/.classpath | 1 - demo/org.argeo.slc.demo.manager/.classpath | 1 - demo/org.argeo.slc.demo.manager/.springBeans | 3 - demo/site/.project | 11 ++ .../META-INF/MANIFEST.MF | 22 +++ .../org.argeo.slc.demo.basic}/conf/basic.xml | 0 .../conf/canonic.xml | 0 .../org.argeo.slc.demo.basic}/conf/common.xml | 0 .../conf/imports.xml | 0 .../org.argeo.slc.demo.basic}/conf/main.xml | 0 .../org.argeo.slc.demo.basic}/conf/osgi.xml | 0 .../conf/testCases/basic-001.xml | 0 .../conf/testCases/basic-002.xml | 0 .../conf/testCases/canonic-001.xml | 0 .../conf/testCases/canonic-002.xml | 0 .../META-INF/MANIFEST.MF | 4 + .../META-INF/slc/dep/manager.maven | 59 +++++++ .../META-INF/spring/manager.xml | 25 +++ demo/site/org.argeo.slc.demo.deploy/pom.xml | 152 ++++++++++++++++++ .../META-INF/MANIFEST.MF | 22 +++ .../org.argeo.slc.demo.manager}/conf/jms.xml | 0 .../conf/manager-osgi.xml | 4 +- .../conf/manager.xml | 6 +- .../conf/maven.xml | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 30 +--- .../src/main/webapp/index.jsp | 5 +- .../{ => old}/WEB-INF/applicationContext.xml | 0 .../WEB-INF/classes/log4j.properties | 0 .../webapp/{ => old}/WEB-INF/doc-servlet.xml | 0 .../{ => old}/WEB-INF/slc-service-servlet.xml | 0 .../{ => old}/WEB-INF/slc-ws-servlet.xml | 0 .../webapp/{ => old}/WEB-INF/web-osgi.xml | 0 .../src/main/webapp/{ => old}/WEB-INF/web.xml | 0 .../webapp/{ => old}/WEB-INF/xslt-servlet.xml | 0 .../{ => old}/WEB-INF/xslt/resultView.xsl | 0 .../webapp/{ => old}/WEB-INF/xslt/viewXml.xsl | 0 .../src/main/webapp/{ => old}/style.css | 0 .../main/webapp/{ => old}/test-amq/send.html | 0 .../main/webapp/{ => old}/test-amq/send.js | 0 .../org/argeo/slc/osgiboot/Activator.java | 57 ++++--- .../mvc/execution/GetModuleDescriptor.java | 32 ++++ .../mvc/execution/ListModulesDescriptors.java | 42 +++++ .../slc/server/spring/slc-service-servlet.xml | 10 ++ .../execution/ExecutionModulesManager.java | 10 ++ ...anager.java => DefaultModulesManager.java} | 17 +- .../bundles/logging/log4j.properties | 4 +- .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml | 3 + .../org.argeo.slc.webapp.war/index.jsp | 5 - server/org.argeo.slc.siteserver/pom.xml | 48 +++++- 49 files changed, 501 insertions(+), 72 deletions(-) create mode 100644 demo/site/.project create mode 100644 demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/basic.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/canonic.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/common.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/imports.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/main.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/osgi.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/testCases/basic-001.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/testCases/basic-002.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/testCases/canonic-001.xml (100%) rename demo/{org.argeo.slc.demo.basic/src/main/resources => site/org.argeo.slc.demo.basic}/conf/testCases/canonic-002.xml (100%) create mode 100644 demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF create mode 100644 demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven create mode 100644 demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml create mode 100644 demo/site/org.argeo.slc.demo.deploy/pom.xml create mode 100644 demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF rename demo/{org.argeo.slc.demo.manager/src/main/resources => site/org.argeo.slc.demo.manager}/conf/jms.xml (100%) rename demo/{org.argeo.slc.demo.manager/src/main/resources => site/org.argeo.slc.demo.manager}/conf/manager-osgi.xml (82%) rename demo/{org.argeo.slc.demo.manager/src/main/resources => site/org.argeo.slc.demo.manager}/conf/manager.xml (88%) rename demo/{org.argeo.slc.demo.manager/src/main/resources => site/org.argeo.slc.demo.manager}/conf/maven.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/applicationContext.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/classes/log4j.properties (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/doc-servlet.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/slc-service-servlet.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/slc-ws-servlet.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/web-osgi.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/web.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/xslt-servlet.xml (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/xslt/resultView.xsl (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/WEB-INF/xslt/viewXml.xsl (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/style.css (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/test-amq/send.html (100%) rename org.argeo.slc.webapp/src/main/webapp/{ => old}/test-amq/send.js (100%) create mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java create mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java create mode 100644 runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java rename runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/{ModulesManager.java => DefaultModulesManager.java} (74%) delete mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath index b5ef387af..624a6cfe1 100644 --- a/demo/org.argeo.slc.demo.basic/.classpath +++ b/demo/org.argeo.slc.demo.basic/.classpath @@ -1,6 +1,5 @@ - diff --git a/demo/org.argeo.slc.demo.manager/.classpath b/demo/org.argeo.slc.demo.manager/.classpath index b5ef387af..624a6cfe1 100644 --- a/demo/org.argeo.slc.demo.manager/.classpath +++ b/demo/org.argeo.slc.demo.manager/.classpath @@ -1,6 +1,5 @@ - diff --git a/demo/org.argeo.slc.demo.manager/.springBeans b/demo/org.argeo.slc.demo.manager/.springBeans index 15edcfdb8..c11d81486 100644 --- a/demo/org.argeo.slc.demo.manager/.springBeans +++ b/demo/org.argeo.slc.demo.manager/.springBeans @@ -7,9 +7,6 @@ - src/main/resources/conf/manager-osgi.xml - src/main/resources/conf/manager.xml - src/main/resources/conf/jms.xml diff --git a/demo/site/.project b/demo/site/.project new file mode 100644 index 000000000..3bc0b024e --- /dev/null +++ b/demo/site/.project @@ -0,0 +1,11 @@ + + + org.argeo.slc.demo.site + + + + + + + + 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 index 000000000..b5326e558 --- /dev/null +++ b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF @@ -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/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml rename to demo/site/org.argeo.slc.demo.basic/conf/basic.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml rename to demo/site/org.argeo.slc.demo.basic/conf/canonic.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml b/demo/site/org.argeo.slc.demo.basic/conf/common.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml rename to demo/site/org.argeo.slc.demo.basic/conf/common.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml rename to demo/site/org.argeo.slc.demo.basic/conf/imports.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml b/demo/site/org.argeo.slc.demo.basic/conf/main.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml rename to demo/site/org.argeo.slc.demo.basic/conf/main.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml rename to demo/site/org.argeo.slc.demo.basic/conf/osgi.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml rename to demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml rename to demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml rename to demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml similarity index 100% rename from demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml rename to demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml 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 index 000000000..f41bdfba5 --- /dev/null +++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF @@ -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 index 000000000..b0ae3606e --- /dev/null +++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven @@ -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 index 000000000..5a3b94a67 --- /dev/null +++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ 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 index 000000000..6f56921e3 --- /dev/null +++ b/demo/site/org.argeo.slc.demo.deploy/pom.xml @@ -0,0 +1,152 @@ + + 4.0.0 + + org.argeo.slc + argeo-slc-demo + 0.11.3-SNAPSHOT + ../.. + + org.argeo.slc.demo + org.argeo.slc.demo.deploy + Argeo SLC Demo Deploy + jar + + + + + . + + META-INF/** + + + + + + maven-jar-plugin + + + META-INF/MANIFEST.MF + + + + + maven-dependency-plugin + + + manager + initialize + + list + + + META-INF/slc/dep/manager.maven + + + + copy + initialize + + copy + + + ${project.build.directory}/equinox + true + + + org.eclipse.osgi + org.eclipse.osgi + ${version.equinox} + + + org.argeo.slc.runtime + org.argeo.slc.osgiboot + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.osgiboot + ${project.version} + xml + osgiboot + + + + + + + + maven-antrun-plugin + + + + + + + + + + + + + + + + org.argeo.slc.runtime + org.argeo.slc.support.equinox + + + org.argeo.slc.runtime + org.argeo.slc.support.activemq + + + org.argeo.slc.runtime + org.argeo.slc.support.castor + + + org.argeo.slc.runtime + org.argeo.slc.support.maven + ${project.version} + + + + org.argeo.slc + org.argeo.slc.detached.launcher + ${project.version} + + + + org.argeo.slc.demo + org.argeo.slc.demo.basic + ${project.version} + + + org.argeo.slc.demo + org.argeo.slc.demo.log4j + ${project.version} + + + + + com.thoughtworks.xstream + com.springsource.com.thoughtworks.xstream + 1.2.2 + + + + org.apache.xerces + + com.springsource.org.apache.xerces + + 2.8.1 + + + org.apache.xmlcommons + com.springsource.org.apache.xmlcommons + 1.3.3 + + + + 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 index 000000000..c4c968a76 --- /dev/null +++ b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF @@ -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/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml b/demo/site/org.argeo.slc.demo.manager/conf/jms.xml similarity index 100% rename from demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml rename to demo/site/org.argeo.slc.demo.manager/conf/jms.xml diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml similarity index 82% rename from demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml rename to demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml index 0b7c972df..36419b408 100644 --- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml +++ b/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml @@ -8,6 +8,6 @@ - - + + \ No newline at end of file diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager.xml similarity index 88% rename from demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml rename to demo/site/org.argeo.slc.demo.manager/conf/manager.xml index 58c45b66d..34b9c3da4 100644 --- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml +++ b/demo/site/org.argeo.slc.demo.manager/conf/manager.xml @@ -4,10 +4,10 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + - + diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml b/demo/site/org.argeo.slc.demo.manager/conf/maven.xml similarity index 100% rename from demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml rename to demo/site/org.argeo.slc.demo.manager/conf/maven.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF index 2bd2fed58..dcd1e6c23 100644 --- a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF +++ b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF @@ -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/index.jsp b/org.argeo.slc.webapp/src/main/webapp/index.jsp index 1c9726909..f7bfec888 100644 --- a/org.argeo.slc.webapp/src/main/webapp/index.jsp +++ b/org.argeo.slc.webapp/src/main/webapp/index.jsp @@ -1,5 +1,6 @@ - + <%@ page language="java" contentType="text/html"%> +Hello World XX! <% -response.sendRedirect("argeo-ria/index.html"); +//response.sendRedirect("argeo-ria/index.html"); %> diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl rename to org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl diff --git a/org.argeo.slc.webapp/src/main/webapp/style.css b/org.argeo.slc.webapp/src/main/webapp/old/style.css similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/style.css rename to org.argeo.slc.webapp/src/main/webapp/old/style.css diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/test-amq/send.html rename to org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/test-amq/send.js rename to org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java index 7b02c785a..c4b06be06 100644 --- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java +++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java @@ -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 urls = getMavenUrls(); - installUrls(bundleContext, urls); + List 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 index 000000000..b6a64b2ef --- /dev/null +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java @@ -0,0 +1,32 @@ +package org.argeo.slc.web.mvc.execution; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.argeo.slc.execution.ExecutionModuleDescriptor; +import org.argeo.slc.execution.ExecutionModulesManager; +import org.argeo.slc.web.mvc.AbstractServiceController; +import org.springframework.web.servlet.ModelAndView; + +/** . */ +public class GetModuleDescriptor extends AbstractServiceController { + private ExecutionModulesManager modulesManager; + + @Override + protected void handleServiceRequest(HttpServletRequest request, + HttpServletResponse response, ModelAndView modelAndView) + throws Exception { + + String moduleName = request.getParameter("moduleName"); + String version = request.getParameter("version"); + + ExecutionModuleDescriptor md = modulesManager + .getExecutionModuleDescriptor(moduleName, version); + modelAndView.addObject(md); + } + + public void setModulesManager(ExecutionModulesManager modulesManager) { + this.modulesManager = modulesManager; + } + +} 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 index 000000000..32cf1383e --- /dev/null +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java @@ -0,0 +1,42 @@ +package org.argeo.slc.web.mvc.execution; + +import java.util.ArrayList; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.argeo.slc.execution.ExecutionModule; +import org.argeo.slc.execution.ExecutionModuleDescriptor; +import org.argeo.slc.execution.ExecutionModulesManager; +import org.argeo.slc.msg.ObjectList; +import org.argeo.slc.web.mvc.AbstractServiceController; +import org.springframework.web.servlet.ModelAndView; + +/** . */ +public class ListModulesDescriptors extends AbstractServiceController { + private ExecutionModulesManager modulesManager; + + @Override + protected void handleServiceRequest(HttpServletRequest request, + HttpServletResponse response, ModelAndView modelAndView) + throws Exception { + + List modules = modulesManager.listExecutionModules(); + + List descriptors = new ArrayList(); + for (ExecutionModule module : modules) { + ExecutionModuleDescriptor md = new ExecutionModuleDescriptor(); + md.setName(module.getName()); + md.setVersion(module.getVersion()); + descriptors.add(md); + } + + modelAndView.addObject(new ObjectList(descriptors)); + } + + public void setModulesManager(ExecutionModulesManager modulesManager) { + this.modulesManager = modulesManager; + } + +} diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml index c245ecabd..7a8a88a8d 100644 --- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml +++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml @@ -53,6 +53,16 @@ + + + + + + + + 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 index 000000000..8182f889d --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java @@ -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 listExecutionModules(); +} 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/DefaultModulesManager.java similarity index 74% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java index 0f677eb21..b55a9c377 100644 --- 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/DefaultModulesManager.java @@ -5,26 +5,35 @@ 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 ModulesManager { +public class DefaultModulesManager implements ExecutionModulesManager { private List executionModules = new ArrayList(); public ExecutionModuleDescriptor getExecutionModuleDescriptor( String moduleName, String version) { ExecutionModule module = null; for (ExecutionModule moduleT : executionModules) { - if(moduleT.getName().equals(moduleName)){ + if (moduleT.getName().equals(moduleName)) { // TODO: check version module = moduleT; break; } } - + Assert.notNull(module); - + return module.getDescriptor(); } + + + + public List listExecutionModules() { + return executionModules; + } + + public void setExecutionModules(List executionModules) { this.executionModules = executionModules; diff --git a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties index 0bde8b4b2..6c4dd861a 100644 --- a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties +++ b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties @@ -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. diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml index 6426dc9b7..002e6d9a7 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml @@ -20,4 +20,7 @@ + + \ 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 index 1c9726909..000000000 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ - -<%@ page language="java" contentType="text/html"%> -<% -response.sendRedirect("argeo-ria/index.html"); -%> diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml index e81a74800..6611adab2 100644 --- a/server/org.argeo.slc.siteserver/pom.xml +++ b/server/org.argeo.slc.siteserver/pom.xml @@ -80,6 +80,17 @@ xml osgiboot + + + org.objectweb.asm + com.springsource.org.objectweb.asm + 1.5.3 + + + org.objectweb.asm + com.springsource.org.objectweb.asm.attrs + 1.5.3 + @@ -90,22 +101,31 @@ + + + + + + + + + + value="${user.dir}/bundles,${user.dir}/../../demo/site" /> + 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" /> + antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" /> @@ -356,6 +376,26 @@ ${project.version} + + + + org.argeo.slc.runtime + org.argeo.slc.support.equinox + + + org.argeo.slc.runtime + org.argeo.slc.support.activemq + + + org.argeo.slc.runtime + org.argeo.slc.support.castor + + + org.argeo.slc.runtime + org.argeo.slc.support.maven + ${project.version} + + -- 2.39.2