airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [01/53] [abbrv] airavata git commit: Revert "Revert "removing previous airavata client API - AIRAVATA-1371""
Date Fri, 06 Feb 2015 16:05:14 GMT
Repository: airavata
Updated Branches:
  refs/heads/gfac-storm ce7e8f951 -> e197005da


http://git-wip-us.apache.org/repos/asf/airavata/blob/6e5e336f/modules/airavata-client/src/main/resources/RegistryService.wsdl
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/resources/RegistryService.wsdl b/modules/airavata-client/src/main/resources/RegistryService.wsdl
deleted file mode 100644
index 86c85a2..0000000
--- a/modules/airavata-client/src/main/resources/RegistryService.wsdl
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--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. -->
-
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd"
-    xmlns:ns="http://services.registry.airavata.apache.org" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
-    xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-    targetNamespace="http://services.registry.airavata.apache.org">
-    <wsdl:documentation>
-        Provide Simple Service for Testing Purpose including addition, subtraction, multiplication,
-        array-generator
-    </wsdl:documentation>
-    <wsdl:types>
-        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified"
-            targetNamespace="http://services.registry.airavata.apache.org">
-            <xs:element name="isRegistryServiceStartedResponse">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element minOccurs="0" name="return" type="xs:boolean" />
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="isRegistryServiceStartedRequest" />
-    <wsdl:message name="isRegistryServiceStartedResponse">
-        <wsdl:part name="parameters" element="ns:isRegistryServiceStartedResponse" />
-    </wsdl:message>
-    <wsdl:portType name="RegistryServicePortType">
-        <wsdl:operation name="isRegistryServiceStarted">
-            <wsdl:input message="ns:isRegistryServiceStartedRequest" wsaw:Action="urn:isRegistryServiceStarted"
/>
-            <wsdl:output message="ns:isRegistryServiceStartedResponse" wsaw:Action="urn:isRegistryServiceStartedResponse"
/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="RegistryServiceSoap11Binding" type="ns:RegistryServicePortType">
-        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"
/>
-        <wsdl:operation name="isRegistryServiceStarted">
-            <soap:operation soapAction="urn:isRegistryServiceStarted" style="document"
/>
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="RegistryServiceSoap12Binding" type="ns:RegistryServicePortType">
-        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"
/>
-        <wsdl:operation name="isRegistryServiceStarted">
-            <soap12:operation soapAction="urn:isRegistryServiceStarted" style="document"
/>
-            <wsdl:input>
-                <soap12:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap12:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:binding name="RegistryServiceHttpBinding" type="ns:RegistryServicePortType">
-        <http:binding verb="POST" />
-        <wsdl:operation name="isRegistryServiceStarted">
-            <http:operation location="RegistryService/isRegistryServiceStarted" />
-            <wsdl:input>
-                <mime:content type="text/xml" part="isRegistryServiceStarted" />
-            </wsdl:input>
-            <wsdl:output>
-                <mime:content type="text/xml" part="isRegistryServiceStarted" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="RegistryService">
-        <wsdl:port name="RegistryServiceHttpSoap11Endpoint" binding="ns:RegistryServiceSoap11Binding">
-            <soap:address location="http://localhost:8080/axis2/services/RegistryService.RegistryServiceHttpSoap11Endpoint/"
/>
-        </wsdl:port>
-        <wsdl:port name="RegistryServiceHttpSoap12Endpoint" binding="ns:RegistryServiceSoap12Binding">
-            <soap12:address location="http://localhost:8080/axis2/services/RegistryService.RegistryServiceHttpSoap12Endpoint/"
/>
-        </wsdl:port>
-        <wsdl:port name="RegistryServiceHttpEndpoint" binding="ns:RegistryServiceHttpBinding">
-            <http:address location="http://localhost:8080/axis2/services/RegistryService.RegistryServiceHttpEndpoint/"
/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/airavata/blob/6e5e336f/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
b/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
deleted file mode 100644
index 617cb8f..0000000
--- a/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- * 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.airavata;
-
-import org.junit.Test;
-
-public class AiravataClientTest {
-
-    @Test
-	public void testInvokeWorkflowString() {
-//        try {
-//            AiravataClient airavataClient = new AiravataClient("airavata-client.properties");
-//            List<String> workflowTemplateIds = airavataClient.getWorkflowTemplateIds();
-//            for(String eachId:workflowTemplateIds){
-//                List<WorkflowInput> workflowInputs = airavataClient.getWorkflowInputs(eachId);
-//                for(WorkflowInput input:workflowInputs){
-//                    input.setValue("testing");
-//                }
-//                System.out.println(airavataClient.runWorkflow(eachId,workflowInputs));
-//            }
-//        } catch (RegistryException e1) {
-//            e1.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-//        } catch (IOException e1) {
-//            e1.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-//        } catch (Exception e) {
-//            e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-//        }
-    }
-
-    @Test
-    public void testExperimentDeletion() {
-//        URI uri1 = null,uri2 = null;
-//        try {
-//            uri1 = new URI("http://gw56.quarry.iu.teragrid.org:8090/jackrabbit-webapp-2.4.0/rmi");
-//            uri2 = new URI("http://gf7.ucs.indiana.edu:8030/jackrabbit/rmi");
-//        } catch (URISyntaxException e) {
-//            e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-//        }
-//        HashMap<String, String> map = new HashMap<String, String>();
-//        map.put("org.apache.jackrabbit.repository.uri", "http://gf7.ucs.indiana.edu:8030/jackrabbit/rmi");
-//        try {
-//            JCRRegistry jcrRegistry1 = new JCRRegistry(
-//                    uri1,
-//                    "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory",
-//                    "admin",
-//                    "admin", map);
-//            Session session = jcrRegistry1.getSession();
-////            session.importXML("/SERVICE_HOST",export, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
-//            javax.jcr.Node serviceHost = jcrRegistry1.getOrAddNode(jcrRegistry1.getRootNode(session),
"experiments");
-//            serviceHost.remove();
-//            session.save();
-////            javax.jcr.Node appHost = jcrRegistry1.getOrAddNode(jcrRegistry1.getRootNode(session),
"APP_HOST");
-////            javax.jcr.Node workflows = jcrRegistry1.getOrAddNode(jcrRegistry1.getRootNode(session),
"WORKFLOWS");
-////
-////            HashMap<String, String> map2 = new HashMap<String, String>();
-////            map2.put("org.apache.jackrabbit.repository.uri", "http://gf7.ucs.indiana.edu:8030/jackrabbit/rmi");
-////            JCRRegistry jcrRegistry2 = new JCRRegistry(
-////                    uri2,
-////                    "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory",
-////                    "admin",
-////                    "admin", map2);
-////            Session session2 = jcrRegistry2.getSession();
-////
-////            RepositoryCopier.copy(session.getRepository(),jcrRegistry2.getRepository());
-////            Node service_host = jcrRegistry2.getOrAddNode(jcrRegistry2.getRootNode(session2),
"SERVICE_HOST");
-////            service_host = serviceHost;
-////            session2.save();
-////
-//
-//        } catch (RepositoryException e) {
-//            e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-//        }  catch (RegistryException e) {
-//            e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-//        }
-    }
-
-    //@Test
-//    public void testRegistryServiceInvocation() throws Exception {
-//        org.apache.airavata.registry.stub.RegistryServiceStub stub =
-//                new org.apache.airavata.registry.stub.RegistryServiceStub("http://localhost:8080/axis2/services/RegistryService?wsdl");
-//        boolean registryServiceStarted = stub.isRegistryServiceStarted().getIsRegistryServiceStartedResponse().
-//                getReturn();
-//
-//        System.out.println(registryServiceStarted);
-//    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6e5e336f/modules/gfac/gfac-bes/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/pom.xml b/modules/gfac/gfac-bes/pom.xml
index f14c9f5..8fdeb7c 100644
--- a/modules/gfac/gfac-bes/pom.xml
+++ b/modules/gfac/gfac-bes/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.airavata</groupId>
 		<artifactId>gfac</artifactId>
-		<version>0.14-SNAPSHOT</version>
+		<version>0.15-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/6e5e336f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7351421..ebc35a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -509,7 +509,6 @@
 			<modules>
 				<module>modules/configuration</module>
 				<module>airavata-api</module>
-				<module>modules/airavata-client</module>
 				<module>modules/commons</module>
 				<module>modules/gfac</module>
 				<module>modules/workflow-model</module>
@@ -601,7 +600,6 @@
 				<module>modules/ws-messenger</module>
 				<module>modules/workflow-model</module>
 				<module>modules/registry</module>
-				<module>modules/airavata-client</module>
 				<module>modules/security</module>
 				<module>modules/credential-store-service</module>
 				<module>modules/orchestrator</module>


Mime
View raw message