incubator-hise-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r.@apache.org
Subject svn commit: r981488 - in /incubator/hise/trunk: hise-docs/ hise-services/src/main/java/org/apache/hise/dao/ hise-services/src/main/java/org/apache/hise/lang/ hise-services/src/main/java/org/apache/hise/runtime/ hise-services/src/main/resources/META-INF...
Date Mon, 02 Aug 2010 12:46:45 GMT
Author: rr
Date: Mon Aug  2 12:46:45 2010
New Revision: 981488

URL: http://svn.apache.org/viewvc?rev=981488&view=rev
Log:
HISE-53: task history in comments (Thanks to Paweł Byszewski)

Added:
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskHistoryMessage.java
    incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/taskHistoryComments.sql
Modified:
    incubator/hise/trunk/hise-docs/pom.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/Task.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/Task.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskHistoryListener.java
    incubator/hise/trunk/hise-services/src/main/resources/META-INF/persistence.xml
    incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml
    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.xsd

Modified: incubator/hise/trunk/hise-docs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-docs/pom.xml?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-docs/pom.xml (original)
+++ incubator/hise/trunk/hise-docs/pom.xml Mon Aug  2 12:46:45 2010
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>hise</artifactId>
     <groupId>org.apache.hise</groupId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hise-docs</artifactId>

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=981488&r1=981487&r2=981488&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 Mon
Aug  2 12:46:45 2010
@@ -31,6 +31,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hise.dao.JpaQueryBuilder.JQBParam;
 import org.springframework.orm.jpa.JpaCallback;
