airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1516599 [1/6] - in /airavata/trunk: ./ modules/airavata-client/src/main/java/org/apache/airavata/client/ modules/airavata-client/src/main/java/org/apache/airavata/client/api/ modules/commons/utils/src/test/resources/ modules/distribution/a...
Date Thu, 22 Aug 2013 20:43:36 GMT
Author: samindaw
Date: Thu Aug 22 20:43:35 2013
New Revision: 1516599

URL: http://svn.apache.org/r1516599
Log:
adding updated sample workflows and updating integration tests to use war disctributions

Added:
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
  (with props)
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
  (with props)
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
  (with props)
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
  (with props)
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
  (with props)
    airavata/trunk/samples/echo-service/
    airavata/trunk/samples/echo-service/README.txt
    airavata/trunk/samples/echo-service/pom.xml
    airavata/trunk/samples/echo-service/src/
    airavata/trunk/samples/echo-service/src/main/
    airavata/trunk/samples/echo-service/src/main/java/
    airavata/trunk/samples/echo-service/src/main/java/org/
    airavata/trunk/samples/echo-service/src/main/java/org/apache/
    airavata/trunk/samples/echo-service/src/main/java/org/apache/airavata/
    airavata/trunk/samples/echo-service/src/main/java/org/apache/airavata/samples/
    airavata/trunk/samples/echo-service/src/main/java/org/apache/airavata/samples/EchoService.java
    airavata/trunk/samples/echo-service/src/main/resources/
    airavata/trunk/samples/echo-service/src/main/resources/services.xml
Removed:
    airavata/trunk/modules/xbaya-gui/src/test/resources/RangerEchoWorkflow.xwf
Modified:
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
    airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
    airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
    airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties
    airavata/trunk/modules/integration-tests/pom.xml
    airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
    airavata/trunk/modules/rest/webapp/src/main/resources/airavata-server.properties
    airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
    airavata/trunk/modules/xbaya-gui/src/test/resources/ComplexForEach.xwf
    airavata/trunk/modules/xbaya-gui/src/test/resources/ComplexMath.xwf
    airavata/trunk/modules/xbaya-gui/src/test/resources/LevenshteinDistance.xwf
    airavata/trunk/modules/xbaya-gui/src/test/resources/SimpleEcho.xwf
    airavata/trunk/modules/xbaya-gui/src/test/resources/SimpleForEach.xwf
    airavata/trunk/modules/xbaya-gui/src/test/resources/SimpleMath.xwf
    airavata/trunk/pom.xml

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Thu Aug 22 20:43:35 2013
@@ -22,6 +22,7 @@ package org.apache.airavata.client;
 
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +35,7 @@ import org.apache.airavata.client.api.Ai
 import org.apache.airavata.client.api.AiravataManager;
 import org.apache.airavata.client.api.ApplicationManager;
 import org.apache.airavata.client.api.ExecutionManager;
+import org.apache.airavata.client.api.ExperimentAdvanceOptions;
 import org.apache.airavata.client.api.ProvenanceManager;
 import org.apache.airavata.client.api.UserManager;
 import org.apache.airavata.client.api.WorkflowManager;
@@ -58,6 +60,7 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.Gateway;
 import org.apache.airavata.registry.api.PasswordCallback;
 import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.workflow.model.wf.WorkflowInput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -392,7 +395,6 @@ public class AiravataClient extends Obse
 			return getCallBack().getPassword(getCurrentUser());
 		}
 		return null;
-
 	}
 
 	public URI getRegitryURI() {
@@ -414,4 +416,13 @@ public class AiravataClient extends Obse
 	public void setGateway(String gateway) {
 		this.gateway = gateway;
 	}
+	
+	public static void main(String[] args) throws Exception {
+		AiravataAPI api = AiravataAPIFactory.getAPI(new URI("http://localhost:8080/airavata/services/registry"),
"default", "admin", new PasswordCallBackImpl("admin", "admin"));
+		ExperimentAdvanceOptions options = api.getExecutionManager().createExperimentAdvanceOptions();
+		options.getCustomWorkflowSchedulingSettings().addNewNodeSettings("data1", "comma_app",
1, 1);
+		String workflow = "Workflow3";
+		List<WorkflowInput> inputs = api.getWorkflowManager().getWorkflowInputs(workflow);
+		System.out.println(api.getExecutionManager().runExperiment(workflow, inputs,options));
+	}
 }

