airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1511366 - in /airavata/trunk/modules: airavata-client/src/main/resources/ distribution/airavata-client/src/main/resources/conf/ distribution/airavata-server/ distribution/xbaya-gui/src/main/resources/conf/ gfac-core/src/test/resources/ int...
Date Wed, 07 Aug 2013 15:46:13 GMT
Author: samindaw
Date: Wed Aug  7 15:46:13 2013
New Revision: 1511366

URL: http://svn.apache.org/r1511366
Log:
updating registry rest service context

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/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/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=1511366&r1=1511365&r2=1511366&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 Wed
Aug  7 15:46:13 2013
@@ -68,6 +68,6 @@ trust.store.password=airavata
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
 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=1511366&r1=1511365&r2=1511366&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
Wed Aug  7 15:46:13 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
 xbaya.default.gateway=default
 
 trust.store=aiaravata.jks

Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1511366&r1=1511365&r2=1511366&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Wed Aug  7 15:46:13 2013
@@ -65,7 +65,7 @@
                                 <type>war</type>
                                 <overWrite>true</overWrite>
                                 <outputDirectory>${airavata.war.dir}</outputDirectory>
-								<destFileName>airavata-registry.war</destFileName>
+								<destFileName>airavata-services.war</destFileName>
                             </artifactItem>
 						  </artifactItems>
 						  <outputDirectory>${airavata.war.dir}</outputDirectory>

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=1511366&r1=1511365&r2=1511366&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
Wed Aug  7 15:46:13 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
 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=1511366&r1=1511365&r2=1511366&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 Wed Aug
 7 15:46:13 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
 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=1511366&r1=1511365&r2=1511366&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Wed Aug  7 15:46:13 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-registry</rest.service.context>
+        <rest.service.context>airavata-services</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=1511366&r1=1511365&r2=1511366&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
Wed Aug  7 15:46:13 2013
@@ -155,7 +155,7 @@ public class BaseCaseIT {
         String strContext = System.getProperty("test.server.context");
 
         if (strContext == null) {
-            strContext = "airavata-registry";
+            strContext = "airavata-services";
         }
 
         port = Integer.parseInt(strPort);
@@ -166,7 +166,7 @@ public class BaseCaseIT {
         log("Configurations - serverUrl : " + serverUrl);
         log("Configurations - serverContext : " + serverContextName);
 
-        registryURL = "http://" + serverUrl + ":" + port + "/" + serverContextName + "/api";
+        registryURL = "http://" + serverUrl + ":" + port + "/" + serverContextName + "/registry-api";
 
         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=1511366&r1=1511365&r2=1511366&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
Wed Aug  7 15:46:13 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
 xbaya.default.gateway=default
 
 trust.store=aiaravata.jks

Modified: airavata/trunk/modules/rest/webapp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/pom.xml?rev=1511366&r1=1511365&r2=1511366&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/pom.xml (original)
+++ airavata/trunk/modules/rest/webapp/pom.xml Wed Aug  7 15:46:13 2013
@@ -50,7 +50,7 @@
 								<artifactId>airavata-rest-service-webapp</artifactId>
 								<type>war</type>
 								<properties>
-									<context>/airavata-registry</context>
+									<context>/airavata-services</context>
 								</properties>
 							</deployable>
 						</deployables>

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=1511366&r1=1511365&r2=1511366&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 Wed
Aug  7 15:46:13 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-registry/callback</callbackUri>
+        <callbackUri>https://156.56.179.169:8443/airavata-services/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-registry/WEB-INF/classes/credential-store/oauth-pubkey.pem</publicKeyFile>
+        <publicKeyFile>../webapps/airavata-services/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-registry/WEB-INF/classes/credential-store/oauth-privkey.pk8</privateKeyFile>
+        <privateKeyFile>../webapps/airavata-services/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=1511366&r1=1511365&r2=1511366&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 Wed Aug  7 15:46:13
2013
@@ -27,7 +27,7 @@
 
     <context-param>
         <param-name>oa4mp:client.config.file</param-name>
-        <param-value>${catalina.home}/webapps/airavata-registry/WEB-INF/classes/credential-store/client.xml</param-value>
+        <param-value>${catalina.home}/webapps/airavata-services/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
         </param-value-->
@@ -55,9 +55,8 @@
         <param-value>com.mysql.jdbc.Driver</param-value>
     </context-param>
 
-
     <servlet>
-        <servlet-name>Airavata Web Application</servlet-name>
+        <servlet-name>Airavata Registry 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>
@@ -65,6 +64,16 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    
+    <servlet>
+        <servlet-name>Airavata Execution 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.experiment;org.codehaus.jackson.jaxrs</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
     <!-- ========================= Security Related Configurations go here ==================================
-->
     <filter>
@@ -79,14 +88,20 @@
     <filter-mapping>
         <filter-name>AuthenticationFilter</filter-name>
         <url-pattern>/user-store/*</url-pattern>
-        <url-pattern>/api/*</url-pattern>
+        <url-pattern>/registry-api/*</url-pattern>
+        <url-pattern>/execution-service/*</url-pattern>
     </filter-mapping>
 
     <!-- ================================ End Security Related Configurations ===============================
-->
 
     <servlet-mapping>
-        <servlet-name>Airavata Web Application</servlet-name>
-        <url-pattern>/api/*</url-pattern>
+        <servlet-name>Airavata Registry Service</servlet-name>
+        <url-pattern>/registry-api/*</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>Airavata Execution Service</servlet-name>
+        <url-pattern>/execution-service/*</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=1511366&r1=1511365&r2=1511366&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
Wed Aug  7 15:46:13 2013
@@ -57,9 +57,13 @@ public class ServerMain {
                 File.separator + "bin" + File.separator + "axis2.xml");
         axis2Servlet.setLoadOnStartup(1);
 
-        StandardContext context = (StandardContext)tomcat.getTomcat().addContext("/airavata-registry",
System.getenv("AIRAVATA_HOME"));
-        Wrapper registryServlet = tomcat.addServlet("/airavata-registry", "Airavata Web Application",
"com.sun.jersey.spi.container.servlet.ServletContainer");
-        registryServlet.addInitParameter("com.sun.jersey.config.property.packages", "org.apache.airavata.services.registry.rest;org.apache.airavata.services.experiment;org.codehaus.jackson.jaxrs");
+        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);
+        
+        Wrapper registryServlet = tomcat.addServlet("/airavata-services", "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);
 
         FilterDef filter1definition = new FilterDef();
@@ -71,9 +75,11 @@ public class ServerMain {
         FilterMap filter1mapping = new FilterMap();
         filter1mapping.setFilterName("AuthenticationFilter");
         filter1mapping.addURLPattern("/user-store/*");
-        filter1mapping.addURLPattern("/api/*");
+        filter1mapping.addURLPattern("/registry-api/*");
+        filter1mapping.addURLPattern("/execution-service/*");
         context.addFilterMap(filter1mapping);
-        registryServlet.addMapping("/api/*");
+        registryServlet.addMapping("/registry-api/*");
+        executionServlet.addMapping("/execution-service/*");
         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=1511366&r1=1511365&r2=1511366&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 Wed Aug
 7 15:46:13 2013
@@ -50,7 +50,7 @@ default.registry.gateway=default
 
 #for xbaya
 xbaya.registry.user=admin
-xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.registry.url=http://localhost:8080/airavata-services/registry-api
 xbaya.default.gateway=default
 
 



Mime
View raw message