Author: lahiru
Date: Thu Sep 20 17:46:37 2012
New Revision: 1388135
URL: http://svn.apache.org/viewvc?rev=1388135&view=rev
Log:
applying AIRAVATA-581.1.patch
Added:
airavata/trunk/modules/distribution/src/main/resources/bin/derby.sh
airavata/trunk/modules/distribution/src/main/resources/bin/startNetworkServer
Modified:
airavata/trunk/modules/distribution/pom.xml
airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
airavata/trunk/modules/distribution/src/main/resources/conf/repository.properties
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Thu Sep 20 17:46:37 2012
@@ -109,6 +109,8 @@
</plugins>
</build>
<dependencies>
+
+ <!-- Derby Dependencies -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -116,6 +118,16 @@
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
Modified: airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Thu
Sep 20 17:46:37 2012
@@ -144,7 +144,8 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.sh</include>
- <include>*.bat</include>
+ <include>*.bat</include>
+ <include>startNetworkServer</include>
</includes>
</fileSet>
<fileSet>
@@ -233,6 +234,8 @@
<includes>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbytools:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
<include>org.apache.jackrabbit:jackrabbit-core:jar</include>
<include>org.apache.jackrabbit:jackrabbit-jcr-rmi:jar</include>
<include>org.slf4j:log4j-over-slf4j:jar</include>
Modified:
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
(original)
+++
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
Thu Sep 20 17:46:37 2012
@@ -18,5 +18,9 @@
# under the License.
. `dirname $0`/setenv.sh
+#cd $AIRAVATA_HOME/bin
+#chmod 777 derby.sh
+#chmod 777 startNetworkServer
+#./derby.sh &
cd $AIRAVATA_HOME/standalone-server/bin
./axis2server.sh $*
Added: airavata/trunk/modules/distribution/src/main/resources/bin/derby.sh
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/bin/derby.sh?rev=1388135&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/bin/derby.sh (added)
+++ airavata/trunk/modules/distribution/src/main/resources/bin/derby.sh Thu Sep
20 17:46:37 2012
@@ -0,0 +1,4 @@
+. `dirname $0`/setenv.sh
+export DERBY_HOME=$AIRAVATA_HOME/standalone-server
+cd $AIRAVATA_HOME/bin
+./startNetworkServer $*
Added:
airavata/trunk/modules/distribution/src/main/resources/bin/startNetworkServer
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/bin/startNetworkServer?rev=1388135&view=auto
==============================================================================
---
airavata/trunk/modules/distribution/src/main/resources/bin/startNetworkServer
(added)
+++
airavata/trunk/modules/distribution/src/main/resources/bin/startNetworkServer
Thu Sep 20 17:46:37 2012
@@ -0,0 +1,191 @@
+#!/bin/sh
+
+# 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.
+
+if [ -n "$derby_common_debug" ] ; then
+ set -x
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+ fi
+ ;;
+esac
+
+if [ -z "$DERBY_HOME" -o ! -d "$DERBY_HOME" ] ; then
+ ## resolve links - $0 may be a link to derby's home
+ PRG="$0"
+ progname=`basename "$0"`
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+ done
+
+ DERBY_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ DERBY_HOME=`cd "$DERBY_HOME" && pwd`
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$DERBY_HOME" ] &&
+ DERBY_HOME=`cygpath --unix "$DERBY_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# set DERBY_LIB location
+DERBY_LIB="${DERBY_HOME}/lib"
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java 2> /dev/null `
+ if [ -z "$JAVACMD" ] ; then
+ JAVACMD=java
+ fi
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+# set local classpath, don't overwrite the user's
+LOCALCLASSPATH=$DERBY_LIB/derby.jar:$DERBY_LIB/derbynet.jar:$DERBY_LIB/derbytools.jar:$DERBY_LIB/derbyclient.jar
+#LOCALCLASSPATH=$DERBY_LIB/derby-10.9.1.0.jar:$DERBY_LIB/derbynet-10.9.1.0.jar:$DERBY_LIB/derbytools-10.9.1.0.jar:$DERBY_LIB/derbyclient-10.9.1.0.jar
+
+
+# if CLASSPATH_OVERRIDE env var is set, LOCALCLASSPATH will be
+# user CLASSPATH first and derby-found jars after.
+# In that case, the user CLASSPATH will override derby-found jars
+#
+# if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour
+# with derby-found jars first and user CLASSPATH after
+if [ -n "$CLASSPATH" ] ; then
+ # merge local and specified classpath
+ if [ -z "$LOCALCLASSPATH" ] ; then
+ LOCALCLASSPATH="$CLASSPATH"
+ elif [ -n "$CLASSPATH_OVERRIDE" ] ; then
+ LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH"
+ else
+ LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
+ fi
+
+ # remove class path from launcher -cp option
+ CLASSPATH=""
+fi
+
+# For Cygwin, switch paths to appropriate format before running java
+# For PATHs convert to unix format first, then to windows format to ensure
+# both formats are supported. Probably this will fail on directories with ;
+# in the name in the path. Let's assume that paths containing ; are more
+# rare than windows style paths on cygwin.
+if $cygwin; then
+ if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
+ format=mixed
+ else
+ format=windows
+ fi
+ DERBY_HOME=`cygpath --$format "$DERBY_HOME"`
+ DERBY_LIB=`cygpath --$format "$DERBY_LIB"`
+ if [ -n "$JAVA_HOME" ]; then
+ JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+ fi
+ LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+ LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
+ if [ -n "$CLASSPATH" ] ; then
+ CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+ CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
+ fi
+ CYGHOME=`cygpath --$format "$HOME"`
+fi
+
+# add a second backslash to variables terminated by a backslash under cygwin
+if $cygwin; then
+ case "$DERBY_HOME" in
+ *\\ )
+ DERBY_HOME="$DERBY_HOME\\"
+ ;;
+ esac
+ case "$CYGHOME" in
+ *\\ )
+ CYGHOME="$CYGHOME\\"
+ ;;
+ esac
+ case "$LOCALCLASSPATH" in
+ *\\ )
+ LOCALCLASSPATH="$LOCALCLASSPATH\\"
+ ;;
+ esac
+ case "$CLASSPATH" in
+ *\\ )
+ CLASSPATH="$CLASSPATH\\"
+ ;;
+ esac
+fi
+
+# Readjust classpath for MKS
+# expr match
+if [ \( "`expr $SHELL : '.*sh.exe$'`" -gt 0 \) -a \( "$cygwin" = "false" \) ];
then
+ LOCALCLASSPATH=`echo $LOCALCLASSPATH | sed -E 's/([\d\w]*):([\d\w]*)/\1;\2/g
+'`
+fi
+#!/bin/sh
+
+# 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.
+
+derby_exec_command="exec \"$JAVACMD\" $DERBY_OPTS -classpath
\"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start $@"
+eval $derby_exec_command
Modified:
airavata/trunk/modules/distribution/src/main/resources/conf/repository.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/conf/repository.properties?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/src/main/resources/conf/repository.properties
(original)
+++
airavata/trunk/modules/distribution/src/main/resources/conf/repository.properties
Thu Sep 20 17:46:37 2012
@@ -80,12 +80,14 @@ class.registry.accessor=org.apache.airav
registry.user=admin
registry.password=admin
gateway.id=default
-registry.jdbc.driver=com.mysql.jdbc.Driver
registry.jdbc.user=airavata
registry.jdbc.password=airavata
+
+#for mysql
registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+registry.jdbc.driver=com.mysql.jdbc.Driver
#for derby database
-#registry.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-#registry.jdbc.url=jdbc:derby:persistent_data
+#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+#registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Application_Descriptor.java
Thu Sep 20 17:46:37 2012
@@ -35,7 +35,7 @@ public class Application_Descriptor {
private String service_descriptor_ID;
@Lob
- private String application_descriptor_xml;
+ private byte[] application_descriptor_xml;
@ManyToOne(cascade=CascadeType.PERSIST)
@JoinColumn(name = "gateway_name")
@@ -49,7 +49,7 @@ public class Application_Descriptor {
return application_descriptor_ID;
}
- public String getApplication_descriptor_xml() {
+ public byte[] getApplication_descriptor_xml() {
return application_descriptor_xml;
}
@@ -77,7 +77,7 @@ public class Application_Descriptor {
this.application_descriptor_ID = application_descriptor_ID;
}
- public void setApplication_descriptor_xml(String
application_descriptor_xml) {
+ public void setApplication_descriptor_xml(byte[]
application_descriptor_xml) {
this.application_descriptor_xml = application_descriptor_xml;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Metadata.java
Thu Sep 20 17:46:37 2012
@@ -9,17 +9,17 @@ public class Experiment_Metadata {
@Id
private String experiment_ID;
@Lob
- private String metadata;
+ private byte[] metadata;
public String getExperiment_ID() {
return experiment_ID;
}
- public String getMetadata() {
+ public byte[] getMetadata() {
return metadata;
}
- public void setMetadata(String metadata) {
+ public void setMetadata(byte[] metadata) {
this.metadata = metadata;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Gram_Data.java
Thu Sep 20 17:46:37 2012
@@ -36,7 +36,7 @@ public class Gram_Data {
private String node_id;
@Lob
- private String rsl;
+ private byte[] rsl;
private String invoked_host;
private String local_Job_ID;
@@ -56,11 +56,11 @@ public class Gram_Data {
this.node_id = node_id;
}
- public String getRsl() {
+ public byte[] getRsl() {
return rsl;
}
- public void setRsl(String rsl) {
+ public void setRsl(byte[] rsl) {
this.rsl = rsl;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Host_Descriptor.java
Thu Sep 20 17:46:37 2012
@@ -30,7 +30,7 @@ public class Host_Descriptor {
@Id
private String gateway_name;
@Lob
- private String host_descriptor_xml;
+ private byte[] host_descriptor_xml;
@ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
@@ -44,7 +44,7 @@ public class Host_Descriptor {
return host_descriptor_ID;
}
- public String getHost_descriptor_xml() {
+ public byte[] getHost_descriptor_xml() {
return host_descriptor_xml;
}
@@ -64,7 +64,7 @@ public class Host_Descriptor {
this.host_descriptor_ID = host_descriptor_ID;
}
- public void setHost_descriptor_xml(String host_descriptor_xml) {
+ public void setHost_descriptor_xml(byte[] host_descriptor_xml) {
this.host_descriptor_xml = host_descriptor_xml;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
Thu Sep 20 17:46:37 2012
@@ -40,9 +40,9 @@ public class Node_Data {
private String node_type;
@Lob
- private String inputs;
+ private byte[] inputs;
@Lob
- private String outputs;
+ private byte[] outputs;
private String status;
private Timestamp start_time;
private Timestamp last_update_time;
@@ -71,19 +71,19 @@ public class Node_Data {
this.node_type = node_type;
}
- public String getInputs() {
+ public byte[] getInputs() {
return inputs;
}
- public void setInputs(String inputs) {
+ public void setInputs(byte[] inputs) {
this.inputs = inputs;
}
- public String getOutputs() {
+ public byte[] getOutputs() {
return outputs;
}
- public void setOutputs(String outputs) {
+ public void setOutputs(byte[] outputs) {
this.outputs = outputs;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Published_Workflow.java
Thu Sep 20 17:46:37 2012
@@ -41,7 +41,7 @@ public class Published_Workflow {
private Date published_date;
@Lob
- private String workflow_content;
+ private byte[] workflow_content;
private String path;
@ManyToOne(cascade=CascadeType.MERGE)
@@ -60,7 +60,7 @@ public class Published_Workflow {
return published_date;
}
- public String getWorkflow_content() {
+ public byte[] getWorkflow_content() {
return workflow_content;
}
@@ -80,7 +80,7 @@ public class Published_Workflow {
this.published_date = published_date;
}
- public void setWorkflow_content(String workflow_content) {
+ public void setWorkflow_content(byte[] workflow_content) {
this.workflow_content = workflow_content;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
Thu Sep 20 17:46:37 2012
@@ -30,7 +30,7 @@ public class Service_Descriptor {
@Id
private String gateway_name;
@Lob
- private String service_descriptor_xml;
+ private byte[] service_descriptor_xml;
@ManyToOne(cascade=CascadeType.MERGE)
@JoinColumn(name = "gateway_name")
@@ -44,7 +44,7 @@ public class Service_Descriptor {
return service_descriptor_ID;
}
- public String getService_descriptor_xml() {
+ public byte[] getService_descriptor_xml() {
return service_descriptor_xml;
}
@@ -56,7 +56,7 @@ public class Service_Descriptor {
this.service_descriptor_ID = service_descriptor_ID;
}
- public void setService_descriptor_xml(String service_descriptor_xml) {
+ public void setService_descriptor_xml(byte[] service_descriptor_xml) {
this.service_descriptor_xml = service_descriptor_xml;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/User_Workflow.java
Thu Sep 20 17:46:37 2012
@@ -45,7 +45,7 @@ public class User_Workflow {
private Date last_updated_date;
@Lob
- private String workflow_graph;
+ private byte[] workflow_graph;
public String getTemplate_name() {
return template_name;
@@ -91,7 +91,7 @@ public class User_Workflow {
return last_updated_date;
}
- public String getWorkflow_graph() {
+ public byte[] getWorkflow_graph() {
return workflow_graph;
}
@@ -103,7 +103,7 @@ public class User_Workflow {
this.path = path;
}
- public void setWorkflow_graph(String workflow_graph) {
+ public void setWorkflow_graph(byte[] workflow_graph) {
this.workflow_graph = workflow_graph;
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
Thu Sep 20 17:46:37 2012
@@ -241,12 +241,13 @@ public class ApplicationDescriptorResour
Users user = em.find(Users.class, updatedUser);
applicationDescriptor.setGateway(gateway);
applicationDescriptor.setUser(user);
- applicationDescriptor.setApplication_descriptor_xml(content);
+ byte[] contentBytes = content.getBytes();
+ applicationDescriptor.setApplication_descriptor_xml(contentBytes);
applicationDescriptor.setService_descriptor_ID(serviceDescName);
applicationDescriptor.setHost_descriptor_ID(hostDescName);
if (existingAppDesc != null) {
existingAppDesc.setUser(user);
- existingAppDesc.setApplication_descriptor_xml(content);
+ existingAppDesc.setApplication_descriptor_xml(contentBytes);
existingAppDesc.setHost_descriptor_ID(hostDescName);
existingAppDesc.setService_descriptor_ID(serviceDescName);
applicationDescriptor = em.merge(existingAppDesc);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentDataResource.java
Thu Sep 20 17:46:37 2012
@@ -43,7 +43,6 @@ public class ExperimentDataResource exte
this.userName = userName;
}
- @Override
public Resource create(ResourceType type) {
switch (type){
case WORKFLOW_DATA:
@@ -60,7 +59,6 @@ public class ExperimentDataResource exte
}
- @Override
public void remove(ResourceType type, Object name) {
EntityManager em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
@@ -88,7 +86,6 @@ public class ExperimentDataResource exte
em.close();
}
- @Override
public Resource get(ResourceType type, Object name) {
EntityManager em = ResourceUtils.getEntityManager();
em.getTransaction().begin();
@@ -121,7 +118,6 @@ public class ExperimentDataResource exte
}
}
- @Override
public List<Resource> get(ResourceType type) {
List<Resource> resourceList = new ArrayList<Resource>();
EntityManager em = ResourceUtils.getEntityManager();
@@ -166,7 +162,6 @@ public class ExperimentDataResource exte
return resourceList;
}
- @Override
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
Experiment_Data existingExpData = em.find(Experiment_Data.class,
experimentID);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentMetadataResource.java
Thu Sep 20 17:46:37 2012
@@ -28,27 +28,22 @@ public class ExperimentMetadataResource
this.metadata = metadata;
}
- @Override
public Resource create(ResourceType type) {
throw new UnsupportedOperationException();
}
- @Override
public void remove(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
- @Override
public Resource get(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
- @Override
public List<Resource> get(ResourceType type) {
throw new UnsupportedOperationException();
}
- @Override
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
Experiment_Metadata existingExpMetaData =
em.find(Experiment_Metadata.class, expID);
@@ -58,10 +53,11 @@ public class ExperimentMetadataResource
em.getTransaction().begin();
Experiment_Metadata experimentMetadata = new Experiment_Metadata();
experimentMetadata.setExperiment_ID(expID);
- experimentMetadata.setMetadata(metadata);
+ byte[] contentBytes = metadata.getBytes();
+ experimentMetadata.setMetadata(contentBytes);
if(existingExpMetaData != null){
- existingExpMetaData.setMetadata(metadata);
+ existingExpMetaData.setMetadata(contentBytes);
existingExpMetaData.setExperiment_ID(expID);
experimentMetadata = em.merge(existingExpMetaData);
}else{
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java
Thu Sep 20 17:46:37 2012
@@ -654,7 +654,7 @@ public class GatewayResource extends Abs
new ApplicationDescriptorResource(
applicationDescriptor.getApplication_descriptor_ID(),
applicationDescriptor.getGateway().getGateway_name());
-
applicationDescriptorResource.setContent(applicationDescriptor.getApplication_descriptor_xml());
+ applicationDescriptorResource.setContent(new
String(applicationDescriptor.getApplication_descriptor_xml()));
applicationDescriptorResource.setUpdatedUser(applicationDescriptor.getUser().getUser_name());
applicationDescriptorResource.setHostDescName(applicationDescriptor.getHost_descriptor_ID());
applicationDescriptorResource.setServiceDescName(applicationDescriptor.getService_descriptor_ID());
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GramDataResource.java
Thu Sep 20 17:46:37 2012
@@ -59,27 +59,22 @@ public class GramDataResource extends Ab
this.localJobID = localJobID;
}
- @Override
public Resource create(ResourceType type) {
throw new UnsupportedOperationException();
}
- @Override
public void remove(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
- @Override
public Resource get(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
- @Override
public List<Resource> get(ResourceType type) {
throw new UnsupportedOperationException();
}
- @Override
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
Gram_Data existingGramData = em.find(Gram_Data.class, new
Gram_DataPK(workflowDataResource.getWorkflowInstanceID(), nodeID));
@@ -94,11 +89,12 @@ public class GramDataResource extends Ab
gramData.setNode_id(nodeID);
gramData.setInvoked_host(invokedHost);
gramData.setLocal_Job_ID(localJobID);
- gramData.setRsl(rsl);
+ byte[] bytes = rsl.getBytes();
+ gramData.setRsl(bytes);
if(existingGramData != null){
existingGramData.setInvoked_host(invokedHost);
existingGramData.setLocal_Job_ID(localJobID);
- existingGramData.setRsl(rsl);
+ existingGramData.setRsl(bytes);
gramData = em.merge(existingGramData);
} else {
em.persist(gramData);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
Thu Sep 20 17:46:37 2012
@@ -28,6 +28,9 @@ import org.apache.airavata.persistance.r
import javax.persistence.EntityManager;
import javax.persistence.Query;
+import javax.sql.rowset.serial.SerialBlob;
+import java.sql.Blob;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -189,31 +192,36 @@ public class HostDescriptorResource exte
* save host descriptor to the database
*/
public void save() {
- EntityManager em = ResourceUtils.getEntityManager();
- Host_Descriptor existingHost_desc = em.find(Host_Descriptor.class, new
Host_Descriptor_PK(gatewayName, hostDescName));
- em.close();
+ try {
+ EntityManager em = ResourceUtils.getEntityManager();
+ Host_Descriptor existingHost_desc = em.find(Host_Descriptor.class,
new Host_Descriptor_PK(gatewayName, hostDescName));
+ em.close();
- em = ResourceUtils.getEntityManager();
- em.getTransaction().begin();
- Host_Descriptor hostDescriptor = new Host_Descriptor();
- Gateway gateway = new Gateway();
- gateway.setGateway_name(gatewayName);
- Users user = new Users();
- user.setUser_name(userName);
- hostDescriptor.setHost_descriptor_ID(getHostDescName());
- hostDescriptor.setGateway(gateway);
- hostDescriptor.setHost_descriptor_xml(content);
- hostDescriptor.setUser(user);
- if(existingHost_desc != null){
- existingHost_desc.setUser(user);
- existingHost_desc.setHost_descriptor_xml(content);
- hostDescriptor = em.merge(existingHost_desc);
- } else {
- em.merge(hostDescriptor);
- }
+ em = ResourceUtils.getEntityManager();
+ em.getTransaction().begin();
+ Host_Descriptor hostDescriptor = new Host_Descriptor();
+ Gateway gateway = new Gateway();
+ gateway.setGateway_name(gatewayName);
+ Users user = new Users();
+ user.setUser_name(userName);
+ hostDescriptor.setHost_descriptor_ID(getHostDescName());
+ hostDescriptor.setGateway(gateway);
+ byte[] contentBytes = content.getBytes();
+ hostDescriptor.setHost_descriptor_xml(contentBytes);
+ hostDescriptor.setUser(user);
+ if (existingHost_desc != null) {
+ existingHost_desc.setUser(user);
+ existingHost_desc.setHost_descriptor_xml(contentBytes);
+ hostDescriptor = em.merge(existingHost_desc);
+ } else {
+ em.merge(hostDescriptor);
+ }
- em.getTransaction().commit();
- em.close();
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
Thu Sep 20 17:46:37 2012
@@ -86,27 +86,22 @@ public class NodeDataResource extends Ab
this.lastUpdateTime = lastUpdateTime;
}
- @Override
public Resource create(ResourceType type) {
throw new UnsupportedOperationException();
}
- @Override
public void remove(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
- @Override
public Resource get(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
- @Override
public List<Resource> get(ResourceType type) {
throw new UnsupportedOperationException();
}
- @Override
public void save() {
EntityManager em = ResourceUtils.getEntityManager();
Node_Data existingNodeData = em.find(Node_Data.class, new
Node_DataPK(workflowDataResource.getWorkflowInstanceID(), nodeID));
@@ -118,15 +113,17 @@ public class NodeDataResource extends Ab
nodeData.setNode_id(nodeID);
Workflow_Data workflow_data = em.find(Workflow_Data.class,
workflowDataResource.getWorkflowInstanceID());
nodeData.setWorkflow_Data(workflow_data);
- nodeData.setInputs(inputs);
- nodeData.setOutputs(outputs);
+ byte[] inputsByte = inputs.getBytes();
+ nodeData.setInputs(inputsByte);
+ byte[] outputsByte = outputs.getBytes();
+ nodeData.setOutputs(outputsByte);
nodeData.setNode_type(nodeType);
nodeData.setLast_update_time(lastUpdateTime);
nodeData.setStart_time(startTime);
nodeData.setStatus(status);
if(existingNodeData != null){
- existingNodeData.setInputs(inputs);
- existingNodeData.setOutputs(outputs);
+ existingNodeData.setInputs(inputsByte);
+ existingNodeData.setOutputs(outputsByte);
existingNodeData.setLast_update_time(lastUpdateTime);
existingNodeData.setNode_type(nodeType);
existingNodeData.setStart_time(startTime);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
Thu Sep 20 17:46:37 2012
@@ -223,7 +223,8 @@ public class PublishWorkflowResource ext
publishedWorkflow.setPublish_workflow_name(getName());
publishedWorkflow.setPublished_date(publishedDate);
publishedWorkflow.setVersion(version);
- publishedWorkflow.setWorkflow_content(content);
+ byte[] bytes = content.getBytes();
+ publishedWorkflow.setWorkflow_content(bytes);
Gateway gateway = new Gateway();
gateway.setGateway_name(this.gateway.getGatewayName());
publishedWorkflow.setGateway(gateway);
@@ -233,7 +234,7 @@ public class PublishWorkflowResource ext
if(existingWF != null){
existingWF.setUser(user);
existingWF.setPublished_date(publishedDate);
- existingWF.setWorkflow_content(content);
+ existingWF.setWorkflow_content(bytes);
existingWF.setVersion(version);
existingWF.setPath(path);
publishedWorkflow = em.merge(existingWF);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
Thu Sep 20 17:46:37 2012
@@ -143,12 +143,13 @@ public class ServiceDescriptorResource e
serviceDescriptor.setService_descriptor_ID(getServiceDescName());
Gateway gateway = em.find(Gateway.class, gatewayName);
serviceDescriptor.setGateway(gateway);
- serviceDescriptor.setService_descriptor_xml(content);
+ byte[] bytes = content.getBytes();
+ serviceDescriptor.setService_descriptor_xml(bytes);
Users user = em.find(Users.class, userName);
serviceDescriptor.setUser(user);
if(existingServiceDesc != null) {
existingServiceDesc.setUser(user);
- existingServiceDesc.setService_descriptor_xml(content);
+ existingServiceDesc.setService_descriptor_xml(bytes);
serviceDescriptor = em.merge(existingServiceDesc);
}else {
em.merge(serviceDescriptor);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
Thu Sep 20 17:46:37 2012
@@ -133,7 +133,8 @@ public class UserWorkflowResource extend
User_Workflow userWorkflow = new User_Workflow();
userWorkflow.setTemplate_name(name);
userWorkflow.setLast_updated_date(lastUpdateDate);
- userWorkflow.setWorkflow_graph(content);
+ byte[] bytes = content.getBytes();
+ userWorkflow.setWorkflow_graph(bytes);
userWorkflow.setGateway_name(this.gateway.getGatewayName());
userWorkflow.setOwner(this.getWorker().getUser());
userWorkflow.setPath(path);
@@ -143,7 +144,7 @@ public class UserWorkflowResource extend
existingWF.setTemplate_name(name);
existingWF.setLast_updated_date(lastUpdateDate);
existingWF.setPath(path);
- existingWF.setWorkflow_graph(content);
+ existingWF.setWorkflow_graph(bytes);
userWorkflow = em.merge(existingWF);
} else {
em.merge(userWorkflow);
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
Thu Sep 20 17:46:37 2012
@@ -26,6 +26,8 @@ import org.apache.airavata.persistance.r
import java.io.IOException;
import java.net.URL;
+import java.sql.Blob;
+import java.sql.SQLException;
import java.util.Properties;
@@ -234,7 +236,7 @@ public class Utils {
applicationDescriptorResource.setName(o.getApplication_descriptor_ID());
applicationDescriptorResource.setHostDescName(o.getHost_descriptor_ID());
applicationDescriptorResource.setServiceDescName(o.getService_descriptor_ID());
-
applicationDescriptorResource.setContent(o.getApplication_descriptor_xml());
+ applicationDescriptorResource.setContent(new
String(o.getApplication_descriptor_xml()));
applicationDescriptorResource.setUpdatedUser(o.getUser().getUser_name());
applicationDescriptorResource.setGatewayName(o.getGateway().getGateway_name());
return applicationDescriptorResource;
@@ -276,12 +278,18 @@ public class Utils {
* @return HostDescriptor resource object
*/
private static Resource createHostDescriptor(Host_Descriptor o) {
- HostDescriptorResource hostDescriptorResource = new
HostDescriptorResource();
-
hostDescriptorResource.setGatewayName(o.getGateway().getGateway_name());
- hostDescriptorResource.setUserName(o.getUser().getUser_name());
- hostDescriptorResource.setHostDescName(o.getHost_descriptor_ID());
- hostDescriptorResource.setContent(o.getHost_descriptor_xml());
- return hostDescriptorResource;
+ try {
+ HostDescriptorResource hostDescriptorResource = new
HostDescriptorResource();
+
hostDescriptorResource.setGatewayName(o.getGateway().getGateway_name());
+ hostDescriptorResource.setUserName(o.getUser().getUser_name());
+ hostDescriptorResource.setHostDescName(o.getHost_descriptor_ID());
+ byte[] bytes = o.getHost_descriptor_xml();
+ hostDescriptorResource.setContent(new String(bytes));
+ return hostDescriptorResource;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
}
/**
@@ -295,7 +303,7 @@ public class Utils {
publishWorkflowResource.setGateway(gatewayResource);
publishWorkflowResource.setCreatedUser(o.getUser().getUser_name());
publishWorkflowResource.setName(o.getPublish_workflow_name());
- publishWorkflowResource.setContent(o.getWorkflow_content());
+ publishWorkflowResource.setContent(new
String(o.getWorkflow_content()));
publishWorkflowResource.setPublishedDate(o.getPublished_date());
publishWorkflowResource.setVersion(o.getVersion());
publishWorkflowResource.setPath(o.getPath());
@@ -312,7 +320,7 @@ public class Utils {
serviceDescriptorResource.setGatewayName(o.getGateway().getGateway_name());
serviceDescriptorResource.setUserName(o.getUser().getUser_name());
serviceDescriptorResource.setServiceDescName(o.getService_descriptor_ID());
- serviceDescriptorResource.setContent(o.getService_descriptor_xml());
+ serviceDescriptorResource.setContent(new
String(o.getService_descriptor_xml()));
return serviceDescriptorResource;
}
@@ -332,7 +340,7 @@ public class Utils {
WorkerResource workerResource = (WorkerResource)
createGatewayWorker(gateway_worker);
userWorkflowResource.setWorker(workerResource);
userWorkflowResource.setLastUpdateDate(o.getLast_updated_date());
- userWorkflowResource.setContent(o.getWorkflow_graph());
+ userWorkflowResource.setContent(new String(o.getWorkflow_graph()));
userWorkflowResource.setPath(o.getPath());
return userWorkflowResource;
}
@@ -360,7 +368,7 @@ public class Utils {
private static Resource createExperimentMetadata(Experiment_Metadata o) {
ExperimentMetadataResource experimentMetadataResource = new
ExperimentMetadataResource();
experimentMetadataResource.setExpID(o.getExperiment_ID());
- experimentMetadataResource.setMetadata(o.getMetadata());
+ experimentMetadataResource.setMetadata(new String(o.getMetadata()));
return experimentMetadataResource;
}
@@ -381,8 +389,8 @@ public class Utils {
nodeDataResource.setWorkflowDataResource(workflowDataResource);
nodeDataResource.setNodeID(o.getNode_id());
nodeDataResource.setNodeType(o.getNode_type());
- nodeDataResource.setInputs(o.getInputs());
- nodeDataResource.setOutputs(o.getOutputs());
+ nodeDataResource.setInputs(new String(o.getInputs()));
+ nodeDataResource.setOutputs(new String(o.getOutputs()));
nodeDataResource.setStatus(o.getStatus());
nodeDataResource.setStartTime(o.getStart_time());
nodeDataResource.setLastUpdateTime(o.getLast_update_time());
@@ -394,9 +402,14 @@ public class Utils {
WorkflowDataResource workflowDataResource =
(WorkflowDataResource)createWorkflowData(o.getWorkflow_Data());
gramDataResource.setWorkflowDataResource(workflowDataResource);
gramDataResource.setNodeID(o.getNode_id());
- gramDataResource.setRsl(o.getRsl());
+ gramDataResource.setRsl(new String(o.getRsl()));
gramDataResource.setInvokedHost(o.getInvoked_host());
gramDataResource.setLocalJobID(o.getLocal_Job_ID());
return gramDataResource;
}
+
+// public static byte[] getByteArray(String content){
+// byte[] contentBytes = content.getBytes();
+// return contentBytes;
+// }
}
Modified:
airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties
Thu Sep 20 17:46:37 2012
@@ -80,8 +80,14 @@ class.registry.accessor=org.apache.airav
registry.user=admin
registry.password=admin
gateway.id=default
-registry.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
registry.jdbc.user=airavata
registry.jdbc.password=airavata
+
+#for mysql
+registry.jdbc.driver=com.mysql.jdbc.Driver
registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+#for derby
+#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+#registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
+
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1388135&r1=1388134&r2=1388135&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Thu Sep 20 17:46:37 2012
@@ -56,7 +56,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<axis2.version>1.5.1</axis2.version>
- <derby.version>10.7.1.1</derby.version>
+ <derby.version>10.9.1.0</derby.version>
<jackrabbit.version>2.2.7</jackrabbit.version>
<logback.version>0.9.20</logback.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
