airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1417985 - in /airavata/trunk/modules: airavata-client/ commons/workflow-tracking/ gfac-axis2/ gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/ gfac-core/ registry/airavata-jpa-registry/ registry/airavata-registry-service/ ...
Date Thu, 06 Dec 2012 16:28:15 GMT
Author: chathuri
Date: Thu Dec  6 16:28:09 2012
New Revision: 1417985

URL: http://svn.apache.org/viewvc?rev=1417985&view=rev
Log:
cleaning up poms

Added:
    airavata/trunk/modules/rest/webapp/README.txt
      - copied, changed from r1417648, airavata/trunk/modules/rest/service/README.txt
Removed:
    airavata/trunk/modules/rest/service/README.txt
Modified:
    airavata/trunk/modules/airavata-client/pom.xml
    airavata/trunk/modules/commons/workflow-tracking/pom.xml
    airavata/trunk/modules/gfac-axis2/pom.xml
    airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
    airavata/trunk/modules/gfac-core/pom.xml
    airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml
    airavata/trunk/modules/registry/airavata-registry-service/pom.xml
    airavata/trunk/modules/registry/airavata-registry-test/pom.xml
    airavata/trunk/modules/registry/registry-api/pom.xml
    airavata/trunk/modules/rest/service/pom.xml
    airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
    airavata/trunk/modules/rest/webapp/pom.xml
    airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db
    airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml
    airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
    airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
    airavata/trunk/modules/ws-messenger/commons/pom.xml
    airavata/trunk/modules/ws-messenger/message-monitor/pom.xml
    airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
    airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
    airavata/trunk/modules/xbaya-gui/pom.xml

Modified: airavata/trunk/modules/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/airavata-client/pom.xml Thu Dec  6 16:28:09 2012
@@ -33,7 +33,7 @@
             <artifactId>airavata-message-monitor</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>${axis2.version}</version>
@@ -42,12 +42,22 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb-codegen</artifactId>
             <version>${axis2.version}</version>
-        </dependency-->
+        </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-model-core</artifactId>
             <version>${project.version}</version>
-        </dependency>        
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-workflow-execution-context</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <version>${jcr.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

Modified: airavata/trunk/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ airavata/trunk/modules/commons/workflow-tracking/pom.xml Thu Dec  6 16:28:09 2012
@@ -75,12 +75,6 @@
             <artifactId>airavata-messenger-client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>${xmlbeans.version}</version>
-            <scope>compile</scope>
-        </dependency>
 
         <!-- Logging -->
         <dependency>

Modified: airavata/trunk/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/pom.xml (original)
+++ airavata/trunk/modules/gfac-axis2/pom.xml Thu Dec  6 16:28:09 2012
@@ -25,21 +25,6 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-workflow-execution-context</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-workflow-tracking</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-core</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -48,11 +33,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-         <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-jpa-registry</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 
 	<build>

Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Thu Dec  6 16:28:09 2012
@@ -184,7 +184,7 @@ public class GFacService implements Serv
         protected void updateRegistry(AiravataAPI airavataAPI) throws Exception {
             URI localAddress = new URI((String) this.context.getProperty(GFAC_URL));
             airavataAPI.getAiravataManager().addGFacURI(localAddress);
-            log.info("Updated Workflow Interpreter service URL in to Repository");
+            log.info("Updated GFac service URL in to Repository");
         }
     }
 }

Modified: airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac-core/pom.xml Thu Dec  6 16:28:09 2012
@@ -46,7 +46,7 @@
             <type>jar</type>
             <version>cog-4_1_6</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>cog-4_1_6_rc2</groupId>
             <artifactId>cryptix32</artifactId>
             <version>cog-4_1_6</version>
@@ -55,13 +55,12 @@
             <groupId>cog-4_1_6_rc2</groupId>
             <artifactId>cryptix-asn1</artifactId>
             <version>cog-4_1_6</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
             <version>143</version>
-        </dependency>
-
+        </dependency-->
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
@@ -75,11 +74,11 @@
         </dependency>
 
         <!-- GFAC schemas -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-client-api</artifactId>

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/pom.xml Thu Dec  6 16:28:09 2012
@@ -33,11 +33,11 @@
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <!-- Test -->
         <dependency>
             <groupId>junit</groupId>
