You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/12/16 21:02:30 UTC
airavata git commit: fixing deployment issue
Repository: airavata
Updated Branches:
refs/heads/develop dc65b9c51 -> b33d72be7
fixing deployment issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b33d72be
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b33d72be
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b33d72be
Branch: refs/heads/develop
Commit: b33d72be7a0b0adbf1c827a64afbcc5c4d732c84
Parents: dc65b9c
Author: scnakandala <su...@gmail.com>
Authored: Fri Dec 16 16:02:18 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Dec 16 16:02:18 2016 -0500
----------------------------------------------------------------------
modules/sharing-registry/sharing-registry-server/pom.xml | 8 --------
.../apache/airavata/sharing/registry/db/utils/JPAUtils.java | 2 +-
.../apache/airavata/sharing/registry/server/ServerMain.java | 3 ++-
3 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b33d72be/modules/sharing-registry/sharing-registry-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 2822f35..69b16fd 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -73,14 +73,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.airavata.sharing.registry.server.SharingRegistryServer</mainClass>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.openjpa</groupId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/b33d72be/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
index 8592adb..3cfd60a 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java
@@ -87,7 +87,7 @@ public class JPAUtils {
// properties.put("openjpa.DataCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
// properties.put("openjpa.QueryCache","" + readServerProperties(JPA_CACHE_ENABLED) + "(CacheSize=" + Integer.valueOf(readServerProperties(JPA_CACHE_SIZE)) + ", SoftReferenceSize=0)");
properties.put("openjpa.RemoteCommitProvider", "sjvm");
- properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=TRACE, Tool=INFO, SQL=INFO");
+ properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
properties.put("openjpa.jdbc.QuerySQLCache", "false");
// properties.put("openjpa.Multithreaded", "true");
http://git-wip-us.apache.org/repos/asf/airavata/blob/b33d72be/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
index a34f8c8..fbe5443 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
@@ -66,7 +66,8 @@ public class ServerMain {
if(SHARING_REGISTRY_HOME==null)
SHARING_REGISTRY_HOME = "/tmp";
else
- SHARING_REGISTRY_HOME = SHARING_REGISTRY_HOME + "bin";
+ SHARING_REGISTRY_HOME = SHARING_REGISTRY_HOME + "/bin";
+ logger.info(SHARING_REGISTRY_HOME);
return new File(SHARING_REGISTRY_HOME, serverStartedFileNamePrefix + "_" + Integer.toString(serverPID)).toString();
}