You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/06/09 18:45:09 UTC

[4/4] airavata git commit: add registry-tools

add registry-tools


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6c1eebe3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6c1eebe3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6c1eebe3

Branch: refs/heads/master
Commit: 6c1eebe31cdf0e935604503a3c001512ad9bb0d9
Parents: c75d406
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Jun 9 12:44:59 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Jun 9 12:44:59 2015 -0400

----------------------------------------------------------------------
 modules/registry/jpa-gen/pom.xml                |  42 --
 .../computeresource/BatchQueueGenerator.java    |  88 ----
 .../ComputeResourceDescriptionGenerator.java    |  82 ---
 .../DataMovementInterfaceGenerator.java         |  85 ---
 .../computeresource/FileSystemsGenerator.java   |  84 ---
 .../GridFTPDataMovementGenerator.java           |  82 ---
 .../GridFTPEndpointsGenerator.java              |  83 ---
 .../JobManagerCommandGenerator.java             |  84 ---
 .../JobSubmissionInterfaceGenerator.java        |  85 ---
 .../LocalDataMovementGenerator.java             |  80 ---
 .../LocalSubmissionGenerator.java               |  82 ---
 .../computeresource/ModuleCMDGenerator.java     |  82 ---
 .../ResourceJobManagerGenerator.java            |  83 ---
 .../SCPDataMovementGenerator.java               |  83 ---
 .../SSHJobSubmissionGenerator.java              |  85 ---
 .../main/java/generators/AbstractGenerator.java | 119 -----
 .../main/java/generators/JPAClassGenerator.java | 224 --------
 .../generators/JPAResourceClassGenerator.java   | 513 -------------------
 .../src/main/java/generators/SQLGenerator.java  |  77 ---
 .../src/main/java/model/JPAClassField.java      |  47 --
 .../src/main/java/model/JPAClassModel.java      |  34 --
 .../src/main/java/model/JPAPKClassModel.java    |  30 --
 .../main/java/model/JPAResourceClassModel.java  |  28 -
 .../jpa-gen/src/main/java/model/SQLData.java    |  79 ---
 .../jpa-gen/src/main/java/test/Test.java        |  81 ---
 modules/registry/pom.xml                        |   2 +-
 .../app/catalog/util/AppCatalogJPAUtils.java    |   5 +-
 modules/registry/registry-tools/jpa-gen/pom.xml |  42 ++
 .../computeresource/BatchQueueGenerator.java    |  88 ++++
 .../ComputeResourceDescriptionGenerator.java    |  82 +++
 .../DataMovementInterfaceGenerator.java         |  85 +++
 .../computeresource/FileSystemsGenerator.java   |  84 +++
 .../GridFTPDataMovementGenerator.java           |  82 +++
 .../GridFTPEndpointsGenerator.java              |  83 +++
 .../JobManagerCommandGenerator.java             |  84 +++
 .../JobSubmissionInterfaceGenerator.java        |  85 +++
 .../LocalDataMovementGenerator.java             |  80 +++
 .../LocalSubmissionGenerator.java               |  82 +++
 .../computeresource/ModuleCMDGenerator.java     |  82 +++
 .../ResourceJobManagerGenerator.java            |  83 +++
 .../SCPDataMovementGenerator.java               |  83 +++
 .../SSHJobSubmissionGenerator.java              |  85 +++
 .../main/java/generators/AbstractGenerator.java | 119 +++++
 .../main/java/generators/JPAClassGenerator.java | 224 ++++++++
 .../generators/JPAResourceClassGenerator.java   | 513 +++++++++++++++++++
 .../src/main/java/generators/SQLGenerator.java  |  77 +++
 .../src/main/java/model/JPAClassField.java      |  47 ++
 .../src/main/java/model/JPAClassModel.java      |  34 ++
 .../src/main/java/model/JPAPKClassModel.java    |  30 ++
 .../main/java/model/JPAResourceClassModel.java  |  28 +
 .../jpa-gen/src/main/java/model/SQLData.java    |  79 +++
 .../jpa-gen/src/main/java/test/Test.java        |  81 +++
 .../registry-tools/registry-tool/README         |   9 +
 .../registry-tools/registry-tool/pom.xml        |  56 ++
 .../airavata/registry/tool/DBMigrator.java      | 375 ++++++++++++++
 .../src/main/resources/db-migrate.sh            |  36 ++
 .../resources/db-scripts/0.6/migrate_derby.sql  |  35 ++
 .../resources/db-scripts/0.6/migrate_mysql.sql  |  32 ++
 .../resources/db-scripts/0.7/migrate_derby.sql  |  40 ++
 .../resources/db-scripts/0.7/migrate_mysql.sql  |  40 ++
 .../resources/db-scripts/0.8/migrate_derby.sql  |  72 +++
 .../resources/db-scripts/0.8/migrate_mysql.sql  |  72 +++
 tools/registry-tool/README                      |   9 -
 tools/registry-tool/pom.xml                     |  56 --
 .../airavata/registry/tool/DBMigrator.java      | 375 --------------
 .../src/main/resources/db-migrate.sh            |  36 --
 .../resources/db-scripts/0.6/migrate_derby.sql  |  35 --
 .../resources/db-scripts/0.6/migrate_mysql.sql  |  32 --
 .../resources/db-scripts/0.7/migrate_derby.sql  |  40 --
 .../resources/db-scripts/0.7/migrate_mysql.sql  |  40 --
 .../resources/db-scripts/0.8/migrate_derby.sql  |  72 ---
 .../resources/db-scripts/0.8/migrate_mysql.sql  |  72 ---
 72 files changed, 3213 insertions(+), 3212 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/pom.xml b/modules/registry/jpa-gen/pom.xml