@@ -93,12 +93,6 @@
             <version>${derby.version}</version>
             <scope>test</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-service</artifactId>
-            <version>${project.version}</version>
-        </dependency-->
-
     </dependencies>
 
 </project>

Modified: airavata/trunk/modules/registry/airavata-registry-service/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/pom.xml Thu Dec  6 16:28:09 2012
@@ -23,16 +23,16 @@
     <url>http://airavata.apache.org/</url>
     
     <dependencies>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
+        </dependency-->
         <!--dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>

Modified: airavata/trunk/modules/registry/airavata-registry-test/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/pom.xml Thu Dec  6 16:28:09 2012
@@ -29,11 +29,11 @@
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <!-- Test -->
         <dependency>
             <groupId>junit</groupId>
@@ -85,12 +85,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-model-core</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-        </dependency>
+        </dependency-->
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-registry-service</artifactId>

Modified: airavata/trunk/modules/registry/registry-api/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/pom.xml (original)
+++ airavata/trunk/modules/registry/registry-api/pom.xml Thu Dec  6 16:28:09 2012
@@ -24,11 +24,11 @@
     <url>http://airavata.apache.org/</url>
 
     <dependencies>
-        <dependency>
+        <!--dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
             <version>${jcr.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -43,11 +43,11 @@
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
 			<version>20090211</version>
-		</dependency>        
+		</dependency-->
         <!-- Test -->
         <dependency>
             <groupId>junit</groupId>

Modified: airavata/trunk/modules/rest/service/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/pom.xml (original)
+++ airavata/trunk/modules/rest/service/pom.xml Thu Dec  6 16:28:09 2012
@@ -66,11 +66,11 @@
 			<artifactId>airavata-security</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
+		<!--dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-jpa-registry</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency-->
 		<dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-rest-mappings</artifactId>

Modified: airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
Binary files - no diff available.

Copied: airavata/trunk/modules/rest/webapp/README.txt (from r1417648, airavata/trunk/modules/rest/service/README.txt)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/README.txt?p2=airavata/trunk/modules/rest/webapp/README.txt&p1=airavata/trunk/modules/rest/service/README.txt&r1=1417648&r2=1417985&rev=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/README.txt (original)
+++ airavata/trunk/modules/rest/webapp/README.txt Thu Dec  6 16:28:09 2012
@@ -9,102 +9,102 @@ To test
 * for simple methods you can use curl for testing.
 
 **************For Configuration releated methods********************
-   curl -v 'http://localhost:8080/airavata-registry/registry/api/configuration?key=key1'
-   curl -v 'http://localhost:8080/airavata-registry/registry/api/configurationlist?key=key1'
-   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value4&date=2012-09-21 04:09:56" http://localhost:8080/airavata-registry/registry/api/save/configuration
-   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value5&date=2012-09-23 04:09:56" http://localhost:8080/airavata-registry/registry/api/update/configuration
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/allconfiguration?key=key1
-   curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/delete/configuration?key=key2&value=value2'
-   curl --request GET http://localhost:8080/airavata-registry/registry/api/gfac/urilist
-   curl --request GET http://localhost:8080/airavata-registry/registry/api/workflowinterpreter/urilist
-   curl --request GET http://localhost:8080/airavata-registry/registry/api/eventingservice/uri
-   curl --request GET http://localhost:8080/airavata-registry/registry/api/messagebox/uri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/GFacService2" http://localhost:8080/airavata-registry/registry/api/add/gfacuri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2" http://localhost:8080/airavata-registry/registry/api/add/workflowinterpreteruri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/EventingService2" http://localhost:8080/airavata-registry/registry/api/add/eventinguri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/MsgBoxService2" http://localhost:8080/airavata-registry/registry/api/add/msgboxuri
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/GFacService2&date=2012-10-18 00:00:00" http://localhost:8080/airavata-registry/registry/api/add/gfacuri/date
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2&date=2012-10-18 00:00:00" http://localhost:8080/airavata-registry/registry/api/add/workflowinterpreteruri/date
-   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:8080/axis2/services/MsgBoxService2&date=2012-10-18 00:00:00" http://localhost:8080/airavata-registry/registry/api/add/msgboxuri/date
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/gfacuri?uri=http://192.168.17.1:8080/axis2/services/GFacService2
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/allgfacuris
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/workflowinterpreteruri?uri=http://192.168.17.1:8080/axis2/services/WorkflowInterpretor2
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/allworkflowinterpreteruris
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/eventinguri
-   curl --request DELETE http://localhost:8080/airavata-registry/registry/api/delete/msgboxuri
+   curl -v 'http://localhost:9080/airavata-registry/registry/api/configuration?key=key1'
+   curl -v 'http://localhost:9080/airavata-registry/registry/api/configurationlist?key=key1'
+   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value4&date=2012-09-21 04:09:56" http://localhost:9080/airavata-registry/registry/api/save/configuration
+   curl -H "Accept: text/plain" -X POST -d "key=key1&value=value5&date=2012-09-23 04:09:56" http://localhost:9080/airavata-registry/registry/api/update/configuration
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/allconfiguration?key=key1
+   curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/delete/configuration?key=key2&value=value2'
+   curl --request GET http://localhost:9080/airavata-registry/registry/api/gfac/urilist
+   curl --request GET http://localhost:9080/airavata-registry/registry/api/workflowinterpreter/urilist
+   curl --request GET http://localhost:9080/airavata-registry/registry/api/eventingservice/uri
+   curl --request GET http://localhost:9080/airavata-registry/registry/api/messagebox/uri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/GFacService2" http://localhost:9080/airavata-registry/registry/api/add/gfacuri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/WorkflowInterpretor2" http://localhost:9080/airavata-registry/registry/api/add/workflowinterpreteruri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/EventingService2" http://localhost:9080/airavata-registry/registry/api/add/eventinguri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/MsgBoxService2" http://localhost:9080/airavata-registry/registry/api/add/msgboxuri
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/GFacService2&date=2012-10-18 00:00:00" http://localhost:9080/airavata-registry/registry/api/add/gfacuri/date
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/WorkflowInterpretor2&date=2012-10-18 00:00:00" http://localhost:9080/airavata-registry/registry/api/add/workflowinterpreteruri/date
+   curl -H "Accept: text/plain" -X POST -d "uri=http://192.168.17.1:9080/axis2/services/MsgBoxService2&date=2012-10-18 00:00:00" http://localhost:9080/airavata-registry/registry/api/add/msgboxuri/date
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/gfacuri?uri=http://192.168.17.1:9080/axis2/services/GFacService2
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/allgfacuris
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/workflowinterpreteruri?uri=http://192.168.17.1:9080/axis2/services/WorkflowInterpretor2
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/allworkflowinterpreteruris
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/eventinguri
+   curl --request DELETE http://localhost:9080/airavata-registry/registry/api/delete/msgboxuri
 
 ************For descriptiors*********************************
     ############## Host descriptrors ##########################
 
-    curl --request GET http://localhost:8080/airavata-registry/registry/api/hostdescriptor/exist?descriptorName=ember
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1", "hostAddress":"testHostAddress" }' http://localhost:8080/airavata-registry/registry/api/hostdescriptor/save
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1", "hostAddress":"testHostAddress2" }' http://localhost:8080/airavata-registry/registry/api/hostdescriptor/update
-    curl --request GET http://localhost:8080/airavata-registry/registry/api/host/description?hostName=testHost1
-    curl --request DELETE http://localhost:8080/airavata-registry/registry/api/hostdescriptor/delete?hostName=testHost1
-    curl --request GET http://localhost:8080/airavata-registry/registry/api/get/hostdescriptors
+    curl --request GET http://localhost:9080/airavata-registry/registry/api/hostdescriptor/exist?descriptorName=ember
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1", "hostAddress":"testHostAddress" }' http://localhost:9080/airavata-registry/registry/api/hostdescriptor/save
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"hostname":"testHost1", "hostAddress":"testHostAddress2" }' http://localhost:9080/airavata-registry/registry/api/hostdescriptor/update
+    curl --request GET http://localhost:9080/airavata-registry/registry/api/host/description?hostName=testHost1
+    curl --request DELETE http://localhost:9080/airavata-registry/registry/api/hostdescriptor/delete?hostName=testHost1
+    curl --request GET http://localhost:9080/airavata-registry/registry/api/get/hostdescriptors
 
     ############## Service descriptrors ##########################
