You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hise-commits@incubator.apache.org by wi...@apache.org on 2010/01/15 16:07:29 UTC
svn commit: r899677 - in
/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise: api/
dao/ engine/ engine/jaxws/ engine/store/ lang/ runtime/ utils/
Author: witek
Date: Fri Jan 15 16:07:28 2010
New Revision: 899677
URL: http://svn.apache.org/viewvc?rev=899677&view=rev
Log:
Review, licence added, removed static from log objects
Modified:
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/api/HISEUserDetails.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Fault.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/GenericHumanRole.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.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/dao/TaskOrgEntity.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/DefaultHISEUserDetails.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngine.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEPasswordCallback.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSClient.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TransactionHandler.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/CompileException.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDD.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDeployer.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/TaskDD.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/HumanInteractions.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/ResponseHandler.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/runtime/TaskLifecycle.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/DOMUtils.java
incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/XQueryEvaluator.java
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/api/HISEUserDetails.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/api/HISEUserDetails.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/api/HISEUserDetails.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/api/HISEUserDetails.java Fri Jan 15 16:07:28 2010
@@ -1,8 +1,29 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.api;
import java.util.Collection;
public interface HISEUserDetails {
- public Collection<String> getUserGroups(String user);
- public String getUserPassword(String user);
+
+ Collection<String> getUserGroups(String user);
+
+ String getUserPassword(String user);
}
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java Fri Jan 15 16:07:28 2010
@@ -24,17 +24,12 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
@Entity
@Table(name = "ATTACHMENT")
public class Attachment extends JpaBase {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Deadline.java Fri Jan 15 16:07:28 2010
@@ -24,18 +24,13 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import org.apache.commons.lang.builder.EqualsBuilder;
-
/**
* Holds start or completion deadline information.
*
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Fault.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Fault.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Fault.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Fault.java Fri Jan 15 16:07:28 2010
@@ -21,11 +21,6 @@
import javax.persistence.Column;
import javax.persistence.Embeddable;
-import javax.persistence.Transient;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Fault.
@@ -33,6 +28,7 @@
*/
@Embeddable
public class Fault extends JpaBase {
+
@Column(name = "fault_name", nullable = true)
private String name;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/GenericHumanRole.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/GenericHumanRole.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/GenericHumanRole.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/GenericHumanRole.java Fri Jan 15 16:07:28 2010
@@ -1,5 +1,29 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.dao;
+/**
+ *
+ * @author RafaÅ Rusin
+ * @author Witek WoÅejszo
+ */
public enum GenericHumanRole {
ACTUALOWNER,
TASKSTAKEHOLDERS,
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.dao;
import java.util.Date;
@@ -7,39 +26,50 @@
import javax.persistence.Id;
import javax.persistence.ManyToOne;
+/**
+ *
+ * @author RafaÅ Rusin
+ */
@Entity
public class Job extends JpaBase {
+
@Id
@GeneratedValue
private Long id;
-
+
private Date fire;
-
+
@ManyToOne
private Task task;
-
+
private String action;
+
private String details;
-
+
public Long getId() {
return id;
}
+
public void setId(Long id) {
this.id = id;
}
+
public Date getFire() {
return fire;
}
+
public void setFire(Date fire) {
this.fire = fire;
}
-
+
public Task getTask() {
return task;
}
+
public void setTask(Task task) {
this.task = task;
}
+
public String getAction() {
return action;
}
@@ -47,15 +77,17 @@
public void setAction(String action) {
this.action = action;
}
-
+
public String getDetails() {
return details;
}
+
public void setDetails(String details) {
this.details = details;
}
+
@Override
public Object[] getKeys() {
- return new Object[] {id};
+ return new Object[] { id };
}
}
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java Fri Jan 15 16:07:28 2010
@@ -19,34 +19,18 @@
package org.apache.hise.dao;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.MapKey;
-import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hise.utils.DOMUtils;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
/**
* Message part related to Task. It can be either part of input message or part of output message.
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java Fri Jan 15 16:07:28 2010
@@ -21,23 +21,14 @@
import java.util.Collection;
import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.Basic;
import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java Fri Jan 15 16:07:28 2010
@@ -23,12 +23,9 @@
import java.util.Date;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -44,7 +41,7 @@
@Table(name = "PRESENTATION_PARAMETERS")
public class PresentationParameter extends JpaBase {
- private static final Log log = LogFactory.getLog(PresentationParameter.class);
+ private final Log log = LogFactory.getLog(PresentationParameter.class);
@Id
private Long id;
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=899677&r1=899676&r2=899677&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 Fri Jan 15 16:07:28 2010
@@ -82,7 +82,7 @@
@Configurable(preConstruction = true)
public class Task extends JpaBase {
- private static final Log __log = LogFactory.getLog(Task.class);
+ private final Log log = LogFactory.getLog(Task.class);
@Column(nullable = false)
private String taskDefinitionKey;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java Fri Jan 15 16:07:28 2010
@@ -19,23 +19,16 @@
package org.apache.hise.dao;
-import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementRef;
/**
* Task Assignee - member of generic human role.
+ *
* @author Witek WoÅejszo
*/
@Entity
@@ -49,17 +42,17 @@
private Task task;
private String name;
-
+
public static enum OrgEntityType {
USER, GROUP;
}
-
+
@Enumerated(value = EnumType.STRING)
private OrgEntityType type;
@Enumerated(value = EnumType.STRING)
private GenericHumanRole genericHumanRole;
-
+
public Task getTask() {
return task;
}
@@ -72,24 +65,17 @@
return name;
}
-
-
public void setName(String name) {
this.name = name;
}
-
-
public OrgEntityType getType() {
return type;
}
-
-
public void setType(OrgEntityType type) {
this.type = type;
}
-
public GenericHumanRole getGenericHumanRole() {
return genericHumanRole;
@@ -101,6 +87,6 @@
@Override
public Object[] getKeys() {
- return new Object[] {id} ;
+ return new Object[] { id };
}
}
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=899677&r1=899676&r2=899677&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 Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.dao;
import java.util.Collection;
@@ -8,6 +27,7 @@
import org.apache.hise.lang.xsd.htda.TStatus;
public class TaskQuery {
+
private String user;
private Collection<String> userGroups = new HashSet<String>();
private String taskType = "ALL";
@@ -17,58 +37,75 @@
private String whereClause = "";
private String createdOnClause = "";
private Integer maxTasks = 20;
-
+
public String getUser() {
return user;
}
+
public void setUser(String user) {
this.user = user;
}
+
public Collection<String> getUserGroups() {
return userGroups;
}
+
public void setUserGroups(Collection<String> userGroups) {
this.userGroups = userGroups;
}
+
public String getTaskType() {
return taskType;
}
+
public void setTaskType(String taskType) {
this.taskType = taskType;
}
+
public GenericHumanRole getGenericHumanRole() {
return genericHumanRole;
}
+
public void setGenericHumanRole(GenericHumanRole genericHumanRole) {
this.genericHumanRole = genericHumanRole;
}
+
public String getWorkQueue() {
return workQueue;
}
+
public void setWorkQueue(String workQueue) {
this.workQueue = workQueue;
}
+
public List<TStatus> getStatus() {
return status;
}
+
public void setStatus(List<TStatus> status) {
this.status = status;
}
+
public String getWhereClause() {
return whereClause;
}
+
public void setWhereClause(String whereClause) {
this.whereClause = whereClause;
}
+
public String getCreatedOnClause() {
return createdOnClause;
}
+
public void setCreatedOnClause(String createdOnClause) {
this.createdOnClause = createdOnClause;
}
+
public Integer getMaxTasks() {
return maxTasks;
}
+
public void setMaxTasks(Integer maxTasks) {
this.maxTasks = maxTasks;
}
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/DefaultHISEUserDetails.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine;
import java.util.ArrayList;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngine.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngine.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngine.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEEngine.java Fri Jan 15 16:07:28 2010
@@ -1,6 +1,24 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine;
-import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEPasswordCallback.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEPasswordCallback.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEPasswordCallback.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEPasswordCallback.java Fri Jan 15 16:07:28 2010
@@ -20,17 +20,18 @@
package org.apache.hise.engine;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.hise.api.HISEUserDetails;
-import org.apache.hise.dao.HISEDao;
import org.apache.ws.security.WSPasswordCallback;
+/**
+ *
+ * @author RafaÅ Rusin
+ */
public class HISEPasswordCallback implements CallbackHandler {
private HISEUserDetails hiseUserDetails;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/HISEScheduler.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine;
import java.util.Calendar;
@@ -16,8 +35,13 @@
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
+/**
+ *
+ * @author RafaÅ Rusin
+ */
public class HISEScheduler {
- private static Log __log = LogFactory.getLog(HISEScheduler.class);
+
+ private Log __log = LogFactory.getLog(HISEScheduler.class);
private HISEEngine hiseEngine;
private ScheduledExecutorService executor;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSClient.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSClient.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSClient.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/HISEJaxWSClient.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine.jaxws;
import java.net.URL;
@@ -22,7 +41,8 @@
import org.w3c.dom.Node;
public class HISEJaxWSClient {
- private static Log __log = LogFactory.getLog(HISEJaxWSClient.class);
+
+ private Log __log = LogFactory.getLog(HISEJaxWSClient.class);
private MessageFactory messageFactory;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TransactionHandler.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TransactionHandler.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TransactionHandler.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/jaxws/TransactionHandler.java Fri Jan 15 16:07:28 2010
@@ -33,9 +33,11 @@
* This is workaround for not working @Transactional + @Resource web services.
*/
public class TransactionHandler implements Handler<MessageContext> {
- private static Log __log = LogFactory.getLog(TransactionHandler.class);
+
public static final String TRANSACTION = "org.apache.hise.transaction";
+ private Log __log = LogFactory.getLog(TransactionHandler.class);
+
private JpaTransactionManager transactionManager;
public void setTransactionManager(JpaTransactionManager transactionManager) {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/CompileException.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/CompileException.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/CompileException.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/CompileException.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine.store;
public class CompileException extends Exception {
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDD.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDD.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDD.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDD.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine.store;
import java.util.List;
@@ -5,6 +24,7 @@
import org.springframework.core.io.Resource;
public class HISEDD {
+
private List<TaskDD> tasksDI;
private Resource humanInteractionsResource;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDeployer.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDeployer.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDeployer.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/HISEDeployer.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine.store;
import org.apache.commons.lang.Validate;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/TaskDD.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/TaskDD.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/TaskDD.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/engine/store/TaskDD.java Fri Jan 15 16:07:28 2010
@@ -1,30 +1,54 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.engine.store;
import javax.xml.namespace.QName;
public class TaskDD {
+
public QName taskName;
public Object handler;
public Object sender;
-
+
public QName getTaskName() {
return taskName;
}
+
public void setTaskName(QName taskName) {
this.taskName = taskName;
}
+
public Object getHandler() {
return handler;
}
+
public void setHandler(Object handler) {
this.handler = handler;
}
+
public Object getSender() {
return sender;
}
+
public void setSender(Object sender) {
this.sender = sender;
}
-
-
+
}
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/HumanInteractions.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/HumanInteractions.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/HumanInteractions.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/lang/HumanInteractions.java Fri Jan 15 16:07:28 2010
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
-
/**
* Provides access methods to Human Interactions document defined
* using http://www.example.org/WS-HT schema.
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/DeadlineController.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/DeadlineController.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/DeadlineController.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/DeadlineController.java Fri Jan 15 16:07:28 2010
@@ -29,7 +29,8 @@
import org.apache.hise.lang.xsd.htd.TExpression;
public class DeadlineController implements TaskStateListener {
- private static Log __log = LogFactory.getLog(DeadlineController.class);
+
+ private Log __log = LogFactory.getLog(DeadlineController.class);
public void stateChanged(Task task, Status oldStatus, Status newStatus) {
__log.debug(task + " " + oldStatus + " " + newStatus);
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/ResponseHandler.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/ResponseHandler.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/ResponseHandler.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/ResponseHandler.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.runtime;
import org.apache.hise.dao.Task.Status;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskEvaluator.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskEvaluator.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskEvaluator.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.runtime;
import java.util.HashSet;
@@ -23,7 +42,8 @@
import org.w3c.dom.Node;
public class TaskEvaluator {
- private static Log __log = LogFactory.getLog(TaskEvaluator.class);
+
+ private Log __log = LogFactory.getLog(TaskEvaluator.class);
private Task task;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskLifecycle.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskLifecycle.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/runtime/TaskLifecycle.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.runtime;
import org.apache.commons.lang.Validate;
@@ -6,7 +25,8 @@
import org.apache.hise.dao.Task.Status;
public class TaskLifecycle implements TaskStateListener {
- private static Log __log = LogFactory.getLog(TaskLifecycle.class);
+
+ private Log __log = LogFactory.getLog(TaskLifecycle.class);
public void stateChanged(Task task, Status oldStatus, Status newStatus) {
boolean isOk = false;
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/DOMUtils.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/DOMUtils.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/DOMUtils.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/DOMUtils.java Fri Jan 15 16:07:28 2010
@@ -18,6 +18,7 @@
*/
package org.apache.hise.utils;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -76,6 +77,7 @@
import org.xml.sax.SAXException;
public class DOMUtils {
+
public static QName uniqueQName(QName q) {
String s = q.getNamespaceURI();
while (s.endsWith("/")) { s = s.substring(0, s.length() - 1); }
Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/XQueryEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/XQueryEvaluator.java?rev=899677&r1=899676&r2=899677&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/XQueryEvaluator.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/utils/XQueryEvaluator.java Fri Jan 15 16:07:28 2010
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.hise.utils;
import java.util.ArrayList;
@@ -11,7 +30,6 @@
import net.sf.saxon.dom.DocumentWrapper;
import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.expr.JPConverter;
-import net.sf.saxon.functions.FunctionLibrary;
import net.sf.saxon.functions.FunctionLibraryList;
import net.sf.saxon.functions.JavaExtensionLibrary;
import net.sf.saxon.om.NodeInfo;
@@ -29,8 +47,13 @@
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Node;
+/**
+ *
+ * @author RafaÅ Rusin
+ */
public class XQueryEvaluator {
- private static Log __log = LogFactory.getLog(XQueryEvaluator.class);
+
+ private Log __log = LogFactory.getLog(XQueryEvaluator.class);
public static ThreadLocal<Object> contextObjectTL = new ThreadLocal<Object>() ;