+import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.orm.jpa.support.JpaDaoSupport;
 
 /**
@@ -136,5 +137,29 @@ public class HISEDao extends JpaDaoSuppo
             getJpaTemplate().remove(o);
         }
     }
+	public<T> List find(final String query, final List<String> parameters,  final
Class<T> what){
+		
+		JpaTemplate jpaTemp=getJpaTemplate();
+		Object result=jpaTemp.execute(new JpaCallback() {					
+				public Object doInJpa(EntityManager em) throws PersistenceException {
+					String temp1;
+					
+					Query q=em.createNativeQuery(query, what);
+					for(int i=0; i<parameters.size();++i){
+						temp1=parameters.get(i);
+						q.setParameter(i+1, parameters.get(i));
+					}
+					List res=q.getResultList();					
+					
+        
+               	
+					return res;
+					
+				}
+			});
+		
+		return (List)result;
+	
+	}
 
 }

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java Mon Aug
 2 12:46:45 2010
@@ -237,6 +237,9 @@ public class Task extends JpaBase {
 	public void setSavingTaskHistory(boolean savingStateHistory) {
 		this.savingStateHistory = savingStateHistory;
 	}
+	
+	private String savingTaskHistoryLanguage;
+	
 
 	private boolean escalated;
     
@@ -306,11 +309,22 @@ public class Task extends JpaBase {
 //        this.deadlines = deadlines;
 //    }
 
+    
+    
+    
     public Set<Job> getDeadlines() {
         return deadlines;
     }
 
-    public void setDeadlines(Set<Job> deadlines) {
+    public String getSavingTaskHistoryLanguage() {
+		return savingTaskHistoryLanguage;
+	}
+
+	public void setSavingTaskHistoryLanguage(String savingTaskHistoryLanguage) {
+		this.savingTaskHistoryLanguage = savingTaskHistoryLanguage;
+	}
+
+	public void setDeadlines(Set<Job> deadlines) {
         this.deadlines = deadlines;
     }
     

Added: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskHistoryMessage.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskHistoryMessage.java?rev=981488&view=auto
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskHistoryMessage.java
(added)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskHistoryMessage.java
Mon Aug  2 12:46:45 2010
@@ -0,0 +1,60 @@
+package org.apache.hise.dao;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+@Entity
+@Table(name = "HISE_TASK_HISTORY_MESSAGE")
+public class TaskHistoryMessage {
+	
+    @Id
+    private Long id;
+    
+    private String type;
+    
+    private String lang;
+    
+    private String content;
+
+    
+	public TaskHistoryMessage() {
+		super();
+	}
+
+	public TaskHistoryMessage(String type, String lang, String content) {
+		super();
+		this.type = type;
+		this.lang = lang;
+		this.content = content;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getLang() {
+		return lang;
+	}
+
+	public void setLang(String lang) {
+		this.lang = lang;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+    
+    
+
+}

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/TaskDefinition.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/TaskDefinition.java?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/TaskDefinition.java
(original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/TaskDefinition.java
Mon Aug  2 12:46:45 2010
@@ -379,6 +379,9 @@ public class TaskDefinition {
         this.portType = portType;
     }
     
+    public boolean isAutoActivate(){
+    			return tTask.isAutoActivate();
+    }
 	public TRenderings getRenderings() {
 		return tTask.getRenderings();
 	}
@@ -393,10 +396,11 @@ public class TaskDefinition {
 	}
 	
 	public boolean isSavingTaskHistory(){
-			return tTask.isSavingTaskHistory();
+			return tTask.getSavingTaskHistory().isActive();
 	}
 	
-	public boolean isAutoActivate(){
-		return tTask.isAutoActivate();
+
+	public String getSavingHistoryLanguage() {
+		return tTask.getSavingTaskHistory().getLang();
 	}
 }

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/Task.java Mon
Aug  2 12:46:45 2010
@@ -147,6 +147,7 @@ public class Task {
         }
         
         taskHistoryListener = new TaskHistoryListener();
+        taskHistoryListener.setHiseEngine(engine);
 
         taskEvaluator = new TaskEvaluator(this);
     }
@@ -228,6 +229,7 @@ public class Task {
         taskDto.setNotification(false);
         taskDto.setSkippable(true);
         taskDto.setSavingTaskHistory(taskDefinition.isSavingTaskHistory());
+        taskDto.setSavingTaskHistoryLanguage(taskDefinition.getSavingHistoryLanguage());
         t.taskDto = taskDto;
         taskDto.setPeopleAssignments(t.getTaskEvaluator().evaluatePeopleAssignments());
         taskDto.setPotentalDelegates(t.getTaskEvaluator().evaluatePotentialDelegates());
@@ -244,14 +246,15 @@ public class Task {
         } catch (HiseIllegalStateException e) {
             throw new IllegalStateException(e);
         }
+             try {
+        	            if(t.getTaskDefinition().isAutoActivate()){
+        	            	t.activate();
+        	            }
+        	        } catch (IllegalStateFault e) {
+        	            throw new IllegalStateException(e);
+        	        }
+
 
-        try {
-            if(t.getTaskDefinition().isAutoActivate()){
-            	t.activate();
-            }
-        } catch (IllegalStateFault e) {
-            throw new IllegalStateException(e);
-        }
         
         engine.getHiseDao().persist(taskDto);
         return t;
@@ -391,7 +394,7 @@ public class Task {
     public void setActualOwner(String user) throws HiseIllegalStateException {
         
     	if(taskDto.isSavingTaskHistory()){
-    		Comment comment=taskHistoryListener.actualOwnerChanged(taskDto, taskDto.getActualOwner(),
user, getCurrentUser());
+    		Comment comment=taskHistoryListener.actualOwnerChanged(taskDto, taskDto.getActualOwner(),
user, getCurrentUser(), taskDto.getSavingTaskHistoryLanguage());
     		taskDto.getComments().add(comment);
     	}
         taskDto.setActualOwner(user);
@@ -576,7 +579,7 @@ public class Task {
             l.stateChanged(oldStatus, newStatus);
         }
     	if(taskDto.isSavingTaskHistory()){
-        	Comment comment= taskHistoryListener.stateChanged(taskDto, oldStatus, newStatus,
getCurrentUser());
+        	Comment comment= taskHistoryListener.stateChanged(taskDto, oldStatus, newStatus,
getCurrentUser(),taskDto.getSavingTaskHistoryLanguage());
         	taskDto.getComments().add(comment);
     	}
         taskDto.setStatus(newStatus);

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskHistoryListener.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskHistoryListener.java?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskHistoryListener.java
(original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskHistoryListener.java
Mon Aug  2 12:46:45 2010
@@ -18,8 +18,15 @@
  */
 package org.apache.hise.runtime;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.hise.api.HISEEngine;
 import org.apache.hise.dao.Comment;
 import org.apache.hise.dao.Task.Status;
