airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1514921 - in /airavata/trunk/modules: airavata-client/src/main/resources/ distribution/airavata-client/src/main/resources/conf/ distribution/airavata-server/ distribution/airavata-server/src/main/resources/conf/ distribution/xbaya-gui/src/...
Date Fri, 16 Aug 2013 23:14:49 GMT
Author: samindaw
Date: Fri Aug 16 23:14:48 2013
New Revision: 1514921

URL: http://svn.apache.org/r1514921
Log:
updating rest contexts and paths + introducing server management service

Added:
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
Modified:
    airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
    airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
    airavata/trunk/modules/distribution/airavata-server/pom.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
    airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
    airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties
    airavata/trunk/modules/integration-tests/pom.xml
    airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
    airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties
    airavata/trunk/modules/rest/webapp/pom.xml
    airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties
    airavata/trunk/modules/rest/webapp/src/main/resources/credential-store/client.xml
    airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
    airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
    airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties

Modified: airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties Fri
Aug 16 23:14:48 2013
@@ -68,6 +68,6 @@ trust.store.password=airavata
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
+xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 

Modified: airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
(original)
+++ airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Fri Aug 16 23:14:48 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
+xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 
 trust.store=aiaravata.jks
@@ -65,4 +65,5 @@ trust.store.password=airavata
 # To make JPA accessor work you need to add OpenJPA jars and uncomment jpa.connection.properties
 #class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
 #jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000
+
 #registry.service.wsdl=http://localhost:8080/airavata-server/services/RegistryService?wsdl

Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Fri Aug 16 23:14:48 2013
@@ -66,7 +66,7 @@
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${airavata.war.dir}</outputDirectory>
-                                    <destFileName>airavata-services.war</destFileName>
+                                    <destFileName>airavata.war</destFileName>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${airavata.war.dir}</outputDirectory>

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
Fri Aug 16 23:14:48 2013
@@ -230,7 +230,6 @@ amqp.sender=org.apache.airavata.wsmg.cli
 amqp.topic.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPTopicSenderImpl
 amqp.broadcast.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPBroadcastSenderImpl
 