Added: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java?rev=1516599&view=auto
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
(added)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
Thu Aug 22 20:43:35 2013
@@ -0,0 +1,47 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.client.api;
+
+import java.net.URI;
+
+import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
+import org.apache.airavata.common.utils.Version;
+import org.apache.airavata.registry.api.PasswordCallback;
+
+public interface BaseAPI {
+
+    /**
+     * Retrieve the version associated with the Experiment Execution API
+     * @return
+     * @throws AiravataAPIInvocationException
+     */
+    public Version getVersion() throws AiravataAPIInvocationException;
+    
+    public String getUser();
+    
+    public String getGateway();
+    
+    public void initialize() throws AiravataAPIInvocationException;
+    
+	public URI getServiceURL() throws AiravataAPIInvocationException;
+	public PasswordCallback getPasswordCallback() throws AiravataAPIInvocationException;
+}
\ No newline at end of file

Propchange: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/BaseAPI.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties?rev=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/commons/utils/src/test/resources/airavata-server.properties Thu
Aug 22 20:43:35 2013
@@ -140,7 +140,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
 ###########################################################################
 
 #Update the server context root path if airavata server is deployed under a different context
root other than axis2
-server.context-root=axis2
+server.context-root=airavata-server
 
 #
 # Class which implemented HostScheduler interface. It will determine the which host to submit
the request

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Thu Aug 22 20:43:35 2013
@@ -167,6 +167,14 @@
                 <include>*.aar</include>
             </includes>
         </fileSet>
+		<fileSet>
+            <directory>../../../samples/echo-service/target
+            </directory>
+            <outputDirectory>repository/services</outputDirectory>
+            <includes>
+                <include>*.aar</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>../../xbaya-gui/src/test/resources/</directory>
             <outputDirectory>samples/workflows</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=1516599&r1=1516598&r2=1516599&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
Thu Aug 22 20:43:35 2013
@@ -140,7 +140,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
 ###########################################################################
 
 #Update the server context root path if airavata server is deployed under a different context
root other than axis2
-server.context-root=axis2
+server.context-root=airavata-server
 
 #
 # Class which implemented HostScheduler interface. It will determine the which host to submit
the request

Modified: airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties?rev=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/gfac-core/src/test/resources/airavata-server.properties Thu Aug
22 20:43:35 2013
@@ -140,7 +140,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
 ###########################################################################
 
 #Update the server context root path if airavata server is deployed under a different context
root other than axis2
-server.context-root=axis2
+server.context-root=airavata-server
 
 #
 # Class which implemented HostScheduler interface. It will determine the which host to submit
the request

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Thu Aug 22 20:43:35 2013
@@ -48,37 +48,33 @@
 					</execution>
 				</executions>
 			</plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-
