Author: smarru
Date: Thu Aug 15 02:59:47 2013
New Revision: 1514143
URL: http://svn.apache.org/r1514143
Log:
Moving extreme lab jars to maven central addressing AIRAVATA-406
Removed:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/lead/LEADWorkflowInvoker.java
Modified:
airavata/trunk/modules/commons/utils/pom.xml
airavata/trunk/modules/distribution/airavata-client/pom.xml
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/pom.xml
airavata/trunk/modules/gfac-core/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml
airavata/trunk/modules/ws-messenger/messagebox/pom.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/commons/utils/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/pom.xml (original)
+++ airavata/trunk/modules/commons/utils/pom.xml Thu Aug 15 02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
@@ -23,53 +24,53 @@
<name>Airavata Common Utilities</name>
<url>http://airavata.apache.org/</url>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>${xmlbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3_7</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_b</version>
- </dependency>
- <dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>xpp5</artifactId>
+ <version>1.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.6</version>
+ </dependency>
+ <dependency>
+ <groupId>xsul5-ogce</groupId>
+ <artifactId>xsul5-2007-02-27</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
</dependency>
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -91,28 +92,28 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>7.0.22</version>
</dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: airavata/trunk/modules/distribution/airavata-client/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Thu Aug 15
02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
<artifactId>distribution</artifactId>
@@ -24,33 +25,11 @@
<build>
<plugins>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>unpack-axis2</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-webapp</artifactId>
- <version>${axis2.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
-
<outputDirectory>target/axis2-${axis2.version}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin-->
+ <!--plugin> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <version>2.4</version>
+ <inherited>false</inherited> <executions> <execution>
<id>unpack-axis2</id> <phase>package</phase> <goals> <goal>unpack</goal>
+ </goals> <configuration> <artifactItems> <artifactItem>
<groupId>org.apache.axis2</groupId> <artifactId>axis2-webapp</artifactId>
+ <version>${axis2.version}</version> <type>war</type>
<overWrite>true</overWrite>
<outputDirectory>target/axis2-${axis2.version}</outputDirectory>
+ </artifactItem> </artifactItems> </configuration> </execution>
</executions> </plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -72,67 +51,57 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>${airavata.client-bin.zip}</file>
- <type>zip</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
-
<file>${airavata.client-bin.tar.gz}</file>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${airavata.client-bin.zip}</file>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>${airavata.client-bin.tar.gz}</file>
+ <type>tar.gz</type>
+ <classifier>bin</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_xpath</artifactId>
- <version>1.1.4c</version>
- </dependency>
<dependency>
- <groupId>xpp3</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
- <groupId>xpp5</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp5</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5_xpath</artifactId>
- <version>1.2.6</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.6</version>
</dependency>
<dependency>
- <groupId>gpel</groupId>
- <artifactId>gpel_client</artifactId>
- <version>1.0.7-BETA</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>gpel-client</artifactId>
+ <version>1.0.8</version>
</dependency>
<dependency>
<groupId>atomixmiser</groupId>
@@ -165,11 +134,6 @@
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
- </dependency>
- <dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
@@ -238,7 +202,7 @@
</dependency>
<!-- AIRAVATA modules -->
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-xbaya-gui</artifactId>
<version>${project.version}</version>
@@ -335,11 +299,8 @@
<artifactId>airavata-workflow-execution-context</artifactId>
<version>${project.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency-->
+ <!--dependency> <groupId>org.apache.airavata</groupId>
<artifactId>airavata-jpa-registry</artifactId>
<version>${project.version}</version>
+ </dependency -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
@@ -378,8 +339,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<archieve.name>apache-airavata-client</archieve.name>
<used.axis2.release>${axis2.version}</used.axis2.release>
-
<airavata.client-dist.name>${archieve.name}-${project.version}</airavata.client-dist.name>
-
<airavata.client-bin.zip>${project.build.directory}/${airavata.client-dist.name}-bin.zip</airavata.client-bin.zip>
-
<airavata.client-bin.tar.gz>${project.build.directory}/${airavata.client-dist.name}-bin.tar.gz</airavata.client-bin.tar.gz>
+
<airavata.client-dist.name>${archieve.name}-${project.version}</airavata.client-dist.name>
+
<airavata.client-bin.zip>${project.build.directory}/${airavata.client-dist.name}-bin.zip</airavata.client-bin.zip>
+
<airavata.client-bin.tar.gz>${project.build.directory}/${airavata.client-dist.name}-bin.tar.gz</airavata.client-bin.tar.gz>
</properties>
</project>
Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Thu Aug 15
02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
<artifactId>distribution</artifactId>
@@ -50,27 +51,27 @@
<excludes>**/icu4j-2.6.1.jar</excludes>
</configuration>
</execution>
- <execution>
- <id>copy</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.airavata</groupId>
-
<artifactId>airavata-rest-service-webapp</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
-
<outputDirectory>${airavata.war.dir}</outputDirectory>
-
<destFileName>airavata-services.war</destFileName>
- </artifactItem>
- </artifactItems>
-
<outputDirectory>${airavata.war.dir}</outputDirectory>
- </configuration>
- </execution>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.airavata</groupId>
+
<artifactId>airavata-rest-service-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${airavata.war.dir}</outputDirectory>
+
<destFileName>airavata-services.war</destFileName>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${airavata.war.dir}</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -117,7 +118,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -125,24 +126,24 @@
<phase>package</phase>
<configuration>
<target>
- <echo
message="Building Airavata Server WAR" />
- <echo
message="============================" />
+ <echo message="Building Airavata Server WAR" />
+ <echo message="============================" />
<unzip src="${airavata.bin.zip}"
dest="${project.build.directory}/tests" />
- <copy
todir="${airavata.webapp.dir}/META-INF">
-
<fileset dir="${project.build.directory}/axis2-${axis2.version}/META-INF" />
-
</copy>
- <copy
todir="${airavata.webapp.dir}/axis2-web">
-
<fileset dir="${project.build.directory}/axis2-${axis2.version}/axis2-web"
/>
-
</copy>
- <copy
todir="${airavata.webapp.dir}/WEB-INF">
-
<fileset dir="${project.build.directory}/axis2-${axis2.version}/WEB-INF" />
-
</copy>
- <copy
todir="${airavata.webapp.dir}/WEB-INF">
+ <copy todir="${airavata.webapp.dir}/META-INF">
+ <fileset
dir="${project.build.directory}/axis2-${axis2.version}/META-INF" />
+ </copy>
+ <copy todir="${airavata.webapp.dir}/axis2-web">
+ <fileset
dir="${project.build.directory}/axis2-${axis2.version}/axis2-web" />
+ </copy>
+ <copy todir="${airavata.webapp.dir}/WEB-INF">
+ <fileset
dir="${project.build.directory}/axis2-${axis2.version}/WEB-INF" />
+ </copy>
+ <copy todir="${airavata.webapp.dir}/WEB-INF">
<fileset
dir="${airavata.work.dir}/repository/" />
</copy>
<copy
todir="${airavata.webapp.dir}/WEB-INF/lib">
<fileset dir="${airavata.work.dir}/lib/">
- <exclude name="tomcat-*.jar" />
+ <exclude name="tomcat-*.jar" />
</fileset>
</copy>
<copy
todir="${airavata.webapp.dir}/WEB-INF/classes">
@@ -153,23 +154,24 @@
<copy
todir="${airavata.webapp.dir}/WEB-INF/classes/database_scripts">
<fileset
dir="${airavata.work.dir}/bin/database_scripts" />
</copy>
- <copy
todir="${airavata.webapp.dir}">
+ <copy todir="${airavata.webapp.dir}">
<fileset dir="src/main/resources">
-
<include name="LICENSE" />
-
<include name="NOTICE" />
-
</fileset>
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
</copy>
- <replace
file="${airavata.webapp.dir}/WEB-INF/classes/airavata-server.properties">
+ <replace
file="${airavata.webapp.dir}/WEB-INF/classes/airavata-server.properties">
<replacetoken>server.context-root=axis2</replacetoken>
<replacevalue>server.context-root=airavata-server</replacevalue>
</replace>
- <zip
destfile="${airavata.war.dir}/airavata-server.war"
basedir="${airavata.webapp.dir}" />
- <copy
todir="${airavata.war.dir}">
+ <zip
destfile="${airavata.war.dir}/airavata-server.war"
basedir="${airavata.webapp.dir}" />
+ <copy todir="${airavata.war.dir}">
<fileset dir="src/main/resources/war" />
</copy>
<copy
file="${airavata.work.dir}/RELEASE_NOTES" todir="${airavata.war.dir}" />
- <zip
destfile="${airavata.webapp.war.zip}" basedir="${airavata.war.dir}" />
- <tar
tarfile="${airavata.webapp.war.tar.gz}" basedir="${airavata.war.dir}"
compression="gzip" />
+ <zip destfile="${airavata.webapp.war.zip}"
basedir="${airavata.war.dir}" />
+ <tar tarfile="${airavata.webapp.war.tar.gz}"
basedir="${airavata.war.dir}"
+ compression="gzip" />
</target>
</configuration>
<goals>
@@ -178,44 +180,44 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
-
<file>${airavata.webapp.war.zip}</file>
- <type>zip</type>
- <classifier>war</classifier>
- </artifact>
- <artifact>
-
<file>${airavata.webapp.war.tar.gz}</file>
- <type>tar.gz</type>
- <classifier>war</classifier>
- </artifact>
- <artifact>
- <file>${airavata.bin.zip}</file>
- <type>zip</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
- <file>${airavata.bin.tar.gz}</file>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${airavata.webapp.war.zip}</file>
+ <type>zip</type>
+ <classifier>war</classifier>
+ </artifact>
+ <artifact>
+ <file>${airavata.webapp.war.tar.gz}</file>
+ <type>tar.gz</type>
+ <classifier>war</classifier>
+ </artifact>
+ <artifact>
+ <file>${airavata.bin.zip}</file>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+ <file>${airavata.bin.tar.gz}</file>
+ <type>tar.gz</type>
+ <classifier>bin</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
@@ -251,11 +253,6 @@
<version>${derby.version}</version>
</dependency>
<dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -268,9 +265,9 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>gpel</groupId>
- <artifactId>gpel_client</artifactId>
- <version>1.0.7-BETA</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>gpel-client</artifactId>
+ <version>1.0.8</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -278,19 +275,14 @@
<version>${jcr.version}</version>
</dependency>
<dependency>
- <groupId>xpp5</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp5</artifactId>
- <version>1.2.6</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_xpath</artifactId>
- <version>1.1.4c</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
<groupId>xutil</groupId>
@@ -298,14 +290,14 @@
<version>0.2</version>
</dependency>
<dependency>
- <groupId>jython</groupId>
+ <groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>2.5.1</version>
+ <version>2.5.3</version>
</dependency>
<dependency>
- <groupId>xsul</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
+ <version>2.10.6</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
@@ -456,11 +448,8 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15</artifactId>
- <version>1.45</version>
- </dependency-->
+ <!--dependency> <groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk15</artifactId> <version>1.45</version>
+ </dependency -->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
@@ -516,11 +505,8 @@
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-common-utils</artifactId>
- <version>${project.version}</version>
- </dependency-->
+ <!--dependency> <groupId>org.apache.airavata</groupId>
<artifactId>airavata-common-utils</artifactId>
<version>${project.version}</version>
+ </dependency -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
@@ -577,11 +563,8 @@
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
- <!--dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency-->
+ <!--dependency> <groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId> <version>${jersey.version}</version>
+ </dependency -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
@@ -612,7 +595,7 @@
<artifactId>icu4j</artifactId>
<version>3.4.4</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>12.0</version>
@@ -673,13 +656,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<archieve.name>apache-airavata-server</archieve.name>
<used.axis2.release>${axis2.version}</used.axis2.release>
-
<airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name>
+
<airavata.dist.name>${archieve.name}-${project.version}</airavata.dist.name>
<airavata.work.dir>${project.build.directory}/tests/${airavata.dist.name}</airavata.work.dir>
-
<airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip>
-
<airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz>
-
<airavata.webapp.dir>${project.build.directory}/airavata-axis2</airavata.webapp.dir>
-
<airavata.war.dir>${project.build.directory}/test</airavata.war.dir>
-
<airavata.webapp.war.zip>${project.build.directory}/${airavata.dist.name}.war.zip</airavata.webapp.war.zip>
-
<airavata.webapp.war.tar.gz>${project.build.directory}/${airavata.dist.name}.war.tar.gz</airavata.webapp.war.tar.gz>
+
<airavata.bin.zip>${project.build.directory}/${airavata.dist.name}-bin.zip</airavata.bin.zip>
+
<airavata.bin.tar.gz>${project.build.directory}/${airavata.dist.name}-bin.tar.gz</airavata.bin.tar.gz>
+
<airavata.webapp.dir>${project.build.directory}/airavata-axis2</airavata.webapp.dir>
+ <airavata.war.dir>${project.build.directory}/test</airavata.war.dir>
+
<airavata.webapp.war.zip>${project.build.directory}/${airavata.dist.name}.war.zip</airavata.webapp.war.zip>
+
<airavata.webapp.war.tar.gz>${project.build.directory}/${airavata.dist.name}.war.tar.gz</airavata.webapp.war.tar.gz>
</properties>
</project>
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Thu Aug 15 02:59:47 2013
@@ -217,11 +217,10 @@
<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>org.ogce:xpp3:jar</include>
+ <include>org.ogce:gpel-client:jar</include>
+ <include>org.ogce:xpp5:jar</include>
+ <include>org.ogce:xsul:jar</include>
<include>xsul5-ogce:xsul5-2007-02-27:jar</include>
<include>xutil:xutil</include>
<include>jython:jython</include>
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Thu Aug 15 02:59:47
2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
<artifactId>distribution</artifactId>
@@ -116,8 +117,10 @@
<phase>compile</phase>
<configuration>
<target>
- <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.dependency.classpath" />
- <unzip
src="target/apache-airavata-xbaya-gui-${project.version}-bin.zip"
dest="${project.build.directory}/temp" />
+ <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
+
classpathref="maven.dependency.classpath" />
+ <unzip
src="target/apache-airavata-xbaya-gui-${project.version}-bin.zip"
+
dest="${project.build.directory}/temp" />
<mkdir dir="${jnlp.direcotry}" />
<mkdir dir="${jnlp.direcotry}/lib" />
<copy todir="${jnlp.direcotry}/lib">
@@ -193,8 +196,10 @@
<configuration>
<target>
<zip
destfile="${airavata.xbaya-jnlp.zip}" basedir="${jnlp.direcotry}" />
- <tar
destfile="${project.build.directory}/xbaya-jnlp-${project.version}.tar"
basedir="${jnlp.direcotry}" />
- <gzip
destfile="${airavata.xbaya-jnlp.tar.gz}"
src="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
+ <tar
destfile="${project.build.directory}/xbaya-jnlp-${project.version}.tar"
+ basedir="${jnlp.direcotry}" />
+ <gzip
destfile="${airavata.xbaya-jnlp.tar.gz}"
+
src="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
<delete
file="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
</target>
</configuration>
@@ -231,14 +236,14 @@
<version>1.2.6</version>
</dependency>
<dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.6</version>
</dependency>
<dependency>
- <groupId>gpel</groupId>
- <artifactId>gpel_client</artifactId>
- <version>1.0.7-BETA</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>gpel-client</artifactId>
+ <version>1.0.8</version>
</dependency>
<dependency>
<groupId>atomixmiser</groupId>
@@ -271,11 +276,6 @@
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
- </dependency>
- <dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
Modified: airavata/trunk/modules/gfac-core/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/pom.xml (original)
+++ airavata/trunk/modules/gfac-core/pom.xml Thu Aug 15 02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata</artifactId>
@@ -97,16 +98,14 @@
<version>1.3.20</version>
</dependency>
<dependency>
- <groupId>j2ssh</groupId>
+ <groupId>sshtools</groupId>
<artifactId>j2ssh-core</artifactId>
<version>0.2.9</version>
- <type>jar</type>
</dependency>
<dependency>
- <groupId>j2ssh</groupId>
+ <groupId>sshtools</groupId>
<artifactId>j2ssh-common</artifactId>
<version>0.2.9</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Modified:
airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml
(original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component-node/pom.xml
Thu Aug 15 02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
@@ -61,9 +62,9 @@
<dependencies>
<dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>xsul</artifactId>
+ <version>2.10.6</version>
</dependency>
<dependency>
<groupId>atomixmiser</groupId>
Modified: airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml
(original)
+++ airavata/trunk/modules/workflow-model/workflow-model-component/pom.xml Thu
Aug 15 02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
@@ -65,9 +66,9 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>xsul</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
+ <version>2.10.6</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
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=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml (original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/pom.xml Thu Aug
15 02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
@@ -72,9 +73,9 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>xsul</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
+ <version>2.10.6</version>
</dependency>
<dependency>
Modified: airavata/trunk/modules/ws-messenger/messagebox/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebox/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebox/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebox/pom.xml Thu Aug 15 02:59:47
2013
@@ -74,7 +74,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
+
<version>${antrun.version}</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
<id>restore-persistence</id>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Thu Aug 15 02:59:47 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
@@ -90,29 +91,19 @@
<version>1.1.4c</version>
</dependency>
<dependency>
- <groupId>xpp5</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xpp5</artifactId>
- <version>1.2.6</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5_xpath</artifactId>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <groupId>xsul</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>xsul</artifactId>
- <version>2.10.5_b</version>
+ <version>2.10.6</version>
</dependency>
<dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>gpel</groupId>
- <artifactId>gpel_client</artifactId>
- <version>1.0.7-BETA</version>
+ <groupId>org.ogce</groupId>
+ <artifactId>gpel-client</artifactId>
+ <version>1.0.8</version>
</dependency>
<dependency>
<groupId>atomixmiser</groupId>
@@ -144,11 +135,6 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
- </dependency>
- <dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
@@ -309,11 +295,8 @@
<artifactId>airavata-workflow-execution-context</artifactId>
<version>${project.version}</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency-->
+ <!--dependency> <groupId>org.apache.airavata</groupId>
<artifactId>airavata-jpa-registry</artifactId>
<version>${project.version}</version>
+ </dependency -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
Thu Aug 15 02:59:47 2013
@@ -38,7 +38,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import xsul.lead.LeadDeploymentConfig;
-import xsul.lead.types.context.ContextDocument;
public class XBayaConfiguration extends Observable implements Observer {
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1514143&r1=1514142&r2=1514143&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Thu Aug 15 02:59:47 2013
@@ -354,7 +354,7 @@
<id>ogce.m2.all</id>
<url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
<snapshots>
- <!--updatePolicy>daily</updatePolicy -->
+ <updatePolicy>daily</updatePolicy>
<enabled>false</enabled>
</snapshots>
</repository>