-    curl --request GET http://localhost:8080/airavata-registry/registry/api/servicedescriptor/exist?descriptorName=echo
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService1", "description":"test description","inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}' http://localhost:8080/airavata-registry/registry/api/servicedescriptor/save
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService2", "description":"test description2","inputParams":{"dataType":"input", "description":"myinput2","name":"myinput2","type":"String"},"outputParams":{"dataType":"output","description":"myoutput2","name":"myoutput2","type":"String"}}' http://localhost:8080/airavata-registry/registry/api/servicedescriptor/update
-    curl --request GET http://localhost:8080/airavata-registry/registry/api/servicedescriptor/description?serviceName=echo1
-    curl --request DELETE http://localhost:8080/airavata-registry/registry/api/servicedescriptor/delete?serviceName=echo1
-    curl --request GET http://localhost:8080/airavata-registry/registry/api/get/servicedescriptors
+    curl --request GET http://localhost:9080/airavata-registry/registry/api/servicedescriptor/exist?descriptorName=echo
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService1", "description":"test description","inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}' http://localhost:9080/airavata-registry/registry/api/servicedescriptor/save
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"serviceName":"testService2", "description":"test description2","inputParams":{"dataType":"input", "description":"myinput2","name":"myinput2","type":"String"},"outputParams":{"dataType":"output","description":"myoutput2","name":"myoutput2","type":"String"}}' http://localhost:9080/airavata-registry/registry/api/servicedescriptor/update
+    curl --request GET http://localhost:9080/airavata-registry/registry/api/servicedescriptor/description?serviceName=echo1
+    curl --request DELETE http://localhost:9080/airavata-registry/registry/api/servicedescriptor/delete?serviceName=echo1
+    curl --request GET http://localhost:9080/airavata-registry/registry/api/get/servicedescriptors
 
     ############## Application descriptrors ##########################
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/exist?serviceName=echo&hostName=LocalHost&descriptorName=LocalHost_application'
-    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1", "hostdescName":"LocalHost", "executablePath":"cccc", "workingDir":"dddd" , "serviceDescriptor":{"inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}}' http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/build/save
-     curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1", "hostdescName":"LocalHost", "executablePath":"cccc111", "workingDir":"dddd1111" , "serviceDescriptor":{"inputParams":{"dataType":"input", "description":"myinput11","name":"myinput11","type":"String"},"outputParams":{"dataType":"output","description":"myoutput11","name":"myoutput11","type":"String"}}}' http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/update
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/description?serviceName=echo&hostName=LocalHost&applicationName=LocalHost_application2'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptors/alldescriptors/host/service?serviceName=echo&hostName=LocalHost'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/alldescriptors/service?serviceName=echo'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/alldescriptors'
-    curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/applicationdescriptor/delete?serviceName=echo&hostName=LocalHost&appName=LocalHost_application2'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/exist?serviceName=echo&hostName=LocalHost&descriptorName=LocalHost_application'
+    curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1", "hostdescName":"LocalHost", "executablePath":"cccc", "workingDir":"dddd" , "serviceDescriptor":{"inputParams":{"dataType":"input", "description":"myinput","name":"myinput","type":"String"},"outputParams":{"dataType":"output","description":"myoutput","name":"myoutput","type":"String"}}}' http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/build/save
+     curl -H "Accept:application/json"  -X POST -H "Content-Type:application/json" -d '{"name":"abc1", "hostdescName":"LocalHost", "executablePath":"cccc111", "workingDir":"dddd1111" , "serviceDescriptor":{"inputParams":{"dataType":"input", "description":"myinput11","name":"myinput11","type":"String"},"outputParams":{"dataType":"output","description":"myoutput11","name":"myoutput11","type":"String"}}}' http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/update
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/description?serviceName=echo&hostName=LocalHost&applicationName=LocalHost_application2'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptors/alldescriptors/host/service?serviceName=echo&hostName=LocalHost'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/alldescriptors/service?serviceName=echo'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/alldescriptors'
+    curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/applicationdescriptor/delete?serviceName=echo&hostName=LocalHost&appName=LocalHost_application2'
 
 ************ Project Registry *********************************
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/project/exist?projectName=default'
-    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:8080/airavata-registry/registry/api/add/project
-    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:8080/airavata-registry/registry/api/update/project
-    curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/delete/project?projectName=project1'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/project?projectName=project1'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/projects'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/project/exist?projectName=default'
+    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:9080/airavata-registry/registry/api/add/project
+    curl -H "Accept: text/plain" -X POST -d 'projectName=project1' http://localhost:9080/airavata-registry/registry/api/update/project
+    curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/delete/project?projectName=project1'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/project?projectName=project1'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/projects'
 
 ************* Experiments *************************************
