You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by dk...@apache.org on 2016/09/13 13:16:01 UTC
[1/3] incubator-taverna-server git commit: Stop using deprecated
class.
Repository: incubator-taverna-server
Updated Branches:
refs/heads/master 61706d413 -> e2a2b1822
Stop using deprecated class.
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/c78c159b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/c78c159b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/c78c159b
Branch: refs/heads/master
Commit: c78c159b816107e06aeb2401ded5659ace2c3cc9
Parents: 61706d4
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Mon Sep 12 15:58:23 2016 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Mon Sep 12 15:58:23 2016 +0100
----------------------------------------------------------------------
.../org/taverna/server/localworker/impl/TavernaRunManager.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/c78c159b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
----------------------------------------------------------------------
diff --git a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
index 02fffaa..167302c 100644
--- a/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
+++ b/taverna-server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java
@@ -34,7 +34,6 @@ import static org.taverna.server.localworker.api.Constants.UNSECURE_PROP;
import java.io.ByteArrayInputStream;
import java.net.URI;
-import java.rmi.RMISecurityManager;
import java.rmi.RemoteException;
import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
@@ -189,7 +188,6 @@ public class TavernaRunManager extends UnicastRemoteObject implements
* the workflow, or if we can't build the worker instance, or
* register it. Also if the arguments are wrong.
*/
- @SuppressWarnings("deprecation")
public static void main(String[] args) throws Exception {
if (args.length < 2)
throw new Exception("wrong # args: must be \"" + usage + "\"");
@@ -198,7 +196,7 @@ public class TavernaRunManager extends UnicastRemoteObject implements
.getResource(SECURITY_POLICY_FILE).toExternalForm());
setProperty(RMI_HOST_PROP, LOCALHOST);
}
- setSecurityManager(new RMISecurityManager());
+ setSecurityManager(new SecurityManager());
factoryName = args[args.length - 1];
TavernaRunManager man = new TavernaRunManager(args[0]);
for (int i = 1; i < args.length - 1; i++)
[3/3] incubator-taverna-server git commit: Centralise the
lifecycle-mapping "plugin" configuration.
Posted by dk...@apache.org.
Centralise the lifecycle-mapping "plugin" configuration.
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/e2a2b182
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/e2a2b182
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/e2a2b182
Branch: refs/heads/master
Commit: e2a2b1822b07a166cb800096792862271b67cf7c
Parents: 798defd
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Tue Sep 13 14:06:35 2016 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Tue Sep 13 14:06:35 2016 +0100
----------------------------------------------------------------------
pom.xml | 161 ++++++++++++++++++++++++++++----
taverna-server-client/pom.xml | 56 -----------
taverna-server-usagerecord/pom.xml | 30 ------
taverna-server-webapp/pom.xml | 78 ----------------
taverna-server-worker/pom.xml | 28 ------
5 files changed, 145 insertions(+), 208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c0d79f..94fe9e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,26 +119,155 @@ executing.</description>
</dependency>
</dependencies>
</plugin>
- </plugins>
- </pluginManagement>
- <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
<configuration>
- <excludes>
- <!-- These refer to files under the Apache license, but which have no comment syntax. -->
- <exclude>CITATION</exclude>
- <exclude>**/META-INF/MANIFEST.MF</exclude>
- <exclude>**/WEB-INF/lib/*.vtmpl</exclude>
- <exclude>**/org.apache.cxf.Logger</exclude>
-
- <!-- Cause problems with RAT; need replacing -->
- <exclude>**/jquery*.js</exclude>
- <exclude>**/jquery*.css</exclude>
- </excludes>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <versionRange>[1.3.1,)</versionRange>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.jvnet.ws.wadl</groupId>
+ <artifactId>wadl-client-plugin</artifactId>
+ <versionRange>[1.1.6,)</versionRange>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <versionRange>[1.0-alpha-2,)</versionRange>
+ <goals>
+ <goal>set-system-properties</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals><goal>process</goal></goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <versionRange>[5,)</versionRange>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-maven-plugin</artifactId>
+ <versionRange>[5,)</versionRange>
+ <goals>
+ <goal>schema-create</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <versionRange>[2.1.4,)</versionRange>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>compress</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
</configuration>
</plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- These refer to files under the Apache license, but which have no comment syntax. -->
+ <exclude>CITATION</exclude>
+ <exclude>**/META-INF/MANIFEST.MF</exclude>
+ <exclude>**/WEB-INF/lib/*.vtmpl</exclude>
+ <exclude>**/org.apache.cxf.Logger</exclude>
+
+ <!-- Cause problems with RAT; need replacing -->
+ <exclude>**/jquery*.js</exclude>
+ <exclude>**/jquery*.css</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-client/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-client/pom.xml b/taverna-server-client/pom.xml
index 980fd2c..3250e5c 100644
--- a/taverna-server-client/pom.xml
+++ b/taverna-server-client/pom.xml
@@ -40,7 +40,6 @@ limitations under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@@ -112,60 +111,5 @@ limitations under the License.
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.jvnet.ws.wadl
- </groupId>
- <artifactId>
- wadl-client-plugin
- </artifactId>
- <versionRange>
- [1.1.6,)
- </versionRange>
- <goals>
- <goal>generate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- properties-maven-plugin
- </artifactId>
- <versionRange>
- [1.0-alpha-2,)
- </versionRange>
- <goals>
- <goal>set-system-properties</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-usagerecord/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-usagerecord/pom.xml b/taverna-server-usagerecord/pom.xml
index a0dcec2..6af20db 100644
--- a/taverna-server-usagerecord/pom.xml
+++ b/taverna-server-usagerecord/pom.xml
@@ -44,36 +44,6 @@ limitations under the License.
</execution>
</executions>
</plugin>
-
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <versionRange>[1.3.1,)</versionRange>
- <goals>
- <goal>xjc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml
index 81acbb6..5ba9bba 100644
--- a/taverna-server-webapp/pom.xml
+++ b/taverna-server-webapp/pom.xml
@@ -449,84 +449,6 @@ limitations under the License.
</dependency>
</dependencies>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- <goal>unpack</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>${version.datanucleus}</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <versionRange>[2.1.4,)</versionRange>
- <goals>
- <goal>revision</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>${version.datanucleus}</versionRange>
- <goals>
- <goal>schema-create</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>yuicompressor-maven-plugin</artifactId>
- <versionRange>[1.0.0,)</versionRange>
- <goals>
- <goal>compress</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-worker/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-worker/pom.xml b/taverna-server-worker/pom.xml
index a4dad91..4b8df5d 100644
--- a/taverna-server-worker/pom.xml
+++ b/taverna-server-worker/pom.xml
@@ -95,33 +95,5 @@ limitations under the License.
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
- <goals>
- <goal>single</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
</project>
[2/3] incubator-taverna-server git commit: Usage Record documents
should really be best as CLOBs.
Posted by dk...@apache.org.
Usage Record documents should really be best as CLOBs.
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/798defdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/798defdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/798defdd
Branch: refs/heads/master
Commit: 798defdda5533636e6da23393529354754db0843
Parents: c78c159
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Mon Sep 12 15:59:13 2016 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Mon Sep 12 15:59:13 2016 +0100
----------------------------------------------------------------------
.../main/java/org/taverna/server/master/usage/UsageRecord.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/798defdd/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 b4a7da3..d71a983 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
@@ -93,8 +93,7 @@ public class UsageRecord {
private Date createDate;
@Persistent
- @Column(name = "USAGE_RECORD", length = 32000)
- // TODO Consider moving to BLOB (CLOB?) type
+ @Column(name = "USAGE_RECORD", jdbcType = "CLOB")
private String usageRecord;
public String getId() {