-
 ###---------------------------Computational Middleware Configurations---------------------------###
 
 #enable.application.job.status.history=true

Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
(original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
Fri Aug 16 23:14:48 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
+xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 
 trust.store=aiaravata.jks

Modified: airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/gfac-core/src/test/resources/airavata-client.properties Fri Aug
16 23:14:48 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
+xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 
 trust.store=aiaravata.jks

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Fri Aug 16 23:14:48 2013
@@ -452,7 +452,7 @@
         <airavata.work.dir>${project.build.directory}/tests/apache-airavata-server-${project.version}</airavata.work.dir>
         <xbaya.work.dir>${project.build.directory}/tests/apache-airavata-xbaya-gui-${project.version}</xbaya.work.dir>
         <airavata.tomcat.distribution>${project.build.directory}/apache-airavata-tomcat.zip</airavata.tomcat.distribution>
-        <rest.service.context>airavata-services</rest.service.context>
+        <rest.service.context>airavata</rest.service.context>
         <local.tomcat.distribution>${settings.localRepository}/org/apache/airavata/integration/tomcat/apache-tomcat/${tomcat.version}/apache-tomcat-${tomcat.version}.zip</local.tomcat.distribution>
     </properties>
 </project>

Modified: airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
(original)
+++ airavata/trunk/modules/integration-tests/src/test/java/org/apache/airavata/integration/BaseCaseIT.java
Fri Aug 16 23:14:48 2013
@@ -155,7 +155,7 @@ public class BaseCaseIT {
         String strContext = System.getProperty("test.server.context");
 
         if (strContext == null) {
-            strContext = "airavata-services";
+            strContext = "airavata";
         }
 
         port = Integer.parseInt(strPort);
@@ -166,7 +166,7 @@ public class BaseCaseIT {
         log("Configurations - serverUrl : " + serverUrl);
         log("Configurations - serverContext : " + serverContextName);
 
-        registryURL = "http://" + serverUrl + ":" + port + "/" + serverContextName + "/registry-api";
+        registryURL = "http://" + serverUrl + ":" + port + "/" + serverContextName + "/services/registry";
 
         log("Configurations - Registry URL : " + registryURL);
 

Modified: airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties
(original)
+++ airavata/trunk/modules/integration-tests/src/test/resources/airavata-client.properties
Fri Aug 16 23:14:48 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
+xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 
 trust.store=aiaravata.jks

Added: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java?rev=1514921&view=auto
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
(added)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
Fri Aug 16 23:14:48 2013
@@ -0,0 +1,10 @@
+package org.apache.airavata.services.server;
+
+import javax.ws.rs.Path;
+
+import org.apache.airavata.services.registry.rest.resources.ConfigurationRegistryResource;
+
+@Path("/manager/")
+public class ServerConfigurationService extends ConfigurationRegistryResource{
+
+}

Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Fri Aug 16 23:14:48 2013
@@ -50,7 +50,7 @@
 								<artifactId>airavata-rest-service-webapp</artifactId>
 								<type>war</type>
 								<properties>
-									<context>/airavata-services</context>
+									<context>/airavata</context>
 								</properties>
 							</deployable>
 						</deployables>

Modified: airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties Fri Aug
16 23:14:48 2013
@@ -218,5 +218,3 @@ class.registry.accessor=org.apache.airav
 #class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
 registry.service.wsdl=http://localhost:${port}/axis2/services/RegistryService?wsdl
 
-
-

Modified: airavata/trunk/modules/rest/webapp/src/main/resources/credential-store/client.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/resources/credential-store/client.xml?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/resources/credential-store/client.xml (original)
+++ airavata/trunk/modules/rest/webapp/src/main/resources/credential-store/client.xml Fri
Aug 16 23:14:48 2013
@@ -21,11 +21,11 @@
         <id>myproxy:oa4mp,2012:/client/24c45c2eb65d93231d02d423e94d0362</id>
         <serviceUri>https://portal.xsede.org/oauth</serviceUri>
         <!--callbackUri>https://156.56.179.104:8443/client/pages/client-success.jsp</callbackUri-->
-        <callbackUri>https://156.56.179.169:8443/airavata-services/callback</callbackUri>
+        <callbackUri>https://156.56.179.169:8443/airavata/callback</callbackUri>
         <lifetime>864000</lifetime>
         <!--publicKeyFile>/Users/thejaka/manager-server/webapps/airavata-registry/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile-->
-        <publicKeyFile>../webapps/airavata-services/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile>
+        <publicKeyFile>../webapps/airavata/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile>
         <!--privateKeyFile>/Users/thejaka/manager-server/webapps/airavata-registry/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile-->
-        <privateKeyFile>../webapps/airavata-services/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile>
+        <privateKeyFile>../webapps/airavata/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile>
     </client>
 </config>

Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml Fri Aug 16 23:14:48
2013
@@ -27,9 +27,9 @@
 
     <context-param>
         <param-name>oa4mp:client.config.file</param-name>
-        <param-value>${catalina.home}/webapps/airavata-services/WEB-INF/classes/credential-store/client.xml</param-value>
+        <param-value>${catalina.home}/webapps/airavata/WEB-INF/classes/credential-store/client.xml</param-value>
         <!--param-value>
-            /home/amila/development/tools/apache-tomcat-7.0.29/webapps/airavata-registry-rest-services/WEB-INF/classes/credential-store/client.xml
+            /home/amila/development/tools/apache-tomcat-7.0.29/webapps/airavata/WEB-INF/classes/credential-store/client.xml
         </param-value-->
 
     </context-param>
@@ -66,7 +66,7 @@
     </servlet>
     
     <servlet>
-        <servlet-name>Airavata Execution Service</servlet-name>
+        <servlet-name>Airavata Experiment Service</servlet-name>
         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>com.sun.jersey.config.property.packages</param-name>
@@ -74,7 +74,15 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
+	<servlet>
+        <servlet-name>Airavata Server Configuration Service</servlet-name>
+        <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>com.sun.jersey.config.property.packages</param-name>
+            <param-value>org.apache.airavata.services.server;org.codehaus.jackson.jaxrs</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
     <!-- ========================= Security Related Configurations go here ==================================
-->
     <filter>
         <filter-name>AuthenticationFilter</filter-name>
@@ -88,20 +96,26 @@
     <filter-mapping>
         <filter-name>AuthenticationFilter</filter-name>
         <url-pattern>/user-store/*</url-pattern>
-        <url-pattern>/registry-api/*</url-pattern>
-        <url-pattern>/execution-service/*</url-pattern>
+        <url-pattern>/services/registry/*</url-pattern>
+        <url-pattern>/services/experiment/*</url-pattern>
+        <url-pattern>/services/server/*</url-pattern>
     </filter-mapping>
 
     <!-- ================================ End Security Related Configurations ===============================
-->
 
     <servlet-mapping>
         <servlet-name>Airavata Registry Service</servlet-name>
-        <url-pattern>/registry-api/*</url-pattern>
+        <url-pattern>/services/registry/*</url-pattern>
     </servlet-mapping>
     
     <servlet-mapping>
-        <servlet-name>Airavata Execution Service</servlet-name>
-        <url-pattern>/execution-service/*</url-pattern>
+        <servlet-name>Airavata Experiment Service</servlet-name>
+        <url-pattern>/services/experiment/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>Airavata Server Configuration Service</servlet-name>
+        <url-pattern>/services/server/*</url-pattern>
     </servlet-mapping>
 
     <!-- Credential Store Configurations -->

Modified: airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
(original)
+++ airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
Fri Aug 16 23:14:48 2013
@@ -57,12 +57,16 @@ public class ServerMain {
                 File.separator + "bin" + File.separator + "axis2.xml");
         axis2Servlet.setLoadOnStartup(1);
 
-        StandardContext context = (StandardContext)tomcat.getTomcat().addContext("/airavata-services",
System.getenv("AIRAVATA_HOME"));
-        Wrapper executionServlet = tomcat.addServlet("/airavata-services", "Airavata Execution
Service", "com.sun.jersey.spi.container.servlet.ServletContainer");
-        executionServlet.addInitParameter("com.sun.jersey.config.property.packages", "org.apache.airavata.services.experiment;org.codehaus.jackson.jaxrs");
-        executionServlet.setLoadOnStartup(1);
+        StandardContext context = (StandardContext)tomcat.getTomcat().addContext("/airavata",
System.getenv("AIRAVATA_HOME"));
+        Wrapper experimentServlet = tomcat.addServlet("/airavata", "Airavata Experiment Service",
"com.sun.jersey.spi.container.servlet.ServletContainer");
+        experimentServlet.addInitParameter("com.sun.jersey.config.property.packages", "org.apache.airavata.services.experiment;org.codehaus.jackson.jaxrs");
+        experimentServlet.setLoadOnStartup(1);
         
-        Wrapper registryServlet = tomcat.addServlet("/airavata-services", "Airavata Registry
Service", "com.sun.jersey.spi.container.servlet.ServletContainer");
+        Wrapper configurationServlet = tomcat.addServlet("/airavata", "Airavata Server Configuration
Service", "com.sun.jersey.spi.container.servlet.ServletContainer");
+        configurationServlet.addInitParameter("com.sun.jersey.config.property.packages",
"org.apache.airavata.services.server;org.codehaus.jackson.jaxrs");
+        configurationServlet.setLoadOnStartup(1);
+        
+        Wrapper registryServlet = tomcat.addServlet("/airavata", "Airavata Registry Service",
"com.sun.jersey.spi.container.servlet.ServletContainer");
         registryServlet.addInitParameter("com.sun.jersey.config.property.packages", "org.apache.airavata.services.registry.rest;org.codehaus.jackson.jaxrs");
         registryServlet.setLoadOnStartup(1);
 
@@ -75,11 +79,13 @@ public class ServerMain {
         FilterMap filter1mapping = new FilterMap();
         filter1mapping.setFilterName("AuthenticationFilter");
         filter1mapping.addURLPattern("/user-store/*");
-        filter1mapping.addURLPattern("/registry-api/*");
-        filter1mapping.addURLPattern("/execution-service/*");
+        filter1mapping.addURLPattern("/services/registry/*");
+        filter1mapping.addURLPattern("/services/server/*");
+        filter1mapping.addURLPattern("/services/experiment/*");
         context.addFilterMap(filter1mapping);
-        registryServlet.addMapping("/registry-api/*");
-        executionServlet.addMapping("/execution-service/*");
+        registryServlet.addMapping("/services/registry/*");
+        configurationServlet.addMapping("/services/server/*");
+        experimentServlet.addMapping("/services/experiment/*");
         context.addApplicationListener("org.apache.airavata.rest.mappings.utils.RegistryListener");
 
         tomcat.start();

Modified: airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties?rev=1514921&r1=1514920&r2=1514921&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties Fri Aug
16 23:14:48 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
+xbaya.registry.url=http://localhost:8080/airavata/services/registry
 xbaya.default.gateway=default
 
 



Mime
View raw message