From a999641cd4bf45736cee462f2e6ba5fc01cc0cd3 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 15 Mar 2009 09:25:39 +0000
Subject: [PATCH] Improve server structure

git-svn-id: https://svn.argeo.org/slc/trunk@2269 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../META-INF/spring/transaction-osgi.xml      | 25 ++++++++++
 .../META-INF/MANIFEST.MF                      | 46 +++++++++----------
 .../WEB-INF/applicationContext.xml            | 10 +---
 .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml |  3 ++
 .../org.argeo.slc.webapp.war/WEB-INF/web.xml  | 10 ++--
 server/org.argeo.slc.siteserver/pom.xml       |  6 +++
 7 files changed, 65 insertions(+), 38 deletions(-)
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction-osgi.xml

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 cd721650f..7e50f5daa 100644
--- 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
index 000000000..08c04583a
--- /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"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
+		ref="testResultDao" />
+	<service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
+		ref="testResultCollectionDao" />
+	<service interface="org.argeo.slc.dao.test.TestRunDescriptorDao"
+		ref="testRunDescriptorDao" />
+	<service interface="org.argeo.slc.dao.process.SlcExecutionDao"
+		ref="slcExecutionDao" />
+	<service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
+		ref="slcAgentDescriptorDao" />
+	<service ref="transactionManager"
+		interface="org.springframework.transaction.PlatformTransactionManager" />
+
+	<reference id="sessionFactory" interface="org.hibernate.SessionFactory" />
+
+
+</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 93999bc5c..5ad42f11b 100644
--- 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 be36828d7..0ee624be4 100644
--- 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 4a655bb6f..bc1d3fcf2 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
@@ -26,4 +26,7 @@
 		interface="org.argeo.slc.services.test.TestManagerService" />
 	<reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />
 
+	<reference id="transactionManager"
+		interface="org.springframework.transaction.PlatformTransactionManager" />
+
 </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 62d26b5a6..b18721157 100644
--- 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 1f68b72b3..9999303d7 100644
--- 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>
-- 
2.39.2