deleted file mode 100644
index ee9e0ea..0000000
--- a/modules/registry/jpa-gen/pom.xml
+++ /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. -->
-
-<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>registry</artifactId>
-        <version>0.13-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jpa-gen</artifactId>
-    <packaging>jar</packaging>
-    <name>JPA Class Data Generator</name>
-    <url>http://airavata.apache.org/</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </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>
-    </dependencies>
-</project>

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java
deleted file mode 100644
index 9cc6558..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java
+++ /dev/null
@@ -1,88 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class BatchQueueGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("BATCH_QUEUE");
-		data.getFieldData().put("COMPUTE_RESOURCE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("QUEUE_NAME", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("QUEUE_DESCRIPTION", Arrays.asList(new String[]{"VARCHAR", "(255)",}));
-		data.getFieldData().put("MAX_RUNTIME", Arrays.asList(new String[]{"INTEGER"}));
-		data.getFieldData().put("MAX_NODES", Arrays.asList(new String[]{"INTEGER"}));
-		data.getFieldData().put("MAX_PROCESSORS", Arrays.asList(new String[]{"INTEGER"}));
-		data.getFieldData().put("MAX_JOB_IN_QUEUE", Arrays.asList(new String[]{"INTEGER"}));
-		data.getPrimaryKeys().add("COMPUTE_RESOURCE_ID");
-		data.getPrimaryKeys().add("QUEUE_NAME");
-		data.getForiegnKeys().put("COMPUTE_RESOURCE_ID", new SQLData.ForiegnKeyData("COMPUTE_RESOURCE(RESOURCE_ID)","ComputeResource","ComputeHostResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java
deleted file mode 100644
index c61a518..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java
+++ /dev/null
@@ -1,82 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class ComputeResourceDescriptionGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("COMPUTE_RESOURCE");
-		data.getFieldData().put("RESOURCE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("HOST_NAME", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("RESOURCE_DESCRIPTION", Arrays.asList(new String[]{"VARCHAR", "(255)"}));
-		data.getPrimaryKeys().add("RESOURCE_ID");
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java
deleted file mode 100644
index 21c1028..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java
+++ /dev/null
@@ -1,85 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class DataMovementInterfaceGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("DATA_MOVEMENT_INTERFACE");
-		data.getFieldData().put("COMPUTE_RESOURCE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("DATA_MOVEMENT_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("DATA_MOVEMENT_PROTOCOL", Arrays.asList(new String[]{"VARCHAR", "(255)","NOT", "NULL"}));
-		data.getFieldData().put("PRIORITY_ORDER", Arrays.asList(new String[]{"INTEGER"}));
-		data.getPrimaryKeys().add("COMPUTE_RESOURCE_ID");
-		data.getPrimaryKeys().add("DATA_MOVEMENT_INTERFACE_ID");
-		data.getForiegnKeys().put("COMPUTE_RESOURCE_ID", new SQLData.ForiegnKeyData("COMPUTE_RESOURCE(RESOURCE_ID)","ComputeResource","ComputeHostResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java
deleted file mode 100644
index 34f07e7..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java
+++ /dev/null
@@ -1,84 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class FileSystemsGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("COMPUTE_RESOURCE_FILE_SYSTEM");
-		data.getFieldData().put("COMPUTE_RESOURCE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("FILE_SYSTEM", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("PATH", Arrays.asList(new String[]{"VARCHAR", "(255)",}));
-		data.getPrimaryKeys().add("COMPUTE_RESOURCE_ID");
-		data.getPrimaryKeys().add("FILE_SYSTEM");
-		data.getForiegnKeys().put("COMPUTE_RESOURCE_ID", new SQLData.ForiegnKeyData("COMPUTE_RESOURCE(RESOURCE_ID)","ComputeResource","ComputeHostResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java
deleted file mode 100644
index 418fadc..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java
+++ /dev/null
@@ -1,82 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class GridFTPDataMovementGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("GRIDFTP_DATA_MOVEMENT");
-		data.getFieldData().put("DATA_MOVEMENT_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("SECURITY_PROTOCOL", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getPrimaryKeys().add("DATA_MOVEMENT_INTERFACE_ID");
-		return data;
-	}
-	
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java
deleted file mode 100644
index fc4e6ec..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java
+++ /dev/null
@@ -1,83 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class GridFTPEndpointsGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("GRIDFTP_ENDPOINT");
-		data.getFieldData().put("DATA_MOVEMENT_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("ENDPOINT", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getPrimaryKeys().add("DATA_MOVEMENT_INTERFACE_ID");
-		data.getPrimaryKeys().add("ENDPOINT");
-		data.getForiegnKeys().put("DATA_MOVEMENT_INTERFACE_ID", new SQLData.ForiegnKeyData("GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID)","GridftpDataMovement","GridftpDataMovementResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java
deleted file mode 100644
index 45cdbb6..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java
+++ /dev/null
@@ -1,84 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class JobManagerCommandGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("JOB_MANAGER_COMMAND");
-		data.getFieldData().put("RESOURCE_JOB_MANAGER_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("COMMAND_TYPE", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("COMMAND", Arrays.asList(new String[]{"VARCHAR", "(255)",}));
-		data.getPrimaryKeys().add("RESOURCE_JOB_MANAGER_ID");
-		data.getPrimaryKeys().add("COMMAND_TYPE");
-		data.getForiegnKeys().put("RESOURCE_JOB_MANAGER_ID", new SQLData.ForiegnKeyData("RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)","ResourceJobManager","ResourceJobManagerResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java
deleted file mode 100644
index 16fa903..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java
+++ /dev/null
@@ -1,85 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class JobSubmissionInterfaceGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("JOB_SUBMISSION_INTERFACE");
-		data.getFieldData().put("COMPUTE_RESOURCE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("JOB_SUBMISSION_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("JOB_SUBMISSION_PROTOCOL", Arrays.asList(new String[]{"VARCHAR", "(255)","NOT", "NULL"}));
-		data.getFieldData().put("PRIORITY_ORDER", Arrays.asList(new String[]{"INTEGER"}));
-		data.getPrimaryKeys().add("COMPUTE_RESOURCE_ID");
-		data.getPrimaryKeys().add("JOB_SUBMISSION_INTERFACE_ID");
-		data.getForiegnKeys().put("COMPUTE_RESOURCE_ID", new SQLData.ForiegnKeyData("COMPUTE_RESOURCE(RESOURCE_ID)","ComputeResource","ComputeHostResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java
deleted file mode 100644
index 8bfc6ac..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java
+++ /dev/null
@@ -1,80 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class LocalDataMovementGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("LOCAL_DATA_MOVEMENT");
-		data.getFieldData().put("DATA_MOVEMENT_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getPrimaryKeys().add("DATA_MOVEMENT_INTERFACE_ID");
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java
deleted file mode 100644
index df1d2ce..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java
+++ /dev/null
@@ -1,82 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class LocalSubmissionGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("LOCAL_SUBMISSION");
-		data.getFieldData().put("JOB_SUBMISSION_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("RESOURCE_JOB_MANAGER_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getPrimaryKeys().add("JOB_SUBMISSION_INTERFACE_ID");
-		data.getForiegnKeys().put("RESOURCE_JOB_MANAGER_ID", new SQLData.ForiegnKeyData("RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)","ResourceJobManager","ResourceJobManagerResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java
deleted file mode 100644
index 2b08708..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ModuleCMDGenerator.java
+++ /dev/null
@@ -1,82 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-import java.util.Arrays;
-
-public class ModuleCMDGenerator {
-    private static SQLData createSQLData() {
-        SQLData data = new SQLData();
-        data.setTableName("MODULE_LOAD_CMD");
-        data.getFieldData().put("CMD", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-        data.getFieldData().put("APP_DEPLOYMENT_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-        data.getPrimaryKeys().add("APP_DEPLOYMENT_ID");
-        data.getPrimaryKeys().add("CMD");
-        data.getForiegnKeys().put("APP_DEPLOYMENT_ID", new SQLData.ForiegnKeyData("APPLICATION_DEPLOYMENT(DEPLOYMENT_ID)","ApplicationDeployment","AppDeploymentResource"));
-        return data;
-    }
-    public static void testSqlGen() {
-        SQLData data = createSQLData();
-        SQLGenerator sqlGenerator = new SQLGenerator();
-        System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-    }
-
-    public static void testJPAClassGen() {
-        SQLData data = createSQLData();
-        JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-        jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-        JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-        System.out.println(jpaClassGenerator.generateJPAClass(model));
-        System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-        System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-    }
-
-    public static void testJPAResourceClassGen() {
-        SQLData data = createSQLData();
-        JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-        JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-        JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-        jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-        jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-        jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-        jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-        JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-        System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-        System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-        System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-        System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-
-    }
-    public static void main(String[] args) {
-        testSqlGen();
-        testJPAClassGen();
-        testJPAResourceClassGen();
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java
deleted file mode 100644
index 3a1a8e0..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java
+++ /dev/null
@@ -1,83 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class ResourceJobManagerGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("RESOURCE_JOB_MANAGER");
-		data.getFieldData().put("RESOURCE_JOB_MANAGER_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("RESOURCE_JOB_MANAGER_TYPE", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("PUSH_MONITORING_ENDPOINT", Arrays.asList(new String[]{"VARCHAR", "(255)",}));
-		data.getFieldData().put("JOB_MANAGER_BIN_PATH", Arrays.asList(new String[]{"VARCHAR", "(255)",}));
-		data.getPrimaryKeys().add("RESOURCE_JOB_MANAGER_ID");
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java
deleted file mode 100644
index 6c196d3..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java
+++ /dev/null
@@ -1,83 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class SCPDataMovementGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("SCP_DATA_MOVEMENT");
-		data.getFieldData().put("DATA_MOVEMENT_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("SECURITY_PROTOCOL", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("ALTERNATIVE_SCP_HOSTNAME", Arrays.asList(new String[]{"VARCHAR", "(255)"}));
-		data.getFieldData().put("SSH_PORT", Arrays.asList(new String[]{"INTEGER"}));
-		data.getPrimaryKeys().add("DATA_MOVEMENT_INTERFACE_ID");
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java b/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java
deleted file mode 100644
index 50f1fd1..0000000
--- a/modules/registry/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java
+++ /dev/null
@@ -1,85 +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 appcatalog.computeresource;
-
-import generators.JPAClassGenerator;
-import generators.JPAResourceClassGenerator;
-import generators.SQLGenerator;
-
-import java.util.Arrays;
-
-import model.JPAClassModel;
-import model.JPAResourceClassModel;
-import model.SQLData;
-
-public class SSHJobSubmissionGenerator {
-	private static SQLData createSQLData() {
-		SQLData data = new SQLData();
-		data.setTableName("SSH_JOB_SUBMISSION");
-		data.getFieldData().put("JOB_SUBMISSION_INTERFACE_ID", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("SECURITY_PROTOCOL", Arrays.asList(new String[]{"VARCHAR", "(255)", "NOT", "NULL"}));
-		data.getFieldData().put("RESOURCE_JOB_MANAGER_ID", Arrays.asList(new String[]{"VARCHAR", "(255)","NOT", "NULL"}));
-		data.getFieldData().put("ALTERNATIVE_SSH_HOSTNAME", Arrays.asList(new String[]{"VARCHAR", "(255)"}));
-		data.getFieldData().put("SSH_PORT", Arrays.asList(new String[]{"INTEGER"}));
-		data.getPrimaryKeys().add("JOB_SUBMISSION_INTERFACE_ID");
-		data.getForiegnKeys().put("RESOURCE_JOB_MANAGER_ID", new SQLData.ForiegnKeyData("RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)","ResourceJobManager","ResourceJobManagerResource"));
-		return data;
-	}
-	public static void testSqlGen() {
-		SQLData data = createSQLData();
-		SQLGenerator sqlGenerator = new SQLGenerator();
-		System.out.println(sqlGenerator.generateSQLCreateQuery(data));
-	}
-	
-	public static void testJPAClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		jpaClassGenerator.setJpaClassPackageName("org.apache.aiaravata.application.catalog.data.model");
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		System.out.println(jpaClassGenerator.generateJPAClass(model));
-		System.out.println(jpaClassGenerator.generateJPAPKClass(model.pkClassModel));
-		System.out.println(jpaClassGenerator.generatePersistenceXmlEntry(model));
-	}
-	
-	public static void testJPAResourceClassGen() {
-		SQLData data = createSQLData();
-		JPAClassGenerator jpaClassGenerator = new JPAClassGenerator();
-		JPAClassModel model = jpaClassGenerator.createJPAClassModel(data);
-		JPAResourceClassGenerator jpaResourceClassGenerator = new JPAResourceClassGenerator();
-		jpaResourceClassGenerator.setExceptionClassName("AppCatalogException");
-		jpaResourceClassGenerator.setJpaUtilsClassName("AppCatalogJPAUtils");
-		jpaResourceClassGenerator.setResourceTypeClassName("AppCatalogResourceType");
-		jpaResourceClassGenerator.setQueryGeneratorClassName("AppCatalogQueryGenerator");
-
-		JPAResourceClassModel model2 = jpaResourceClassGenerator.createJPAResourceClassModel(model);
-		System.out.println(jpaResourceClassGenerator.generateJPAResourceClass(model2));
-		System.out.println(jpaResourceClassGenerator.generateAbstractResourceClassUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogResourceTypeUpdates(model2));
-		System.out.println(jpaResourceClassGenerator.generateAppCatalogJPAUtilUpdates(model2));
-		
-	}
-	public static void main(String[] args) {
-		testSqlGen();
-		testJPAClassGen();
-		testJPAResourceClassGen();
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/generators/AbstractGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/generators/AbstractGenerator.java b/modules/registry/jpa-gen/src/main/java/generators/AbstractGenerator.java
deleted file mode 100644
index b4fb643..0000000
--- a/modules/registry/jpa-gen/src/main/java/generators/AbstractGenerator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package generators;
-
-import java.util.List;
-
-/*
- *
- * 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.
- *
- */
-
-public class AbstractGenerator {
-	private static final String TAB="\t";
-	
-	protected String removeLastChar(String s) {
-		return s.substring(0, s.length()-1);
-	}
-	
-	protected String addLines(String s, String...lines){
-		for (String line : lines) {
-			s=((s==null||s.equals(""))?"":s+"\n")+line;
-		}
-		return s;
-	}
-	
-	protected String convertToJavaTitleCaseStringConvention(String s){
-		String result="";
-		String[] split = s.split("_");
-		for (String item : split) {
-			result+=(item.toUpperCase().substring(0,1)+(item.length()>1?item.toLowerCase().substring(1):""));
-		}
-		return result;
-	}
-	
-	protected String convertToJavaVariableNameCaseStringConvention(String s){
-		String result=null;
-		String[] split = s.split("_");
-		for (String item : split) {
-			result=(result==null?item.toLowerCase():result+(item.toUpperCase().substring(0,1)+(item.length()>1?item.toLowerCase().substring(1):"")));
-		}
-		return result;
-	}
-	
-	protected String convertToJavaConstantNameCaseStringConvention(String s){
-		String result="";
-		for (int i = 0; i < s.length(); i++) {
-			String c=String.valueOf(s.charAt(i));
-			result+=((c.toUpperCase().equals(c) && !result.equals(""))?"_"+c:c.toUpperCase());
-		}
-		return result;
-	}
-	
-	protected String convertToTitleCaseString(String s){
-		String result="";
-		for (int i = 0; i < s.length(); i++) {
-			String c=String.valueOf(s.charAt(i));
-			result+=((c.toUpperCase().equals(c) && !result.equals(""))?" ":"")+c;
-		}
-		return result;
-	}
-	
-	protected String tabs(int n){
-		String result="";
-		for (int i = 0; i < n; i++) {
-			result+=TAB;
-		}
-		return result;
-	}
-	
-	protected String commaSeperatedString(List<String> list, String delimiter){
-		String result=null;
-		for (String s : list) {
-			result=(result==null?s:result+delimiter+s);
-		}
-		return result;
-	}
-	
-	protected String createFieldVarString(String dataType, String fieldName){
-		return "private " + dataType + " " + fieldName + ";";
-	}
-	
-	protected String createSetterString(int indents,String fieldName,
-			String dataType, String fieldTitleString) {
-	    String setterString=null;
-		setterString=addLines(setterString, tabs(indents));
-		setterString=addLines(setterString,tabs(indents)+"public void set"+fieldTitleString+"("+dataType+" "+fieldName+") {");
-		setterString=addLines(setterString,tabs(indents+1)+"this."+fieldName+"="+fieldName+";");
-		setterString=addLines(setterString,tabs(indents)+"}");
-		return setterString;
-	}
-
-	protected String createGetterString(int indents, String fieldName,
-			String dataType, String fieldTitleString) {
-	    String getterString=null;
-		getterString=addLines(getterString, tabs(indents));
-		getterString=addLines(getterString,tabs(indents)+"public "+dataType+" get"+fieldTitleString+"() {");
-		getterString=addLines(getterString,tabs(indents+1)+"return "+fieldName+";");
-		getterString=addLines(getterString,tabs(indents)+"}");
-		return getterString;
-	}
-	
-	protected String createVarNameFromClassName(String s){
-		return s.substring(0,1).toLowerCase()+s.substring(1);
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/6c1eebe3/modules/registry/jpa-gen/src/main/java/generators/JPAClassGenerator.java
----------------------------------------------------------------------
diff --git a/modules/registry/jpa-gen/src/main/java/generators/JPAClassGenerator.java b/modules/registry/jpa-gen/src/main/java/generators/JPAClassGenerator.java
deleted file mode 100644
index a83e43e..0000000
--- a/modules/registry/jpa-gen/src/main/java/generators/JPAClassGenerator.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package generators;
-import java.util.ArrayList;
-import java.util.List;
-
-import model.JPAClassField;
-import model.JPAClassModel;
-import model.JPAPKClassModel;
-import model.SQLData;
-
-
-/*
- *
- * 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.
- *
- */
-
-public class JPAClassGenerator extends AbstractGenerator{
-//    private static final Logger log = LoggerFactory.getLogger(JPAClassGenerator.class);
-	private String jpaClassPackageName;
-	
-    public JPAClassModel createJPAClassModel(SQLData sqlData){
-		JPAClassModel model = new JPAClassModel();
-		model.generatePKClass=sqlData.getPrimaryKeys().size()>1;
-		model.tableName=sqlData.getTableName();
-		model.className = convertToJavaTitleCaseStringConvention(sqlData.getTableName());
-		if (model.generatePKClass) {
-			model.pkClassModel.className=model.className+"_PK";
-		}
-		for (String field : sqlData.getFieldData().keySet()) {
-		    String dataType = null;
-		    SQLGenerator.DataTypes sqlDataType = SQLGenerator.DataTypes.valueOf(sqlData.getFieldData().get(field).get(0));
-		    switch (sqlDataType){
-		    case LONGTEXT:case VARCHAR:
-		    	dataType="String"; break;
-		    case INTEGER: 
-		    	dataType="int"; break;
-		    case SMALLINT:
-		    	dataType="boolean"; break;
-		    case TIMESTAMP: 
-		    	dataType="Timestamp"; break;
-		    case CLOB:
-		    	dataType="String"; break;
-		    }
-		    String fieldTitleString = convertToJavaTitleCaseStringConvention(field);
-		    String fieldName = convertToJavaVariableNameCaseStringConvention(field);
-
-		    
-		    boolean foriegnKey = sqlData.getForiegnKeys().containsKey(field);
-			JPAClassField jpaField = new JPAClassField(field,fieldName,dataType,fieldTitleString,sqlData.getPrimaryKeys().contains(field),
-		    		foriegnKey,(foriegnKey?sqlData.getForiegnKeys().get(field).jpaClassName:null),
-		    		(foriegnKey?sqlData.getForiegnKeys().get(field).jpaResourceClassName:null));
-			model.fields.add(jpaField);
-		    if (model.generatePKClass){
-		    	if (sqlData.getPrimaryKeys().contains(field)){
-		    		model.pkClassModel.pkFields.add(jpaField);
-		    	}
-		    }
-		    
-		}
-		return model;
-	}
-    
-	public String generateJPAClass(JPAClassModel model){
-		String classStr = null;
-		String pkClassName = null;
-		classStr=addLines(classStr,"@DataCache");
-		classStr=addLines(classStr,"@Entity");
-		classStr=addLines(classStr,"@Table(name = \""+model.tableName+"\")");
-		String className = model.className;
-		if (model.generatePKClass) {
-			pkClassName=model.pkClassModel.className;
-			classStr = addLines(classStr,"@IdClass("+pkClassName+".class)");
-		}
-		classStr=addLines(classStr,"public class "+className+" implements Serializable {");
-		
-		List<String> columnFields=new ArrayList<String>();
-		List<String> fieldGetters=new ArrayList<String>();
-		List<String> fieldSetters=new ArrayList<String>();
-		for (JPAClassField jpaField : model.fields) {
-			String field=jpaField.tableColumnName;
-		    String fieldString=null;
-		    
-		    String fieldName = jpaField.fieldName;
-		    String dataType = jpaField.fieldDataType;
-		    String fieldTitleString = jpaField.fieldTitle;
-
-		    
-		    fieldString=addLines(fieldString, tabs(1));
-		    if (jpaField.primaryKey){
-		    	fieldString=addLines(fieldString,tabs(1)+"@Id");	
-		    }
-		    fieldString=addLines(fieldString,tabs(1)+"@Column(name = \""+field+"\")");
-			fieldString=addLines(fieldString,tabs(1)+createFieldVarString(dataType ,fieldName));
-		    columnFields.add(fieldString);
-		    
-		    
-		    fieldGetters.add(createGetterString(1, fieldName,dataType, fieldTitleString));
-
-		    fieldSetters.add(createSetterString(1, fieldName,dataType, fieldTitleString));
-		    
-		    if (jpaField.foriegnKey){
-			    fieldString=null;
-			    
-			    fieldName = createVarNameFromClassName(jpaField.foriegnKeyJPAClass);
-			    dataType = jpaField.foriegnKeyJPAClass;
-			    fieldTitleString = jpaField.foriegnKeyJPAClass;
-			    
-			    
-			    fieldString=addLines(fieldString, tabs(1));
-			    fieldString=addLines(fieldString,tabs(1)+"@ManyToOne(cascade= CascadeType.MERGE)");
-			    fieldString=addLines(fieldString,tabs(1)+"@JoinColumn(name = \""+jpaField.tableColumnName+"\")");
-				fieldString=addLines(fieldString,tabs(1)+createFieldVarString(dataType ,fieldName));
-				columnFields.add(fieldString);
-				
-			    fieldGetters.add(createGetterString(1, fieldName,dataType, fieldTitleString));
-
-			    fieldSetters.add(createSetterString(1, fieldName,dataType, fieldTitleString));
-		    }
-		}
-		classStr=addLines(classStr,columnFields.toArray(new String[]{}));
-		classStr=addLines(classStr,fieldGetters.toArray(new String[]{}));
-		classStr=addLines(classStr,fieldSetters.toArray(new String[]{}));
-		
-		classStr=addLines(classStr,"}");
-		return classStr;
-	}
-
-	public String generateJPAPKClass(JPAPKClassModel model){
-		if (model.pkFields.size()==0){
-			return "";
-		}
-		String classStr=null;
-		classStr=addLines(classStr,"public class "+model.className+" implements Serializable {");
-		
-		List<String> columnFields=new ArrayList<String>();
-		List<String> fieldGetters=new ArrayList<String>();
-		List<String> fieldSetters=new ArrayList<String>();
-		List<String> parameterList=new ArrayList<String>();
-		String constructorMethod=null;
-		for (JPAClassField jpaField : model.pkFields) {
-		    
-		    String dataType = jpaField.fieldDataType;
-		    String fieldTitleString = jpaField.fieldTitle;
-		    String fieldName = jpaField.fieldName;
-		    
-		    String fieldString=tabs(1)+createFieldVarString(dataType ,fieldName);
-		    columnFields.add(fieldString);
-		    
-		    
-		    fieldGetters.add(createGetterString(1, fieldName, dataType, fieldTitleString));
-
-		    fieldSetters.add(createSetterString(1, fieldName,	dataType, fieldTitleString));
-
-		    parameterList.add(dataType+" "+fieldName);
-		    constructorMethod=addLines(constructorMethod, tabs(2)+"this."+fieldName+" = "+fieldName+";");
-		}
-		classStr=addLines(classStr,columnFields.toArray(new String[]{}));
-		String constructorParametersString=commaSeperatedString(parameterList,", ");
-		constructorMethod=addLines(tabs(1), tabs(1)+"public "+model.className+"("+constructorParametersString+"){",constructorMethod);
-		constructorMethod=addLines(constructorMethod, tabs(1)+"}");
-		String emptyConstructorMethod=null;
-		emptyConstructorMethod=addLines(tabs(1),tabs(1)+"public "+model.className+"(){",tabs(1)+"}");
-		
-		classStr=addLines(classStr,emptyConstructorMethod);
-		classStr=addLines(classStr,constructorMethod);
-		
-
-
-
-		classStr=addLines(classStr,tabs(1));
-		classStr=addLines(classStr,tabs(1)+"@Override");
-		classStr=addLines(classStr,tabs(1)+"public boolean equals(Object o) {");
-		classStr=addLines(classStr,tabs(2)+"return false;");
-		classStr=addLines(classStr,tabs(1)+"}");
-
-		classStr=addLines(classStr,tabs(1));
-		classStr=addLines(classStr,tabs(1)+"@Override");
-		classStr=addLines(classStr,tabs(1)+"public int hashCode() {");
-		classStr=addLines(classStr,tabs(2)+"return 1;");
-		classStr=addLines(classStr,tabs(1)+"}");
-	    
-		classStr=addLines(classStr,fieldGetters.toArray(new String[]{}));
-		classStr=addLines(classStr,fieldSetters.toArray(new String[]{}));
-		
-		classStr=addLines(classStr,"}");
-		return classStr;
-	}
-
-	public String generatePersistenceXmlEntry(JPAClassModel model){
-		String xmlEntry=null;
-		xmlEntry=addLines(xmlEntry,"<persistence xmlns=\"http://java.sun.com/xml/ns/persistence\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"1.0\">");
-		xmlEntry=addLines(xmlEntry,tabs(1)+"<persistence-unit name=\"appcatalog_data\">");
-		xmlEntry=addLines(xmlEntry,tabs(2)+"<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>");
-		xmlEntry=addLines(xmlEntry,tabs(2)+"<class>"+getJpaClassPackageName()+"."+model.className+"</class>");
-		xmlEntry=addLines(xmlEntry,tabs(2)+"<exclude-unlisted-classes>true</exclude-unlisted-classes>");
-		xmlEntry=addLines(xmlEntry,tabs(1)+"</persistence-unit>");
-		xmlEntry=addLines(xmlEntry,"</persistence>");
-		return xmlEntry;
-	}
-	
-	public String getJpaClassPackageName() {
-		return jpaClassPackageName;
-	}
-
-	public void setJpaClassPackageName(String jpaClassPackageName) {
-		this.jpaClassPackageName = jpaClassPackageName;
-	}
-	
-}