-    curl --request DELETE 'http://localhost:8080/airavata-registry/registry/api/delete/experiment?experimentId=eb9e67cf-6fe3-46f1-b50b-7b42936d347d
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/all'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/project?projectName=default'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/date?fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiments/project/date?projectName=default&fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
-    curl -H "Accept: text/plain" -X POST -d 'projectName=project1&experimentID=testexpID1&submittedDate=2012-10-18 00:00:00' http://localhost:8080/airavata-registry/registry/api/add/experiment
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/experiment/exist?experimentId=testexpID1'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/experiment/notexist/create?experimentId=testExpID2&createIfNotPresent=true'
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&user=abc' http://localhost:8080/airavata-registry/registry/api/update/experiment
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment/executionuser?experimentId=testExpID2'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment/name?experimentId=testExpID2'
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&experimentName=ddscsddsss111' http://localhost:8080/airavata-registry/registry/api/update/experimentname
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experimentmetadata?experimentId=testExpID2'
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&metadata=aaaaaaa' http://localhost:8080/airavata-registry/registry/api/update/experimentmetadata
+    curl --request DELETE 'http://localhost:9080/airavata-registry/registry/api/delete/experiment?experimentId=eb9e67cf-6fe3-46f1-b50b-7b42936d347d
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/all'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/project?projectName=default'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/date?fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiments/project/date?projectName=default&fromDate=2012-10-16%2000:00:00&toDate=2012-10-18%2000:00:00'
+    curl -H "Accept: text/plain" -X POST -d 'projectName=project1&experimentID=testexpID1&submittedDate=2012-10-18 00:00:00' http://localhost:9080/airavata-registry/registry/api/add/experiment
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/experiment/exist?experimentId=testexpID1'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/experiment/notexist/create?experimentId=testExpID2&createIfNotPresent=true'
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&user=abc' http://localhost:9080/airavata-registry/registry/api/update/experiment
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment/executionuser?experimentId=testExpID2'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment/name?experimentId=testExpID2'
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&experimentName=ddscsddsss111' http://localhost:9080/airavata-registry/registry/api/update/experimentname
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experimentmetadata?experimentId=testExpID2'
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testExpID2&metadata=aaaaaaa' http://localhost:9080/airavata-registry/registry/api/update/experimentmetadata
 
 ************* Workflow Execution *************************************
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflowtemplatename?workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
-    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c&templateName=wftemplate1' http://localhost:8080/airavata-registry/registry/api/update/workflowinstancetemplatename
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experimentworkflowinstances?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/workflowinstance/exist/check?instanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/workflowinstance/exist/create?instanceId=testWFInstanceID&createIfNotPresent=true'
-    curl -H "Accept: text/plain" -X POST -d 'instanceId=testWFInstanceID&executionStatus=FINISHED' http://localhost:8080/airavata-registry/registry/api/update/workflowinstancestatus/instanceid
-    curl -H "Accept: text/plain" -X POST -d 'experimentId=testWFInstanceID&workflowInstanceId=testWFInstanceID&executionStatus=STARTED&statusUpdateTime=2012-10-23 00:00:00' http://localhost:8080/airavata-registry/registry/api/update/workflowinstancestatus/experimentid
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflowinstancestatus?instanceId=testWFInstanceID'
-    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testInputdata' http://localhost:8080/airavata-registry/registry/api/update/workflownodeinput
-    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testOutputdata' http://localhost:8080/airavata-registry/registry/api/update/workflownodeoutput
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflowtemplatename?workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
+    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c&templateName=wftemplate1' http://localhost:9080/airavata-registry/registry/api/update/workflowinstancetemplatename
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experimentworkflowinstances?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/workflowinstance/exist/check?instanceId=e00ddc5e-f8d5-4492-9eb2-10372efb103c'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/workflowinstance/exist/create?instanceId=testWFInstanceID&createIfNotPresent=true'
+    curl -H "Accept: text/plain" -X POST -d 'instanceId=testWFInstanceID&executionStatus=FINISHED' http://localhost:9080/airavata-registry/registry/api/update/workflowinstancestatus/instanceid
+    curl -H "Accept: text/plain" -X POST -d 'experimentId=testWFInstanceID&workflowInstanceId=testWFInstanceID&executionStatus=STARTED&statusUpdateTime=2012-10-23 00:00:00' http://localhost:9080/airavata-registry/registry/api/update/workflowinstancestatus/experimentid
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflowinstancestatus?instanceId=testWFInstanceID'
+    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testInputdata' http://localhost:9080/airavata-registry/registry/api/update/workflownodeinput
+    curl -H "Accept: text/plain" -X POST -d 'nodeID=TempConvertSoap_FahrenheitToCelsius&workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&data=testOutputdata' http://localhost:9080/airavata-registry/registry/api/update/workflownodeoutput
 
 
 ****************** Experiment Data *************************************
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experimentId/user?username=admin'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/experiment/user?username=admin'
-    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius&executionStatus=STARTED' http://localhost:8080/airavata-registry/registry/api/update/workflownode/status
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflownode/status?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
-    curl --request GET 'http://localhost:8080/airavata-registry/registry/api/get/workflownode/starttime?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment?experimentId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experimentId/user?username=admin'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/experiment/user?username=admin'
+    curl -H "Accept: text/plain" -X POST -d 'workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius&executionStatus=STARTED' http://localhost:9080/airavata-registry/registry/api/update/workflownode/status
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflownode/status?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
+    curl --request GET 'http://localhost:9080/airavata-registry/registry/api/get/workflownode/starttime?workflowInstanceId=ff7338c9-f9ad-4d86-b486-1e8e9c3a9cc4&nodeId=TempConvertSoap_FahrenheitToCelsius'
 
 
 

Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Thu Dec  6 16:28:09 2012
@@ -94,22 +94,22 @@
 			<artifactId>jersey-multipart</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
