You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/04/14 20:30:48 UTC
[46/90] [abbrv] [partial] AIRAVATA-1124
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/distribution/xbaya-gui/src/main/resources/jnlp/NOTICE
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/jnlp/NOTICE b/modules/distribution/xbaya-gui/src/main/resources/jnlp/NOTICE
deleted file mode 100644
index 431db59..0000000
--- a/modules/distribution/xbaya-gui/src/main/resources/jnlp/NOTICE
+++ /dev/null
@@ -1,163 +0,0 @@
-Apache Airavata
-Copyright 2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-Apache Xerces Java Notice:
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
-
-================================================================================
-Apache XmlBeans Notice:
-
- Portions of this software were originally based on the following:
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
- Aside from contributions to the Apache XMLBeans project, this
- software also includes:
-
- - one or more source files from the Apache Xerces-J and Apache Axis
- products, Copyright (c) 1999-2003 Apache Software Foundation
-
- - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
- Consortium (Massachusetts Institute of Technology, European Research
- Consortium for Informatics and Mathematics, Keio University)
-
- - resolver.jar from Apache Xml Commons project,
- Copyright (c) 2001-2003 Apache Software Foundation
-
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
- Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
-
- - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
-
-=========================================================================================
-Apache Axis2 Notice: (axis2-*, mex-1.5.1-impl)
-
-Portions Copyright 2006 International Business Machines Corp.
-Portions Copyright 2005-2007 WSO2, Inc.
-
-This product also includes schemas and specification developed by:
-- the W3C consortium (http://www.w3c.org)
-
-This product also includes WS-* schemas developed by International
-Business Machines Corporation, Microsoft Corporation, BEA Systems,
-TIBCO Software, SAP AG, Sonic Software, and VeriSign
-
-This product also includes a WSDL developed by salesforce.com
-- Copyright 1999-2006 salesforce.com, inc.
-Portions of the included xmlbeans library were originally based on the following:
-- software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-====================================================================================
-Apache Derby Notice:
-
-Portions of Derby were originally developed by
-International Business Machines Corporation and are
-licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement",
-informally known as the "Derby CLA".
-The following copyright notice(s) were affixed to portions of the code
-with which this file is now or was at one time distributed
-and are placed here unaltered.
-
-(C) Copyright 1997,2004 International Business Machines Corporation. All rights reserved.
-
-(C) Copyright IBM Corp. 2003.
-
-=======================
-
-The portion of the functionTests under 'nist' was originally
-developed by the National Institute of Standards and Technology (NIST),
-an agency of the United States Department of Commerce, and adapted by
-International Business Machines Corporation in accordance with the NIST
-Software Acknowledgment and Redistribution document at
-http://www.itl.nist.gov/div897/ctg/sql_form.htm
-
-========================
-
-The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
-java/stubs/jdbc3) were produced by trimming sources supplied by the
-Apache Harmony project. In addition, the Harmony SerialBlob and
-SerialClob implementations are used. The following notice covers the Harmony sources:
-
-Portions of Harmony were originally developed by
-Intel Corporation and are licensed to the Apache Software
-Foundation under the "Software Grant and Corporate Contribution
-License Agreement", informally known as the "Intel Harmony CLA".
-
-=============================================================================
-Apache Woden Notice:
-
- This product also includes software developed by :
-
- - IBM Corporation (http://www.ibm.com),
- WSDL4J was the initial code contribution for the Apache Woden
- project and some of the WSDL4J design and code has been reused.
- - The W3C Consortium (http://www.w3c.org),
- Common W3C XML Schema and DTD files are packaged with Apache Woden.
-
- Please read the different LICENSE files present in the root directory of
- this distribution.
-
-=========================================================================
-Woodstox Notice:
-
-This product includes software developed by the Woodstox Project
-(http://woodstox.codehaus.org/)
-
-This product currently only contains code developed by authors
-of specific components, as identified by the source code files.
-
-Since product implements StAX API, it has dependencies to StAX API
-classes.
-
-For additional credits (generally to people who reported problems)
-see CREDITS file.
-
-===========================================================================
-Apache xml-commons xml-apis Notice:
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
-
-================================================================================================
-Apache Xalan Notice:
-
-Portions of this software was originally based on the following:
- - software copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
- - software copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
- - software copyright (c) 2003, IBM Corporation., http://www.ibm.com.
- - voluntary contributions made by Ovidiu Predescu (ovidiu@cup.hp.com) on behalf of the
- Apache Software Foundation and was originally developed at Hewlett Packard Company.
-================================================================================================
-Apache OpenJPA Notice:
-
-OpenJPA includes software developed by the SERP project
-Copyright (c) 2002-2006, A. Abram White. All rights reserved.
-
-OpenJPA includes the persistence and orm schemas from the JPA specifications.
-Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
-OpenJPA elects to include this software in this distribution under the
-CDDL license. You can obtain a copy of the License at:
- https://glassfish.dev.java.net/public/CDDL+GPL.html
-The source code is available at:
- https://glassfish.dev.java.net/source/browse/glassfish/
-
-OpenJPA includes software written by Miroslav Nachev
-OpenJPA uses test code written by Charles Tillman.
-================================================================================================
-Apache XmlSchema Notice:
-
-Portions Copyright 2006 International Business Machines Corp.
-================================================================================================
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/distribution/xbaya-gui/src/main/resources/jnlp/README
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/jnlp/README b/modules/distribution/xbaya-gui/src/main/resources/jnlp/README
deleted file mode 100644
index 092c20e..0000000
--- a/modules/distribution/xbaya-gui/src/main/resources/jnlp/README
+++ /dev/null
@@ -1,91 +0,0 @@
-Apache Airavata XBaya JNLP - README.txt
-Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
---------------------------------------------------------------------------------
-
-About
-=====
-Apache Airavata, a software framework to executing and managing computational jobs on
-distributed computing resources including local clusters, supercomputers, national grids,
-academic and commercial clouds. Airavata can be used as individual components or
-as an integrated solution to build science gateways or general-purpose distributed
-application and workflow management systems. Users can use Airavata back end services
-and build gadgets to deploy in open social containers such as Apache Rave and modify them
-to suit their needs. Airavata builds on general concepts of service oriented computing,
-distributed messaging, and workflow composition and orchestration.
-
-This distribution is a client gui application designed to be hosted on a web server as
-a web start application that can compose workflows, application descriptors & communicate
-with the airavata server to persist user data, run & monitor experiments and analyze
-the results.
-
-Release Notes
-=============
-0.11 is the tenth release of Airavata (skipped 0.1-INCUBATNG). This release focuses GFac rearchitecturing and more GFac level changes. For detailed tasks list, please see RELEASE_NOTES.
-
-Building from source
-====================
-For brief installation instructions, see INSTALL
-For detailed installation and further instructions refer http://airavata.apache.org/ - Documentation section in left hand panel. Step by step with proper documentation are provided.
-
-Known Issues in This Release
-============================
-This is the base release and is focused on a good foundation and less on features. This
-version is not recommended for production usage.
-
-Airavata XBaya JNLP Distribution Directory Structure
-====================================================
-
- AIRAVATA_XBAYA_JNLP
- ├── lib
- ├── airavata-logo.gif
- ├── INSTALL
- ├── LICENSE
- ├── NOTICE
- ├── README
- └── xbaya.jnlp
-
-How to test and run samples
-===========================
-* If you built Airavata from source, and if you see "BUILD SUCCESS", then the test cases should have passes.
-* The test cases are beyond unit level, they startup embedded services and run through basic workflow use cases.
-* To walk through Airavata features, follow "Airavata in Five Minutes" tutorial at http://airavata.apache.org/documentation/tutorials/airavata-in-5-minutes.html
-* For intermediate level Airavata features, follow "Airavata in Ten Minutes" tutorial at http://airavata.apache.org/documentation/tutorials/airavata-in-10-minutes.html
-* For advanced use cases, please contact mailing lists - http://airavata.apache.org/community/mailing-lists.html
-
-Description of Directory Structure
-==================================
-
- - lib
- This contains all the libraries required to run the XBaya GUI as a Java Web Start Application.
-
- - xbaya.jnlp
- Java Web start file
-
- - README
- This document.
-
- - INSTALL
- This document will contain information on installing Apache-Airavata XBaya.
-
-Other Available Distributions
-=============================
-
-Server Distributions
---------------------
-* Airavata Server
- The Airavata Server binary distribution allows you to run a standalone Airavata Server which includes all the airavata services
- shipped with a default derby database as the backend registry.
-
-* Airavata Server Web Application
- The Airavata Server Web Application distribution allows you to run Airavata Server in a tomcat hosted environment. It includes
- all the airavata services shipped with a default derby database as the backend registry.
-
-Client Distributions
---------------------
-* Airavata XBaya
- The Airavata XBaya distribution is a client gui application capable of composing workflows, application descriptors & communicating
- with the airavata server to persist user data, run & monitor experiments and analyze the results.
-
-* Airavata Client
- The Airavata Client distribution is a set of libraries and configurations files that allow a 3rd party application to programatically
- access Airavata functionality through Airavata API.
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/distribution/xbaya-gui/src/main/resources/jnlp/xbaya.jnlp
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/jnlp/xbaya.jnlp b/modules/distribution/xbaya-gui/src/main/resources/jnlp/xbaya.jnlp
deleted file mode 100644
index 7f196d3..0000000
--- a/modules/distribution/xbaya-gui/src/main/resources/jnlp/xbaya.jnlp
+++ /dev/null
@@ -1,42 +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. -->
-
-<jnlp spec="1.0+"
- codebase="http://localhost:8080/airavata-xbaya/"
- href="xbaya.jnlp">
-<information>
- <title>XBaya</title>
- <vendor>Apache Airavata</vendor>
- <icon href="airavata-logo.gif"/>
- <offline-allowed/>
-</information>
-<security>
- <all-permissions/>
-</security>
-<resources>
- <j2se version="1.5+" java-vm-args="-Xmx1024m" />
-
- DEPENDENT_JARS
-
- <property name="log" value="org.apache.airavata.xbaya:ALL"/>
- <!--property name="javax.net.ssl.trustStore" value="client.jks"/>
- <property name="javax.net.ssl.trustStorePassword" value="airavata"/>
- <property name="javax.net.ssl.trustStoreType" value="JKS"/>
- <property name="javax.net.ssl.keyStore" value="client.jks"/>
- <property name="javax.net.ssl.keyStorePassword" value="airavata"/-->
-</resources>
-<application-desc main-class="org.apache.airavata.xbaya.XBaya">
-
-</application-desc>
-</jnlp>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/distribution/xbaya-gui/src/main/resources/xbaya.jks
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/xbaya.jks b/modules/distribution/xbaya-gui/src/main/resources/xbaya.jks
deleted file mode 100644
index 15ee6f9..0000000
Binary files a/modules/distribution/xbaya-gui/src/main/resources/xbaya.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp
----------------------------------------------------------------------
diff --git a/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp b/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp
deleted file mode 100644
index 7f196d3..0000000
--- a/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp
+++ /dev/null
@@ -1,42 +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. -->
-
-<jnlp spec="1.0+"
- codebase="http://localhost:8080/airavata-xbaya/"
- href="xbaya.jnlp">
-<information>
- <title>XBaya</title>
- <vendor>Apache Airavata</vendor>
- <icon href="airavata-logo.gif"/>
- <offline-allowed/>
-</information>
-<security>
- <all-permissions/>
-</security>
-<resources>
- <j2se version="1.5+" java-vm-args="-Xmx1024m" />
-
- DEPENDENT_JARS
-
- <property name="log" value="org.apache.airavata.xbaya:ALL"/>
- <!--property name="javax.net.ssl.trustStore" value="client.jks"/>
- <property name="javax.net.ssl.trustStorePassword" value="airavata"/>
- <property name="javax.net.ssl.trustStoreType" value="JKS"/>
- <property name="javax.net.ssl.keyStore" value="client.jks"/>
- <property name="javax.net.ssl.keyStorePassword" value="airavata"/-->
-</resources>
-<application-desc main-class="org.apache.airavata.xbaya.XBaya">
-
-</application-desc>
-</jnlp>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/pom.xml b/modules/registry/airavata-registry-service/pom.xml
deleted file mode 100644
index bc49133..0000000
--- a/modules/registry/airavata-registry-service/pom.xml
+++ /dev/null
@@ -1,116 +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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.12-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-registry-service</artifactId>
- <name>Airavata Registry Service</name>
- <description>Registry Service to expose Registry as a web service</description>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <!--dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- </dependency-->
- <!--dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency-->
- <!--dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.8</version>
- </dependency-->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${org.slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
- <executions>
- <execution>
- <id>restore-persistence</id>
- <phase>prepare-package</phase>
- <configuration>
- <tasks>
- <copy file="${project.build.outputDirectory}/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java
deleted file mode 100644
index 4fc9099..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java
+++ /dev/null
@@ -1,77 +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.registry.services;
-
-import javax.ws.rs.core.Response;
-import java.net.URI;
-import java.util.Date;
-
-public interface ConfigurationRegistryService {
- public Response getConfiguration(String key);
-
- public Response getConfigurationList(String key);
-
- public Response setConfiguration(String key, String value, Date expire);
-
- public Response addConfiguration(String key, String value, Date expire);
-
- public Response removeAllConfiguration(String key);
-
- public Response removeConfiguration(String key, String value);
-
- public Response getGFacURIs();
-
- public Response getWorkflowInterpreterURIs();
-
- public Response getEventingServiceURI();
-
- public Response getMessageBoxURI();
-
- public Response addGFacURI(URI uri);
-
- public Response addWorkflowInterpreterURI(URI uri);
-
- public Response setEventingURI(URI uri);
-
- public Response setMessageBoxURI(URI uri);
-
- public Response addGFacURIByDate(URI uri, Date expire);
-
- public Response addWorkflowInterpreterURI(URI uri, Date expire);
-
- public Response setEventingURIByDate(URI uri, Date expire);
-
- public Response setMessageBoxURIByDate(URI uri, Date expire);
-
- public Response removeGFacURI(URI uri);
-
- public Response removeAllGFacURI();
-
- public Response removeWorkflowInterpreterURI(URI uri);
-
- public Response removeAllWorkflowInterpreterURI();
-
- public Response unsetEventingURI();
-
- public Response unsetMessageBoxURI();
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java
deleted file mode 100644
index 98c93d7..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java
+++ /dev/null
@@ -1,105 +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.registry.services;
-
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
-import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
-import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
-
-import javax.ws.rs.core.Response;
-
-public interface DescriptorRegistryService {
- /*
- * Note Name changes of the descriptors should not be allowed
- */
-
- // ---------Host Descriptor data------------
- public Response isHostDescriptorExists(String descriptorName) throws RegistryException;
-
- public Response addHostDescriptor(String descriptor) throws DescriptorAlreadyExistsException, RegistryException;
-
- public Response updateHostDescriptor(String descriptor) throws DescriptorDoesNotExistsException, RegistryException;
-
- public Response getHostDescriptor(String hostName) throws DescriptorDoesNotExistsException,
- MalformedDescriptorException, RegistryException;
-
- public Response removeHostDescriptor(String hostName) throws DescriptorDoesNotExistsException, RegistryException;
-
- public Response getHostDescriptors() throws MalformedDescriptorException, RegistryException;
-
- public Response getHostDescriptorMetadata(String hostName) throws DescriptorDoesNotExistsException,
- RegistryException;
-
- // ---------Service Descriptor data------------
- public Response isServiceDescriptorExists(String descriptorName) throws RegistryException;
-
- public Response addServiceDescriptor(String descriptor) throws DescriptorAlreadyExistsException, RegistryException;
-
- public Response updateServiceDescriptor(String descriptor) throws DescriptorDoesNotExistsException,
- RegistryException;
-
- public Response getServiceDescriptor(String serviceName) throws DescriptorDoesNotExistsException,
- MalformedDescriptorException, RegistryException;
-
- public Response removeServiceDescriptor(String serviceName) throws DescriptorDoesNotExistsException,
- RegistryException;
-
- public Response getServiceDescriptors() throws MalformedDescriptorException, RegistryException;
-
- public Response getServiceDescriptorMetadata(String serviceName) throws DescriptorDoesNotExistsException,
- RegistryException;
-
- // ---------Application Descriptor data------------
- public Response isApplicationDescriptorExists(String serviceName, String hostName, String descriptorName)
- throws RegistryException;
-
- public Response addApplicationDescriptor(String serviceDescription, String hostDescriptor, String descriptor)
- throws DescriptorAlreadyExistsException, RegistryException;
-
- public Response addApplicationDesc(String serviceName, String hostName, String descriptor)
- throws DescriptorAlreadyExistsException, RegistryException;
-
- public Response udpateApplicationDescriptorByDescriptors(String serviceDescription, String hostDescriptor,
- String descriptor) throws DescriptorDoesNotExistsException, RegistryException;
-
- public Response updateApplicationDescriptor(String serviceName, String hostName, String descriptor)
- throws DescriptorDoesNotExistsException, RegistryException;
-
- public Response getApplicationDescriptor(String serviceName, String hostname, String applicationName)
- throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException;
-
- public Response getApplicationDescriptors(String serviceName, String hostname) throws MalformedDescriptorException,
- RegistryException;
-
- public Response getApplicationDescriptors(String serviceName) throws MalformedDescriptorException,
- RegistryException;
-
- public Response getApplicationDescriptors() throws MalformedDescriptorException, RegistryException;
-
- public Response removeApplicationDescriptor(String serviceName, String hostName, String applicationName)
- throws DescriptorDoesNotExistsException, RegistryException;
-
- public Response getApplicationDescriptorMetadata(String serviceName, String hostName, String applicationName)
- throws DescriptorDoesNotExistsException, RegistryException;
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java
deleted file mode 100644
index d51cf8c..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java
+++ /dev/null
@@ -1,66 +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.registry.services;
-
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.AiravataExperiment;
-import org.apache.airavata.registry.api.exception.worker.ExperimentDoesNotExistsException;
-import org.apache.airavata.registry.api.exception.worker.WorkspaceProjectAlreadyExistsException;
-import org.apache.airavata.registry.api.exception.worker.WorkspaceProjectDoesNotExistsException;
-
-import javax.ws.rs.core.Response;
-import java.util.Date;
-
-public interface ProjectsRegistryService {
- // ------------Project management
- public Response isWorkspaceProjectExists(String projectName) throws RegistryException;
-
- public Response isWorkspaceProjectExists(String projectName, String createIfNotExists) throws RegistryException;
-
- public Response addWorkspaceProject(String projectName) throws WorkspaceProjectAlreadyExistsException,
- RegistryException;
-
- public Response updateWorkspaceProject(String projectName) throws WorkspaceProjectDoesNotExistsException,
- RegistryException;
-
- public Response deleteWorkspaceProject(String projectName) throws WorkspaceProjectDoesNotExistsException,
- RegistryException;
-
- public Response getWorkspaceProject(String projectName) throws WorkspaceProjectDoesNotExistsException,
- RegistryException;
-
- public Response getWorkspaceProjects() throws RegistryException;
-
- // ------------Experiment management
- public Response addExperiment(String projectName, AiravataExperiment experiment)
- throws WorkspaceProjectDoesNotExistsException, ExperimentDoesNotExistsException, RegistryException;
-
- public Response removeExperiment(String experimentId) throws ExperimentDoesNotExistsException;
-
- public Response getExperiments() throws RegistryException;
-
- public Response getExperimentsByProject(String projectName) throws RegistryException;
-
- public Response getExperimentsByDate(Date from, Date to) throws RegistryException;
-
- public Response getExperimentsByProjectDate(String projectName, Date from, Date to) throws RegistryException;
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java
deleted file mode 100644
index 5109a0b..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java
+++ /dev/null
@@ -1,311 +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.registry.services;
-
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.workflow.NodeExecutionStatus;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeGramData;
-
-import javax.ws.rs.core.Response;
-import java.util.Date;
-
-public interface ProvenanceRegistryService {
- /*------------------------------------------- Experiment data ---------------------------------------------*/
-
- /**
- * Returns true if the experiment exists
- *
- * @param experimentId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response isExperimentExists(String experimentId) throws RegistryException;
-
- public Response isExperimentExistsThenCreate(String experimentId, boolean createIfNotPresent)
- throws RegistryException;
-
- /**
- * Save the username of the user who runs this experiment
- *
- * @param experimentId
- * @param user
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateExperimentExecutionUser(String experimentId, String user) throws RegistryException;
-
- /**
- * Retrieve the user who is runing the experiment
- *
- * @param experimentId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperimentExecutionUser(String experimentId) throws RegistryException;
-
- /**
- * Get the name of the workflow intance
- *
- * @param experimentId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperimentName(String experimentId) throws RegistryException;
-
- /**
- * Save a name for this workflow execution
- *
- * @param experimentId
- * @param experimentName
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateExperimentName(String experimentId, String experimentName) throws RegistryException;
-
- /**
- * Return the metadata information saved for the experiment
- *
- * @param experimentId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperimentMetadata(String experimentId) throws RegistryException;
-
- /**
- * Save the metadata for the experiment
- *
- * @param experimentId
- * @param metadata
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateExperimentMetadata(String experimentId, String metadata) throws RegistryException;
-
- /**
- * Return the template name of the workflow that this intance was created from
- *
- * @param workflowInstanceId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getWorkflowExecutionTemplateName(String workflowInstanceId) throws RegistryException;
-
- /**
- * Save the template name of the workflow that this intance was created from
- *
- * @param workflowInstanceId
- * @param templateName
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response setWorkflowInstanceTemplateName(String workflowInstanceId, String templateName)
- throws RegistryException;
-
- public Response getExperimentWorkflowInstances(String experimentId) throws RegistryException;
-
- /*-------------------------------------- Experiment Workflow instance node data ----------------------------------------*/
-
- public Response isWorkflowInstanceExists(String instanceId) throws RegistryException;
-
- public Response isWorkflowInstanceExistsThenCreate(String instanceId, boolean createIfNotPresent)
- throws RegistryException;
-
- /**
- * Save a status for this workflow execution with the current time at the moment
- *
- * @param instanceId
- * @param executionStatus
- * - contains the status
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateWorkflowInstanceStatusByInstance(String instanceId, String executionStatus)
- throws RegistryException;
-
- /**
- * Save a status for this workflow execution
- *
- * @param experimentID
- * @param workflowInstanceID
- * @param executionStatus
- * @param statusUpdateTime
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateWorkflowInstanceStatusByExperiment(String experimentID, String workflowInstanceID,
- String executionStatus, Date statusUpdateTime) throws RegistryException;
-
- /**
- * Return the status of the execution
- *
- * @param instanceId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getWorkflowInstanceStatus(String instanceId) throws RegistryException;
-
- /**
- * Save the input data of a node in the workflow instance of an experiment
- *
- * @param experimentID
- * @param nodeID
- * @param workflowInstanceID
- * @param data
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateWorkflowNodeInput(String experimentID, String nodeID, String workflowInstanceID, String data)
- throws RegistryException;
-
- /**
- * Save the output data of a node in the workflow instance of an experiment
- *
- * @param experimentID
- * @param nodeID
- * @param workflowInstanceID
- * @param data
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateWorkflowNodeOutput(String experimentID, String nodeID, String workflowInstanceID, String data)
- throws RegistryException;
-
- /**
- * Return a list of data passed as input for service node which regex matched nodeId, workflow template id &
- * experiment id
- *
- * @param experimentIdRegEx
- * @param workflowNameRegEx
- * - this is the workflowName or workflow template Id of an experiment
- * @param nodeNameRegEx
- * - nodeId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response searchWorkflowInstanceNodeInput(String experimentIdRegEx, String workflowNameRegEx,
- String nodeNameRegEx) throws RegistryException;
-
- /**
- * Return a list of data returned as output from service node which regex matched nodeId, workflow template id &
- * experiment id
- *
- * @param experimentIdRegEx
- * @param workflowNameRegEx
- * - this is the workflowName or workflow template Id of an experiment
- * @param nodeNameRegEx
- * - nodeId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response searchWorkflowInstanceNodeOutput(String experimentIdRegEx, String workflowNameRegEx,
- String nodeNameRegEx) throws RegistryException;
-
- public Response getWorkflowInstanceNodeInput(String workflowInstanceId, String nodeType) throws RegistryException;
-
- public Response getWorkflowInstanceNodeOutput(String workflowInstanceId, String nodeType) throws RegistryException;
-
- /*--------------------------------------- Retrieving Experiment ------------------------------------------*/
- /**
- * Return workflow execution object fully populated with data currently avaialble for that experiment
- *
- * @param experimentId
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperiment(String experimentId) throws RegistryException;
-
- /**
- * Return experiment ids of experiments launched by the given user
- *
- * @param user
- * - a regex user id
- * @return - experiment id list
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperimentIdByUser(String user) throws RegistryException;
-
- /**
- * Return experiments launched by the given user
- *
- * @param user
- * @return experiment object list each populated by current data of that experiment
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperimentByUser(String user) throws RegistryException;
-
- /**
- * Return the pageNo set of experiments launched by the given user if grouped in to pages of size pageSize
- *
- * @param user
- * @param pageSize
- * @param pageNo
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response getExperimentByUser(String user, int pageSize, int pageNo) throws RegistryException;
-
- /**
- * This will update the workflowStatus for given experimentID,workflowInstanceID combination.
- *
- * @param workflowStatusNode
- * @return
- * @throws org.apache.airavata.registry.api.exception.RegistryException
- */
- public Response updateWorkflowNodeStatus(NodeExecutionStatus workflowStatusNode) throws RegistryException;
-
- public Response updateWorkflowNodeStatus(String workflowInstanceId, String nodeId, String executionStatus)
- throws RegistryException;
-
- public Response updateWorkflowNodeStatus(String workflowInstanceId, String executionStatus)
- throws RegistryException;
-
- public Response getWorkflowNodeStatus(String workflowInstanceId, String nodeId) throws RegistryException;
-
- public Response getWorkflowNodeStartTime(String workflowInstanceId, String nodeId) throws RegistryException;
-
- public Response getWorkflowStartTime(String workflowInstanceId) throws RegistryException;
-
- /**
- * This will store the gram specific data in to repository, this can be called before submitting the workflow in to
- * Grid
- *
- * @param workflowNodeGramData
- * @return
- */
- public Response updateWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData) throws RegistryException;
-
- public Response getWorkflowInstanceData(String workflowInstanceId) throws RegistryException;
-
- public Response isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId) throws RegistryException;
-
- public Response isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId, boolean createIfNotPresent)
- throws RegistryException;
-
- public Response getWorkflowInstanceNodeData(String workflowInstanceId, String nodeId) throws RegistryException;
-
- public Response addWorkflowInstance(String experimentId, String workflowInstanceId, String templateName)
- throws RegistryException;
-
- public Response updateWorkflowNodeType(String workflowInstanceId, String nodeId, String nodeType)
- throws RegistryException;
-
- public Response addWorkflowInstanceNode(String workflowInstance, String nodeId) throws RegistryException;
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/PublishedWorkflowRegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/PublishedWorkflowRegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/PublishedWorkflowRegistryService.java
deleted file mode 100644
index 8056ca6..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/PublishedWorkflowRegistryService.java
+++ /dev/null
@@ -1,51 +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.registry.services;
-
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowAlreadyExistsException;
-import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowDoesNotExistsException;
-import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
-
-import javax.ws.rs.core.Response;
-
-public interface PublishedWorkflowRegistryService {
- public Response isPublishedWorkflowExists(String workflowName) throws RegistryException;
-
- public Response publishWorkflow(String workflowName, String publishWorkflowName)
- throws PublishedWorkflowAlreadyExistsException, UserWorkflowDoesNotExistsException, RegistryException;
-
- public Response publishWorkflow(String workflowName) throws PublishedWorkflowAlreadyExistsException,
- UserWorkflowDoesNotExistsException, RegistryException;
-
- public Response getPublishedWorkflowGraphXML(String workflowName) throws PublishedWorkflowDoesNotExistsException,
- RegistryException;
-
- public Response getPublishedWorkflowNames() throws RegistryException;
-
- public Response getPublishedWorkflows() throws RegistryException;
-
- public Response getPublishedWorkflowMetadata(String workflowName) throws RegistryException;
-
- public Response removePublishedWorkflow(String workflowName) throws PublishedWorkflowDoesNotExistsException,
- RegistryException;
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
deleted file mode 100644
index c2c48d1..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
+++ /dev/null
@@ -1,164 +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.registry.services;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import org.apache.airavata.persistance.registry.jpa.ResourceType;
-import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
-import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
-import org.apache.airavata.persistance.registry.jpa.resources.Utils;
-import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
-import org.apache.airavata.registry.api.exception.RegistrySettingsException;
-import org.apache.airavata.registry.api.util.RegistrySettings;
-import org.apache.airavata.registry.services.utils.DatabaseCreator;
-import org.apache.airavata.registry.services.utils.JdbcStorage;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.ServiceLifeCycle;
-import org.apache.derby.drda.NetworkServerControl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RegistryService implements ServiceLifeCycle {
- private static final Logger logger = LoggerFactory.getLogger(RegistryService.class);
-
- public static final String PERSISTANT_DATA = "Configuration";
- public static final String REGISTRY_DEFAULT_GATEWAY_ID = "default.registry.gateway";
- public static final String REGISTRY_DEFAULT_USER = "default.registry.user";
- public static final String REGISTRY_DEFAULT_USER_PASSWORD = "default.registry.password";
- public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
- public static final String REGISTRY_JDBC_DRIVER = "registry.jdbc.driver";
- public static final String REGISTRY_JDBC_URL = "registry.jdbc.url";
- public static final String REGISTRY_JDBC_USER = "registry.jdbc.user";
- public static final String REGISTRY_JDBC_PASSWORD = "registry.jdbc.password";
- private JdbcStorage db;
- private NetworkServerControl server;
-
- private static volatile boolean serverStarted = false;
-
- @Override
- public void startUp(ConfigurationContext configurationContext, AxisService axisService) {
- //todo have to read these properties from some configuration
- initializeDB();
- serverStarted = true;
- }
-
- private void startDerbyInServerMode() {
- try {
- System.setProperty(DERBY_SERVER_MODE_SYS_PROPERTY, "true");
- server = new NetworkServerControl(InetAddress.getByName("0.0.0.0"),
- Utils.getPort(),
- Utils.getJDBCUser(), Utils.getJDBCPassword());
- java.io.PrintWriter consoleWriter = new java.io.PrintWriter(System.out, true);
- server.start(consoleWriter);
- } catch (IOException e) {
- logger.error("Unable to start Apache derby in the server mode! Check whether " +
- "specified port is available");
- } catch (Exception e) {
- logger.error("Unable to start Apache derby in the server mode! Check whether " +
- "specified port is available");
- }
-
- }
-
- private void stopDerbyServer() {
- try {
- server.shutdown();
- serverStarted = false;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void initializeDB() {
- System.setProperty("registry.initialize.state", "0");
- String jdbcUrl = null;
- String jdbcDriver = null;
- try{
- jdbcDriver = RegistrySettings.getSetting(REGISTRY_JDBC_DRIVER);
- jdbcUrl = RegistrySettings.getSetting(REGISTRY_JDBC_URL);
- String jdbcUser = RegistrySettings.getSetting(REGISTRY_JDBC_USER);
- String jdbcPassword = RegistrySettings.getSetting(REGISTRY_JDBC_PASSWORD);
- jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
- } catch (RegistrySettingsException e) {
- logger.error("Unable to read properties" , e);
- }
-
- if (Utils.getDBType().equals("derby") && Utils.isDerbyStartEnabled()) {
- startDerbyInServerMode();
- }
- db = new JdbcStorage(10, 50, jdbcUrl, jdbcDriver, true);
-
- Connection conn = null;
- try {
- conn = db.connect();
- if (!DatabaseCreator.isDatabaseStructureCreated(PERSISTANT_DATA, conn)) {
- DatabaseCreator.createRegistryDatabase(conn);
- logger.info("New Database created for Registry");
- } else {
- logger.info("Database already created for Registry!");
- }
- try{
- GatewayResource gatewayResource = new GatewayResource();
- gatewayResource.setGatewayName(RegistrySettings.getSetting(REGISTRY_DEFAULT_GATEWAY_ID));
- gatewayResource.setOwner(RegistrySettings.getSetting(REGISTRY_DEFAULT_GATEWAY_ID));
- gatewayResource.save();
- UserResource userResource = (UserResource) gatewayResource.create(ResourceType.USER);
- userResource.setUserName(RegistrySettings.getSetting(REGISTRY_DEFAULT_USER));
- userResource.setPassword(RegistrySettings.getSetting(REGISTRY_DEFAULT_USER_PASSWORD));
- userResource.save();
- WorkerResource workerResource = (WorkerResource) gatewayResource.create(ResourceType.GATEWAY_WORKER);
- workerResource.setUser(userResource.getUserName());
- workerResource.save();
- } catch (RegistrySettingsException e) {
- logger.error("Unable to read properties", e);
- }
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- throw new RuntimeException("Database failure");
- } finally {
- db.closeConnection(conn);
- try {
- if (!conn.getAutoCommit()) {
- conn.commit();
- }
- conn.close();
- } catch (SQLException e) {
- logger.error(e.getMessage(), e);
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
- }
- System.setProperty("registry.initialize.state", "1");
- }
-
- public boolean isRegistryServiceStarted() {
- return serverStarted;
- }
-
- @Override
- public void shutDown(ConfigurationContext configurationContext, AxisService axisService) {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/UserWorkflowRegistryService.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/UserWorkflowRegistryService.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/UserWorkflowRegistryService.java
deleted file mode 100644
index 938af72..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/UserWorkflowRegistryService.java
+++ /dev/null
@@ -1,47 +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.registry.services;
-
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.exception.worker.UserWorkflowAlreadyExistsException;
-import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
-
-import javax.ws.rs.core.Response;
-
-public interface UserWorkflowRegistryService {
- public Response isWorkflowExists(String workflowName) throws RegistryException;
-
- public Response addWorkflow(String workflowName, String workflowGraphXml)
- throws UserWorkflowAlreadyExistsException, RegistryException;
-
- public Response updateWorkflow(String workflowName, String workflowGraphXml)
- throws UserWorkflowDoesNotExistsException, RegistryException;
-
- public Response getWorkflowGraphXML(String workflowName) throws UserWorkflowDoesNotExistsException,
- RegistryException;
-
- public Response getWorkflows() throws RegistryException;
-
- public Response getWorkflowMetadata(String workflowName) throws RegistryException;
-
- public Response removeWorkflow(String workflowName) throws UserWorkflowDoesNotExistsException, RegistryException;
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/0e2c10f5/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java b/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java
deleted file mode 100644
index b37575b..0000000
--- a/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/utils/ConnectionPool.java
+++ /dev/null
@@ -1,381 +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.registry.services.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Stack;
-import java.util.concurrent.Semaphore;
-
-
-/**
- * A class for preallocating, recycling, and managing JDBC connections.
- */
-public class ConnectionPool {
- private static final Logger logger = LoggerFactory.getLogger(ConnectionPool.class);
-
- private long MAX_IDLE_TIME = 5 * 60 * 1000; // 5 minutes
-
- private String driver;
- private String url;
- private String username;
- private String password;
- private String jdbcUrl;
-
- private int maxConnections;
-
- private boolean autoCommit = true;
- private boolean waitIfBusy;
-
- private Semaphore needConnection = new Semaphore(0);
- private boolean stop;
-
- private Stack<Connection> availableConnections;
- private Stack<Connection> busyConnections;
-
- private HashMap<Connection, Long> lastAccessTimeRecord = new HashMap<Connection, Long>();
-
- private String urlType = "";
-
- private DataSource datasource;
-
- private int transactionIsolation = Connection.TRANSACTION_NONE;
-
- private Thread clenupThread;
- private Thread producerThread;
-
- public ConnectionPool(String driver, String url, String username, String password, int initialConnections,
- int maxConnections, boolean waitIfBusy) throws SQLException {
- this.driver = driver;
- this.url = url;
- this.username = username;
- this.password = password;
- this.urlType = "speratedURL";
- initialize(initialConnections, maxConnections, waitIfBusy);
- }
-
- public ConnectionPool(String driver, String jdbcUrl, int initialConnections, int maxConnections,
- boolean waitIfBusy, boolean autoCommit, int transactionIsolation) throws SQLException {
- this.driver = driver;
- this.jdbcUrl = jdbcUrl;
- this.urlType = "simpleURL";
- this.autoCommit = autoCommit;
- this.transactionIsolation = transactionIsolation;
- initialize(initialConnections, maxConnections, waitIfBusy);
- }
-
- public ConnectionPool(String driver, String jdbcUrl, int initialConnections, int maxConnections, boolean waitIfBusy)
- throws SQLException {
- this.driver = driver;
- this.jdbcUrl = jdbcUrl;
- this.urlType = "simpleURL";
- initialize(initialConnections, maxConnections, waitIfBusy);
- }
-
- public ConnectionPool(DataSource dataSource, int initialConnections, int maxConnections, boolean waitIfBusy)
- throws SQLException {
- this.urlType = "dataSource";
- this.datasource = dataSource;
- initialize(initialConnections, maxConnections, waitIfBusy);
- }
-
- /**
- * Check if this connection pool is auto commit or not
- *
- * @return
- */
- public boolean isAutoCommit() {
- return this.autoCommit;
- }
-
- private void initialize(int initialConnections, int maxConnections, boolean waitIfBusy) throws SQLException {
- this.maxConnections = maxConnections;
- this.waitIfBusy = waitIfBusy;
-
- int sizeOfConnections = (initialConnections > maxConnections) ? maxConnections : initialConnections;
-
- availableConnections = new Stack<Connection>();
- busyConnections = new Stack<Connection>();
-
- for (int i = 0; i < sizeOfConnections; i++) {
- Connection con = makeNewConnection();
- setTimeStamp(con);
- availableConnections.push(con);
-
- }
-
- producerThread = new Thread(new FillUpThread());
- producerThread.start();
-
- clenupThread = new Thread(new CleanUpThread());
- clenupThread.start();
- }
-
- public synchronized Connection getConnection() throws SQLException {
- if (!availableConnections.isEmpty()) {
- Connection existingConnection = availableConnections.pop();
-
- // If connection on available list is closed (e.g.,
- // it timed out), then remove it from available list
- // and race for a connection again.
- if (existingConnection.isClosed()) {
- lastAccessTimeRecord.remove(existingConnection);
- // notifyAll for fairness
- notifyAll();
- } else {
- busyConnections.push(existingConnection);
- setTimeStamp(existingConnection);
- return existingConnection;
- }
- } else if (!waitIfBusy && busyConnections.size() >= maxConnections) {
- // You reached maxConnections limit and waitIfBusy flag is false.
- // Throw SQLException in such a case.
- throw new SQLException("Connection limit reached");
- } else {
-
- if (busyConnections.size() < maxConnections) {
- // available connection is empty, but total number of connection
- // doesn't reach maxConnection. Request for more connection
- needConnection.release();
- }
-
- try {
- // wait for free connection
- wait();
- } catch (InterruptedException ie) {
- }
- }
- // always race for connection forever
- return getConnection();
- }
-
- // This explicitly makes a new connection. Called in
- // the foreground when initializing the ConnectionPool,
- // and called in the background when running.
- private Connection makeNewConnection() throws SQLException {
- try {
- // Load database driver if not already loaded
- Class.forName(driver);
- Connection connection;
- // Establish network connection to database
- if (urlType.equals("speratedURL")) {
- connection = DriverManager.getConnection(url, username, password);
- } else if (urlType.equals("simpleURL")) {
- connection = DriverManager.getConnection(jdbcUrl);
- } else { // if(urlType.equals("dataSource")){
- connection = datasource.getConnection();
- }
- connection.setTransactionIsolation(this.transactionIsolation);
- connection.setAutoCommit(this.autoCommit);
- return connection;
- } catch (ClassNotFoundException cnfe) {
- // Simplify try/catch blocks of people using this by
- // throwing only one exception type.
- throw new SQLException("Can't find class for driver: " + driver);
- }
- }
-
- private synchronized void fillUpConnection(Connection conn) {
- setTimeStamp(conn);
- availableConnections.push(conn);
-
- // notify all since new connection is created
- notifyAll();
- }
-
- private void setTimeStamp(Connection connection) {
- lastAccessTimeRecord.put(connection, System.currentTimeMillis());
- }
-
- // The database connection cannot be left idle for too long, otherwise TCP
- // connection will be broken.
- /**
- * From http://forums.mysql.com/read.php?39,28450,57460#msg-57460 Okay, then it looks like wait_timeout on the
- * server is killing your connection (it is set to 8 hours of idle time by default). Either set that value higher on
- * your server, or configure your connection pool to not hold connections idle that long (I prefer the latter). Most
- * folks I know that run MySQL with a connection pool in high-load production environments only let connections sit
- * idle for a matter of minutes, since it only takes a few milliseconds to open a connection, and the longer one
- * sits idle the more chance it will go "bad" because of a network hiccup or the MySQL server being restarted.
- *
- * @throws SQLException
- */
- private boolean isConnectionStale(Connection connection) {
- long currentTime = System.currentTimeMillis();
- long lastAccess = lastAccessTimeRecord.get(connection);
- if (currentTime - lastAccess > MAX_IDLE_TIME) {
- return true;
- } else
- return false;
- }
-
- private synchronized void closeStaleConnections() {
- // close idle connections
- Iterator<Connection> iter = availableConnections.iterator();
- while (iter.hasNext()) {
- Connection existingConnection = iter.next();
- if (isConnectionStale(existingConnection)) {
- try {
- existingConnection.close();
- iter.remove();
- } catch (SQLException sql) {
- logger.error(sql.getMessage(), sql);
- }
- }
- }
- // close busy connections that have been checked out for too long.
- // This should not happen since this means program has bug for not
- // releasing connections .
- iter = busyConnections.iterator();
- while (iter.hasNext()) {
- Connection busyConnection = iter.next();
- if (isConnectionStale(busyConnection)) {
- try {
- busyConnection.close();
- iter.remove();
- logger.warn("****Connection has checked out too long. Forced release. Check the program for calling release connection [free(Connection) method]");
- } catch (SQLException sql) {
- logger.error(sql.getMessage(), sql);
- }
- }
- }
- }
-
- public synchronized void free(Connection connection) {
- busyConnections.removeElement(connection);
- availableConnections.addElement(connection);
- // Wake up threads that are waiting for a connection
- notifyAll();
- }
-
- /**
- * Close all the connections. Use with caution: be sure no connections are in use before calling. Note that you are
- * not <I>required</I> to call this when done with a ConnectionPool, since connections are guaranteed to be closed
- * when garbage collected. But this method gives more control regarding when the connections are closed.
- */
- public synchronized void dispose() {
- logger.info("Connection Pool Shutting down");
-
- // stop clean up thread
- this.stop = true;
- this.clenupThread.interrupt();
-
- // stop producer up thread
- this.producerThread.interrupt();
-
- // close all connection
- closeConnections(availableConnections);
- availableConnections = new Stack<Connection>();
- closeConnections(busyConnections);
- busyConnections = new Stack<Connection>();
- lastAccessTimeRecord.clear();
-
- logger.info("All connection is closed");
-
- try {
- this.clenupThread.join();
- this.producerThread.join();
- } catch (Exception e) {
- logger.error("Cannot shutdown cleanup thread", e);
- }
-
- logger.info("Connection Pool Shutdown");
- }
-
- private void closeConnections(Stack<Connection> connections) {
- while (!connections.isEmpty()) {
- Connection connection = connections.pop();
- try {
- if (!connection.isClosed()) {
- connection.close();
- }
- } catch (SQLException sqle) {
- // Ignore errors; garbage collect anyhow
- logger.warn(sqle.getMessage());
- }
- }
- }
-
- public synchronized String toString() {
- String info = "ConnectionPool(" + url + "," + username + ")" + ", available=" + availableConnections.size()
- + ", busy=" + busyConnections.size() + ", max=" + maxConnections;
- return (info);
- }
-
- class CleanUpThread implements Runnable {
- public void run() {
- while (!stop) {
- try {
- Thread.sleep(MAX_IDLE_TIME);
- closeStaleConnections();
- } catch (InterruptedException e) {
- logger.info("Clean up thread is interrupted to close");
- }
- }
- }
- }
-
- class FillUpThread implements Runnable {
- public void run() {
- while (!stop) {
- try {
- // block until get
- needConnection.acquire();
-
- Connection conn = makeNewConnection();
- fillUpConnection(conn);
- } catch (SQLException e) {
- // cannot create connection (increase semaphore value back)
- needConnection.release();
- logger.error(e.getMessage(), e);
- } catch (InterruptedException e) {
- logger.info("Fill up thread is interrupted to close");
- break;
- }
- }
- }
- }
-
- public void shutdown(){
- for (Connection c : availableConnections) {
- try {
- c.close();
- } catch (SQLException e) {
-
- }
- }
-
- for (Connection c : busyConnections) {
- try {
- c.close();
- } catch (SQLException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
- }
- }
-}