incubator-hise-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r.@apache.org
Subject svn commit: r983870 [1/6] - in /incubator/hise/trunk: hise-docs/src/main/resources/ hise-services/src/main/java/org/apache/hise/dao/ hise-services/src/main/java/org/apache/hise/engine/jaxws/ hise-test-example-osgi/src/main/resources/ hise-test-example-...
Date Tue, 10 Aug 2010 07:02:18 GMT
Author: rr
Date: Tue Aug 10 07:02:17 2010
New Revision: 983870

URL: http://svn.apache.org/viewvc?rev=983870&view=rev
Log:
HISE-60: return startBy and completeBy in getMyTasks (Thanks to PaweĊ‚ Byszewski)

Added:
    incubator/hise/trunk/itest/deadlineInfo.xml
Modified:
    incubator/hise/trunk/hise-docs/src/main/resources/user-guide.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/engine/jaxws/TaskOperationsImpl.java
    incubator/hise/trunk/hise-test-example-osgi/src/main/resources/META-INF/spring/beans.xml
    incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml
    incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api-wsdl.xsd
    incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api.xsd
    incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask.xsd
    incubator/hise/trunk/itest/filtering.xml
    incubator/hise/trunk/itest/hise-example-osgi.xml
    incubator/hise/trunk/itest/hise-soapui-project.xml
    incubator/hise/trunk/itest/task_history.xml

Modified: incubator/hise/trunk/hise-docs/src/main/resources/user-guide.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-docs/src/main/resources/user-guide.xml?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-docs/src/main/resources/user-guide.xml (original)
+++ incubator/hise/trunk/hise-docs/src/main/resources/user-guide.xml Tue Aug 10 07:02:17 2010
@@ -57,17 +57,6 @@ xsi:schemaLocation="http://docbook.org/n
           <para>Start your application server. This will create H2 database schema
in files hise-h2-db.*.db. </para>
         </listitem>
         <listitem>
-          <para>Enter hise URL into your browser. For Tomcat, this will be http://localhost:8080/hise.
-            There will be a list of services exposed by HISE. It will contain approve operation
from example task. 
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-          You can import WSDL http://localhost:8080/hise/ClaimsHandlingService/?wsdl into
SoapUI to start interacting with Human Task.
-          There is also a prepared project in examples/claimsHandling/claimsHandling-soapui-project.xml.

-          </para>
-        </listitem>
-        <listitem>
           <para>
             You need to import some user and group definitions.
             By default, HISE uses H2 file database named hise-h2-db.

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=983870&r1=983869&r2=983870&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 Tue
Aug 10 07:02:17 2010
@@ -145,7 +145,6 @@ public class HISEDao extends JpaDaoSuppo
 	private static boolean createWhereClause(Vector<Object> q, String clause, String name){
     	StringTokenizer st = new StringTokenizer(clause, "<>=", true);
     	Vector<String> tokens=new Vector<String>();
-    	System.out.println("pawelfiltering clause:"+clause+"**name:"+name);
     	String operands=new String("");
     	String value=new String("");
     	if(st.countTokens()<3) return false;
@@ -227,16 +226,16 @@ public class HISEDao extends JpaDaoSuppo
             getJpaTemplate().remove(o);
         }
     }