+import org.apache.hise.dao.TaskHistoryMessage;
 
 /**
  * @author Paweł Byszewski
@@ -32,15 +39,18 @@ public class TaskHistoryListener {
 		ACTUALOWNER_CHANGE
 	}
 	
+	private HISEEngine hiseEngine;
+	
 	public Comment stateChanged(org.apache.hise.dao.Task taskDto, org.apache.hise.dao.Task.Status
oldStatus,
-			org.apache.hise.dao.Task.Status newStatus, String initiator) {
+			org.apache.hise.dao.Task.Status newStatus, String initiator, String lang) {
+		Map<String,String> messages=getMessages(lang);
 		 if(initiator==null) throw new RuntimeException("Initiator name missing");
 		String content=null;
         if(newStatus==Status.CREATED)
-        	content=new String("Zadanie zostało utworzone.");
+        	content=messages.get(new String("CREATED"));
         else{
-        	content=new String("Zmienił się stan zadania z "+new String(oldStatus.toString())
-        			+" na "+new String(newStatus.toString())+".");
+        	content=messages.get(new String("STATE_CHANGE"))+new String(oldStatus.toString())
+        			+" --> "+new String(newStatus.toString())+".";
         }
         Comment comment= new Comment(content, taskDto, initiator);
         return comment;
@@ -48,7 +58,8 @@ public class TaskHistoryListener {
 	}
 	
 	 public Comment actualOwnerChanged(org.apache.hise.dao.Task taskDto, String oldActualOwner,

-			 	String newActualOwner, String initiator ){
+			 	String newActualOwner, String initiator, String lang){
+			Map<String,String> messages=getMessages(lang);
 		if(initiator==null) throw new RuntimeException("Initiator name missing");
      	if((oldActualOwner==null || oldActualOwner.length()==0) &&
      			(newActualOwner==null || newActualOwner.length()==0))
@@ -56,18 +67,46 @@ public class TaskHistoryListener {
      	
      	String content=null;
 	    if(oldActualOwner==null || oldActualOwner.length()==0)
-	        	content=new String("Jako Actual Owner zadania został przypisany "+newActualOwner+".");
+	        	content=new String(messages.get(new String("NEW_ACTUALOWNER"))+newActualOwner+".");
 	    else if(newActualOwner==null || newActualOwner.length()==0){
-	        	content=new String("Zwolniono stanowisko Actual Owner. Był tam przypisany "+oldActualOwner+".");
+	        	content=new String(messages.get(new String("DEL_ACTUALOWNER"))+".");
 	    }
 	    else{
 	        
-		        	content=new String("Nastąpiła zmiana na stanowisku Actual Owner. "+oldActualOwner+
-		        			" został zastąpiony przez "+newActualOwner+".");
+		        	content=new String(messages.get(new String("CHANGE_ACTUALOWNER"))+oldActualOwner+
+		        			" -->"+newActualOwner+".");
 	    }
 	    Comment comment= new Comment(content, taskDto, initiator);
 	    return comment;
 		
 		
 	}
+	 
+	 
+	 
+	public HISEEngine getHiseEngine() {
+		return hiseEngine;
+	}
+
+	public void setHiseEngine(HISEEngine hiseEngine) {
+		this.hiseEngine = hiseEngine;
+	}
+
+	private Map<String,String> getMessages(String lang){
+			String query=new String("SELECT * FROM HISE_TASK_HISTORY_MESSAGE WHERE lang=?;");
+			List params=new ArrayList<String>();
+			params.add(lang);
+			List<TaskHistoryMessage> temp=hiseEngine.getHiseDao().find(query,params, TaskHistoryMessage.class);
+	        
+			
+			Map<String,String> messages=new HashMap<String, String>();
+			for (TaskHistoryMessage m : temp) {
+				messages.put(m.getType(), m.getContent());  //         add(m.getContent());
+			}
+			params.add(new String("PL"));
+			
+			
+	return messages;
+		
+		}
 }

Modified: incubator/hise/trunk/hise-services/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/resources/META-INF/persistence.xml?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/resources/META-INF/persistence.xml (original)
+++ incubator/hise/trunk/hise-services/src/main/resources/META-INF/persistence.xml Mon Aug
 2 12:46:45 2010
@@ -15,6 +15,7 @@
     <class>org.apache.hise.dao.PresentationParameter</class>
     <class>org.apache.hise.dao.Task</class>
     <class>org.apache.hise.dao.Job</class>
+    <class>org.apache.hise.dao.TaskHistoryMessage</class>
     <exclude-unlisted-classes/>
 
     <!--  OpenJPA & HSQL -->

Modified: incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml?rev=981488&r1=981487&r2=981488&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml
(original)
+++ incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/persistence.xml
Mon Aug  2 12:46:45 2010
@@ -15,6 +15,7 @@
     <class>org.apache.hise.dao.PresentationParameter</class>
     <class>org.apache.hise.dao.Task</class>
     <class>org.apache.hise.dao.Job</class>
+     <class>org.apache.hise.dao.TaskHistoryMessage</class>
     <exclude-unlisted-classes/>
 
     <!--  OpenJPA & HSQL -->

Added: incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/taskHistoryComments.sql
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/taskHistoryComments.sql?rev=981488&view=auto
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/taskHistoryComments.sql
(added)
+++ incubator/hise/trunk/hise-services/src/main/resources/org/apache/hise/taskHistoryComments.sql
Mon Aug  2 12:46:45 2010
@@ -0,0 +1,11 @@
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (0, 'CREATED' , 'PL',
' Zadanie zostało utworzone');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (1, 'STATE_CHANGE'
, 'PL', ' Zmienił się stan zadania ');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (2, 'NEW_ACTUALOWNER'
, 'PL', 'Jako Actual Owner został ustawiony ');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (3, 'DEL_ACTUALOWNER'
, 'PL', 'Wyczyszczono stanowisko Actual Owner ');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (4, 'CHANGE_ACTUALOWNER'
, 'PL', ' Zmiana na stanowsiku Actual Owner');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (5, 'CREATED' , 'ENG',
' Create task');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (6, 'STATE_CHANGE'
, 'ENG', ' Status change ');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (7, 'NEW_ACTUALOWNER'
, 'ENG', 'New Actual Owner is ');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (8, 'DEL_ACTUALOWNER'
, 'ENG', 'Clear Actual Owner ');
+insert into HISE_TASK_HISTORY_MESSAGE (id, type, lang, content) values (9, 'CHANGE_ACTUALOWNER'
, 'ENG', ' Actual Owner change');
+								
\ No newline at end of file

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=981488&r1=981487&r2=981488&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
Mon Aug  2 12:46:45 2010
@@ -116,6 +116,15 @@ xsi:schemaLocation="
     </property>
   </bean>
 
+ <bean class="org.apache.hise.engine.store.DataBaseInitializer" init-method="init">
+ 	<property name="transactionManager" ref="transactionManager"></property>
+ 	<property name="hiseEngine" ref="hiseEngine"/>
+ 	<!-- <property name="sqlScript" ref="file"/>-->
+ 	<property name="fileName" value="classpath:org/apache/hise/taskHistoryComments.sql"/>
+ 													
+ </bean>
+
+
   <bean id="hiseJaxWSService1" class="org.apache.hise.engine.jaxws.HISEJaxWSService" init-method="init">
     <!--property name="id" value="hiseJaxWSService1"/-->
     <property name="hiseEngine" ref="hiseEngine"/>

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=981488&r1=981487&r2=981488&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 Mon Aug  2
12:46:45 2010
@@ -516,8 +516,8 @@ xs:double(htd:getInput("ClaimApprovalReq
             
             <htd:autoActivate>true</htd:autoActivate>
             
-          <htd:savingTaskHistory>
-          		true
+           <htd:savingTaskHistory lang="PL">
+          		<htd:active>true</htd:active>
           </htd:savingTaskHistory> 
           
             <htd:peopleAssignments>
@@ -762,8 +762,8 @@ xs:double(htd:getInput("ClaimApprovalReq
             
             <htd:autoActivate>true</htd:autoActivate>
             
-           <htd:savingTaskHistory>
-          		true
+           <htd:savingTaskHistory lang="PL">
+          		<htd:active>true</htd:active>
           </htd:savingTaskHistory>    
             
             <htd:peopleAssignments>
@@ -1133,7 +1133,7 @@ xs:double(htd:getInput("ClaimApprovalReq
             <htd:autoActivate>true</htd:autoActivate>
             
            <htd:savingTaskHistory>
-          		true
+          		<htd:active>true</htd:active>
           </htd:savingTaskHistory>    
             
             <htd:peopleAssignments>
@@ -1322,6 +1322,9 @@ xs:double(htd:getInput("ClaimApprovalReq
         </htd:task>   
         
         
+        
+        
+        
 </htd:tasks> 
     
     <htd:notifications>

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=981488&r1=981487&r2=981488&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 Mon Aug  2 12:46:45
2010
@@ -204,8 +204,8 @@ Business Machines Corporation, Oracle In
       	<xsd:element name="renderings" type="tRenderings"
       		minOccurs="0" />
       	<xsd:element name="deadlines" type="tDeadlines" minOccurs="0" />
-      	<xsd:element name="savingTaskHistory" type="xsd:boolean" minOccurs="0" maxOccurs="1"
default="false"/>
       	<xsd:element name="autoActivate" type="xsd:boolean" minOccurs="0" maxOccurs="1"
default="false"/>
+      	<xsd:element name="savingTaskHistory" type="tSavingTaskHistory" minOccurs="0" maxOccurs="1"/>
       </xsd:sequence>
       <xsd:attribute name="name" type="xsd:NCName" use="required" />
     </xsd:extension>
@@ -542,4 +542,12 @@ Business Machines Corporation, Oracle In
 
 
 
+
+
+  <xsd:complexType name="tSavingTaskHistory">
+  	<xsd:sequence>
+  		<xsd:element name="active" type="xsd:boolean" default="false"></xsd:element>
+  	</xsd:sequence>
+  	<xsd:attribute name="lang" type="xsd:string" default="ENG"></xsd:attribute>
+  </xsd:complexType>
 </xsd:schema>



Mime
View raw message