From 00152927cfd3607b6fc8b69b0e449549514c9c47 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Mar 2009 23:43:06 +0000
Subject: [PATCH] Fix issues with results not being seen

git-svn-id: https://svn.argeo.org/slc/trunk@2278 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../services/impl/test/TestManagerServiceImpl.java   | 12 ++++++------
 .../argeo/slc/web/mvc/AbstractServiceController.java |  1 +
 .../META-INF/MANIFEST.MF                             |  3 ++-
 .../META-INF/spring/services-osgi.xml                |  4 ++--
 .../META-INF/spring/services.xml                     |  4 ++--
 .../org.argeo.slc.webapp.war/META-INF/MANIFEST.MF    |  1 +
 6 files changed, 14 insertions(+), 11 deletions(-)

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/test/TestManagerServiceImpl.java
index 2489dd468..a70adc852 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/test/TestManagerServiceImpl.java
@@ -56,11 +56,11 @@ public class TestManagerServiceImpl implements TestManagerService {
 							.getTestResultUuid());
 				}
 			} else {
-//				log
-//						.trace("ResultUUID="
-//								+ testRunDescriptor.getTestResultUuid());
-//				addResultToCollection("default", testRunDescriptor
-//						.getTestResultUuid());
+				 log
+						.trace("ResultUUID="
+								+ testRunDescriptor.getTestResultUuid());
+				addResultToCollection("default", testRunDescriptor
+						.getTestResultUuid());
 			}
 		}
 	}
@@ -102,7 +102,7 @@ public class TestManagerServiceImpl implements TestManagerService {
 	}
 
 	public void addResultPart(ResultPartRequest msg) {
-		registerTestRunDescriptor(msg.getTestRunDescriptor());
+//		registerTestRunDescriptor(msg.getTestRunDescriptor());
 
 		if (log.isTraceEnabled())
 			log.trace("Adding result part to test result #"
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/AbstractServiceController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/AbstractServiceController.java
index 3b10f0b22..26d4fd89a 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/AbstractServiceController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/AbstractServiceController.java
@@ -24,6 +24,7 @@ public abstract class AbstractServiceController extends AbstractController {
 		try {
 			handleServiceRequest(request, response, mv);
 		} catch (Exception e) {
+			e.printStackTrace();
 			StringWriter writer = new StringWriter();
 			e.printStackTrace(new PrintWriter(writer));
 			ExecutionAnswer answer = ExecutionAnswer.error(writer.toString());
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 7e50f5daa..3612c0bf5 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
@@ -11,5 +11,6 @@ Import-Package:
 Require-Bundle: 
  org.argeo.slc.server,
  org.argeo.slc.specs,
- org.argeo.slc.support.simple
+ org.argeo.slc.support.simple,
+ com.springsource.org.hibernate
  
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
index 87520ed16..04c557c55 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
@@ -22,7 +22,7 @@
 	<reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
 		id="slcAgentDescriptorDao" />
 
-	<reference id="transactionManager"
-		interface="org.springframework.transaction.PlatformTransactionManager" />
+	<!-- <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.server.services/META-INF/spring/services.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
index debb1c458..e93f04885 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
@@ -23,7 +23,7 @@
 		<constructor-arg ref="slcExecutionDao" />
 	</bean>
 
-	<!-- Services transactions -->
+	<!-- Services transactions
 	<aop:config>
 		<aop:pointcut id="serviceMethods"
 			expression="execution(* org.argeo.slc.services.test.TestManagerService.*(..))" />
@@ -35,5 +35,5 @@
 			<tx:method name="*" propagation="REQUIRED" />
 		</tx:attributes>
 	</tx:advice>
-
+ -->
 </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 219621b85..719331cc6 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
@@ -20,6 +20,7 @@ Import-Package: com.sun.xml.messaging.saaj.soap;optional=true,
  org.apache.taglibs.standard.tlv,
  org.hibernate,
  org.hibernate.jdbc,
+ org.hibernate.hql.ast,
  org.springframework.aop,
  org.springframework.aop.framework,
  org.springframework.orm.hibernate3.support,
-- 
2.39.2