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 2016/08/12 13:12:59 UTC

[11/46] incubator-taverna-plugin-gis git commit: Rename project to prevent conflict with Taverna3 plugin

Rename project to prevent conflict with Taverna3 plugin

Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/commit/1417ed28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/1417ed28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/1417ed28

Branch: refs/heads/taverna2
Commit: 1417ed2808d6d9b7100d3ba28ba51890e24175ba
Parents: f2d47b7
Author: edikaradumi <ed...@gmail.com>
Authored: Fri Jul 15 20:12:37 2016 +0100
Committer: edikaradumi <ed...@gmail.com>
Committed: Fri Jul 15 20:12:37 2016 +0100

----------------------------------------------------------------------
 apache-taverna-plugin-gis-activity-ui/pom.xml   |  8 ++---
 .../ui/serviceprovider/GisServiceProvider.java  |  2 +-
 apache-taverna-plugin-gis-activity/pom.xml      |  6 ++--
 apache-taverna-plugin-gis-plugin/pom.xml        | 10 +++---
 pom.xml                                         | 38 ++++++--------------
 5 files changed, 23 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/1417ed28/apache-taverna-plugin-gis-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-activity-ui/pom.xml b/apache-taverna-plugin-gis-activity-ui/pom.xml
index 0d82976..e254737 100644
--- a/apache-taverna-plugin-gis-activity-ui/pom.xml
+++ b/apache-taverna-plugin-gis-activity-ui/pom.xml
@@ -3,17 +3,17 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.apache.taverna.gis</groupId>
-		<artifactId>apache-taverna-plugin-gis</artifactId>
+		<groupId>org.apache.taverna2.gis</groupId>
+		<artifactId>apache-taverna2-plugin-gis</artifactId>
 		<version>0.0.1-incubating-SNAPSHOT</version>
 	</parent>
-	<artifactId>apache-taverna-plugin-gis-activity-ui</artifactId>
+	<artifactId>apache-taverna2-plugin-gis-activity-ui</artifactId>
 	<name>Gis Taverna activity UI bindings</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>apache-taverna-plugin-gis-activity</artifactId>
+			<artifactId>apache-taverna2-plugin-gis-activity</artifactId>
 			<version>0.0.1-incubating-SNAPSHOT</version>
 		</dependency>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/1417ed28/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
index f5ea684..a241b00 100644
--- a/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
+++ b/apache-taverna-plugin-gis-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
@@ -28,7 +28,7 @@ public class GisServiceProvider extends AbstractConfigurableServiceProvider<GisS
 	}
 
 	private static final URI providerId = URI
-			.create("http://cs.man.ac.uk/2016/service-provider/apache-taverna-plugin-gis");
+			.create("http://cs.man.ac.uk/2016/service-provider/apache-taverna2-plugin-gis");
 
 	/**
 	 * Do the actual search for services. Return using the callBack parameter.

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/1417ed28/apache-taverna-plugin-gis-activity/pom.xml
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-activity/pom.xml b/apache-taverna-plugin-gis-activity/pom.xml
index bae1259..09ebb92 100644
--- a/apache-taverna-plugin-gis-activity/pom.xml
+++ b/apache-taverna-plugin-gis-activity/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.apache.taverna.gis</groupId>
-		<artifactId>apache-taverna-plugin-gis</artifactId>
+		<groupId>org.apache.taverna2.gis</groupId>
+		<artifactId>apache-taverna2-plugin-gis</artifactId>
 		<version>0.0.1-incubating-SNAPSHOT</version>
 	</parent>
-	<artifactId>apache-taverna-plugin-gis-activity</artifactId>
+	<artifactId>apache-taverna2-plugin-gis-activity</artifactId>
 	<name>Gis Taverna activity</name>
 
 	<repositories>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/1417ed28/apache-taverna-plugin-gis-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/apache-taverna-plugin-gis-plugin/pom.xml b/apache-taverna-plugin-gis-plugin/pom.xml
index 90e13eb..c797159 100644
--- a/apache-taverna-plugin-gis-plugin/pom.xml
+++ b/apache-taverna-plugin-gis-plugin/pom.xml
@@ -3,11 +3,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.apache.taverna.gis</groupId>
-		<artifactId>apache-taverna-plugin-gis</artifactId>
+		<groupId>org.apache.taverna2.gis</groupId>
+		<artifactId>apache-taverna2-plugin-gis</artifactId>
 		<version>0.0.1-incubating-SNAPSHOT</version>
 	</parent>
-	<artifactId>apache-taverna-plugin-gis-plugin</artifactId>
+	<artifactId>apache-taverna2-plugin-gis-plugin</artifactId>
 	<packaging>taverna-plugin</packaging>
 	<name>Gis Taverna plugin</name>
 
@@ -29,12 +29,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>apache-taverna-plugin-gis-activity</artifactId>
+			<artifactId>apache-taverna2-plugin-gis-activity</artifactId>
 			<version>0.0.1-incubating-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>apache-taverna-plugin-gis-activity-ui</artifactId>
+			<artifactId>apache-taverna2-plugin-gis-activity-ui</artifactId>
 			<version>0.0.1-incubating-SNAPSHOT</version>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/1417ed28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2683990..204dc52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
 	<prerequisites>
 		<maven>3.0.0</maven>
 	</prerequisites>
-	<groupId>org.apache.taverna.gis</groupId>
-	<artifactId>apache-taverna-plugin-gis</artifactId>
+	<groupId>org.apache.taverna2.gis</groupId>
+	<artifactId>apache-taverna2-plugin-gis</artifactId>
 	<version>0.0.1-incubating-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Gis Taverna project</name>
@@ -97,20 +97,15 @@
 			<url>http://www.mygrid.org.uk/maven/repository</url>
 		</repository>
 		<repository>
-			<!-- The repository that your jars are deployed to -->
-			<id>my-repository</id>
-			<name>My Repository</name>
-			<url>http://repository.example.com/maven/repository</url>
-		</repository>
-		<repository>
-			<!-- The repository that your snapshot jars are deployed to -->
+			<id>n52-releases</id>
+			<name>52n Releases</name>
+			<url>http://52north.org/maven/repo/releases</url>
 			<releases>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</releases>
-			<snapshots/>
-			<id>my-snapshot-repository</id>
-			<name>My snapshot Repository</name>
-			<url>file:///tmp/test-plugins/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 
@@ -122,23 +117,10 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<!-- The location of your plugin site -->
-	<distributionManagement>
-		<repository>
-			<id>my-plugin-site</id>
-			<name>My Plugin Site</name>
-			<url>scpexe://repository.example.com/www/taverna/plugins/</url>
-		</repository>
-		<snapshotRepository>
-			<id>my-test-plugin-site</id>
-			<name>My Test Plugin Site</name>
-			<url>file:///tmp/test-plugins/</url>
-		</snapshotRepository>
-	</distributionManagement>
-
   <modules>
     <module>apache-taverna-plugin-gis-activity</module>
     <module>apache-taverna-plugin-gis-activity-ui</module>
     <module>apache-taverna-plugin-gis-plugin</module>
+    <module>apache-taverna-plugin-gis-client</module>
   </modules>
 </project>
\ No newline at end of file