-                    <execution>
-                        <id>delete-tomcat-example</id>
-                        <phase>compile</phase>
-                        <configuration>
-                            <target>
-                                <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.dependency.classpath"
/>
-                                <unzip src="../distribution/airavata-server/target/apache-airavata-server-${project.version}-bin.zip"
dest="${project.build.directory}/tests" />
-                                <unzip src="../distribution/xbaya-gui/target/apache-airavata-xbaya-gui-${project.version}-bin.zip"
dest="${project.build.directory}/tests" />
-                                <copy todir="${tomcat.work.dir}/webapps/axis2/META-INF">
-                                    <fileset dir="../distribution/airavata-server/target/axis2-${axis2.version}/META-INF"
/>
-                                </copy>
-				<copy todir="${tomcat.work.dir}/webapps/axis2/axis2-web">
-                                    <fileset dir="../distribution/airavata-server/target/axis2-${axis2.version}/axis2-web"
/>
-                                </copy>
-				<copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF">
-                                    <fileset dir="../distribution/airavata-server/target/axis2-${axis2.version}/WEB-INF"
/>
-                                </copy>
-
-                                <delete dir="${tomcat.work.dir}/webapps/examples" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>2.8</version>
+					<executions>
+						<execution>
+							<id>unpack</id>
+							<phase>compile</phase>
+							<goals>
+								<goal>unpack</goal>
+							</goals>
+							<configuration>
+								<artifactItems>
+									<artifactItem>
+										<groupId>org.apache.airavata</groupId>
+										<artifactId>apache-airavata-server</artifactId>
+										<version>${project.version}</version>
+										<type>zip</type>
+										<classifier>war</classifier>
+									</artifactItem>
+								</artifactItems>
+								<includes>**/*.war</includes>
+								<outputDirectory>${tomcat.work.dir}/webapps/</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>	
+			</plugin>
             <plugin>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.3.1</version>
@@ -100,51 +96,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-files</id>
-                        <phase>compile</phase>
-                        <configuration>
-                            <target>
-                                <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF">
-                                    <fileset dir="${airavata.work.dir}/repository/" />
-                                </copy>
-                                <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/lib">
-                                    <fileset dir="${airavata.work.dir}/lib/">
-                                            <exclude name="tomcat-*.jar" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes">
-                                    <fileset dir="${airavata.work.dir}/bin/">
-                                        <exclude name="axis2.xml" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="src/test/resources" overwrite="true">
-                                    <fileset dir="${xbaya.work.dir}/bin/">
-                                        <include name="airavata-client.properties" />
-                                    </fileset>
-                                </copy>
-                                <copy todir="${tomcat.work.dir}/webapps/axis2/WEB-INF/classes/database_scripts">
-                                    <fileset dir="${airavata.work.dir}/bin/database_scripts"
/>
-                                </copy>
-                                <chmod dir="${tomcat.work.dir}/bin" perm="700" includes="*.sh"
/>
-                                <chmod dir="${tomcat.work.dir}/webapps/axis2" perm="700"
includes="**/*" />
-                                <replace file="${tomcat.work.dir}/conf/server.xml">
-                                    <replacetoken>8080</replacetoken>
-                                    <replacevalue>${test.running.port}</replacevalue>
-                                </replace>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-
-            <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
                 <version>1.3.1</version>
@@ -167,31 +118,12 @@
                                 -Xmx512m
                                 -XX:MaxPermSize=256m
                             </cargo.jvmargs>
-                            <!--cargo.jvmargs>
-                                -Xdebug
-                                -Xrunjdwp:transport=dt_socket,server=y,suspend=${cargo.debug.suspend},address=${cargo.debug.address}
-                                -Xnoagent
-                                -Djava.compiler=NONE
-                            </cargo.jvmargs-->
-                            <!--cargo.jvmargs>
-                                <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend}
-noverify]]>
-                            </cargo.jvmargs-->
                             <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
                         </properties>
                         <type>existing</type>
                         <home>${tomcat.work.dir}</home>
 
                     </configuration>
-                    <deployables>
-                        <deployable>
-                            <groupId>org.apache.airavata</groupId>
-                            <artifactId>airavata-rest-service-webapp</artifactId>
-                            <type>war</type>
-                            <properties>
-                                <context>/${rest.service.context}</context>
-                            </properties>
-                        </deployable>
-                    </deployables>
 
                 </configuration>
                 <executions>
@@ -199,7 +131,6 @@
                         <id>start-container</id>
                         <phase>compile</phase>
                         <goals>
-                            <!--goal>deployer-deploy</goal-->
                             <goal>start</goal>
                         </goals>
                     </execution>
@@ -218,9 +149,6 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>2.5</version>
                 <configuration>
-                    <!--suiteXmlFiles>
-                        <suiteXmlFile>testng.xml</suiteXmlFile>
-                    </suiteXmlFiles-->
                     <failIfNoTests>false</failIfNoTests>
                     <systemPropertyVariables>
                         <test.server.port>${test.running.port}</test.server.port>

Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java?rev=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
(original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ResourcePathConstants.java
Thu Aug 22 20:43:35 2013
@@ -211,4 +211,25 @@ public class ResourcePathConstants {
         public static final String SUSPEND_EXPERIMENT = "suspend/experiment";
         public static final String RESUME_EXPERIMENT = "resume/experiment";
     }
+    
+    public final class ServerManagerConstants{
+    	public static final String PATH="/configuration/";
     }
+    
+    public final class ExperimentDataConstants{
+    	public static final String PATH="/data/";
+    }
+    
+    public final class ApplicationDataConstants{
+    	public static final String PATH="/application/";
+    }
+    
+    public final class WorkflowDataConstants{
+    	public static final String PATH="/workflows/";
+    }
+    
+    public final class PublishedWorkflowDataConstants{
+    	public static final String PATH="/workflows/published/";
+    }
+    
+}