-		<dependency>
+		<!--dependency>
 			<groupId>com.sun.jersey.jersey-test-framework</groupId>
 			<artifactId>jersey-test-framework-grizzly2</artifactId>
 			<version>${jersey.version}</version>
 			<scope>test</scope>
-		</dependency>
+		</dependency-->
 		<dependency>
 			<groupId>com.sun.jersey</groupId>
 			<artifactId>jersey-server</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
-		<dependency>
+		<!--dependency>
 			<groupId>com.sun.jersey</groupId>
 			<artifactId>jersey-client</artifactId>
 			<version>${jersey.version}</version>
-		</dependency>
+		</dependency-->
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
@@ -153,7 +153,7 @@
         </dependency>
 
         <!-- Airavata -->
-		<dependency>
+		<!--dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-gfac-schema-utils</artifactId>
 			<version>${project.version}</version>
@@ -172,7 +172,7 @@
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-jpa-registry</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency-->
 		<dependency>
 			<groupId>org.apache.airavata</groupId>
 			<artifactId>airavata-rest-mappings</artifactId>

Modified: airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/security/src/test/resources/testdb/test.h2.db?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
Binary files - no diff available.

Modified: airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml Thu Dec  6 16:28:09 2012
@@ -60,7 +60,7 @@
     </build>
 
     <dependencies>
