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 17:13:26 UTC
airavata git commit: fixing some issues registry
Repository: airavata
Updated Branches:
refs/heads/master 63f6a53f6 -> 80a1dd315
fixing some issues registry
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/80a1dd31
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/80a1dd31
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/80a1dd31
Branch: refs/heads/master
Commit: 80a1dd315ad93ab23e07514b10b3b0cec7543db2
Parents: 63f6a53
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Jun 9 11:13:18 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Jun 9 11:13:18 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/client/samples/CreateLaunchExperiment.java | 2 +-
.../registry/core/app/catalog/model/ApplicationDeployment.java | 2 +-
.../core/app/catalog/resources/AppCatAbstractResource.java | 4 ++--
.../registry/core/app/catalog/util/AppCatalogJPAUtils.java | 2 +-
.../registry/core/experiment/catalog/ExpCatResourceUtils.java | 2 +-
.../registry/core/experiment/catalog/model/QosParam.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/80a1dd31/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index dd7856e..7e31835 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -84,7 +84,7 @@ public class CreateLaunchExperiment {
AuthzToken token = new AuthzToken("empty_token");
System.out.println("API version is " + airavataClient.getAPIVersion(token));
registerApplications(); // run this only the first time
- createAndLaunchExp();
+// createAndLaunchExp();
}
private static String fsdResourceId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/80a1dd31/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
index f42eb13..6289413 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ApplicationDeployment.java
@@ -33,7 +33,7 @@ public class ApplicationDeployment implements Serializable {
private String deploymentID;
@Column(name = "APP_MODULE_ID")
private String appModuleID;
- @Column(name = "COMPUTE_HOST_ID")
+ @Column(name = "COMPUTE_HOSTID")
private String hostID;
@Column(name = "EXECUTABLE_PATH")
private String executablePath;
http://git-wip-us.apache.org/repos/asf/airavata/blob/80a1dd31/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
index 7db1eb7..7e06859 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
@@ -47,9 +47,9 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String APP_ENVIRONMENT = "AppEnvironment";
public static final String APPLICATION_INTERFACE = "ApplicationInterface";
public static final String APP_MODULE_MAPPING = "AppModuleMapping";
- public static final String APPLICATION_INPUT = "ApplicationInput";
+ public static final String APPLICATION_INPUT = "ApplicationIntInput";
public static final String WORKFLOW_INPUT = "WorkflowInput";
- public static final String APPLICATION_OUTPUT = "ApplicationOutput";
+ public static final String APPLICATION_OUTPUT = "ApplicationIntOutput";
public static final String WORKFLOW_OUTPUT = "WorkflowOutput";
public static final String GATEWAY_PROFILE = "GatewayProfile";
public static final String COMPUTE_RESOURCE_PREFERENCE = "ComputeResourcePreference";
http://git-wip-us.apache.org/repos/asf/airavata/blob/80a1dd31/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index bd86bcb..dfc655d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -63,7 +63,7 @@ public class AppCatalogJPAUtils {
properties.put("openjpa.QueryCache","true(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
properties.put("openjpa.RemoteCommitProvider","sjvm");
properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
-// properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
+ properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.jdbc.QuerySQLCache", "false");
properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true");
factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties);
http://git-wip-us.apache.org/repos/asf/airavata/blob/80a1dd31/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
index 6b2aa5c..fc86602 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/ExpCatResourceUtils.java
@@ -61,7 +61,7 @@ public class ExpCatResourceUtils {
properties.put("openjpa.QueryCache","" + Utils.isCachingEnabled() + "(CacheSize=" + Utils.getJPACacheSize() + ", SoftReferenceSize=0)");
properties.put("openjpa.RemoteCommitProvider","sjvm");
properties.put("openjpa.Log","DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
-// properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
+ properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72, PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true");
properties.put("openjpa.jdbc.QuerySQLCache", "false");
expCatFactory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties);
http://git-wip-us.apache.org/repos/asf/airavata/blob/80a1dd31/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/QosParam.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/QosParam.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/QosParam.java
index aed731f..5694597 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/QosParam.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/QosParam.java
@@ -28,7 +28,7 @@ import java.io.Serializable;
@DataCache
@Entity
-@Table(name = "QOS_PARAMS")
+@Table(name = "QOS_PARAM")
public class QosParam implements Serializable {
@Id
@GeneratedValue