airavata-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sachith Withana <swsach...@gmail.com>
Subject Re: git commit: adding the new sql script in new module
Date Tue, 17 Jun 2014 18:54:42 GMT
Hi Chathuri,

Thanks a lot for the suggestion.

I was initially under the impression that it was being used currently by
the users ( including the GSoC students) to register the applications.
I didn't want to disturb the current working catalog.

I would modify the said module under the app catalog.

I'm trying to make it more like the registry folder structure so that the
CPI and the implementations are visible separately.


On Tue, Jun 17, 2014 at 7:14 PM, Chathuri Wimalasena <kamalasini@gmail.com>
wrote:

> Hi Sachith,
>
> Why did you add another project inside app-catalog ? The scripts are
> already inside app-catalog-data/src/main/resources. I think it is better to
> just modify the same scripts instead of adding another project since it
> already has all the JPA models.
>
> Thanks..
> Chathuri
>
>
> On Mon, Jun 16, 2014 at 7:56 PM, <sachith@apache.org> wrote:
>
>> Repository: airavata
>> Updated Branches:
>>   refs/heads/master 18fb76e31 -> 6abdb5f1e
>>
>>
>> adding the new sql script in new module
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6abdb5f1
>> Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6abdb5f1
>> Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6abdb5f1
>>
>> Branch: refs/heads/master
>> Commit: 6abdb5f1ee1698a3b416790437e1a75434f9abd2
>> Parents: 18fb76e
>> Author: Sachith Withana <sachith@apache.org>
>> Authored: Tue Jun 17 05:27:55 2014 +0530
>> Committer: Sachith Withana <sachith@apache.org>
>> Committed: Tue Jun 17 05:27:55 2014 +0530
>>
>> ----------------------------------------------------------------------
>>  modules/app-catalog/app-catalog-jpa/pom.xml     | 131 ++++++++++++
>>  .../src/main/resources/META-INF/persistence.xml |  28 +++
>>  .../src/main/resources/appcatalog-mysql_new.sql | 201 +++++++++++++++++++
>>  3 files changed, 360 insertions(+)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/6abdb5f1/modules/app-catalog/app-catalog-jpa/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/app-catalog/app-catalog-jpa/pom.xml
>> b/modules/app-catalog/app-catalog-jpa/pom.xml
>> new file mode 100644
>> index 0000000..01cdd98
>> --- /dev/null
>> +++ b/modules/app-catalog/app-catalog-jpa/pom.xml
>> @@ -0,0 +1,131 @@
>> +<?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/maven-v4_0_0.xsd">
>> +
>> +    <parent>
>> +        <groupId>org.apache.airavata</groupId>
>> +        <artifactId>app-catalog</artifactId>
>> +        <version>0.12-SNAPSHOT</version>
>> +        <relativePath>../pom.xml</relativePath>
>> +    </parent>
>> +
>> +    <modelVersion>4.0.0</modelVersion>
>> +    <artifactId>app-catalog-jpa</artifactId>
>> +    <packaging>jar</packaging>
>> +    <name>Airavata Application Catalog JPA</name>
>> +    <url>http://airavata.apache.org/</url>
>> +
>> +    <dependencies>
>> +        <dependency>
>> +            <groupId>org.slf4j</groupId>
>> +            <artifactId>slf4j-api</artifactId>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.airavata</groupId>
>> +            <artifactId>airavata-data-models</artifactId>
>> +            <version>${project.version}</version>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.airavata</groupId>
>> +            <artifactId>airavata-common-utils</artifactId>
>> +            <version>${project.version}</version>
>> +        </dependency>
>> +        <!-- Test -->
>> +        <dependency>
>> +            <groupId>junit</groupId>
>> +            <artifactId>junit</artifactId>
>> +            <scope>test</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.slf4j</groupId>
>> +            <artifactId>jcl-over-slf4j</artifactId>
>> +            <scope>test</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.slf4j</groupId>
>> +            <artifactId>slf4j-log4j12</artifactId>
>> +            <scope>test</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.openjpa</groupId>
>> +            <artifactId>openjpa-all</artifactId>
>> +            <version>2.2.0</version>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.derby</groupId>
>> +            <artifactId>derby</artifactId>
>> +            <version>${derby.version}</version>
>> +            <scope>test</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.derby</groupId>
>> +            <artifactId>derbyclient</artifactId>
>> +            <version>${derby.version}</version>
>> +            <scope>test</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.derby</groupId>
>> +            <artifactId>derbynet</artifactId>
>> +            <version>${derby.version}</version>
>> +            <scope>test</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.derby</groupId>
>> +            <artifactId>derbytools</artifactId>
>> +            <version>${derby.version}</version>
>> +            <scope>test</scope>
>> +        </dependency>
>> +    </dependencies>
>> +
>> +    <build>
>> +        <plugins>
>> +            <plugin>
>> +                <groupId>org.apache.maven.plugins</groupId>
>> +                <artifactId>maven-antrun-plugin</artifactId>
>> +                <version>${antrun.version}</version>
>> +                <executions>
>> +                    <execution>
>> +                        <phase>process-classes</phase>
>> +                        <configuration>
>> +                            <tasks>
>> +                                <taskdef name="openjpac"
>> classname="org.apache.openjpa.ant.PCEnhancerTask"
>> classpathref="maven.compile.classpath" />
>> +                                <openjpac>
>> +                                    <classpath
>> refid="maven.compile.classpath" />
>> +                                </openjpac>
>> +                            </tasks>
>> +                        </configuration>
>> +                        <goals>
>> +                            <goal>run</goal>
>> +                        </goals>
>> +                    </execution>
>> +                </executions>
>> +            </plugin>
>> +            <plugin>
>> +                <groupId>org.apache.maven.plugins</groupId>
>> +                <artifactId>maven-surefire-plugin</artifactId>
>> +                <version>${surefire.version}</version>
>> +                <inherited>true</inherited>
>> +                <configuration>
>> +                    <failIfNoTests>false</failIfNoTests>
>> +                    <skipTests>${skipTests}</skipTests>
>> +
>>  <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
>> +                    <!-- making sure that the sure-fire plugin doesn't
>> run the integration tests-->
>> +                    <!-- Integration tests are run using the fail-safe
>> plugin in the module pom-->
>> +                    <excludes>
>> +                        <exclude>**/TaskDetailResourceTest.java</exclude>
>> +
>>  <exclude>**/WorkflowNodeDetailResourceTest.java</exclude>
>> +                    </excludes>
>> +                </configuration>
>> +            </plugin>
>> +        </plugins>
>> +    </build>
>> +
>> +</project>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/6abdb5f1/modules/app-catalog/app-catalog-jpa/src/main/resources/META-INF/persistence.xml
>> ----------------------------------------------------------------------
>> diff --git
>> a/modules/app-catalog/app-catalog-jpa/src/main/resources/META-INF/persistence.xml
>> b/modules/app-catalog/app-catalog-jpa/src/main/resources/META-INF/persistence.xml
>> new file mode 100644
>> index 0000000..7335d90
>> --- /dev/null
>> +++
>> b/modules/app-catalog/app-catalog-jpa/src/main/resources/META-INF/persistence.xml
>> @@ -0,0 +1,28 @@
>> +<?xml version="1.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.
>> + *
>> +* -->
>> +<persistence xmlns="http://java.sun.com/xml/ns/persistence"
>> +       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> version="1.0">
>> +    <persistence-unit name="appcatalog_data">
>> +
>>  <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
>> +        <exclude-unlisted-classes>true</exclude-unlisted-classes>
>> +    </persistence-unit>
>> +</persistence>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/6abdb5f1/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql
>> ----------------------------------------------------------------------
>> diff --git
>> a/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql
>> b/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql
>> new file mode 100644
>> index 0000000..802f3d4
>> --- /dev/null
>> +++
>> b/modules/app-catalog/app-catalog-jpa/src/main/resources/appcatalog-mysql_new.sql
>> @@ -0,0 +1,201 @@
>> +/*
>> + *
>> + * 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.
>> + *
>> + */
>> +
>> +
>> +CREATE TABLE GATEWAY_PROFILE
>> +(
>> +        GATEWAY_ID VARCHAR(255),
>> +        GATEWAY_NAME VARCHAR (255),
>> +        GATEWAY_DESCRIPTION VARCHAR (255),
>> +        PRIMARY KEY(GATEWAY_ID)
>> +
>> +);
>> +
>> +CREATE TABLE APPLICATION
>> +(
>> +        APPLICATION_ID VARCHAR(255),
>> +        APPLICATION_NAME VARCHAR(255),
>> +        GATEWAY_ID VARCHAR(255),
>> +        IS_PUBLIC BOOLEAN,
>> +        APPLICATION_DESCRIPTION VARCHAR (255),
>> +        PRIMARY KEY(APPLICATION_ID),
>> +        FOREIGN KEY(GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID)
>> ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE GATEWAY_APPLICATIONS
>> +(
>> +        GATEWAY_ID VARCHAR (255),
>> +        APPLICATION_ID VARCHAR (255),
>> +        IS_TURNED_ON BOOLEAN,
>> +        PRIMARY KEY(GATEWAY_ID,APPLICATION_ID),
>> +        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID)
>> ON DELETE CASCADE,
>> +        FOREIGN KEY (APPLICATION_ID) REFERENCES
>> APPLICATION(APPLICATION_ID) ON DELETE CASCADE
>> +
>> +);
>> +
>> +CREATE TABLE INPUT_OUTPUTS
>> +(
>> +        ID VARCHAR (255),
>> +        NAME VARCHAR (255),
>> +        TYPE VARCHAR (255),
>> +        MAXSIZE INTEGER ,
>> +        MINSIZE INTEGER ,
>> +        PRIMARY KEY (ID)
>> +
>> +);
>> +
>> +CREATE TABLE APPLICATION_INPUT_OUTPUTS
>> +(
>> +        APPLICATION_ID VARCHAR (255),
>> +        INPUT_OUTPUT_ID VARCHAR (255),
>> +        IS_INPUT BOOLEAN,
>> +        PRIMARY KEY (APPLICATION_ID,INPUT_OUTPUT_ID),
>> +        FOREIGN KEY (APPLICATION_ID) REFERENCES
>> APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
>> +        FOREIGN KEY (INPUT_OUTPUT_ID) REFERENCES INPUT_OUTPUTS(ID) ON
>> DELETE CASCADE
>> +
>> +);
>> +
>> +CREATE TABLE COMPUTE_RESOURCE
>> +(
>> +         RESOURCE_ID VARCHAR(255),
>> +         HOST_NAME VARCHAR(255),
>> +         IP_ADDRESS VARCHAR(255),
>> +         DESCRIPTION VARCHAR(255),
>> +         SCRATCH_LOCATION VARCHAR(255),
>> +         PREFERRED_JOB_SUBMISSION_PROTOCOL VARCHAR(255),
>> +         PRIMARY KEY(RESOURCE_ID)
>> +);
>> +
>> +
>> +CREATE TABLE DEPLOYMENT
>> +(
>> +        DEPLOYMENT_ID VARCHAR (255),
>> +        COMPUTE_RESOURCE_ID VARCHAR (255),
>> +        DEPLOYMENT_HOST_NAME VARCHAR (255),
>> +        INPUT_DIR_ID VARCHAR (255),
>> +        ERROR_DIR VARCHAR (255),
>> +        OUTPUT_DIR VARCHAR (255),
>> +        SCRATCH_DIR VARCHAR (255),
>> +        EXECUTION_PATH VARCHAR (255),
>> +        CPU_COUNT SMALLINT ,
>> +        NODE_COUNT SMALLINT ,
>> +        PRIMARY KEY (DEPLOYMENT_ID),
>> +        FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +
>> +
>> +);
>> +
>> +CREATE TABLE APPLICATION_DEPLOYMENT
>> +(
>> +        APPLICATION_ID VARCHAR (255),
>> +        DEPLOYMENT_ID VARCHAR (255),
>> +        DEPLOYMENT_HOST_NAME VARCHAR (255),
>> +        PRIMARY KEY (APPLICATION_ID,DEPLOYMENT_ID),
>> +        FOREIGN KEY (APPLICATION_ID) REFERENCES
>> APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
>> +        FOREIGN KEY (DEPLOYMENT_ID) REFERENCES DEPLOYMENT(DEPLOYMENT_ID)
>> ON DELETE CASCADE
>> +
>> +);
>> +
>> +CREATE TABLE JOB_SUBMISSION_PROTOCOL
>> +(
>> +         RESOURCE_ID VARCHAR(255),
>> +         SUBMISSION_ID VARCHAR(255),
>> +         JOB_TYPE VARCHAR(255),
>> +         PRIMARY KEY(RESOURCE_ID,SUBMISSION_ID,JOB_TYPE),
>> +         FOREIGN KEY (RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE DATA_MOVEMENT_PROTOCOL
>> +(
>> +         RESOURCE_ID VARCHAR(255),
>> +         DATA_MOVE_ID VARCHAR(255),
>> +         JOB_TYPE VARCHAR(255),
>> +         PRIMARY KEY(RESOURCE_ID,DATA_MOVE_ID,JOB_TYPE),
>> +         FOREIGN KEY (RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE GSISSH_SUBMISSION
>> +(
>> +         SUBMISSION_ID VARCHAR(255),
>> +         RESOURCE_ID VARCHAR(255),
>> +         RESOURCE_JOB_MANAGER VARCHAR(255),
>> +         SSH_PORT INTEGER,
>> +         INSTALLED_PATH VARCHAR(255),
>> +         MONITOR_MODE VARCHAR(255),
>> +         PRIMARY KEY(SUBMISSION_ID),
>> +         FOREIGN KEY (RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE GSISSH_EXPORT
>> +(
>> +         SUBMISSION_ID VARCHAR(255),
>> +         EXPORT VARCHAR(255),
>> +         PRIMARY KEY(SUBMISSION_ID, EXPORT),
>> +         FOREIGN KEY (SUBMISSION_ID) REFERENCES
>> GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE GSISSH_PREJOBCOMMAND
>> +(
>> +         SUBMISSION_ID VARCHAR(255),
>> +         COMMAND VARCHAR(255),
>> +         PRIMARY KEY(SUBMISSION_ID, COMMAND),
>> +         FOREIGN KEY (SUBMISSION_ID) REFERENCES
>> GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE GSISSH_POSTJOBCOMMAND
>> +(
>> +         SUBMISSION_ID VARCHAR(255),
>> +         COMMAND VARCHAR(255),
>> +         PRIMARY KEY(SUBMISSION_ID, COMMAND),
>> +         FOREIGN KEY (SUBMISSION_ID) REFERENCES
>> GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE GLOBUS_SUBMISSION
>> +(
>> +         SUBMISSION_ID VARCHAR(255),
>> +         RESOURCE_ID VARCHAR(255),
>> +         RESOURCE_JOB_MANAGER VARCHAR(255),
>> +         SECURITY_PROTOCAL VARCHAR(255),
>> +         GLOBUS_GATEKEEPER_EP VARCHAR(255),
>> +         PRIMARY KEY(SUBMISSION_ID),
>> +         FOREIGN KEY (RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE SSH_SUBMISSION
>> +(
>> +         SUBMISSION_ID VARCHAR(255),
>> +         RESOURCE_ID VARCHAR(255),
>> +         RESOURCE_JOB_MANAGER VARCHAR(255),
>> +         SSH_PORT INTEGER,
>> +         PRIMARY KEY(SUBMISSION_ID),
>> +         FOREIGN KEY (RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +);
>> +
>> +CREATE TABLE SCP_DATAMOVEMENT
>> +(
>> +         DATA_MOVE_ID VARCHAR(255),
>> +         RESOURCE_ID VARCHAR(255),
>> +         RESOURCE_JOB_MANAGER VARCHAR(255),
>> +         SSH_PORT INTEGER,
>> +         PRIMARY KEY(DATA_MOVE_ID),
>> +         FOREIGN KEY (RESOURCE_ID) REFERENCES
>> COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
>> +);
>> +
>>
>>
>


-- 
Thanks,
Sachith Withana

Mime
View raw message