-        <dependency>
+        <!--dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3_xpath</artifactId>
             <version>1.1.4c</version>
@@ -79,23 +79,23 @@
             <groupId>xpp5</groupId>
             <artifactId>xpp5_xpath</artifactId>
             <version>1.2.6</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>xsul5-ogce</groupId>
             <artifactId>xsul5-2007-02-27</artifactId>
             <version>1</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>gpel</groupId>
             <artifactId>gpel_client</artifactId>
             <version>1.0.7-BETA</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>atomixmiser</groupId>
             <artifactId>atomixmiser</artifactId>
             <version>0.9.4</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
@@ -183,10 +183,10 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-http</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
+        </dependency-->
 
         <!-- AMAZON STUFFS -->
-        <dependency>
+        <!--dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk</artifactId>
             <version>1.3.20</version>
@@ -200,14 +200,14 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
             <version>0.8.0</version>
-        </dependency>
+        </dependency-->
 
         <!-- AIRAVATA modules -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-message-broker</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-registry-api</artifactId>
@@ -219,7 +219,7 @@
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-		<dependency>
+		<!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-model-component</artifactId>
             <version>${project.version}</version>
@@ -233,11 +233,11 @@
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-tracking</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
 
         <!-- JCR Support -->
         <!-- TODO need clean up -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
