Fix issues with results not being seen

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

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 2489dd468fe44e61c845f192d0be1eca2d21af4e..a70adc8521ef8f021631c392a95fe83cde01782b 100644 (file)
--- 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());\r
                                }\r
                        } else {\r
-//                             log\r
-//                                             .trace("ResultUUID="\r
-//                                                             + testRunDescriptor.getTestResultUuid());\r
-//                             addResultToCollection("default", testRunDescriptor\r
-//                                             .getTestResultUuid());\r
+                                log\r
+                                               .trace("ResultUUID="\r
+                                                               + testRunDescriptor.getTestResultUuid());\r
+                               addResultToCollection("default", testRunDescriptor\r
+                                               .getTestResultUuid());\r
                        }\r
                }\r
        }\r
@@ -102,7 +102,7 @@ public class TestManagerServiceImpl implements TestManagerService {
        }\r
 \r
        public void addResultPart(ResultPartRequest msg) {\r
-               registerTestRunDescriptor(msg.getTestRunDescriptor());\r
+//             registerTestRunDescriptor(msg.getTestRunDescriptor());\r
 \r
                if (log.isTraceEnabled())\r
                        log.trace("Adding result part to test result #"\r

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 3b10f0b22c5dbe1b1952e2eb4a8609eac45068f7..26d4fd89ab9f49f26260d1325a6d87948a5b65ae 100644 (file)
--- 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 7e50f5daaae7c5638107a1efbd0bcdbc6a3b8444..3612c0bf5660bc84239f3e754b731be5e8f81b2a 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
@@ -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 87520ed166cd1e5379b9e79846de6dd367101208..04c557c55a5ab7c2bbdf890ee86e1505c1afe09d 100644 (file)
--- 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 debb1c458daad11e50dce08110984554a4c47561..e93f04885e8b72d5945a6fc2a39e8fa5afa84520 100644 (file)
--- 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 219621b851e53d4537809c49cf456e1c0d0e475c..719331cc66afb3373becb95ac2c61a7bd0020f3d 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
@@ -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,