incubator-hise-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r.@apache.org
Subject svn commit: r984361 [1/4] - in /incubator/hise/trunk: hise-bundle/ hise-bundle/src/main/resources/META-INF/spring/ hise-services/src/main/java/org/apache/hise/dao/ hise-services/src/main/java/org/apache/hise/engine/jaxws/ hise-services/src/main/java/or...
Date Wed, 11 Aug 2010 10:23:45 GMT
Author: rr
Date: Wed Aug 11 10:23:44 2010
New Revision: 984361

URL: http://svn.apache.org/viewvc?rev=984361&view=rev
Log:
HISE-68: Converting JAXB to XMLBeans (Thanks to Piotr Zagórski)

Added:
    incubator/hise/trunk/hise-wsdl-classes/src/main/binding/binding.xsdconfig
Modified:
    incubator/hise/trunk/hise-bundle/pom.xml
    incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PotentialDelegates.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskQuery.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HumanInteractionsCompiler.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/TaskDefinition.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/DeadlineController.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskEvaluator.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/DOMUtils.java
    incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/TaskEvaluatorTest.java
    incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/TaskOperationsTest.java
    incubator/hise/trunk/hise-services/src/test/java/org/apache/hise/runtime/TaskEvaluatorTest.java
    incubator/hise/trunk/hise-test-example-osgi/src/main/resources/META-INF/spring/hise-itest.xml
    incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml
    incubator/hise/trunk/hise-wsdl-classes/pom.xml
    incubator/hise/trunk/hise-wsdl-classes/src/main/binding/bindings-jaxws.xml
    incubator/hise/trunk/itest/hise-soapui-project.xml

Modified: incubator/hise/trunk/hise-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/pom.xml?rev=984361&r1=984360&r2=984361&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/pom.xml (original)
+++ incubator/hise/trunk/hise-bundle/pom.xml Wed Aug 11 10:23:44 2010
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-				<version>1.4.3</version>
+				<!--version>1.4.3</version-->
 				<extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -63,7 +63,7 @@ org.springframework.osgi.context.support
 org.springframework.osgi.service,
 org.springframework.osgi.service.importer
                         </Import-Package>
-                        <Export-Package>org.apache.hise*,org.w3._2001.xmlschema</Export-Package>
+                        <Export-Package>org.apache.hise*,org.w3._2001.xmlschema,schemaorg_apache_xmlbeans*</Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Require-Bundle>
                             org.apache.cxf.bundle

Modified: incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml?rev=984361&r1=984360&r2=984361&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml (original)
+++ incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml Wed Aug 11
10:23:44 2010
@@ -120,6 +120,10 @@
         </constructor-arg>
       </bean>
     </jaxws:inInterceptors>
+    <jaxws:dataBinding>
+       <bean class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" />
+    </jaxws:dataBinding>
+
   </jaxws:endpoint>
   
   <jaxws:endpoint id="taskOperationsEndpointPlainAuth" name="taskOperationsEndpointPlainAuth"
address="/taskOperationsPlainAuth/" implementor="#taskOperations" serviceName="htdaw:taskOperations"
publish="true" wsdlLocation="classpath:ws-humantask.wsdl">

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java?rev=984361&r1=984360&r2=984361&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/HISEDao.java Wed
Aug 11 10:23:44 2010
@@ -180,7 +180,7 @@ public class HISEDao extends JpaDaoSuppo
     	if(!query.getStatuses().isEmpty()){
     		q.add(" ( ");
     		for(int i=0; i<query.getStatuses().size(); ++i){
-    			q.add(new JQBParam("status"+i, Task.Status.fromValue(query.getStatuses().get(i).name()),
+    			q.add(new JQBParam("status"+i, Task.Status.fromValue(query.getStatuses().get(i).toString()),
     					new Object[] {
                 			" t.status = :status"+i, 
             			})

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PotentialDelegates.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PotentialDelegates.java?rev=984361&r1=984360&r2=984361&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PotentialDelegates.java
(original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PotentialDelegates.java
Wed Aug 11 10:23:44 2010
@@ -50,9 +50,11 @@ public enum PotentialDelegates {
 	
 	static public PotentialDelegates mapFromTPotentalDelegates(TPotentialDelegatees delegatees)
 	{
-		if(delegatees.equals(TPotentialDelegatees.ANYBODY)) return ANYBODY;
-		if(delegatees.equals(TPotentialDelegatees.POTENTIAL_OWNERS)) return POTENTIAL_OWNERS;
-		if(delegatees.equals(TPotentialDelegatees.OTHER)) return OTHER;
+            TPotentialDelegatees.Enum e = TPotentialDelegatees.Enum.forString(delegatees.getStringValue());
+
+		if(e.equals(TPotentialDelegatees.ANYBODY)) return ANYBODY;
+		if(e.equals(TPotentialDelegatees.POTENTIAL_OWNERS)) return POTENTIAL_OWNERS;
+		if(e.equals(TPotentialDelegatees.OTHER)) return OTHER;
 		return NOBODY;
 	}
 }

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskQuery.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskQuery.java?rev=984361&r1=984360&r2=984361&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskQuery.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskQuery.java Wed
Aug 11 10:23:44 2010
@@ -38,7 +38,7 @@ public class TaskQuery {
     private String taskType = "ALL";
     private GenericHumanRole genericHumanRole = GenericHumanRole.ACTUALOWNER;
     private String workQueue = "";
-    private List<TStatus> statuses = Collections.EMPTY_LIST;
+    private List<TStatus.Enum> statuses = Collections.EMPTY_LIST;
     private String whereClause = "";
     private String createdOnClause = "";
     private Integer maxTasks = 20;
@@ -83,11 +83,11 @@ public class TaskQuery {
         this.workQueue = workQueue;
     }
 
-    public List<TStatus> getStatuses() {
+    public List<TStatus.Enum> getStatuses() {
         return statuses;
     }
 
-    public void setStatuses(List<TStatus> statuses) {
+    public void setStatuses(List<TStatus.Enum> statuses) {
         this.statuses = statuses;
     }
 



Mime
View raw message