@@ -246,7 +246,7 @@
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-core</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -263,7 +263,7 @@
             <version>${org.slf4j.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
             <version>${jcr.version}</version>
@@ -277,7 +277,7 @@
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-execution-context</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
          <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>

Modified: airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml Thu Dec  6 16:28:09 2012
@@ -60,7 +60,7 @@
     </build>
 
     <dependencies>
-        <dependency>
+        <!--dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3_xpath</artifactId>
             <version>1.1.4c</version>
@@ -84,42 +84,42 @@
             <groupId>xsul5-ogce</groupId>
             <artifactId>xsul5-2007-02-27</artifactId>
             <version>1</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>gpel</groupId>
             <artifactId>gpel_client</artifactId>
             <version>1.0.7-BETA</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>atomixmiser</groupId>
             <artifactId>atomixmiser</artifactId>
             <version>0.9.4</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.3</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>xutil</groupId>
             <artifactId>xutil</artifactId>
             <version>0.2</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>jython</groupId>
             <artifactId>jython</artifactId>
             <version>2.5.1</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>cog-jglobus</groupId>
             <artifactId>cog-jglobus</artifactId>
             <version>1.8.0_1</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -129,22 +129,22 @@
             <artifactId>xsul</artifactId>
             <version>2.10.5_d</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
             <version>${xmlbeans.version}</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>xbaya</groupId>
             <artifactId>pegasuswebservice</artifactId>
             <version>1.0</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
             <version>${axis2.version}</version>
@@ -163,8 +163,8 @@
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-dom</artifactId>
             <version>1.2.8</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
             <version>1.4.2</version>
@@ -173,8 +173,8 @@
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
             <version>2.0.4</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-local</artifactId>
             <version>${axis2.version}</version>
@@ -183,10 +183,10 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-http</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
+        </dependency-->
 
         <!-- AMAZON STUFFS -->
-        <dependency>
+        <!--dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk</artifactId>
             <version>1.3.20</version>
@@ -200,19 +200,19 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
             <version>0.8.0</version>
-        </dependency>
+        </dependency-->
 
         <!-- AIRAVATA modules -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-message-broker</artifactId>
             <version>${project.version}</version>
-        </dependency>
-		<dependency>
+        </dependency-->
+		<!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-model-core</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-registry-api</artifactId>
@@ -224,11 +224,11 @@
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-tracking</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-client-api</artifactId>
@@ -237,7 +237,7 @@
 
         <!-- JCR Support -->
         <!-- TODO need clean up -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
@@ -246,7 +246,7 @@
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-core</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -263,7 +263,7 @@
             <version>${org.slf4j.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
             <version>${jcr.version}</version>
@@ -272,12 +272,12 @@
             <groupId>globus</groupId>
             <artifactId>transfer-api-client</artifactId>
             <version>0.10</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-execution-context</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
          <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml Thu Dec  6 16:28:09 2012
@@ -60,7 +60,7 @@
     </build>
 
     <dependencies>
-        <dependency>
+        <!--dependency>
             <groupId>xpp3</groupId>
             <artifactId>xpp3_xpath</artifactId>
             <version>1.1.4c</version>
@@ -84,13 +84,13 @@
             <groupId>xsul5-ogce</groupId>
             <artifactId>xsul5-2007-02-27</artifactId>
             <version>1</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>gpel</groupId>
             <artifactId>gpel_client</artifactId>
             <version>1.0.7-BETA</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>atomixmiser</groupId>
             <artifactId>atomixmiser</artifactId>
             <version>0.9.4</version>
@@ -119,7 +119,7 @@
             <groupId>cog-jglobus</groupId>
             <artifactId>cog-jglobus</artifactId>
             <version>1.8.0_1</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -129,7 +129,7 @@
             <artifactId>xsul</artifactId>
             <version>2.10.5_d</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
             <version>${xmlbeans.version}</version>
@@ -183,10 +183,10 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-http</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
+        </dependency-->
 
         <!-- AMAZON STUFFS -->
-        <dependency>
+        <!--dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk</artifactId>
             <version>1.3.20</version>
@@ -200,7 +200,7 @@
             <groupId>net.java.dev.jets3t</groupId>
             <artifactId>jets3t</artifactId>
             <version>0.8.0</version>
-        </dependency>
+        </dependency-->
 
         <!-- AIRAVATA modules -->
         <!--dependency>
@@ -219,19 +219,19 @@
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-tracking</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
 
         <!-- JCR Support -->
         <!-- TODO need clean up -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-schema-utils</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-gfac-core</artifactId>
@@ -253,7 +253,7 @@
             <version>${org.slf4j.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
             <version>${jcr.version}</version>
@@ -267,7 +267,7 @@
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-workflow-execution-context</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
          <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-jpa-registry</artifactId>

Modified: airavata/trunk/modules/ws-messenger/commons/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/commons/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/commons/pom.xml Thu Dec  6 16:28:09 2012
@@ -30,11 +30,11 @@
         </dependency>
 
         <!-- Axis2 -->
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
             <version>${axis2.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>

Modified: airavata/trunk/modules/ws-messenger/message-monitor/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/message-monitor/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/message-monitor/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/message-monitor/pom.xml Thu Dec  6 16:28:09 2012
@@ -34,6 +34,11 @@
             <artifactId>airavata-messenger-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>atomixmiser</groupId>
+            <artifactId>atomixmiser</artifactId>
+            <version>0.9.4</version>
+        </dependency>
         <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-registry-api</artifactId>

Modified: airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Thu Dec  6 16:28:09 2012
@@ -184,7 +184,7 @@ public class MsgBoxServiceLifeCycle impl
         protected void updateRegistry(AiravataAPI registry) throws Exception {
             URI localAddress = (URI) this.context.getProperty(SERVICE_URL);
             registry.getAiravataManager().setMessageBoxURI(localAddress);
-            logger.info("Updated Workflow Interpreter service URL in to Repository");
+            logger.info("Updated Message box service URL in to Repository");
         }
     }
 

Modified: airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Thu Dec  6 16:28:09 2012
@@ -320,7 +320,7 @@ public class BrokerServiceLifeCycle impl
             } catch (AiravataAPIInvocationException e) {
                 e.printStackTrace();
             }
-            log.info("Updated Workflow Interpreter service URL in to Repository");
+            log.info("Updated Eventing service URL in to Repository");
         }
 
     }

Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1417985&r1=1417984&r2=1417985&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Thu Dec  6 16:28:09 2012
@@ -181,6 +181,11 @@
             <version>1.2.6</version>
         </dependency>
         <dependency>
+            <groupId>xsul</groupId>
+            <artifactId>xsul</artifactId>
+            <version>2.10.5_b</version>
+        </dependency>
+        <dependency>
             <groupId>xsul5-ogce</groupId>
             <artifactId>xsul5-2007-02-27</artifactId>
             <version>1</version>



Mime
View raw message