You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2018/01/04 05:56:19 UTC
[13/13] incubator-taverna-server git commit: Correct package for
JobUsageRecord
Correct package for JobUsageRecord
Now in org.apache.taverna.server.usagerecord.JobUsageRecord
instead of hijacking org.ogf.usage
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/b8b08883
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/b8b08883
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/b8b08883
Branch: refs/heads/master
Commit: b8b08883e81acd64b757f23dd50950ca2130536f
Parents: 77f7037
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 4 05:55:24 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 4 05:55:24 2018 +0000
----------------------------------------------------------------------
pom.xml | 6 +++---
.../src/main/java/uk/org/taverna/server/client/Run.java | 2 +-
.../src/main/java/org/taverna/server/master/RunREST.java | 2 +-
.../src/main/java/org/taverna/server/master/TavernaServer.java | 2 +-
.../src/main/java/org/taverna/server/master/admin/Admin.java | 2 +-
.../java/org/taverna/server/master/soap/TavernaServerSOAP.java | 2 +-
.../main/java/org/taverna/server/master/usage/UsageRecord.java | 2 +-
.../org/taverna/server/master/usage/UsageRecordRecorder.java | 2 +-
.../java/org/taverna/server/localworker/impl/WorkerCore.java | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2618505..b1a583b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@ executing.</description>
</group>
<group>
<title>Externally-Defined Document Formats</title>
- <packages>org.taverna.server.port_description:org.ogf.usage:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages>
+ <packages>org.taverna.server.port_description:org.apache.taverna.server.usagerecord:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages>
</group>
<group>
<title>Server Back End Factory Coupling to Command Line Executor</title>
@@ -414,7 +414,7 @@ executing.</description>
<artifactId>maven-changelog-plugin</artifactId>
<version>2.2</version>
<configuration>
- <issueLinkUrl>http://dev.mygrid.org.uk/issues/browse/%ISSUE%</issueLinkUrl>
+ <issueLinkUrl>https://issues.apache.org/jira/browse/%ISSUE%</issueLinkUrl>
</configuration>
</plugin>
<plugin>
@@ -486,7 +486,7 @@ executing.</description>
</group>
<group>
<title>Externally-Defined Document Formats</title>
- <packages>org.taverna.server.port_description:org.ogf.usage:org.ogf.usage.v1_0:org.w3._2000._09.xmldsig_</packages>
+ <packages>org.taverna.server.port_description:org.apache.taverna.server.usagerecord:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages>
</group>
<group>
<title>Server Back End Factory Coupling to Command Line Executor</title>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-client/src/main/java/uk/org/taverna/server/client/Run.java
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/java/uk/org/taverna/server/client/Run.java b/taverna-server-client/src/main/java/uk/org/taverna/server/client/Run.java
index 7e3a7d3..6bcae87 100644
--- a/taverna-server-client/src/main/java/uk/org/taverna/server/client/Run.java
+++ b/taverna-server-client/src/main/java/uk/org/taverna/server/client/Run.java
@@ -30,7 +30,7 @@ import javax.xml.bind.JAXBException;
import org.apache.commons.io.IOUtils;
import org.joda.time.DateTime;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.taverna.server.client.wadl.TavernaServer.Root.RunsRunName;
import org.w3c.dom.Element;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
index 65be798..a04de46 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/RunREST.java
@@ -41,7 +41,7 @@ import javax.xml.bind.JAXBException;
import org.apache.commons.logging.Log;
import org.joda.time.DateTime;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.springframework.beans.factory.annotation.Required;
import org.taverna.server.master.api.RunBean;
import org.taverna.server.master.common.ProfileList;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
index 80bc3fb..4844147 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/TavernaServer.java
@@ -67,7 +67,7 @@ import javax.xml.ws.WebServiceContext;
import org.apache.commons.logging.Log;
import org.apache.cxf.annotations.WSDLDocumentation;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.springframework.beans.factory.annotation.Required;
import org.taverna.server.master.api.SupportAware;
import org.taverna.server.master.api.TavernaServerBean;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
index e142b94..03c0c8b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java
@@ -76,7 +76,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.taverna.server.master.common.Uri;
import org.taverna.server.master.common.VersionedElement;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
index 8fc21bb..f41539c 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/soap/TavernaServerSOAP.java
@@ -33,7 +33,7 @@ import javax.jws.WebService;
import javax.xml.bind.annotation.XmlElement;
import org.apache.cxf.annotations.WSDLDocumentation;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.taverna.server.master.common.Capability;
import org.taverna.server.master.common.Credential;
import org.taverna.server.master.common.DirEntryReference;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
index d71a983..b1f0602 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecord.java
@@ -29,7 +29,7 @@ import javax.jdo.annotations.Queries;
import javax.jdo.annotations.Query;
import javax.xml.bind.JAXBException;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
/**
* A usage record as recorded in the database.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
index d8989b5..18aeb3b 100644
--- a/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
+++ b/taverna-server-webapp/src/main/java/org/taverna/server/master/usage/UsageRecordRecorder.java
@@ -30,7 +30,7 @@ import javax.annotation.PreDestroy;
import javax.xml.bind.JAXBException;
import org.apache.commons.logging.Log;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.springframework.beans.factory.annotation.Required;
import org.taverna.server.master.api.ManagementModel;
import org.taverna.server.master.utils.Contextualizer;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/b8b08883/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
----------------------------------------------------------------------
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
index 9db05ab..4aa6605 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java
@@ -86,7 +86,7 @@ import javax.annotation.Nullable;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.ws.Holder;
-import org.ogf.usage.JobUsageRecord;
+import org.apache.taverna.server.usagerecord.JobUsageRecord;
import org.taverna.server.localworker.api.RunAccounting;
import org.taverna.server.localworker.api.Worker;
import org.taverna.server.localworker.impl.utils.TimingOutTask;