-	public<T> List find(final String query, final List<String> parameters,  final
Class<T> what){
+	public<T> List find(final String query, final List parameters,  final Class<T>
what){
 		
 		JpaTemplate jpaTemp=getJpaTemplate();
 		Object result=jpaTemp.execute(new JpaCallback() {					
 				public Object doInJpa(EntityManager em) throws PersistenceException {
-					String temp1;
+					//String temp1;
 					
 					Query q=em.createNativeQuery(query, what);
 					for(int i=0; i<parameters.size();++i){
-						temp1=parameters.get(i);
+						//temp1=parameters.get(i);
 						q.setParameter(i+1, parameters.get(i));
 					}
 					List res=q.getResultList();					

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java
(original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TaskOperationsImpl.java
Tue Aug 10 07:02:17 2010
@@ -1,7 +1,7 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
+ * distributed with this work for additional informationx
  * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -23,10 +23,13 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.Vector;
 
 import javax.jws.WebService;
@@ -40,6 +43,8 @@ import org.apache.commons.logging.LogFac
 import org.apache.hise.dao.Attachment;
 import org.apache.hise.dao.Comment;
 import org.apache.hise.dao.GenericHumanRole;
+import org.apache.hise.dao.Job;
+import org.apache.hise.dao.TaskHistoryMessage;
 import org.apache.hise.dao.Task.Status;
 import org.apache.hise.dao.TaskOrgEntity;
 import org.apache.hise.dao.TaskOrgEntity.OrgEntityType;
@@ -58,6 +63,8 @@ import org.apache.hise.engine.wsdl.Recip
 import org.apache.hise.engine.wsdl.TaskOperations;
 
 import org.apache.hise.lang.TaskDefinition;
+import org.apache.hise.lang.xsd.htd.TDeadlineInfo;
+import org.apache.hise.lang.xsd.htd.TDeadlinesInfo;
 import org.apache.hise.lang.xsd.htd.TGrouplist;
 import org.apache.hise.lang.xsd.htd.TOrganizationalEntity;
 import org.apache.hise.lang.xsd.htd.TRendering;
@@ -125,9 +132,11 @@ public class TaskOperationsImpl implemen
 
     /**
      * {@inheritDoc}
+     * @throws IllegalArgumentFault 
+     * @throws Exception 
      */
     public List<TTask> getMyTasks(String taskType, String genericHumanRole, String
workQueue, List<TStatus> status, String whereClause, String createdOnClause,
-            Integer maxTasks) throws IllegalArgumentFault, IllegalStateFault {
+            Integer maxTasks) throws IllegalArgumentFault  {
 
         List<TTask> result = new ArrayList<TTask>();
 
@@ -152,12 +161,59 @@ public class TaskOperationsImpl implemen
 
         List<org.apache.hise.dao.Task> tasks = hiseEngine.getHiseDao().getUserTasks(query);
         for (org.apache.hise.dao.Task u : tasks) {
-            TTask t = convertTask(u.getId());
+            TTask t=null;
+		
+				t = convertTasktoTTask(u);
+
             result.add(t);
         }
 
         return result;
+        
+        
+        
+        
+        
+        
+        
+        
+        
     }
+	private TTask convertTasktoTTask(org.apache.hise.dao.Task t) throws IllegalArgumentFault
  {
+		TTask result = convertTask(t.getId());
+		result.setDeadlinesInfo(convertToDeadlinesInfo(t));
+		
+		return result;
+	}
+
+	private TDeadlinesInfo  convertToDeadlinesInfo(org.apache.hise.dao.Task t) throws IllegalArgumentFault
{
+		TDeadlinesInfo result=new TDeadlinesInfo();
+		Set<Job> job= t.getDeadlines();
+		if(t.getDeadlines()!=null &&  job.size()>0){
+			for(org.apache.hise.dao.Job j: job){
+				String details=j.getDetails();
+				StringTokenizer st = new StringTokenizer(details, ";", true);
+				String name=new String();
+				String type=new String();
+				if(st.countTokens()<2)
+					throw new IllegalArgumentFault("START or COMPLETION information missing in deadine deatails");
+				while(st.hasMoreTokens()){
+					String token=st.nextToken();
+					if(st.hasMoreTokens())name+=token;
+					else type=token;
+				}
+				if(type.equalsIgnoreCase("START"))
+					result.getStartBy().add((new TDeadlineInfo().withDate(j.getFire()).withName(name)));
+				else
+					result.getCompleteBy().add((new TDeadlineInfo().withDate(j.getFire()).withName(name)));
+		
+				}
+
+		}
+
+	
+		return result;
+	}
 
     /**
      * {@inheritDoc}

Modified: incubator/hise/trunk/hise-test-example-osgi/src/main/resources/META-INF/spring/beans.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-test-example-osgi/src/main/resources/META-INF/spring/beans.xml?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-test-example-osgi/src/main/resources/META-INF/spring/beans.xml
(original)
+++ incubator/hise/trunk/hise-test-example-osgi/src/main/resources/META-INF/spring/beans.xml
Tue Aug 10 07:02:17 2010
@@ -101,6 +101,16 @@ xsi:schemaLocation="
             </bean>
             
             
+            <bean class="org.apache.hise.engine.store.TaskDD">
+              <property name="taskName">
+                <bean class="javax.xml.namespace.QName" factory-method="valueOf">
+                 <constructor-arg type="java.lang.String" value="{http://www.insurance.example.com/claims}Task11"></constructor-arg>
+                </bean>
+              </property>
+             <property name="handler" ref="hiseJaxWSService11"/>
+             <property name="sender" ref="hiseJaxWSSender11"/>
+            </bean>
+            
             
             <bean class="org.apache.hise.engine.store.TaskDD">
               <property name="taskName">
@@ -251,6 +261,24 @@ xsi:schemaLocation="
       </bean>
     </property>
   </bean>
+  
+  
+  <bean id="hiseJaxWSService11" class="org.apache.hise.engine.jaxws.HISEJaxWSService"
init-method="init">
+     <!--property name="id" value="hiseJaxWSService11"/-->
+    <property name="hiseEngine" ref="hiseEngine"/>
+    <property name="transactionManager" ref="transactionManager"></property>
+  </bean>
+ 
+  <jaxws:endpoint id="testHtd11" address="/ClaimsHandlingService11/" implementor="#hiseJaxWSService11"
serviceName="ins:ClaimsHandlingService" endpointName="ins:ClaimsHandlingPort" publish="true"
wsdlLocation="classpath:ExampleTasks.wsdl"/>
+
+  <bean id="hiseJaxWSSender11" class="org.apache.hise.engine.jaxws.HISEJaxWSClient" init-method="init">
+    <property name="wsdlDocumentLocation" value="classpath:ExampleTasks.wsdl"></property>
+    <property name="serviceName">
+     <bean class="javax.xml.namespace.QName" factory-method="valueOf">
+       <constructor-arg type="java.lang.String" value="{http://www.insurance.example.com/claims}ClaimsResolvingService"></constructor-arg>
+      </bean>
+    </property>
+  </bean>
 
 </beans>    
 

Modified: incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml (original)
+++ incubator/hise/trunk/hise-test-example-osgi/src/main/resources/testHtd1.xml Tue Aug 10
07:02:17 2010
@@ -1320,6 +1320,160 @@ xs:double(htd:getInput("ClaimApprovalReq
       
         </htd:task>   
         
+                <htd:task name="Task11">
+
+          <htd:documentation xml:lang="en-US">This task is used to handle claims that
require manual approval. </htd:documentation>
+            <htd:interface portType="tns:ClaimsHandlingPT" operation="approve" responsePortType="tns:ClaimsResolvingPT"
responseOperation="resolve"/>
+            <htd:priority> 
+                declare namespace cla="http://www.insurance.example.com/claims";
+				declare namespace htd="http://www.example.org/WS-HT";  
+				xs:integer(htd:getInput("ClaimApprovalRequest")/cla:prio)
+            </htd:priority>
+            
+            <htd:autoActivate>true</htd:autoActivate>
+             
+            
+            <htd:peopleAssignments>
+            	<htd:potentialOwners>
+                  <htd:from>
+                    <htd:literal>
+                        <htd:organizationalEntity>
+                            <htd:users>
+                                <htd:user>user1</htd:user>
+                            </htd:users>
+                            
+                        </htd:organizationalEntity>
+                    </htd:literal>
+                  </htd:from>
+                </htd:potentialOwners>
+                
+                <htd:businessAdministrators>
+                  <htd:from>
+                    <htd:literal>
+                        <htd:organizationalEntity>
+                            <htd:groups>
+                                <htd:group>group1</htd:group>
+                                <htd:group>group2</htd:group>
+                            </htd:groups>
+                        </htd:organizationalEntity>
+                    </htd:literal>
+                  </htd:from>
+                </htd:businessAdministrators>
+
+                <htd:businessAdministrators>
+                  <htd:from>
+                    <htd:literal>
+                        <htd:organizationalEntity>
+                            <htd:users>
+                                <htd:user>user1</htd:user>
+                                <htd:user>user2</htd:user>
+                            </htd:users>
+                        </htd:organizationalEntity>
+                    </htd:literal>
+                  </htd:from>
+                </htd:businessAdministrators>
+                
+            	<htd:taskStakeholders>
+                  <htd:from>
+                    <htd:literal>
+                        <htd:organizationalEntity>
+                            <htd:users>
+                                <htd:user>user3</htd:user>
+                            </htd:users>
+                        </htd:organizationalEntity>
+                    </htd:literal>
+                  </htd:from>
+                </htd:taskStakeholders>                
+            </htd:peopleAssignments>
+            
+            <htd:delegation potentialDelegatees="nobody"/>
+            
+            <htd:presentationElements>
+                
+                <htd:name xml:lang="en-US"> Approve Claim </htd:name>
+                
+                <htd:presentationParameters>
+                    
+                    <htd:presentationParameter name="firstname" type="xsd:string">
+declare namespace cla="http://www.insurance.example.com/claims";
+declare namespace htd="http://www.example.org/WS-HT";
+xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname)
+</htd:presentationParameter>
+                    
+                    <htd:presentationParameter name="lastname" type="xsd:string">
+declare namespace cla="http://www.insurance.example.com/claims";
+declare namespace htd="http://www.example.org/WS-HT";
+xs:string(htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname)
+</htd:presentationParameter>
+                    
+                    <htd:presentationParameter name="euroAmount" type="xsd:double">
+declare namespace cla="http://www.insurance.example.com/claims";
+declare namespace htd="http://www.example.org/WS-HT";
+xs:double(htd:getInput("ClaimApprovalRequest")/cla:amount)
+</htd:presentationParameter>
+                        
+                </htd:presentationParameters>
+                
+<htd:subject xml:lang="en-US"> Approve the insurance claim for PLN {$euroAmount} on
behalf of {$firstname} {$lastname} </htd:subject>
+
+                <htd:description xml:lang="en-US" contentType="text/plain"> Approve
this claim following corporate guideline #4711.0815/7 for {$firstname} {$lastname} </htd:description>
+
+            </htd:presentationElements>
+            
+            <htd:outcome>
+                <![CDATA[
+                  <cla:resolve xmlns:cla="http://www.insurance.example.com/claims" xmlns:htd="http://www.example.org/WS-HT">
+                     <claimId>{htd:getInput("ClaimApprovalRequest")/cla:cust/cla:id/text()}</claimId>
+                     <ok>{$outcome}</ok>
+                  </cla:resolve>
+                ]]>
+            </htd:outcome>
+            
+                
+            
+  <htd:deadlines>
+
+  <htd:startDeadline>
+    <htd:for>'PT20S'</htd:for>
+    <htd:escalation name="exampleDeadlineforStart">
+      <htd:toParts>
+        <htd:toPart name="request">
+        <![CDATA[
+          <cla:notify xmlns:cla="http://www.insurance.example.com/claims" xmlns:htd="http://www.example.org/WS-HT">
+            <firstname>{htd:getInput("ClaimApprovalRequest")/cla:cust/cla:firstname/text()}</firstname>
+            <lastname>{htd:getInput("ClaimApprovalRequest")/cla:cust/cla:lastname/text()}</lastname>
+            <taskId>{$taskId}</taskId>
+          </cla:notify>
+        ]]>
+        </htd:toPart>
+      </htd:toParts>
+      <htd:localNotification reference="tns:Notify2"/>
+    </htd:escalation>
+  </htd:startDeadline>
+    
+    <htd:completionDeadline>
+      <htd:for>'PT40S'</htd:for>
+      <htd:escalation name="exampleDeadlineforComplete">
+        <htd:reassignment>
+          <htd:potentialOwners>
+            <htd:from>
+              <htd:literal>
+                <htd:organizationalEntity>
+                  <htd:users>
+                    <htd:user>user4</htd:user>
+                  </htd:users>
+                </htd:organizationalEntity>
+              </htd:literal>
+            </htd:from>
+          </htd:potentialOwners>
+        </htd:reassignment>
+      </htd:escalation>
+    </htd:completionDeadline>
+  </htd:deadlines>
+  
+      
+        </htd:task> 
+        
         
         
         

Modified: incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api-wsdl.xsd
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api-wsdl.xsd?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api-wsdl.xsd (original)
+++ incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api-wsdl.xsd Tue Aug 10
07:02:17 2010
@@ -676,4 +676,6 @@ Business Machines Corporation, Oracle In
 <xsd:element name="illegalOperation" type="xsd:string" />
                           
   <xsd:element name="recipientNotAllowed" type="xsd:string" />
+
+    <xsd:complexType name="tDeadlinesInfo"></xsd:complexType>
 </xsd:schema>

Modified: incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api.xsd
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api.xsd?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api.xsd (original)
+++ incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask-api.xsd Tue Aug 10 07:02:17
2010
@@ -52,91 +52,261 @@ Business Machines Corporation, Oracle In
   <xsd:element name="taskAbstract" type="tTaskAbstract" />
   <xsd:complexType name="tTaskAbstract">
     <xsd:sequence>
-      <xsd:element name="id" type="xsd:string" />
-      <xsd:element name="taskType" type="xsd:string" />
-      <xsd:element name="name" type="xsd:QName" />
-                             
-    <xsd:element name="status" type="tStatus" />
-    <xsd:element name="priority" type="xsd:nonNegativeInteger"
-      minOccurs="0" />
-    <xsd:element name="createdOn" type="xsd:dateTime" />
-    <xsd:element name="activationTime" type="xsd:dateTime"
-      minOccurs="0" />
-    <xsd:element name="expirationTime" type="xsd:dateTime"
-      minOccurs="0" />
-    <xsd:element name="isSkipable" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="hasPotentialOwners" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="startByExists" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="completeByExists" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="presentationName" type="tPresentationName"
-      minOccurs="0" />
-    <xsd:element name="presentationSubject"
-      type="tPresentationSubject" minOccurs="0" />
-    <xsd:element name="renderingMethodExists" type="xsd:boolean" />
-    <xsd:element name="hasOutput" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="hasFault" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="hasAttachments" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="hasComments" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="escalated" type="xsd:boolean" minOccurs="0" />
-    <xsd:any namespace="##other" processContents="lax" minOccurs="0"
-      maxOccurs="unbounded" />
-  </xsd:sequence>
-</xsd:complexType>
+    	<xsd:element
+    		name="id"
+    		type="xsd:string"
+    	/>
+    	<xsd:element
+    		name="taskType"
+    		type="xsd:string"
+    	/>
+    	<xsd:element
+    		name="name"
+    		type="xsd:QName"
+    	/>
+    	<xsd:element
+    		name="status"
+    		type="tStatus"
+    	/>
+    	<xsd:element
+    		name="priority"
+    		type="xsd:nonNegativeInteger"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="createdOn"
+    		type="xsd:dateTime"
+    	/>
+    	<xsd:element
+    		name="activationTime"
+    		type="xsd:dateTime"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="expirationTime"
+    		type="xsd:dateTime"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="isSkipable"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="hasPotentialOwners"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="startByExists"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="completeByExists"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="presentationName"
+    		type="tPresentationName"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="presentationSubject"
+    		type="tPresentationSubject"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="renderingMethodExists"
+    		type="xsd:boolean"
+    	/>
+    	<xsd:element
+    		name="hasOutput"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="hasFault"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="hasAttachments"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="hasComments"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:element
+    		name="escalated"
+    		type="xsd:boolean"
+    		minOccurs="0"
+    	/>
+    	<xsd:any
+    		namespace="##other"
+    		processContents="lax"
+    		minOccurs="0"
+    		maxOccurs="unbounded"
+    	/>
+    	<xsd:element
+    		name="deadlinesInfo"
+    		type="htd:tDeadlinesInfo"
+    	minOccurs="0" maxOccurs="1">
+    	</xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
 <xsd:element name="task" type="tTask" />
 <xsd:complexType name="tTask">
   <xsd:sequence>
-    <xsd:element name="id" type="xsd:string" />
-    <xsd:element name="taskType" type="xsd:string" />
-    <xsd:element name="name" type="xsd:QName" />
-    <xsd:element name="status" type="tStatus" />
-    <xsd:element name="priority" type="xsd:nonNegativeInteger"
-      minOccurs="0" />
-    <xsd:element name="taskInitiator" type="htd:tUser"
-      minOccurs="0" />
-    <xsd:element name="taskStakeholders"
-      type="htd:tOrganizationalEntity" minOccurs="0" />
-    <xsd:element name="potentialOwners"
-      type="htd:tOrganizationalEntity" minOccurs="0" />
-    <xsd:element name="businessAdministrators"
-      type="htd:tOrganizationalEntity" minOccurs="0" />
-    <xsd:element name="actualOwner" type="htd:tUser" minOccurs="0" />
-    <xsd:element name="notificationRecipients"
-      type="htd:tOrganizationalEntity" minOccurs="0" />
-    <xsd:element name="createdOn" type="xsd:dateTime" />
-    <xsd:element name="createdBy" type="xsd:string" minOccurs="0" />
-    <xsd:element name="activationTime" type="xsd:dateTime"
-      minOccurs="0" />
-    <xsd:element name="expirationTime" type="xsd:dateTime"
-                           
-      minOccurs="0" />
-    <xsd:element name="isSkipable" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="hasPotentialOwners" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="startByExists" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="completeByExists" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="presentationName" type="tPresentationName"
-      minOccurs="0" />
-    <xsd:element name="presentationSubject"
-      type="tPresentationSubject" minOccurs="0" />
-    <xsd:element name="renderingMethodExists" type="xsd:boolean" />
-    <xsd:element name="hasOutput" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="hasFault" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="hasAttachments" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="hasComments" type="xsd:boolean"
-      minOccurs="0" />
-    <xsd:element name="escalated" type="xsd:boolean" minOccurs="0" />
-    <xsd:element name="primarySearchBy" type="xsd:string"
-      minOccurs="0" />
-    <xsd:any namespace="##other" processContents="lax" minOccurs="0"
-      maxOccurs="unbounded" />
+  	<xsd:element
+  		name="id"
+  		type="xsd:string"
+  	/>
+  	<xsd:element
+  		name="taskType"
+  		type="xsd:string"
+  	/>
+  	<xsd:element
+  		name="name"
+  		type="xsd:QName"
+  	/>
+  	<xsd:element
+  		name="status"
+  		type="tStatus"
+  	/>
+  	<xsd:element
+  		name="priority"
+  		type="xsd:nonNegativeInteger"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="taskInitiator"
+  		type="htd:tUser"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="taskStakeholders"
+  		type="htd:tOrganizationalEntity"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="potentialOwners"
+  		type="htd:tOrganizationalEntity"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="businessAdministrators"
+  		type="htd:tOrganizationalEntity"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="actualOwner"
+  		type="htd:tUser"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="notificationRecipients"
+  		type="htd:tOrganizationalEntity"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="createdOn"
+  		type="xsd:dateTime"
+  	/>
+  	<xsd:element
+  		name="createdBy"
+  		type="xsd:string"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="activationTime"
+  		type="xsd:dateTime"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="expirationTime"
+  		type="xsd:dateTime"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="isSkipable"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="hasPotentialOwners"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="startByExists"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="completeByExists"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="presentationName"
+  		type="tPresentationName"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="presentationSubject"
+  		type="tPresentationSubject"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="renderingMethodExists"
+  		type="xsd:boolean"
+  	/>
+  	<xsd:element
+  		name="hasOutput"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="hasFault"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="hasAttachments"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="hasComments"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="escalated"
+  		type="xsd:boolean"
+  		minOccurs="0"
+  	/>
+  	<xsd:element
+  		name="primarySearchBy"
+  		type="xsd:string"
+  		minOccurs="0"
+  	/>
+  	<xsd:any
+  		namespace="##other"
+  		processContents="lax"
+  		minOccurs="0"
+  		maxOccurs="unbounded"
+  	/>
+  	<xsd:element
+  		name="deadlinesInfo"
+  		type="htd:tDeadlinesInfo"
+  	minOccurs="0" maxOccurs="1">
+  	</xsd:element>
   </xsd:sequence>
 </xsd:complexType>
 <xsd:simpleType name="tPresentationName">

Modified: incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask.xsd
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask.xsd?rev=983870&r1=983869&r2=983870&view=diff
==============================================================================
--- incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask.xsd (original)
+++ incubator/hise/trunk/hise-wsdl/src/main/resources/ws-humantask.xsd Tue Aug 10 07:02:17
2010
@@ -192,20 +192,69 @@ Business Machines Corporation, Oracle In
   <xsd:complexContent>
     <xsd:extension base="tExtensibleElements">
       <xsd:sequence>
-      	<xsd:element name="interface" type="tTaskInterface" />
-      	<xsd:element ref="priority" minOccurs="0" />
+      	<xsd:element
+      		name="interface"
+      		type="tTaskInterface"
+      	/>
+      	<xsd:element
+      		ref="priority"
+      		minOccurs="0"
+      	/>
       	<xsd:element ref="peopleAssignments" />
-      	<xsd:element name="delegation" type="tDelegation" 
-      		minOccurs="0" />
-      	<xsd:element name="presentationElements"
-      		type="tPresentationElements" />
-      	<xsd:element name="outcome" type="tQuery" minOccurs="0" />
-      	<xsd:element name="searchBy" type="tExpression" minOccurs="0" />
-      	<xsd:element name="isSkipable" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="true"/>
-      	<xsd:element name="renderings" type="tRenderings" minOccurs="0" />
-      	<xsd:element name="deadlines" type="tDeadlines" minOccurs="0" />
-      	<xsd:element name="autoActivate" type="xsd:boolean" minOccurs="0" maxOccurs="1"
default="false"/>
-      	<xsd:element name="savingTaskHistory" type="tSavingTaskHistory" minOccurs="0" maxOccurs="1"/>
+      	<xsd:element
+      		name="delegation"
+      		type="tDelegation"
+      		minOccurs="0"
+      	/>
+      	<xsd:element
+      		name="presentationElements"
+      		type="tPresentationElements"
+      	/>
+      	<xsd:element
+      		name="outcome"
+      		type="tQuery"
+      		minOccurs="0"
+      	/>
+      	<xsd:element
+      		name="searchBy"
+      		type="tExpression"
+      		minOccurs="0"
+      	/>
+      	<xsd:element
+      		name="isSkipable"
+      		type="xsd:boolean"
+      		minOccurs="0"
+      		maxOccurs="1"
+      		default="true"
+      	/>
+      	<xsd:element
+      		name="renderings"
+      		type="tRenderings"
+      		minOccurs="0"
+      	/>
+      	<xsd:element
+      		name="deadlines"
+      		type="tDeadlines"
+      		minOccurs="0"
+      	/>
+      	<xsd:element
+      		name="autoActivate"
+      		type="xsd:boolean"
+      		minOccurs="0"
+      		maxOccurs="1"
+      		default="false"
+      	/>
+      	<xsd:element
+      		name="savingTaskHistory"
+      		type="tSavingTaskHistory"
+      		minOccurs="0"
+      		maxOccurs="1"
+      	/>
+      	<xsd:element
+      		name="deadlinesInfo"
+      		type="tDeadlinesInfo"
+      	minOccurs="0" maxOccurs="1">
+      	</xsd:element>
       </xsd:sequence>
       <xsd:attribute name="name" type="xsd:NCName" use="required" />
     </xsd:extension>
@@ -550,4 +599,36 @@ Business Machines Corporation, Oracle In
   	</xsd:sequence>
   	<xsd:attribute name="lang" type="xsd:string" default="ENG"></xsd:attribute>
   </xsd:complexType>
+
+  <xsd:complexType name="tDeadlinesInfo">
+  	<xsd:sequence>
+  		<xsd:element
+  			name="startBy"
+  			type="tDeadlineInfo"
+  		minOccurs="0" maxOccurs="unbounded">
+  		</xsd:element>
+  		<xsd:element
+  			name="completeBy"
+  			type="tDeadlineInfo"
+  		minOccurs="0" maxOccurs="unbounded">
+  		</xsd:element>
+  	</xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="tDeadlineInfo">
+  	<xsd:sequence>
+  		<xsd:element
+  			name="name"
+  			type="xsd:string"
+  		>
+  		</xsd:element>
+  		<xsd:element
+  			name="date"
+  			type="xsd:dateTime"
+  		>
+  		</xsd:element>
+  	</xsd:sequence>
+  </xsd:complexType>
+
+    <xsd:element name="deadlinesInfo" type="tDeadlinesInfo"></xsd:element>
 </xsd:schema>



Mime
View raw message