From 1d1bc92e4aef2b8b889d7482f91b7ed905f0fb47 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 1 Jul 2009 14:07:50 +0000 Subject: [PATCH] Clean up server OSGi git-svn-id: https://svn.argeo.org/slc/trunk@2655 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/MANIFEST.MF | 4 + .../META-INF/spring/activemq-broker.xml | 23 +++++ .../activemq.properties | 1 + .../META-INF/MANIFEST.MF | 14 ++- .../META-INF/spring/activemq-osgi.xml | 9 +- .../META-INF/spring/activemq.xml | 55 ++--------- .../activemq.properties | 3 +- .../META-INF/MANIFEST.MF | 11 +++ .../META-INF/spring/agentProxy-osgi.xml | 14 +++ .../META-INF/spring/agentProxy.xml | 34 +++++++ .../agentproxy.properties | 1 + .../META-INF/MANIFEST.MF | 6 ++ .../META-INF/spring/castor-osgi.xml | 19 ++++ .../META-INF/MANIFEST.MF | 32 ++++-- .../META-INF/spring/db.xml | 3 +- .../META-INF/MANIFEST.MF | 30 ++++-- .../META-INF/spring/hsqldb.xml | 2 +- .../META-INF/spring/jms-osgi.xml | 20 ++-- .../META-INF/spring/jms.xml | 45 +-------- .../META-INF/spring/main.xml | 12 ++- .../META-INF/MANIFEST.MF | 24 +++-- .../META-INF/spring/services-osgi.xml | 6 +- .../META-INF/spring/services.xml | 15 +-- .../META-INF/MANIFEST.MF | 62 +++++++----- .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml | 9 +- .../WEB-INF/slc-service-servlet.xml | 6 +- .../WEB-INF/xslt-servlet.xml | 4 +- .../AbstractExecutionModulesManager.java | 7 -- .../services/{runtime => }/AgentService.java | 2 +- .../slc/services/EventPublisherAspect.java | 8 +- .../argeo/slc/services/ServiceMsgHandler.java | 2 - .../{process => }/SlcExecutionService.java | 2 +- .../{test => }/TestManagerService.java | 2 +- .../impl/{runtime => }/AgentServiceImpl.java | 4 +- .../SlcExecutionServiceImpl.java | 4 +- .../{test => }/TestManagerServiceImpl.java | 4 +- .../process/NewSlcExecutionController.java | 2 +- .../AddResultToCollectionController.java | 2 +- .../CopyCollectionToCollectionController.java | 2 +- .../RemoveResultFromCollectionController.java | 2 +- .../ResultCollectionListController.java | 34 ------- .../resources/org/argeo/slc/hibernate/dao.xml | 31 ++++++ .../slc/hibernate/{cache => }/ehcache.xml | 0 .../argeo/slc/hibernate/sessionFactories.xml | 78 +++++++++++++++ .../org/argeo/slc/hibernate/spring.xml | 9 ++ .../hibernate/spring/applicationContext.xml | 99 +------------------ server/org.argeo.slc.ria/pom.xml | 1 + 47 files changed, 419 insertions(+), 340 deletions(-) create mode 100644 modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF create mode 100644 modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml create mode 100644 modules/server/org.argeo.slc.server.activemq.broker/activemq.properties create mode 100644 modules/server/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF create mode 100644 modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml create mode 100644 modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml create mode 100644 modules/server/org.argeo.slc.server.agentproxy/agentproxy.properties create mode 100644 modules/server/org.argeo.slc.server.castor/META-INF/MANIFEST.MF create mode 100644 modules/server/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/{runtime => }/AgentService.java (84%) rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/{process => }/SlcExecutionService.java (90%) rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/{test => }/TestManagerService.java (94%) rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/{runtime => }/AgentServiceImpl.java (96%) rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/{process => }/SlcExecutionServiceImpl.java (95%) rename runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/{test => }/TestManagerServiceImpl.java (95%) delete mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java create mode 100644 runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/dao.xml rename runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/{cache => }/ehcache.xml (100%) create mode 100644 runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml create mode 100644 runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring.xml diff --git a/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF new file mode 100644 index 000000000..741ef4b43 --- /dev/null +++ b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Bundle-Version: 0.11.4.SNAPSHOT +Bundle-SymbolicName: org.argeo.slc.server.activemq.broker +Import-Package: org.apache.activemq.broker,org.apache.activemq.xbean,org.springframework.beans.factory.config diff --git a/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml new file mode 100644 index 000000000..9595daa23 --- /dev/null +++ b/modules/server/org.argeo.slc.server.activemq.broker/META-INF/spring/activemq-broker.xml @@ -0,0 +1,23 @@ + + + + + + + + osgibundle:activemq.properties + + + + + + + + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.activemq.broker/activemq.properties b/modules/server/org.argeo.slc.server.activemq.broker/activemq.properties new file mode 100644 index 000000000..d1afbfa54 --- /dev/null +++ b/modules/server/org.argeo.slc.server.activemq.broker/activemq.properties @@ -0,0 +1 @@ +slc.server.jms.url=tcp://localhost:61616 \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF index 574686180..89f823e2e 100644 --- a/modules/server/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF +++ b/modules/server/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF @@ -1,11 +1,9 @@ Manifest-Version: 1.0 -Require-Bundle: org.argeo.slc.specs,org.argeo.slc.server,org.argeo.slc - .support.activemq,com.springsource.org.castor,org.springframework.cor - e,org.springframework.context,org.springframework.beans,org.springfra - mework.oxm,org.springframework.jms,org.argeo.dep.osgi.activemq Bundle-Version: 0.11.4.SNAPSHOT Bundle-SymbolicName: org.argeo.slc.server.activemq -Import-Package: javax.jms,javax.management.j2ee.statistics,org.apache. - commons.logging,org.apache.activemq.pool,org.apache.commons.pool,org. - springframework.transaction - +Import-Package: javax.jms, + org.apache.activemq, + org.springframework.jms.connection, + org.springframework.oxm, + org.argeo.slc.jms, + org.springframework.jms.support.converter diff --git a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml index 28f8c0a00..04869badd 100644 --- a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml +++ b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml @@ -7,9 +7,14 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> + + + - - + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml index f76c9ab34..59c02446e 100644 --- a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml +++ b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml @@ -1,30 +1,9 @@ - - - - - - - - osgibundle:activemq.properties - - - - - - - - - - + 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"> - @@ -38,32 +17,16 @@ - - - + + --> - - - - - - - - - - - - + + + + diff --git a/modules/server/org.argeo.slc.server.activemq/activemq.properties b/modules/server/org.argeo.slc.server.activemq/activemq.properties index d9a9e27d3..d1afbfa54 100644 --- a/modules/server/org.argeo.slc.server.activemq/activemq.properties +++ b/modules/server/org.argeo.slc.server.activemq/activemq.properties @@ -1,2 +1 @@ -slc.server.jms.url=tcp://localhost:61616 -slc.server.jms.agentProxy.timeout=20000 \ No newline at end of file +slc.server.jms.url=tcp://localhost:61616 \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF new file mode 100644 index 000000000..1b143f6e0 --- /dev/null +++ b/modules/server/org.argeo.slc.server.agentproxy/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-Version: 0.11.4.SNAPSHOT +Bundle-SymbolicName: org.argeo.slc.server.agentproxy +Import-Package: org.argeo.slc.jms, + org.argeo.slc.activemq, + org.apache.activemq.command, + org.springframework.jms.core, + javax.jms, + org.springframework.jms.support.converter, + org.springframework.beans.factory.config, + org.argeo.slc.runtime diff --git a/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml b/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml new file mode 100644 index 000000000..923a6549a --- /dev/null +++ b/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy-osgi.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml b/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml new file mode 100644 index 000000000..4cb24daf2 --- /dev/null +++ b/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml @@ -0,0 +1,34 @@ + + + + + + + + + + osgibundle:agentproxy.properties + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.agentproxy/agentproxy.properties b/modules/server/org.argeo.slc.server.agentproxy/agentproxy.properties new file mode 100644 index 000000000..b003c434a --- /dev/null +++ b/modules/server/org.argeo.slc.server.agentproxy/agentproxy.properties @@ -0,0 +1 @@ +slc.server.jms.agentProxy.timeout=20000 \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.castor/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.castor/META-INF/MANIFEST.MF new file mode 100644 index 000000000..e61d7161a --- /dev/null +++ b/modules/server/org.argeo.slc.server.castor/META-INF/MANIFEST.MF @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +Bundle-Version: 0.11.4.SNAPSHOT +Bundle-SymbolicName: org.argeo.slc.server.castor +Import-Package: org.springframework.oxm, + org.argeo.slc.castor, + org.springframework.oxm.castor diff --git a/modules/server/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml b/modules/server/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml new file mode 100644 index 000000000..aaacff8cc --- /dev/null +++ b/modules/server/org.argeo.slc.server.castor/META-INF/spring/castor-osgi.xml @@ -0,0 +1,19 @@ + + + + + + + + org.springframework.oxm.Marshaller + + org.springframework.oxm.Unmarshaller + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF index 432760577..c8b3577f0 100644 --- a/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF +++ b/modules/server/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF @@ -1,12 +1,26 @@ Manifest-Version: 1.0 -Require-Bundle: - org.argeo.slc.specs, - org.argeo.slc.core, - org.argeo.slc.server, - com.springsource.org.hibernate Bundle-Version: 0.11.4.SNAPSHOT Bundle-SymbolicName: org.argeo.slc.server.hibernate -Import-Package: org.aopalliance.aop,org.hibernate,org.hibernate.jdbc,o - rg.springframework.aop,org.springframework.aop.framework,org.springfr - amework.orm.hibernate3,org.springframework.transaction - +Import-Package: org.argeo.slc.hibernate, + org.hibernate, + org.springframework.orm.hibernate3, + org.argeo.slc.runtime, + org.argeo.slc.process, + org.argeo.slc.test, + org.argeo.slc.core.attachment, + org.argeo.slc.core.test, + org.argeo.slc.core.test.tree, + org.argeo.slc.core.structure, + org.argeo.slc.core.structure.tree, + org.argeo.slc.dao.runtime, + org.argeo.slc.dao.process, + org.argeo.slc.dao.test, + org.argeo.slc.dao.test.tree, + org.argeo.slc.hibernate.test.tree, + org.argeo.slc.hibernate.runtime, + org.argeo.slc.hibernate.process, + org.argeo.slc.hibernate.test, + org.springframework.aop, + org.springframework.aop.framework, + org.aopalliance.aop, + org.springframework.transaction diff --git a/modules/server/org.argeo.slc.server.hibernate/META-INF/spring/db.xml b/modules/server/org.argeo.slc.server.hibernate/META-INF/spring/db.xml index 4a08a84d3..7345ebd54 100644 --- a/modules/server/org.argeo.slc.server.hibernate/META-INF/spring/db.xml +++ b/modules/server/org.argeo.slc.server.hibernate/META-INF/spring/db.xml @@ -8,8 +8,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd" default-lazy-init="false"> - + diff --git a/modules/server/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF index 347fad21d..d30faec92 100644 --- a/modules/server/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF +++ b/modules/server/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF @@ -1,11 +1,25 @@ Manifest-Version: 1.0 -Require-Bundle: - org.argeo.slc.specs, - org.argeo.slc.core, - org.argeo.slc.server Bundle-Version: 0.11.4.SNAPSHOT Bundle-SymbolicName: org.argeo.slc.server.hsqldb -Import-Package: org.springframework.orm.hibernate3,org.springframework - .cache.ehcache,net.sf.ehcache.hibernate,org.hsqldb.jdbc,org.hibernate - ,org.springframework.beans.factory.config - +Import-Package: org.argeo.slc.hibernate, + org.hibernate, + org.springframework.orm.hibernate3, + org.argeo.slc.runtime, + org.argeo.slc.process, + org.argeo.slc.test, + org.argeo.slc.core.attachment, + org.argeo.slc.core.test.tree, + org.argeo.slc.core.structure, + org.argeo.slc.core.structure.tree, + org.argeo.slc.hibernate.test.tree, + org.argeo.slc.hibernate.runtime, + org.argeo.slc.hibernate.process, + org.argeo.slc.hibernate.test, + org.argeo.slc.hibernate.structure, + org.argeo.slc.hibernate.attachment, + org.aopalliance.aop, + org.argeo.slc.core.test, + org.springframework.cache.ehcache, + net.sf.ehcache.hibernate, + org.hsqldb.jdbc, + org.springframework.beans.factory.config diff --git a/modules/server/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml b/modules/server/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml index 26f0a054d..76c1c9bae 100644 --- a/modules/server/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml +++ b/modules/server/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml @@ -9,7 +9,7 @@ default-lazy-init="false"> + resource="classpath:/org/argeo/slc/hibernate/sessionFactories.xml" /> diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml index 8b172a1ca..2bcb5b11c 100644 --- a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml +++ b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml @@ -6,21 +6,23 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - - + + + - + - + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml index 8c3054dff..d50dfda60 100644 --- a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml +++ b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml @@ -4,7 +4,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + @@ -32,7 +32,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -76,44 +76,9 @@ - - - - - + @@ -130,7 +95,7 @@ - + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml index 6c4b88f91..927a928a8 100644 --- a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml +++ b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml @@ -6,17 +6,25 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - + + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.server.services/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.services/META-INF/MANIFEST.MF index 0dedec0f2..d4f1d048d 100644 --- a/modules/server/org.argeo.slc.server.services/META-INF/MANIFEST.MF +++ b/modules/server/org.argeo.slc.server.services/META-INF/MANIFEST.MF @@ -1,12 +1,20 @@ Manifest-Version: 1.0 -Require-Bundle: - org.argeo.slc.specs, - org.argeo.slc.core, - org.argeo.slc.server Bundle-Version: 0.11.4.SNAPSHOT Bundle-Name: SLC Server Services Bundle-SymbolicName: org.argeo.slc.server.services -Import-Package: org.hibernate.jdbc,org.springframework.transaction,org - .springframework.aop,org.springframework.aop.framework,org.aopallianc - e.aop,org.springframework.beans.factory.config - +Import-Package: org.aopalliance.aop, + org.argeo.slc.core.attachment, + org.argeo.slc.dao.process, + org.argeo.slc.dao.runtime, + org.argeo.slc.dao.test, + org.argeo.slc.dao.test.tree, + org.argeo.slc.msg.event, + org.argeo.slc.msg.process, + org.argeo.slc.process, + org.argeo.slc.runtime, + org.argeo.slc.services, + org.argeo.slc.services.impl, + org.hibernate.jdbc, + org.springframework.aop, + org.springframework.aop.framework, + org.springframework.beans.factory.config diff --git a/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml b/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml index 5a46059ec..af5d86f04 100644 --- a/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml +++ b/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml @@ -6,10 +6,10 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - - + + + interface="org.argeo.slc.services.SlcExecutionService" /> diff --git a/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml b/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml index 6151309e7..e9f1745ee 100644 --- a/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml +++ b/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml @@ -28,31 +28,22 @@ - + - + + class="org.argeo.slc.services.impl.SlcExecutionServiceImpl"> - \ No newline at end of file diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF index 7ba4434c4..f2e2e3dc6 100644 --- a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF +++ b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF @@ -1,29 +1,45 @@ Manifest-Version: 1.0 -Require-Bundle: - org.argeo.slc.server, - org.argeo.slc.specs, - org.argeo.slc.core, - com.springsource.org.castor Bundle-ClassPath: WEB-INF/classes Bundle-Version: 0.11.4.SNAPSHOT Bundle-Name: SLC Webapp Web-ContextPath: org.argeo.slc.webapp Bundle-SymbolicName: org.argeo.slc.webapp -Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,javax.se - rvlet,javax.servlet.http,javax.servlet.jsp,javax.servlet.jsp.jstl.cor - e,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp.jstl.tlv,javax.servlet - .resources,org.aopalliance.aop,org.apache.taglibs.standard.resources, - org.apache.taglibs.standard.tag.common.core,org.apache.taglibs.standa - rd.tag.rt.core,org.apache.taglibs.standard.tei,org.apache.taglibs.sta - ndard.tlv,org.hibernate,org.hibernate.hql.ast,org.hibernate.jdbc,org. - springframework.aop,org.springframework.aop.framework,org.springframe - work.aop.scope,net.sf.cglib.proxy,net.sf.cglib.core,net.sf.cglib.refl - ect,org.springframework.orm.hibernate3.support,org.springframework.os - gi.web.context.support,org.springframework.oxm.castor,org.springframe - work.transaction,org.springframework.beans.factory.support,org.spring - framework.web.context,org.springframework.web.context.support,org.spr - ingframework.web.context.request,org.springframework.web.servlet,org. - springframework.web.servlet.handler,org.springframework.web.servlet.v - iew,org.springframework.web.util,org.springframework.web.servlet.mvc, - org.springframework.xml.xsd - +Import-Package: org.springframework.web.context, + org.springframework.osgi.web.context.support, + org.springframework.web.context.support, + org.springframework.orm.hibernate3.support, + org.argeo.slc.dao.runtime, + org.argeo.slc.dao.process, + org.argeo.slc.dao.test, + org.argeo.slc.dao.test.tree, + org.springframework.web.servlet.mvc, + org.hibernate, + org.argeo.slc.services, + org.springframework.transaction, + org.argeo.slc.runtime, + org.argeo.slc.core.test.tree, + org.argeo.slc.msg.event, + org.argeo.slc.core.attachment, + org.argeo.slc.deploy, + org.argeo.slc.build, + org.springframework.web.servlet, + org.springframework.oxm, + org.springframework.aop, + org.springframework.aop.framework, + org.springframework.aop.scope, + org.argeo.slc.web.mvc.management, + org.argeo.slc.web.mvc.provisioning, + org.argeo.slc.web.mvc.result, + org.argeo.slc.web.mvc.process, + org.argeo.slc.web.mvc.runtime, + org.argeo.slc.web.mvc.event, + org.argeo.slc.web.mvc.attachment, + org.argeo.slc.web.mvc.execution, + org.argeo.slc.web.mvc, + org.springframework.web.servlet.handler, + org.aopalliance.aop, + net.sf.cglib.core, + net.sf.cglib.proxy, + net.sf.cglib.reflect, + org.hibernate.jdbc, + org.hibernate.hql.ast diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml index c79f6a6ea..79eba0f09 100644 --- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml +++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml @@ -6,6 +6,9 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> + + + --> - + interface="org.argeo.slc.services.TestManagerService" /> + + interface="org.argeo.slc.services.SlcExecutionService" /> - - @@ -61,7 +59,7 @@ - + @@ -116,7 +114,7 @@ - + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml index 1d5e5be93..0853254b6 100644 --- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml +++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml @@ -3,8 +3,6 @@ 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"> - - @@ -26,7 +24,7 @@ .xsl - + diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java index 2db1eb31a..4722280d9 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java @@ -142,13 +142,6 @@ public abstract class AbstractExecutionModulesManager implements public void run() { log.info("\n##\n## Process SLC Execution " + slcProcess + "\n##\n"); - // FIXME: hack to let the SlcExecution be registered on server - try { - Thread.sleep(500); - } catch (InterruptedException e1) { - // silent - } - slcProcess.setStatus(SlcExecution.STATUS_RUNNING); dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_SCHEDULED, SlcExecution.STATUS_RUNNING); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/AgentService.java similarity index 84% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/AgentService.java index 33da18a50..85638357d 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/AgentService.java @@ -1,4 +1,4 @@ -package org.argeo.slc.services.runtime; +package org.argeo.slc.services; import org.argeo.slc.runtime.SlcAgentDescriptor; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java index 72cde61e1..77a0d264f 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/EventPublisherAspect.java @@ -27,7 +27,7 @@ public class EventPublisherAspect { private List eventPublishers; - @After("execution(void org.argeo.slc.services.runtime.AgentService.register(..))") + @After("execution(void org.argeo.slc.services.AgentService.register(..))") public void registerAgent(JoinPoint jp) throws Throwable { SlcAgentDescriptor agentDescriptor = (SlcAgentDescriptor) jp.getArgs()[0]; SlcEvent event = new SlcEvent(EVT_AGENT_REGISTERED); @@ -36,7 +36,7 @@ public class EventPublisherAspect { publishEvent(event); } - @After("execution(void org.argeo.slc.services.runtime.AgentService.unregister(..))") + @After("execution(void org.argeo.slc.services.AgentService.unregister(..))") public void unregisterAgent(JoinPoint jp) throws Throwable { SlcAgentDescriptor agentDescriptor = (SlcAgentDescriptor) jp.getArgs()[0]; SlcEvent event = new SlcEvent(EVT_AGENT_UNREGISTERED); @@ -45,7 +45,7 @@ public class EventPublisherAspect { publishEvent(event); } - @After("execution(void org.argeo.slc.services.process.SlcExecutionService.newExecution(..))") + @After("execution(void org.argeo.slc.services.SlcExecutionService.newExecution(..))") public void newSlcExecution(JoinPoint jp) throws Throwable { SlcExecution slcExecution = (SlcExecution) jp.getArgs()[0]; SlcEvent event = new SlcEvent(EVT_NEW_SLC_EXECUTION); @@ -54,7 +54,7 @@ public class EventPublisherAspect { publishEvent(event); } - @After("execution(void org.argeo.slc.services.process.SlcExecutionService.updateStatus(..))") + @After("execution(void org.argeo.slc.services.SlcExecutionService.updateStatus(..))") public void updateSlcExecutionStatus(JoinPoint jp) throws Throwable { SlcExecutionStatusRequest msg = (SlcExecutionStatusRequest) jp .getArgs()[0]; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java index 2ec840962..3718d3cdf 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java @@ -9,8 +9,6 @@ import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; import org.argeo.slc.msg.test.tree.ResultPartRequest; import org.argeo.slc.process.SlcExecution; -import org.argeo.slc.services.process.SlcExecutionService; -import org.argeo.slc.services.test.TestManagerService; public class ServiceMsgHandler implements MsgHandler { private TestManagerService testManagerService; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/process/SlcExecutionService.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/SlcExecutionService.java similarity index 90% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/process/SlcExecutionService.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/SlcExecutionService.java index 03afceeaa..e6931f90c 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/process/SlcExecutionService.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/SlcExecutionService.java @@ -1,4 +1,4 @@ -package org.argeo.slc.services.process; +package org.argeo.slc.services; import org.argeo.slc.msg.process.SlcExecutionStatusRequest; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/TestManagerService.java similarity index 94% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/TestManagerService.java index a286e91a7..c9e9e5f1e 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/TestManagerService.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/TestManagerService.java @@ -1,4 +1,4 @@ -package org.argeo.slc.services.test; +package org.argeo.slc.services; import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest; import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java similarity index 96% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java index b08e9e8d1..a27772b26 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java @@ -1,4 +1,4 @@ -package org.argeo.slc.services.impl.runtime; +package org.argeo.slc.services.impl; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.argeo.slc.dao.runtime.SlcAgentDescriptorDao; import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.runtime.SlcAgentDescriptor; import org.argeo.slc.runtime.SlcAgentFactory; -import org.argeo.slc.services.runtime.AgentService; +import org.argeo.slc.services.AgentService; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/process/SlcExecutionServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/SlcExecutionServiceImpl.java similarity index 95% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/process/SlcExecutionServiceImpl.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/SlcExecutionServiceImpl.java index 1cb71070f..6efb37ae6 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/process/SlcExecutionServiceImpl.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/SlcExecutionServiceImpl.java @@ -1,4 +1,4 @@ -package org.argeo.slc.services.impl.process; +package org.argeo.slc.services.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -8,7 +8,7 @@ import org.argeo.slc.msg.process.SlcExecutionStatusRequest; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionStep; -import org.argeo.slc.services.process.SlcExecutionService; +import org.argeo.slc.services.SlcExecutionService; public class SlcExecutionServiceImpl implements SlcExecutionService { private final Log log = LogFactory.getLog(getClass()); diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java similarity index 95% rename from runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java rename to runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java index 59b7b37db..0679cf306 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java @@ -1,4 +1,4 @@ -package org.argeo.slc.services.impl.test; +package org.argeo.slc.services.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -13,7 +13,7 @@ import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; import org.argeo.slc.msg.test.tree.ResultPartRequest; import org.argeo.slc.process.SlcExecution; -import org.argeo.slc.services.test.TestManagerService; +import org.argeo.slc.services.TestManagerService; import org.argeo.slc.test.TestRunDescriptor; /** diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java index d581da364..7b03f3b9b 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/process/NewSlcExecutionController.java @@ -13,7 +13,7 @@ import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.runtime.SlcAgentFactory; -import org.argeo.slc.services.process.SlcExecutionService; +import org.argeo.slc.services.SlcExecutionService; import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.oxm.Unmarshaller; import org.springframework.util.Assert; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java index cc47a8d16..fcc180859 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/AddResultToCollectionController.java @@ -3,7 +3,7 @@ package org.argeo.slc.web.mvc.result; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.slc.services.test.TestManagerService; +import org.argeo.slc.services.TestManagerService; import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.web.servlet.ModelAndView; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/CopyCollectionToCollectionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/CopyCollectionToCollectionController.java index 1841a3fcc..996b7a796 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/CopyCollectionToCollectionController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/CopyCollectionToCollectionController.java @@ -7,7 +7,7 @@ import org.argeo.slc.SlcException; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.core.test.tree.TreeTestResultCollection; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; -import org.argeo.slc.services.test.TestManagerService; +import org.argeo.slc.services.TestManagerService; import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.util.PatternMatchUtils; import org.springframework.web.servlet.ModelAndView; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java index a9709dc23..b49bed4ac 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java @@ -10,7 +10,7 @@ import org.argeo.slc.SlcException; import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.core.test.tree.TreeTestResultCollection; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; -import org.argeo.slc.services.test.TestManagerService; +import org.argeo.slc.services.TestManagerService; import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.util.PatternMatchUtils; import org.springframework.web.servlet.ModelAndView; diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java deleted file mode 100644 index 6867062f2..000000000 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultCollectionListController.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.argeo.slc.web.mvc.result; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.ParameterizableViewController; - -import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; - -public class ResultCollectionListController extends - ParameterizableViewController { - private final TreeTestResultCollectionDao testResultCollectionDao; - - public ResultCollectionListController( - TreeTestResultCollectionDao testResultCollectionDao) { - this.testResultCollectionDao = testResultCollectionDao; - } - - @Override - protected ModelAndView handleRequestInternal(HttpServletRequest request, - HttpServletResponse response) throws Exception { - ModelAndView modelAndView = new ModelAndView(); - - // no need to retrieve since collection list is always in session - - // SortedSet results = testResultCollectionDao - // .listCollections(); - // modelAndView.addObject("resultCollections", results); - - modelAndView.setViewName(getViewName()); - return modelAndView; - } -} diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/dao.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/dao.xml new file mode 100644 index 000000000..2ab5377d0 --- /dev/null +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/dao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/ehcache.xml similarity index 100% rename from runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml rename to runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/ehcache.xml diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml new file mode 100644 index 000000000..3aafce864 --- /dev/null +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/sessionFactories.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml + + + org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml + + + org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml + + + org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml + + + org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml + + + org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml + + + org/argeo/slc/hibernate/process/SlcExecution.hbm.xml + + + org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml + + + org/argeo/slc/hibernate/runtime/SlcAgentDescriptor.hbm.xml + + + org/argeo/slc/hibernate/attachment/SimpleAttachment.hbm.xml + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring.xml new file mode 100644 index 000000000..10f34b492 --- /dev/null +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml index ca3346db6..d38d8c9c0 100644 --- a/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml +++ b/runtime/org.argeo.slc.support.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml @@ -3,100 +3,9 @@ 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="true"> - - - - - - - - - - - - - - org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml - - - org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml - - - org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml - - - org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml - - - org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml - - - org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml - - - org/argeo/slc/hibernate/process/SlcExecution.hbm.xml - - - org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml - - - org/argeo/slc/hibernate/runtime/SlcAgentDescriptor.hbm.xml - - - org/argeo/slc/hibernate/attachment/SimpleAttachment.hbm.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Deprecated, use + classpath:/org/argeo/slc/hibernate/spring.xml instead + + \ No newline at end of file diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml index 464065838..da8dc1f54 100644 --- a/server/org.argeo.slc.ria/pom.xml +++ b/server/org.argeo.slc.ria/pom.xml @@ -100,6 +100,7 @@ ${version.maven-bundle-plugin} + ${project.artifactId} ${project.version}-r${buildNumber} -- 2.39.2