You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2012/10/21 16:10:09 UTC
svn commit: r1400649 [1/2] - in /airavata/trunk: ./ modules/distribution/
modules/distribution/src/main/assembly/
modules/distribution/src/main/resources/axis2-standalone-bin/
modules/workflow-model/workflow-model-core/ modules/xbaya-gui/
modules/xbaya...
Author: smarru
Date: Sun Oct 21 14:10:07 2012
New Revision: 1400649
URL: http://svn.apache.org/viewvc?rev=1400649&view=rev
Log:
* Addressing AIRAVATA-613, AIRAVATA-614 and removed myproxy dependency in Xbaya.
* Cleaning up assembly and removed distribution dependency on ws-messenger distribution
* removed the jackrabbit binary repo
Added:
airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/
airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.bat
airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.sh (with props)
airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.bat
airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.sh (with props)
airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/setenv.sh (with props)
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java
- copied, changed from r1400527, airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java
Removed:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/myproxy/
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/security/
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/taverna/
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MyProxyTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GridChemRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/JythonRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/ODEInvokerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/PegasusInvokerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/myproxy/
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/utils/MyProxyChecker.java
airavata/trunk/modules/xbaya-gui/src/main/resources/repository.properties
Modified:
airavata/trunk/modules/distribution/pom.xml
airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Sun Oct 21 14:10:07 2012
@@ -172,21 +172,6 @@
<version>1.1.4c</version>
</dependency>
<dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix32</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix-asn1</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>puretls</artifactId>
- <version>0.9b4-1</version>
- </dependency>
- <dependency>
<groupId>xutil</groupId>
<artifactId>xutil</artifactId>
<version>0.2</version>
@@ -215,11 +200,6 @@
<version>2.5.0</version>
</dependency>
<dependency>
- <groupId>xbaya</groupId>
- <artifactId>pegasuswebservice</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.3.20</version>
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=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sun Oct 21 14:10:07 2012
@@ -1,10 +1,13 @@
-<!--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. -->
+<!--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. -->
<!DOCTYPE assembly [
<!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
@@ -23,297 +26,233 @@
<!ELEMENT dependencySet (outputDirectory|includes)*>
]>
<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
- <fileSets>
- <!-- ********************** copy axis2 distribution from messenger folder ********************** -->
- <fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>xom*.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
- <outputDirectory>standalone-server/repository</outputDirectory>
- <includes>
- <include>services/*</include>
- <include>modules/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/classes</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>commons-logging.properties</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy wsmg.broker and messagebox property files ********************** -->
- <fileSet>
- <directory>../ws-messenger/distribution/src/main/resources</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>*properties*</include>
- </includes>
- </fileSet>
-
- <!-- ********************** replace bin directory ********************** -->
- <fileSet>
- <directory>../ws-messenger/distribution/src/main/resources/bin</directory>
- <outputDirectory>standalone-server/bin</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy messagebroker+ messagebox samples ********************** -->
- <fileSet>
- <directory>../ws-messenger/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
+ <fileSets>
+ <!-- ********************** copy axis2 distribution dependencies ********************** -->
+ <fileSet>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
+ <outputDirectory>standalone-server/lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>commons-logging*.jar</exclude>
+ <exclude>xom*.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
+ <outputDirectory>standalone-server/repository</outputDirectory>
+ <includes>
+ <include>services/*</include>
+ <include>modules/*</include>
+ </includes>
+ </fileSet>
- <!-- ********************** copy gui start up script ********************** -->
- <fileSet>
- <directory>../ws-messenger/distribution/src/main/resources</directory>
- <outputDirectory>gui</outputDirectory>
- <includes>
- <include>*sh</include>
- </includes>
- </fileSet>
+ <!-- ********************** copy readme files ********************** -->
+ <fileSet>
+ <directory>../../</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>INSTALL</include>
+ <include>README</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+ <!-- ********************** copy binary licenses ********************** -->
+ <fileSet>
+ <directory>src/main/resources/</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
- <!-- ********************** copy readme files ********************** -->
- <fileSet>
- <directory>../../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>DISCLAIMER</include>
- <include>INSTALL</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
- <!-- ********************** copy binary licenses ********************** -->
- <fileSet>
- <directory>src/main/resources/</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
+ <!-- ********************** copy database scripts ********************** -->
+ <fileSet>
+ <directory>../ws-messenger/messagebroker/src/main/resources/database_scripts
+ </directory>
+ <outputDirectory>standalone-server/bin/database_scripts
+ </outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../ws-messenger/messagebox/src/main/resources/database_scripts
+ </directory>
+ <outputDirectory>standalone-server/bin/database_scripts
+ </outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../registry/airavata-jpa-registry/src/main/resources
+ </directory>
+ <outputDirectory>standalone-server/bin/database_scripts
+ </outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../distribution/src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>777</fileMode>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../distribution/src/main/resources/conf</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
+ <include>airavata-server.properties</include>
+ <include>log4j.properties</include>
+ <include>host.xml</include>
+ <include>persistence.xml</include>
+ <include>provenance.sql</include>
+ </includes>
+ </fileSet>
- <!-- ********************** copy database scripts ********************** -->
- <fileSet>
- <directory>../ws-messenger/messagebroker/src/main/resources/database_scripts</directory>
- <outputDirectory>standalone-server/bin/database_scripts</outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/messagebox/src/main/resources/database_scripts</directory>
- <outputDirectory>standalone-server/bin/database_scripts</outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../registry/airavata-jpa-registry/src/main/resources</directory>
- <outputDirectory>standalone-server/bin/database_scripts</outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- <include>startNetworkServer</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../distribution/src/main/resources/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../distribution/src/main/resources/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>log4j.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../distribution/src/main/resources/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>host.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../distribution/src/main/resources/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>persistence.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../distribution/src/main/resources/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>provenance.sql</include>
- </includes>
- </fileSet>
+ <!-- ********************** Copy Axis2 startup scripts to stand alone server
+ ********************** -->
+ <fileSet>
+ <directory>../distribution/src/main/resources/axis2-standalone-bin
+ </directory>
+ <outputDirectory>standalone-server/bin</outputDirectory>
+ <fileMode>777</fileMode>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
- <!--fileSet>
- <directory>../../samples/simple-math-service/target</directory>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes>
- <include>*.aar</include>
- </includes>
- </fileSet-->
- <fileSet>
- <directory>../../samples/complex-math-service/target</directory>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes>
- <include>*.aar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../samples/levenshtein-distance-service/target</directory>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes>
- <include>*.aar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../xbaya-gui/src/test/resources/</directory>
- <outputDirectory>samples/workflows</outputDirectory>
- <includes>
- <include>*.xwf</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- </fileSets>
+ <!--fileSet> <directory>../../samples/simple-math-service/target</directory>
+ <outputDirectory>standalone-server/repository/services</outputDirectory>
+ <includes> <include>*.aar</include> </includes> </fileSet -->
+ <fileSet>
+ <directory>../../samples/complex-math-service/target</directory>
+ <outputDirectory>standalone-server/repository/services
+ </outputDirectory>
+ <includes>
+ <include>*.aar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../samples/levenshtein-distance-service/target
+ </directory>
+ <outputDirectory>standalone-server/repository/services
+ </outputDirectory>
+ <includes>
+ <include>*.aar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../xbaya-gui/src/test/resources/</directory>
+ <outputDirectory>samples/workflows</outputDirectory>
+ <includes>
+ <include>*.xwf</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/conf</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>org.apache.derby:derbynet:jar</include>
- <include>org.apache.derby:derbyclient:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <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:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-jcl:jar</include>
- <include>org.slf4j:slf4j-log4j12:jar</include>
- <include>javax.jcr:jcr:jar</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-configuration:commons-configuration</include>
- <include>commons-lang:commons-lang</include>
- <include>xpp3:xpp3</include>
- <include>gpel:gpel_client</include>
- <include>xpp5:xpp5</include>
- <include>xpp3:xpp3_xpath</include>
- <include>xsul:xsul:jar</include>
- <include>xsul5-ogce:xsul5-2007-02-27:jar</include>
- <include>gfac:gfac-schema-utils</include>
- <include>lead-security:cryptix32</include>
- <include>lead-security:jce</include>
- <include>lead-security:cryptix-asn1</include>
- <include>lead-security:puretls</include>
- <include>xutil:xutil</include>
- <include>jython:jython</include>
- <include>cog-jglobus:cog-jglobus</include>
- <!--include>edu.iub.soic.damsl:jXSP</include> -->
- <include>xmlbeans:xbean</include>
- <include>xmlbeans-ogce:jsr173_api</include>
- <include>xbaya:pegasuswebservice</include>
- <include>com.amazonaws:aws-java-sdk</include>
- <include>amazon:MapReduce.Service.Client</include>
- <include>net.java.dev.jets3t:jets3t</include>
- <include>wsmg:wsmg</include>
- <include>atomixmiser:atomixmiser</include>
- <include>globus:transfer-api-client</include>
- <include>org.apache.airavata:airavata-registry-api</include>
- <include>org.apache.airavata:airavata-workflow-execution-context</include>
- <include>org.apache.airavata:airavata-workflow-tracking</include>
- <include>org.apache.airavata:airavata-gfac-core</include>
- <include>org.apache.airavata:airavata-messenger-client</include>
- <include>org.apache.airavata:airavata-messenger-commons</include>
- <include>org.apache.airavata:airavata-gfac-schema-utils</include>
- <include>org.apache.airavata:airavata-common-utils</include>
- <include>org.apache.airavata:airavata-workflow-model-core:jar</include>
- <include>org.apache.airavata:airavata-jpa-registry:jar</include>
- <include>org.apache.openjpa:openjpa-all:jar</include>
- <include>edu.berkeley:yfilter</include>
- <include>edu.berkeley:yfilter</include>
- <include>javax.servlet:servlet-api</include>
- <include>org.bouncycastle:bcprov-jdk15</include>
- <include>org.bouncycastle:bcmail-jdk15</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes>
- <include>org.apache.airavata:airavata-message-box:jar</include>
- <include>org.apache.airavata:airavata-message-broker:jar</include>
- <include>org.apache.airavata:airavata-xbaya-gui:jar</include>
- <include>org.apache.airavata:airavata-gfac-axis2-interface:jar</include>
- <include>org.apache.airavata:airavata-registry-service:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.jackrabbit:jackrabbit-standalone:jar</include>
- <include>org.apache.airavata:airavata-client-api</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>standalone-server/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ </outputFileNameMapping>
+ <includes>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>org.apache.derby:derbynet:jar</include>
+ <include>org.apache.derby:derbyclient:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>standalone-server/lib</outputDirectory>
+ <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.slf4j:slf4j-api:jar</include>
+ <include>org.slf4j:slf4j-jcl:jar</include>
+ <include>org.slf4j:slf4j-log4j12:jar</include>
+ <include>javax.jcr:jcr:jar</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-configuration:commons-configuration</include>
+ <include>commons-lang:commons-lang</include>
+ <include>xpp3:xpp3</include>
+ <include>gpel:gpel_client</include>
+ <include>xpp5:xpp5</include>
+ <include>xpp3:xpp3_xpath</include>
+ <include>xsul:xsul:jar</include>
+ <include>xsul5-ogce:xsul5-2007-02-27:jar</include>
+ <include>xutil:xutil</include>
+ <include>jython:jython</include>
+ <include>cog-jglobus:cog-jglobus</include>
+ <!--include>edu.iub.soic.damsl:jXSP</include> -->
+ <include>xmlbeans:xbean</include>
+ <include>com.amazonaws:aws-java-sdk</include>
+ <include>amazon:MapReduce.Service.Client</include>
+ <include>net.java.dev.jets3t:jets3t</include>
+ <include>atomixmiser:atomixmiser</include>
+ <include>globus:transfer-api-client</include>
+ <include>org.apache.airavata:airavata-registry-api</include>
+ <include>org.apache.airavata:airavata-workflow-execution-context</include>
+ <include>org.apache.airavata:airavata-workflow-tracking</include>
+ <include>org.apache.airavata:airavata-gfac-core</include>
+ <include>org.apache.airavata:airavata-messenger-client</include>
+ <include>org.apache.airavata:airavata-messenger-commons</include>
+ <include>org.apache.airavata:airavata-gfac-schema-utils</include>
+ <include>org.apache.airavata:airavata-common-utils</include>
+ <include>org.apache.airavata:airavata-workflow-model-core:jar</include>
+ <include>org.apache.airavata:airavata-jpa-registry:jar</include>
+ <include>org.apache.openjpa:openjpa-all:jar</include>
+ <include>edu.berkeley:yfilter</include>
+ <include>edu.berkeley:yfilter</include>
+ <include>javax.servlet:servlet-api</include>
+ <include>org.bouncycastle:bcprov-jdk15</include>
+ <include>org.bouncycastle:bcmail-jdk15</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>standalone-server/repository/services
+ </outputDirectory>
+ <includes>
+ <include>org.apache.airavata:airavata-message-box:jar</include>
+ <include>org.apache.airavata:airavata-message-broker:jar</include>
+ <include>org.apache.airavata:airavata-xbaya-gui:jar</include>
+ <include>org.apache.airavata:airavata-gfac-axis2-interface:jar
+ </include>
+ <include>org.apache.airavata:airavata-registry-service:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
Added: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.bat
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.bat?rev=1400649&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.bat (added)
+++ airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.bat Sun Oct 21 14:10:07 2012
@@ -0,0 +1,75 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+rem ---------------------------------------------------------------------------
+rem Axis2 Script
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+set CURRENT_DIR=%cd%
+
+rem Make sure prerequisite environment variables are set
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+echo The JAVA_HOME environment variable is not defined
+echo This environment variable is needed to run this program
+goto end
+:gotJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto okJavaHome
+:noJavaHome
+echo The JAVA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+echo NB: JAVA_HOME should point to a JDK/JRE
+goto end
+:okJavaHome
+
+rem check the AXIS2_HOME environment variable
+if not "%AXIS2_HOME%" == "" goto gotHome
+set AXIS2_HOME=%CURRENT_DIR%
+if exist "%AXIS2_HOME%\bin\java2wsdl.bat" goto okHome
+
+rem guess the home. Jump one directory up to check if that is the home
+cd ..
+set AXIS2_HOME=%cd%
+cd "%CURRENT_DIR%"
+
+:gotHome
+if EXIST "%AXIS2_HOME%\lib\axis2*.jar" goto okHome
+echo The AXIS2_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+
+:okHome
+rem set the classes
+setlocal EnableDelayedExpansion
+
+rem ----- Execute The Requested Command ---------------------------------------
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+set _RUNJAVA="%JAVA_HOME%\bin\java"
+
+%_RUNJAVA% %JAVA_OPTS% -Djava.ext.dirs="%AXIS2_HOME%\lib\" -Daxis2.repo="%AXIS2_HOME%\repository" -Daxis2.xml="%AXIS2_HOME%\conf\axis2.xml" %*
+endlocal
+:end
Added: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.sh
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.sh?rev=1400649&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.sh (added)
+++ airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.sh Sun Oct 21 14:10:07 2012
@@ -0,0 +1,56 @@
+#!/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.
+
+# ----------------------------------------------------------------------------
+# Axis2 Script
+#
+# Pre-requisites
+# - setenv.sh must have been called.
+#
+# AXIS2_HOME Home of Axis2 installation. If not set I will try
+# to figure it out.
+#
+# JAVA_HOME Must point at your Java Development Kit installation.
+#
+# -----------------------------------------------------------------------------
+
+# Get the context and from that find the location of setenv.sh
+dir=`dirname "$0"`
+. "${dir}"/setenv.sh
+
+#add any user given classpath's
+USER_COMMANDS=""
+prearg=""
+for arg in "$@"
+do
+ if [ "$arg" != -classpath ] && [ "$arg" != -cp ] && [ "$prearg" != -classpath ] && [ "$prearg" != -cp ]
+ then
+ USER_COMMANDS="$USER_COMMANDS ""$arg"
+ fi
+
+ if [ "$prearg"=-classpath ] || [ "$prearg"=-cp ]
+ then
+ AXIS2_CLASSPATH="$arg":"$AXIS2_CLASSPATH"
+ fi
+ prearg="$arg"
+done
+
+
+"$JAVA_HOME"/bin/java -classpath "$AXIS2_CLASSPATH" \
+-Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $USER_COMMANDS
Propchange: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2.sh
------------------------------------------------------------------------------
svn:executable = *
Added: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.bat
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.bat?rev=1400649&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.bat (added)
+++ airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.bat Sun Oct 21 14:10:07 2012
@@ -0,0 +1,118 @@
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+rem ---------------------------------------------------------------------------
+rem Startup script for the Simple Axis Server (with default parameters)
+rem
+rem Environment Variable Prequisites
+rem
+rem AXIS2_HOME Must point at your AXIS2 directory
+rem
+rem JAVA_HOME Must point at your Java Development Kit installation.
+rem
+rem JAVA_OPTS (Optional) Java runtime options
+rem ---------------------------------------------------------------------------
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_AXIS2_HOME=%~dp0..
+
+if "%AXIS2_HOME%"=="" set AXIS2_HOME=%DEFAULT_AXIS2_HOME%
+set DEFAULT_AXIS2_HOME=
+
+:loop
+if ""%1""==""-xdebug"" goto xdebug
+if ""%1""==""-security"" goto security
+if ""%1""==""-h"" goto help
+if ""%1""=="""" goto checkConf
+
+:xdebug
+set JAVA_OPTS= %JAVA_OPTS% -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000
+shift
+goto loop
+
+:security
+set JAVA_OPTS=%JAVA_OPTS% -Djava.security.manager -Djava.security.policy=%AXIS2_HOME%\conf\axis2.policy -Daxis2.home=%AXIS2_HOME%
+shift
+goto loop
+
+:help
+echo Usage: axis2server.bat
+
+echo commands:
+echo -xdebug Start Axis2 Server under JPDA debugger
+echo -security Enable Java 2 security
+echo -h help
+goto end
+
+
+
+rem find AXIS2_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+:checkConf
+if exist "%AXIS2_HOME%\conf\axis2.xml" goto checkJava
+
+:noAxis2Home
+echo AXIS2_HOME environment variable is set incorrectly or AXIS2 could not be located.
+echo Please set the AXIS2_HOME variable appropriately
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+if "%AXIS2_CMD_LINE_ARGS%" == "" goto defaultParams
+
+goto runAxis2
+
+:defaultParams
+set AXIS2_CMD_LINE_ARGS=-repo "%AXIS2_HOME%\repository" -conf "%AXIS2_HOME%\conf\axis2.xml"
+goto runAxis2
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+echo JAVA_HOME environment variable is set incorrectly or Java runtime could not be located.
+echo Please set the JAVA_HOME variable appropriately
+goto end
+
+:runAxis2
+rem set the classes by looping through the libs
+setlocal EnableDelayedExpansion
+set AXIS2_CLASS_PATH=%AXIS2_HOME%;%AXIS2_HOME%\conf;%JAVA_HOME%\lib\tools.jar;
+FOR %%C in ("%AXIS2_HOME%\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;".\lib\%%~nC%%~xC"
+
+echo Using JAVA_HOME %JAVA_HOME%
+echo Using AXIS2_HOME %AXIS2_HOME%
+
+cd %AXIS2_HOME%
+"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!" -Djava.endorsed.dirs="%AXIS2_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed" org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS%
+goto end
+
+:end
+set _JAVACMD=
+set AXIS2_CMD_LINE_ARGS=
+
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
+:mainEnd
Added: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.sh
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.sh?rev=1400649&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.sh (added)
+++ airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.sh Sun Oct 21 14:10:07 2012
@@ -0,0 +1,66 @@
+#!/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.
+
+# ----------------------------------------------------------------------------
+# SimpleAxis2Server Script
+#
+# Environment Variable Prequisites
+#
+# AXIS2_HOME Home of Axis2 installation. If not set I will try
+# to figure it out.
+#
+# JAVA_HOME Must point at your Java Development Kit installation.
+#
+# -----------------------------------------------------------------------------
+
+# Get the context and from that find the location of setenv.sh
+. `dirname $0`/setenv.sh
+
+JAVA_OPTS=""
+while [ $# -ge 1 ]; do
+ case $1 in
+ -xdebug)
+ JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=8000"
+ shift
+ ;;
+ -security)
+ JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$AXIS2_HOME/conf/axis2.policy -Daxis2.home=$AXIS2_HOME"
+ shift
+ ;;
+ -h)
+ echo "Usage: axis2server.sh"
+ echo "commands:"
+ echo " -xdebug Start Axis2 Server under JPDA debugger"
+ echo " -security Enable Java 2 security"
+ echo " -h help"
+ shift
+ exit 0
+ ;;
+ *)
+ echo "Error: unknown command:$1"
+ echo "For help: axis2server.sh -h"
+ shift
+ exit 1
+ esac
+done
+
+java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" \
+ -Djava.endorsed.dirs="$AXIS2_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed" \
+ org.apache.axis2.transport.SimpleAxis2Server \
+ -repo "$AXIS2_HOME"/repository -conf "$AXIS2_HOME"/conf/axis2.xml $*
Propchange: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/axis2server.sh
------------------------------------------------------------------------------
svn:executable = *
Added: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/setenv.sh
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/setenv.sh?rev=1400649&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/setenv.sh (added)
+++ airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/setenv.sh Sun Oct 21 14:10:07 2012
@@ -0,0 +1,112 @@
+#!/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.
+
+# ----------------------------------------------------------------------------
+# Set Environment Shell Script
+#
+# This will set AXIS2_HOME and JAVA_HOME environment variables properly.
+#
+# AXIS2_HOME Home of Axis2 installation. If not set I will try
+# to figure it out.
+#
+# JAVA_HOME Must point at your Java Development Kit installation.
+#
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# -----------------------------------------------------------------------------
+
+# if JAVA_HOME is not set we're not happy
+if [ -z "$JAVA_HOME" ]; then
+ echo "You must set the JAVA_HOME variable before running Axis2 Script."
+ exit 1
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+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
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set AXIS2_HOME if not already set
+[ -z "$AXIS2_HOME" ] && AXIS2_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$AXIS2_HOME" ] && AXIS2_HOME=`cygpath --unix "$AXIS2_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For OS400
+if $os400; then
+ # Set job priority to standard for interactive (interactive - 6) by using
+ # the interactive priority - 6, the helper threads that respond to requests
+ # will be running at the same priority as interactive jobs.
+ COMMAND='chgjob job('$JOBNAME') runpty(6)'
+ system $COMMAND
+
+ # Enable multi threading
+ QIBM_MULTI_THREADED=Y
+ export QIBM_MULTI_THREADED
+fi
+
+# update classpath
+AXIS2_CLASSPATH=""
+for f in "$AXIS2_HOME"/lib/*.jar
+do
+ AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f
+done
+AXIS2_CLASSPATH="$AXIS2_HOME":"$AXIS2_HOME/conf":"$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+ AXIS2_HOME=`cygpath --absolute --windows "$AXIS2_HOME"`
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ AXIS2_CLASSPATH=`cygpath --path --windows "$AXIS2_CLASSPATH"`
+ JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+export AXIS2_HOME
+export JAVA_HOME
+export AXIS2_CLASSPATH
+
+
+echo " Using AXIS2_HOME: $AXIS2_HOME"
+echo " Using JAVA_HOME: $JAVA_HOME"
+
+
+
Propchange: airavata/trunk/modules/distribution/src/main/resources/axis2-standalone-bin/setenv.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml Sun Oct 21 14:10:07 2012
@@ -106,21 +106,6 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix32</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix-asn1</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>puretls</artifactId>
- <version>0.9b4-1</version>
- </dependency>
- <dependency>
<groupId>xutil</groupId>
<artifactId>xutil</artifactId>
<version>0.2</version>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Sun Oct 21 14:10:07 2012
@@ -206,21 +206,6 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix32</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>cryptix-asn1</artifactId>
- <version>versionless</version>
- </dependency>
- <dependency>
- <groupId>lead-security</groupId>
- <artifactId>puretls</artifactId>
- <version>0.9b4-1</version>
- </dependency>
- <dependency>
<groupId>xutil</groupId>
<artifactId>xutil</artifactId>
<version>0.2</version>
@@ -251,11 +236,6 @@
<version>${xmlbeans.version}</version>
</dependency>
<dependency>
- <groupId>xbaya</groupId>
- <artifactId>pegasuswebservice</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
<version>${axis2.version}</version>
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java Sun Oct 21 14:10:07 2012
@@ -35,8 +35,6 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
import org.apache.airavata.xbaya.monitor.Monitor;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
-import org.apache.airavata.xbaya.myproxy.MyProxyClient;
-import org.apache.airavata.xbaya.security.XBayaSecurity;
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.monitor.MonitorStarter;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
@@ -58,8 +56,6 @@ public class XBayaEngine {
private Monitor monitor;
- private MyProxyClient myProxyClient;
-
private boolean exitOnClose = true;
private ComponentTreeNode systemComponentTree;
@@ -144,13 +140,6 @@ public class XBayaEngine {
}
/**
- * @return The MyProxyClient.
- */
- public MyProxyClient getMyProxyClient() {
- return this.myProxyClient;
- }
-
- /**
* Disposes on exit.
*
* @throws WorkflowException
@@ -164,24 +153,12 @@ public class XBayaEngine {
*/
private void initAfterGUI() {
- // Initialize security at the beginning.
- initSecurity();
-
initRegistry();
initMonitor();
}
- private void initSecurity() {
- // Initializes XSUL invokers with SSL without client authentication.
- try {
- XBayaSecurity.init();
- } catch (RuntimeException e) {
- getGUI().getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
- }
- }
-
/**
* Initializes registris.
*/
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java Sun Oct 21 14:10:07 2012
@@ -37,7 +37,6 @@ import org.apache.airavata.xbaya.ui.dial
import org.apache.airavata.xbaya.ui.graph.subworkflow.SubWorkflowNodeGUI;
import org.apache.airavata.xbaya.ui.graph.system.DifferedInputHandler;
import org.apache.airavata.xbaya.ui.utils.Cancelable;
-import org.apache.airavata.xbaya.ui.utils.MyProxyChecker;
import org.apache.airavata.xbaya.util.InterpreterUtil;
public class GUIWorkflowInterpreterInteractorImpl implements
@@ -143,7 +142,7 @@ public class GUIWorkflowInterpreterInter
switch (messageType) {
case INPUT_WORKFLOWINTERPRETER_FOR_WORKFLOW:
Workflow subWorkflow= (Workflow) data;
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(), config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(), new MyProxyChecker(this.engine), this.engine.getMonitor());
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(), config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(), this.engine.getMonitor());
workflowInterpreterConfiguration.setActOnProvenance(config.isActOnProvenance());
workflowInterpreterConfiguration.setSubWorkflow(true);
if (config.isTestMode()){
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java Sun Oct 21 14:10:07 2012
@@ -60,7 +60,7 @@ public class SSWorkflowInterpreterIntera
switch (messageType) {
case INPUT_WORKFLOWINTERPRETER_FOR_WORKFLOW:
Workflow subWorkflow= (Workflow) data;
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(), config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(), config.getMyProxyChecker(), config.getMonitor());
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(), config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(), config.getMonitor());
if (config.isTestMode()){
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Sun Oct 21 14:10:07 2012
@@ -99,13 +99,12 @@ import org.apache.airavata.xbaya.invoker
import org.apache.airavata.xbaya.invoker.EmbeddedGFacInvoker;
import org.apache.airavata.xbaya.invoker.GenericInvoker;
import org.apache.airavata.xbaya.invoker.Invoker;
-import org.apache.airavata.xbaya.invoker.ODEClientUtil;
+import org.apache.airavata.xbaya.invoker.WorkflowInputUtil;
import org.apache.airavata.xbaya.invoker.WorkflowInvokerWrapperForGFacInvoker;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.provenance.ProvenanceReader;
import org.apache.airavata.xbaya.provenance.ProvenanceWrite;
-import org.apache.airavata.xbaya.security.XBayaSecurity;
import org.apache.airavata.xbaya.ui.graph.NodeGUI;
import org.apache.airavata.xbaya.ui.monitor.MonitorEventHandler.NodeState;
import org.apache.airavata.xbaya.util.AmazonUtil;
@@ -675,8 +674,6 @@ public class WorkflowInterpreter {
// done
// rest of the loading should work.
- XBayaSecurity.init();
-
} catch (URISyntaxException e) {
throw new WorkflowRuntimeException(e);
}
@@ -753,14 +750,14 @@ public class WorkflowInterpreter {
* Need to override inputValue if it is odeClient
*/
if (port.getFromNode() instanceof InputNode) {
- inputVal = ODEClientUtil.parseValue((WSComponentPort) port.getComponentPort(), (String) inputVal);
+ inputVal = WorkflowInputUtil.parseValue((WSComponentPort) port.getComponentPort(), (String) inputVal);
}
if (null == inputVal) {
throw new WorkFlowInterpreterException("Unable to find inputs for the node:" + node.getID());
}
if (port.getFromNode() instanceof EndForEachNode) {
- inputVal = ODEClientUtil.parseValue((WSComponentPort) port.getComponentPort(), (String) inputVal);
+ inputVal = WorkflowInputUtil.parseValue((WSComponentPort) port.getComponentPort(), (String) inputVal);
// org.xmlpull.v1.builder.XmlElement inputElem = XMLUtil
// .stringToXmlElement3("<" + port.getName() + ">"
// + inputVal.toString() + "</" + port.getName()
@@ -1189,7 +1186,7 @@ public class WorkflowInterpreter {
*/
Node fromNode = port.getFromNode();
// if (fromNode instanceof ForEachNode) {
- inputVal = ODEClientUtil.parseValue((WSComponentPort) port.getComponentPort(), input);
+ inputVal = WorkflowInputUtil.parseValue((WSComponentPort) port.getComponentPort(), input);
// }
if (null == inputVal) {
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java Sun Oct 21 14:10:07 2012
@@ -30,7 +30,6 @@ import org.apache.airavata.xbaya.jython.
import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
import org.apache.airavata.xbaya.monitor.Monitor;
import org.apache.airavata.xbaya.ui.XBayaGUI;
-import org.apache.airavata.xbaya.ui.utils.MyProxyChecker;
public class WorkflowInterpreterConfiguration {
// public static final int GUI_MODE = 1;
@@ -41,7 +40,6 @@ public class WorkflowInterpreterConfigur
private AiravataRegistry2 registry;
private XBayaConfiguration configuration;
private XBayaGUI gui;
- private MyProxyChecker myProxyChecker;
private Monitor monitor;
private boolean offline=false;
private boolean runWithCrossProduct=false;
@@ -53,17 +51,16 @@ public class WorkflowInterpreterConfigur
private boolean subWorkflow;
private boolean testMode=false;
- public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,MyProxyChecker myProxyChecker,Monitor monitor) {
- this(workflow, topic, messageBoxURL,messageBrokerURL,registry,configuration,gui,myProxyChecker,monitor, true);
+ public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,Monitor monitor) {
+ this(workflow, topic, messageBoxURL,messageBrokerURL,registry,configuration,gui,monitor, true);
}
- public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,MyProxyChecker myProxyChecker,Monitor monitor, boolean offline) {
+ public WorkflowInterpreterConfiguration(Workflow workflow, String topic, URI messageBoxURL,URI messageBrokerURL,AiravataRegistry2 registry,XBayaConfiguration configuration,XBayaGUI gui,Monitor monitor, boolean offline) {
this.messageBoxURL = messageBoxURL;
this.messageBrokerURL = messageBrokerURL;
this.registry = registry;
this.configuration = configuration;
this.gui = gui;
- this.myProxyChecker = myProxyChecker;
this.monitor = monitor;
this.offline = offline;
this.workflow = workflow;
@@ -100,12 +97,6 @@ public class WorkflowInterpreterConfigur
public void setGUI(XBayaGUI gui) {
this.gui = gui;
}
- public MyProxyChecker getMyProxyChecker() {
- return myProxyChecker;
- }
- public void setMyProxyChecker(MyProxyChecker myProxyChecker) {
- this.myProxyChecker = myProxyChecker;
- }
public Monitor getMonitor() {
return monitor;
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Sun Oct 21 14:10:07 2012
@@ -297,7 +297,7 @@ public class WorkflowInterpretorSkeleton
WorkflowInterpretorEventListener listener = null;
WorkflowInterpreter interpreter = null;
AiravataRegistry2 registry = getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,topic,conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null, null, null);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,topic,conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null, null);
workflowInterpreterConfiguration.setGfacEmbeddedMode(gfacEmbeddedMode);
workflowInterpreterConfiguration.setActOnProvenance(provenance);
// WorkflowInterpreter object should create prior creation of Listener, because listener needs the threadlocal variable
Copied: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java (from r1400527, airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java?p2=airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java&p1=airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java&r1=1400527&r2=1400649&rev=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/WorkflowInputUtil.java Sun Oct 21 14:10:07 2012
@@ -28,7 +28,7 @@ import org.apache.airavata.xbaya.lead.LE
import javax.xml.namespace.QName;
-public class ODEClientUtil {
+public class WorkflowInputUtil {
public static String createInputForGFacService(WSComponentPort port,String input){
String paramType = port.getType().getLocalPart();
@@ -70,7 +70,7 @@ public class ODEClientUtil {
} else {
try {
if(XBayaConstants.HTTP_SCHEMAS_AIRAVATA_APACHE_ORG_GFAC_TYPE.equals(input.getType().getNamespaceURI())){
- value = XMLUtil.stringToXmlElement3(ODEClientUtil.createInputForGFacService(input, valueString));
+ value = XMLUtil.stringToXmlElement3(WorkflowInputUtil.createInputForGFacService(input, valueString));
}else {
throw new WorkflowRuntimeException("Input parameter, " + name + ", Unkown Type");
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/XBayaTestCase.java Sun Oct 21 14:10:07 2012
@@ -27,14 +27,10 @@ import java.net.URI;
import junit.framework.TestCase;
import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.security.XBayaSecurity;
import org.slf4j.Logger;
public abstract class XBayaTestCase extends TestCase {
- private static final String SAMPLE_MY_LEAD_USER = "/O=LEAD Project/OU=portal.leadproject.org/OU=cs.indiana.edu/CN=sshirasu/EMAIL=sshirasu@cs.indiana.edu";
-
- private static final String SAMPLE_MY_LEAD_PROJECT = "Project1";
protected XBayaConfiguration configuration;
@@ -77,8 +73,5 @@ public abstract class XBayaTestCase exte
this.configuration.setMyProxyPassphrase(myProxyPassphrase);
}
- // Initializes security
- XBayaSecurity.init();
-
}
}
\ No newline at end of file
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicWorkflowRunnerWindow.java Sun Oct 21 14:10:07 2012
@@ -60,7 +60,6 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.graph.ws.WSNodeGUI;
import org.apache.airavata.xbaya.ui.utils.ErrorMessages;
-import org.apache.airavata.xbaya.ui.utils.MyProxyChecker;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
@@ -352,7 +351,7 @@ public class DynamicWorkflowRunnerWindow
@Override
public void run() {
XBayaConfiguration conf = DynamicWorkflowRunnerWindow.this.engine.getConfiguration();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(engine.getGUI().getWorkflow(),topicString,conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, DynamicWorkflowRunnerWindow.this.engine.getGUI(), new MyProxyChecker(DynamicWorkflowRunnerWindow.this.engine), DynamicWorkflowRunnerWindow.this.engine.getMonitor());
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(engine.getGUI().getWorkflow(),topicString,conf.getMessageBoxURL(), conf.getBrokerURL(), conf.getJcrComponentRegistry().getRegistry(), conf, DynamicWorkflowRunnerWindow.this.engine.getGUI(), DynamicWorkflowRunnerWindow.this.engine.getMonitor());
workflowInterpreterConfiguration.setRunWithCrossProduct(isRunCrossProduct);
WorkflowInterpreter workflowInterpreter = new WorkflowInterpreter(
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RunMenuItem.java Sun Oct 21 14:10:07 2012
@@ -46,8 +46,6 @@ import org.apache.airavata.xbaya.event.E
import org.apache.airavata.xbaya.monitor.Monitor;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ui.dialogs.GridChemRunnerWindow;
-import org.apache.airavata.xbaya.ui.dialogs.JythonRunnerWindow;
import org.apache.airavata.xbaya.ui.dialogs.graph.dynamic.DynamicWorkflowRunnerWindow;
import org.apache.airavata.xbaya.ui.dialogs.monitor.MonitorConfigurationWindow;
import org.apache.airavata.xbaya.ui.experiment.WorkflowInterpreterLaunchWindow;
@@ -66,12 +64,8 @@ public class RunMenuItem implements Eve
private JMenuItem launchDynamicWorkflowItem;
- private JMenuItem launchGridChemWorkflowItem;
-
private JMenuItem launchXBayaInterpreterItem;
- private JMenuItem launchAndSaveInGridChemWorkflowItem;
-
private JMenuItem configMonitorItem;
private JMenuItem resumeMonitoringItem;
@@ -126,9 +120,7 @@ public class RunMenuItem implements Eve
*/
private void createWorkflowMenu() {
this.launchDynamicWorkflowItem = createLaunchDynamicWorkflowItem();
- this.launchGridChemWorkflowItem = createLaunchGridChemWorkflowItem();
createLaunchXBayaInterpreterItem();
- createLaunchAndSaveGridChemWorkflowItem();
this.configMonitorItem = createConfigMonitoring();
this.resumeMonitoringItem = createResumeMonitoring();
this.pauseMonitoringItem = createPauseMonitoring();
@@ -143,10 +135,6 @@ public class RunMenuItem implements Eve
runMenu.addSeparator();
runMenu.add(stopWorkflowItem);
-
- runMenu.addSeparator();
- runMenu.add(launchGridChemWorkflowItem);
- runMenu.add(launchAndSaveInGridChemWorkflowItem);
runMenu.addSeparator();
@@ -184,8 +172,6 @@ public class RunMenuItem implements Eve
toolbarButtonRunWorkflow.setEnabled(runShouldBeActive);
launchDynamicWorkflowItem.setEnabled(runShouldBeActive);
launchXBayaInterpreterItem.setEnabled(runShouldBeActive);
- launchGridChemWorkflowItem.setEnabled(false);
- launchAndSaveInGridChemWorkflowItem.setEnabled(false);
}
});
}
@@ -276,23 +262,6 @@ public class RunMenuItem implements Eve
toolbarButtonStopWorkflow.setEnabled(item.isEnabled());
return item;
}
-
- private JMenuItem createRunJythonWorkflowItem() {
- JMenuItem menuItem = new JMenuItem("Run workflow as Jython...");
- menuItem.setMnemonic(KeyEvent.VK_J);
- menuItem.addActionListener(new AbstractAction() {
- private JythonRunnerWindow window;
-
- public void actionPerformed(ActionEvent event) {
- if (this.window == null) {
- this.window = new JythonRunnerWindow(engine);
- }
- this.window.show();
- }
- });
- menuItem.setEnabled(false);
- return menuItem;
- }
private JMenuItem createLaunchDynamicWorkflowItem() {
JMenuItem menuItem = new JMenuItem("Run workflow...");
@@ -338,22 +307,6 @@ public class RunMenuItem implements Eve
return engine.getGUI().getGraphCanvas() !=null;
}
- private JMenuItem createLaunchGridChemWorkflowItem() {
- JMenuItem menuItem = new JMenuItem("Run as GridChem Workflow...");
- menuItem.addActionListener(new AbstractAction() {
- private GridChemRunnerWindow window;
-
- public void actionPerformed(ActionEvent event) {
- if (this.window == null) {
- this.window = new GridChemRunnerWindow(engine);
- }
- this.window.show();
- }
- });
- menuItem.setEnabled(false);
- return menuItem;
- }
-
private void createLaunchXBayaInterpreterItem() {
this.launchXBayaInterpreterItem = new JMenuItem("Run on Interpreter Server...", MenuIcons.RUN_ICON);
AbstractAction action = new AbstractAction() {
@@ -384,18 +337,6 @@ public class RunMenuItem implements Eve
toolbarButtonRunWorkflow.setEnabled(launchXBayaInterpreterItem.isEnabled());
launchXBayaInterpreterItem.setEnabled(false);
}
-
- /**
- *
- */
- private void createLaunchAndSaveGridChemWorkflowItem() {
- launchAndSaveInGridChemWorkflowItem = new JMenuItem("Run & Register in GridChem... ");
- // TODO Add the following operations
- // First Call OGCE-GridChem-Bridge Service to register an experiment
- // Set lead context header with all the required notifier context
- // call launch workflow
- launchAndSaveInGridChemWorkflowItem.setEnabled(false);
- }
/**
* @see org.apache.airavata.xbaya.event.EventListener#eventReceived(org.apache.airavata.xbaya.event.Event)
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/workflow/WorkflowClient.java Sun Oct 21 14:10:07 2012
@@ -30,7 +30,6 @@ import org.apache.airavata.workflow.mode
import org.apache.airavata.workflow.model.wf.Workflow;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.event.EventProducer;
-import org.apache.airavata.xbaya.security.UserX509Credential;
import org.gpel.client.GcInstance;
import org.gpel.client.GcSearchList;
import org.slf4j.Logger;
@@ -168,12 +167,6 @@ public abstract class WorkflowClient ext
// ===========================================================================
/**
- * @param userX509Credential
- * @throws WorkflowEngineException
- */
- public abstract void setUserX509Credential(UserX509Credential userX509Credential) throws WorkflowEngineException;
-
- /**
* @param workflow
* @param redeploy
* @return The workflow template ID.
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java Sun Oct 21 14:10:07 2012
@@ -60,7 +60,7 @@ public class ComplexForEachWorkflowTest
// ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,null,true);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,null,null,true);
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java Sun Oct 21 14:10:07 2012
@@ -60,7 +60,7 @@ public class ComplexMathWorkflowTest {
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,null,true);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,ssWorkflowInterpreterInteractorImpl);
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java Sun Oct 21 14:10:07 2012
@@ -60,7 +60,7 @@ public class CrossProductWorkflowTest {
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,null,true);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
WorkflowInterpreter interpretor = new WorkflowInterpreter(workflowInterpreterConfiguration,new SSWorkflowInterpreterInteractorImpl());
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java Sun Oct 21 14:10:07 2012
@@ -61,7 +61,7 @@ public class ForEachWorkflowTest {
((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,null,true);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java Sun Oct 21 14:10:07 2012
@@ -59,7 +59,7 @@ public class SimpleForEachWorkflowTest {
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,null,true);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();
Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java?rev=1400649&r1=1400648&r2=1400649&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java Sun Oct 21 14:10:07 2012
@@ -60,7 +60,7 @@ public class SimpleMathWorkflowTest {
Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
- WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,null,true);
+ WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow, UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf, null,null,true);
workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();