Improve server structure

git-svn-id: https://svn.argeo.org/slc/trunk@2269 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
index cd721650f9a90458c99bdf3fa160d9be73c1555c..7e50f5daaae7c5638107a1efbd0bcdbc6a3b8444 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Import-Package:
  org.springframework.aop,
  org.springframework.aop.framework,
  org.aopalliance.aop,
- org.hibernate.jdbc
+ org.hibernate.jdbc,
+ org.springframework.transaction
 Require-Bundle: 
  org.argeo.slc.server,
  org.argeo.slc.specs,

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml
new file mode 100644 (file)
index 0000000..08c0458
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+       http://www.springframework.org/schema/beans   \r
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r
+               ref="testResultDao" />\r
+       <service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
+               ref="testResultCollectionDao" />\r
+       <service interface="org.argeo.slc.dao.test.TestRunDescriptorDao"\r
+               ref="testRunDescriptorDao" />\r
+       <service interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
+               ref="slcExecutionDao" />\r
+       <service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"\r
+               ref="slcAgentDescriptorDao" />\r
+       <service ref="transactionManager"\r
+               interface="org.springframework.transaction.PlatformTransactionManager" />\r
+\r
+       <reference id="sessionFactory" interface="org.hibernate.SessionFactory" />\r
+\r
+\r
+</beans:beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index 93999bc5cf52a094ba5a0a0f40d6029c9e12eda8..5ad42f11ba7c8c645153fa3c069ae072004f8a08 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -3,45 +3,43 @@ Bundle-Name: SLC Webapp
 Bundle-SymbolicName: org.argeo.slc.webapp
 Bundle-Version: 1.0.0
 Bundle-ClassPath: WEB-INF/classes
-Import-Package: javax.servlet,
+Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,
+ javax.servlet,
  javax.servlet.http,
- javax.servlet.resources,
  javax.servlet.jsp,
  javax.servlet.jsp.jstl.core,
  javax.servlet.jsp.jstl.fmt,
  javax.servlet.jsp.jstl.tlv,
+ javax.servlet.resources,
+ org.aopalliance.aop,
+ org.apache.activemq.web,
  org.apache.taglibs.standard.resources,
  org.apache.taglibs.standard.tag.common.core,
  org.apache.taglibs.standard.tag.rt.core,
  org.apache.taglibs.standard.tei,
  org.apache.taglibs.standard.tlv,
- org.aopalliance.aop,
+ org.hibernate,
  org.springframework.aop,
  org.springframework.aop.framework,
+ org.springframework.orm.hibernate3.support,
  org.springframework.osgi.web.context.support,
+ org.springframework.oxm.castor,
+ org.springframework.transaction,
  org.springframework.web.context,
+ org.springframework.web.context.support,
+ org.springframework.web.servlet,
+ org.springframework.web.servlet.handler,
+ org.springframework.web.servlet.view,
  org.springframework.web.util,
- org.apache.naming.java,
- com.sun.xml.messaging.saaj.soap;resolution:=optional
+ org.springframework.ws.context,
+ org.springframework.ws.server.endpoint,
+ org.springframework.ws.server.endpoint.interceptor,
+ org.springframework.ws.server.endpoint.mapping,
+ org.springframework.ws.soap.saaj,
+ org.springframework.ws.transport.http,
+ org.springframework.ws.wsdl.wsdl11,
+ org.springframework.xml.xsd
 Require-Bundle: org.argeo.slc.server,
  org.argeo.slc.specs,
  org.argeo.slc.support.simple,
- 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.xml,
- 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,
- org.argeo.dep.osgi.activemq,
- org.argeo.dep.osgi.activemq.web,
- com.springsource.org.mortbay.util
- 
\ No newline at end of file
+ com.springsource.org.castor

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
index be36828d73d5080ee4c367162751d1619b639925..0ee624be412c92415ef2a15c576c7cb5500d4b45 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -13,8 +13,7 @@
 
        <import resource="osgi.xml" />
 
-       <!--
-               Hibernate instrumentation-->
+       <!-- Hibernate instrumentation-->
        <bean id="osivInterceptor"
                class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
                <property name="sessionFactory" ref="sessionFactory" />
@@ -26,13 +25,6 @@
                class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
                lazy-init="false">
                <property name="contextOverride" value="true" />
-               <property name="properties">
-                       <props>
-                               <prop key="sessionFactoryParentBean">
-                                       slcServerDefault.sessionFactory.HSQL
-                </prop>
-                       </props>
-               </property>
                <property name="ignoreUnresolvablePlaceholders" value="true" />
        </bean>
 

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 4a655bb6f384bf9a65a157875a0cdc3134a75350..bc1d3fcf2d24eb894f5c15eff7bd1e441f4e1441 100644 (file)
--- 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
@@ -26,4 +26,7 @@
                interface="org.argeo.slc.services.test.TestManagerService" />\r
        <reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />\r
 \r
+       <reference id="transactionManager"\r
+               interface="org.springframework.transaction.PlatformTransactionManager" />\r
+\r
 </beans:beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
index 62d26b5a61f81bf1797b4db35685a6a15479a976..b1872115788ff54a194f697e1c387453f0f2fb15 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -13,6 +13,7 @@
                        <param-name>contextClass</param-name>
                        <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
                </init-param>
+               <load-on-startup>1</load-on-startup>
        </servlet>
 
        <servlet-mapping>
@@ -85,11 +86,12 @@
                <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
        </context-param>
 
-       <!-- Env refs
-       <resource-env-ref>
+       <!--
+               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> -->
+               </resource-env-ref>
+       -->
 
        <!-- Log4j configContext loader config -->
        <listener>
@@ -109,7 +111,7 @@
        <!-- Active MQ -->
        <context-param>
                <param-name>org.apache.activemq.brokerURL</param-name>
-               <param-value>tcp://localhost:61616</param-value>
+               <param-value>vm://localhost</param-value>
        </context-param>
 
        <context-param>

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 1f68b72b302cb8458b7293c213d0755005c536af..9999303d78ca2a218536da1faaf7364a630f6bea 100644 (file)
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -190,6 +190,12 @@
                                        com.springsource.org.apache.log4j
                                </artifactId>
                </dependency>
+               
+               <!-- For WS -->
+               <dependency>
+                       <groupId>com.sun.xml</groupId>
+                       <artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
+               </dependency>
 
                <!-- For ActiveMQ Web -->
                <dependency>