Added: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java?rev=1516599&view=auto
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
(added)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
Thu Aug 22 20:43:35 2013
@@ -0,0 +1,11 @@
+package org.apache.airavata.services.experiment;
+
+import javax.ws.rs.Path;
+
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants.ExperimentDataConstants;
+import org.apache.airavata.services.registry.rest.resources.ProvenanceRegistryResource;
+
+@Path(ExperimentDataConstants.PATH)
+public class ExperimentDataService extends ProvenanceRegistryResource{
+
+}

Propchange: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/experiment/ExperimentDataService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java?rev=1516599&view=auto
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
(added)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
Thu Aug 22 20:43:35 2013
@@ -0,0 +1,11 @@
+package org.apache.airavata.services.gateway;
+
+import javax.ws.rs.Path;
+
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants.ApplicationDataConstants;
+import org.apache.airavata.services.registry.rest.resources.DescriptorRegistryResource;
+
+@Path(ApplicationDataConstants.PATH)
+public class ApplicationDataService extends DescriptorRegistryResource {
+
+}

Propchange: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/ApplicationDataService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java?rev=1516599&view=auto
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
(added)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
Thu Aug 22 20:43:35 2013
@@ -0,0 +1,11 @@
+package org.apache.airavata.services.gateway;
+
+import javax.ws.rs.Path;
+
+import org.apache.airavata.persistance.registry.jpa.resources.UserWorkflowResource;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants.WorkflowDataConstants;
+
+@Path(WorkflowDataConstants.PATH)
+public class PublishedWorkflowDataService extends UserWorkflowResource {
+
+}

Propchange: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/PublishedWorkflowDataService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java?rev=1516599&view=auto
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
(added)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
Thu Aug 22 20:43:35 2013
@@ -0,0 +1,11 @@
+package org.apache.airavata.services.gateway;
+
+import javax.ws.rs.Path;
+
+import org.apache.airavata.persistance.registry.jpa.resources.UserWorkflowResource;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants.WorkflowDataConstants;
+
+@Path(WorkflowDataConstants.PATH)
+public class WorkflowDataService extends UserWorkflowResource {
+
+}

Propchange: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/gateway/WorkflowDataService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: 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=1516599&r1=1516598&r2=1516599&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/server/ServerConfigurationService.java
Thu Aug 22 20:43:35 2013
@@ -2,9 +2,10 @@ package org.apache.airavata.services.ser
 
 import javax.ws.rs.Path;
 
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants.ServerManagerConstants;
 import org.apache.airavata.services.registry.rest.resources.ConfigurationRegistryResource;
 
-@Path("/manager/")
+@Path(ServerManagerConstants.PATH)
 public class ServerConfigurationService extends ConfigurationRegistryResource{
 
 }

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=1516599&r1=1516598&r2=1516599&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 Thu Aug
22 20:43:35 2013
@@ -139,7 +139,7 @@ msgBox.jdbc.url=jdbc:derby:wsmg;create=t
 ###########################################################################
 
 #Update the server context root path if airavata server is deployed under a different context
root other than axis2
-#server.context-root=axis2
+#server.context-root=airavata-server
 
 
 #

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=1516599&r1=1516598&r2=1516599&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
Thu Aug 22 20:43:35 2013
@@ -47,8 +47,8 @@ public class ServerMain {
         AiravataUtils.setExecutionAsServer();
         String protocol = ServerSettings.isEnableHttps() ? "https" : "http";
         BetterTomcat tomcat = new BetterTomcat(Integer.parseInt(ServerSettings.getTomcatPort(protocol)));
-        tomcat.addContext("/axis2", System.getenv("AIRAVATA_HOME"));
-        Wrapper axis2Servlet = tomcat.addServlet("/axis2", "AxisServlet", "org.apache.axis2.transport.http.AxisServlet");
+        tomcat.addContext("/airavata-server", System.getenv("AIRAVATA_HOME"));
+        Wrapper axis2Servlet = tomcat.addServlet("/airavata-server", "AxisServlet", "org.apache.axis2.transport.http.AxisServlet");
         axis2Servlet.addMapping("/servlet/AxisServlet");
         axis2Servlet.addMapping("*.jws");
         axis2Servlet.addMapping("/services/*");



Mime
View raw message