Repository: incubator-taverna-server Updated Branches: refs/heads/master 412ef6c49 -> 529e59d51
org.apache.taverna.* groupIds first attempt 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/529e59d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/529e59d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/529e59d5 Branch: refs/heads/master Commit: 529e59d513d330e904422d37ffa19e8137a6a506 Parents: 412ef6c Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Feb 23 12:54:52 2015 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Feb 23 12:54:52 2015 +0000 ---------------------------------------------------------------------- pom.xml | 21 +++++----- server-client/pom.xml | 19 +++------ server-distribution/pom.xml | 11 ++--- server-execution-delegate/pom.xml | 8 ++-- server-port-description/pom.xml | 23 +--------- server-rmidaemon/pom.xml | 12 +----- server-runinterface/pom.xml | 4 +- server-unix-forker/pom.xml | 12 +----- server-usagerecord/pom.xml | 21 ++-------- server-webapp/pom.xml | 77 ++++++++++++++++------------------ server-worker/pom.xml | 36 +++++++--------- 11 files changed, 85 insertions(+), 159 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 232b42d..4240e5d 100644 --- a/pom.xml +++ b/pom.xml @@ -36,8 +36,17 @@ executing.</description> <signing.keystore>${project.parent.basedir}/src/main/signing/signing.jks</signing.keystore> <signing.user>taverna</signing.user> <signing.password>taverna</signing.password> - <scmBrowseRoot>https://github.com/apache/incubator-taverna-server/tree/master</scmBrowseRoot> + + <scmBrowseRoot>https://github.com/apache/incubator-taverna-server/tree/master</scmBrowseRoot> <jenkinsJob>taverna-server-2.5-auto</jenkinsJob> + + <!-- versions of Taverna dependencies --> + <taverna.language.version>0.15.0-incubating-SNAPSHOT</taverna.language.version> + <taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version> + <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version> + <taverna.commandline.version>3.1.0-incubating-SNAPSHOT</taverna.commandline.version> + + </properties> <!-- Having to edit anything below here is probably indicative of a bug. --> @@ -57,16 +66,6 @@ executing.</description> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <encoding>US-ASCII</encoding> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <version>2.9</version> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-client/pom.xml ---------------------------------------------------------------------- diff --git a/server-client/pom.xml b/server-client/pom.xml index 1ed4ee2..d16b07a 100644 --- a/server-client/pom.xml +++ b/server-client/pom.xml @@ -22,8 +22,9 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-client</artifactId> + <artifactId>taverna-server-client</artifactId> <packaging>bundle</packaging> + <name>Apache Taverna Server Client OSGi Module</name> <dependencies> <dependency> @@ -47,9 +48,9 @@ limitations under the License. <version>1.5</version> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-usagerecord</artifactId> - <version>${project.version}</version> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-usagerecord</artifactId> + <version>${project.parent.version}</version> </dependency> </dependencies> @@ -67,14 +68,6 @@ limitations under the License. </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - <plugin> <groupId>org.jvnet.ws.wadl</groupId> <artifactId>wadl-client-plugin</artifactId> <version>1.1.6</version> @@ -134,6 +127,4 @@ limitations under the License. </plugins> </pluginManagement> </build> - <inceptionYear>2014</inceptionYear> - <name>Server Client OSGi Module</name> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/server-distribution/pom.xml b/server-distribution/pom.xml index 5a59b75..8939dbf 100644 --- a/server-distribution/pom.xml +++ b/server-distribution/pom.xml @@ -22,17 +22,14 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-distribution</artifactId> - <name>Distribution Packaging</name> + <artifactId>taverna-server-distribution</artifactId> + <name>Apache Taverna Server Distribution Packaging</name> <packaging>pom</packaging> - <scm> - <url>${scmBrowseRoot}/server-distribution</url> - </scm> <dependencies> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-webapp</artifactId> + <groupId>${project.parent.version}</groupId> + <artifactId>taverna-server-webapp</artifactId> <version>${project.parent.version}</version> <type>war</type> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-execution-delegate/pom.xml ---------------------------------------------------------------------- diff --git a/server-execution-delegate/pom.xml b/server-execution-delegate/pom.xml index 8d674b2..59c8aff 100644 --- a/server-execution-delegate/pom.xml +++ b/server-execution-delegate/pom.xml @@ -22,13 +22,14 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-execution-delegate</artifactId> + <artifactId>taverna-server-execution-delegate</artifactId> <packaging>bundle</packaging> + <name>Apache Taverna Server Reporting Probe</name> <dependencies> <dependency> - <groupId>uk.org.taverna.platform</groupId> + <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-execution-api</artifactId> - <version>0.1.3-SNAPSHOT</version> + <version>${taverna.engine.version}</version> <type>bundle</type> </dependency> <dependency> @@ -37,5 +38,4 @@ limitations under the License. <scope>test</scope> </dependency> </dependencies> - <name>Reporting Probe</name> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-port-description/pom.xml ---------------------------------------------------------------------- diff --git a/server-port-description/pom.xml b/server-port-description/pom.xml index 3a9b087..99582ed 100644 --- a/server-port-description/pom.xml +++ b/server-port-description/pom.xml @@ -22,33 +22,14 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-port-description</artifactId> - <name>Workflow Port Descriptor Types</name> + <artifactId>taverna-server-port-description</artifactId> + <name>Apache Taverna Server Workflow Port Descriptor Types</name> <description>The structural types used to describe ports on workflows, as exported by Taverna Server.</description> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>US-ASCII</encoding> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-rmidaemon/pom.xml ---------------------------------------------------------------------- diff --git a/server-rmidaemon/pom.xml b/server-rmidaemon/pom.xml index 9486c00..0e2a565 100644 --- a/server-rmidaemon/pom.xml +++ b/server-rmidaemon/pom.xml @@ -23,22 +23,14 @@ limitations under the License. <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-rmidaemon</artifactId> - <name>RMI registry daemon</name> + <artifactId>taverna-server-rmidaemon</artifactId> + <name>Apache Taverna Server RMI registry daemon</name> <description>Customised RMI registry that supports restricting to localhost.</description> <properties> <project.build.sourceEncoding>US-ASCII</project.build.sourceEncoding> <mainClass>org.taverna.server.rmidaemon.Registry</mainClass> </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-runinterface/pom.xml ---------------------------------------------------------------------- diff --git a/server-runinterface/pom.xml b/server-runinterface/pom.xml index 5a50181..efd3763 100644 --- a/server-runinterface/pom.xml +++ b/server-runinterface/pom.xml @@ -23,8 +23,8 @@ limitations under the License. <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-runinterface</artifactId> - <name>RMI Interface: Webapp <-> Worker</name> + <artifactId>taverna-server-runinterface</artifactId> + <name>Apache Taverna Server RMI Interface: Webapp <-> Worker</name> <description>This is the implementation of the RMI interface between the workflow run factory and the web-app service front-end.</description> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-unix-forker/pom.xml ---------------------------------------------------------------------- diff --git a/server-unix-forker/pom.xml b/server-unix-forker/pom.xml index 46fc81b..a2beeb4 100644 --- a/server-unix-forker/pom.xml +++ b/server-unix-forker/pom.xml @@ -22,8 +22,8 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-unix-forker</artifactId> - <name>Impersonation Module (Unix)</name> + <artifactId>taverna-server-unix-forker</artifactId> + <name>Apache Taverna Server Impersonation Module (Unix)</name> <description>Manages the starting of the worker processes as different users. Unix-specific.</description> <properties> @@ -31,14 +31,6 @@ limitations under the License. <forkerMainClass>org.taverna.server.unixforker.Forker</forkerMainClass> </properties> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-usagerecord/pom.xml ---------------------------------------------------------------------- diff --git a/server-usagerecord/pom.xml b/server-usagerecord/pom.xml index 4e10ca9..47ab732 100644 --- a/server-usagerecord/pom.xml +++ b/server-usagerecord/pom.xml @@ -22,16 +22,8 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-usagerecord</artifactId> - <name>Usage Record Support</name> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <type>jar</type> - <scope>test</scope> - </dependency> - </dependencies> + <artifactId>taverna-server-usagerecord</artifactId> + <name>Apache Taverna Server Usage Record Support</name> <description>Basic Java bindings for the OGF Usage Record Format, version 1.0, plus a simple wrapper to make working with it easier.</description> <build> <plugins> @@ -52,14 +44,7 @@ limitations under the License. </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> + </plugins> <pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/server-webapp/pom.xml b/server-webapp/pom.xml index e0bc3b3..f4cf0ef 100644 --- a/server-webapp/pom.xml +++ b/server-webapp/pom.xml @@ -22,9 +22,9 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-webapp</artifactId> + <artifactId>taverna-server-webapp</artifactId> <packaging>war</packaging> - <name>Web Application Core</name> + <name>Apache Taverna Server Web Application Core</name> <description>This is the implementation of the web-app that provides the Taverna Server with its SOAP and REST faces. It relies on the worker process to handle the actual launching of workflow runs.</description> <properties> @@ -33,13 +33,9 @@ limitations under the License. <version.spring-security>3.1.4.RELEASE</version.spring-security> <version.asm>3.3.1</version.asm> <version.smack>3.2.1</version.smack> - <!--<version.commandline>3.0.1-SNAPSHOT</version.commandline>--> - <version.commandline>3.0.0</version.commandline> - <edition.commandline>enterprise</edition.commandline> <version.jdoapi>3.0.1</version.jdoapi> - <forker.module>server-unix-forker</forker.module> + <forker.module>taverna-server-unix-forker</forker.module> <util.dir>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/util</util.dir> - <scufl2.version>0.9.2</scufl2.version> <cmdline.dir>${util.dir}/taverna-commandline-${edition.commandline}-${version.commandline}</cmdline.dir> </properties> @@ -105,38 +101,37 @@ limitations under the License. <scope>test</scope> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-port-description</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-port-description</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-runinterface</artifactId> - <scope>compile</scope> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-runinterface</artifactId> + <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-usagerecord</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-usagerecord</artifactId> <version>${project.parent.version}</version> - <scope>compile</scope> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-worker</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-worker</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> <scope>provided</scope> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>${forker.module}</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> <scope>provided</scope> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-rmidaemon</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-rmidaemon</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> <scope>provided</scope> @@ -305,20 +300,20 @@ limitations under the License. <scope>runtime</scope> </dependency> <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-api</artifactId> - <version>${scufl2.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-api</artifactId> + <version>${taverna.language.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-t2flow</artifactId> - <version>${scufl2.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-t2flow</artifactId> + <version>${taverna.language.version}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-rdfxml</artifactId> - <version>${scufl2.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-wfbundle</artifactId> + <version>${taverna.language.version}</version> <scope>runtime</scope> </dependency> <dependency> @@ -331,8 +326,8 @@ limitations under the License. <dependencyManagement> <dependencies> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-runinterface</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-runinterface</artifactId> <version>${project.parent.version}</version> <scope>compile</scope> </dependency> @@ -568,15 +563,15 @@ limitations under the License. <configuration> <artifactItems> <artifactItem> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-worker</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-worker</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> <overWrite>false</overWrite> <destFileName>server.worker.jar</destFileName> </artifactItem> <artifactItem> - <groupId>uk.org.taverna.server</groupId> + <groupId>${project.parent.groupId}</groupId> <artifactId>${forker.module}</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> @@ -584,8 +579,8 @@ limitations under the License. <destFileName>secure.fork.jar</destFileName> </artifactItem> <artifactItem> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-rmidaemon</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-rmidaemon</artifactId> <version>${project.parent.version}</version> <classifier>jar-with-dependencies</classifier> <overWrite>false</overWrite> @@ -607,9 +602,9 @@ limitations under the License. <configuration> <artifactItems> <artifactItem> - <groupId>net.sf.taverna.t2.taverna-commandline</groupId> - <artifactId>taverna-commandline-${edition.commandline}</artifactId> - <version>${version.commandline}</version> + <groupId>org.apache.taverna.commandline</groupId> + <artifactId>taverna-commandline</artifactId> + <version>${taverna.commandline.version}</version> <classifier>bin</classifier> <type>zip</type> <classifier>bin</classifier> @@ -852,14 +847,14 @@ limitations under the License. <profile> <id>unix</id> <properties> - <forker.module>server-unix-forker</forker.module> + <forker.module>taverna-server-unix-forker</forker.module> </properties> </profile> <profile> <id>win</id> <properties> <!-- This doesn't exist yet. --> - <forker.module>server-win-forker</forker.module> + <forker.module>taverna-server-win-forker</forker.module> </properties> </profile> <profile> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/529e59d5/server-worker/pom.xml ---------------------------------------------------------------------- diff --git a/server-worker/pom.xml b/server-worker/pom.xml index 590a4d9..8006c6d 100644 --- a/server-worker/pom.xml +++ b/server-worker/pom.xml @@ -22,33 +22,27 @@ limitations under the License. <artifactId>taverna-server</artifactId> <version>3.1.0-incubating-SNAPSHOT</version> </parent> - <artifactId>server-worker</artifactId> - <name>Workflow Executor/File System Access Process Implementation</name> + <artifactId>taverna-server-worker</artifactId> + <name>Apache Taverna Server Workflow Executor/File System Access Process Implementation</name> <description>This is the implementation of the factory process that is started up by the web application to manage executing Taverna Workflow executeworkflow.sh calls. Also provides per-user access to filestore.</description> <properties> <workerMainClass>org.taverna.server.localworker.impl.TavernaRunManager</workerMainClass> - <scufl2.version>0.9.2</scufl2.version> </properties> <dependencies> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-runinterface</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-runinterface</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> <dependency> - <groupId>uk.org.taverna.server</groupId> - <artifactId>server-usagerecord</artifactId> + <groupId>${project.parent.groupId}</groupId> + <artifactId>taverna-server-usagerecord</artifactId> <version>${project.parent.version}</version> </dependency> <dependency> @@ -56,20 +50,20 @@ limitations under the License. <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-api</artifactId> - <version>${scufl2.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-api</artifactId> + <version>${taverna.language.version}</version> </dependency> <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-t2flow</artifactId> - <version>${scufl2.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-t2flow</artifactId> + <version>${taverna.language.version}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-rdfxml</artifactId> - <version>${scufl2.version}</version> + <groupId>org.apache.taverna.language</groupId> + <artifactId>taverna-scufl2-wfbundle</artifactId> + <version>${taverna.language.version}</version> <scope>runtime</scope> </dependency> </dependencies>
