You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/02/15 06:13:10 UTC
svn commit: r1244361 - in
/incubator/airavata/branches/0.2-incubating-SNAPSHOT: ./
modules/commons/gfac-schema/ modules/commons/registry-api/
modules/commons/utils/ modules/commons/workflow-execution-context/
modules/commons/workflow-tracking/ modules/...
Author: lahiru
Date: Wed Feb 15 05:13:10 2012
New Revision: 1244361
URL: http://svn.apache.org/viewvc?rev=1244361&view=rev
Log:
fixing the build system not to use aar files.
Modified:
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/gfac-schema/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/registry-api/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/utils/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-execution-context/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-tracking/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/resources/bin/jackrabbit-server.sh
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-axis2/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-core/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/test-suite/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebox/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebroker/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/xbaya-gui/pom.xml
incubator/airavata/branches/0.2-incubating-SNAPSHOT/pom.xml
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/gfac-schema/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/gfac-schema/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/gfac-schema/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/gfac-schema/pom.xml Wed Feb 15 05:13:10 2012
@@ -26,16 +26,9 @@
<dependencies>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
- <dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -43,26 +36,14 @@
<version>1.6.2</version>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.4c</version>
</dependency>
<dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_d</version>
- </dependency>
- <!-- Logging -->
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/registry-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/registry-api/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/registry-api/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/registry-api/pom.xml Wed Feb 15 05:13:10 2012
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -46,8 +47,6 @@
<artifactId>common-utils</artifactId>
<version>${project.version}</version>
</dependency>
-
-
<!-- Test -->
<dependency>
<groupId>junit</groupId>
@@ -62,11 +61,13 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
<scope>test</scope>
</dependency>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/utils/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/utils/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/utils/pom.xml Wed Feb 15 05:13:10 2012
@@ -31,15 +31,17 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.4.0</version>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
+ <version>1.1.3_7</version>
</dependency>
<dependency>
<groupId>xpp5</groupId>
@@ -49,6 +51,7 @@
<dependency>
<groupId>xsul</groupId>
<artifactId>xsul</artifactId>
+ <version>2.10.5_b</version>
</dependency>
<dependency>
<groupId>xsul5-ogce</groupId>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-execution-context/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-execution-context/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-execution-context/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-execution-context/pom.xml Wed Feb 15 05:13:10 2012
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.4.0</version>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-tracking/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/commons/workflow-tracking/pom.xml Wed Feb 15 05:13:10 2012
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.4.0</version>
+ <version>${xmlbeans.version}</version>
<scope>compile</scope>
</dependency>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/pom.xml Wed Feb 15 05:13:10 2012
@@ -192,6 +192,7 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
</dependency>
<dependency>
<groupId>xpp5</groupId>
@@ -308,6 +309,86 @@
<artifactId>transfer-api-client</artifactId>
<version>0.10</version>
</dependency>
+ <dependency>
+ <groupId>edu.berkeley</groupId>
+ <artifactId>yfilter</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>workflow-execution-context</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>workflowtracking</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>gfac-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>gfac-schema-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>common-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messagebox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messagebroker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>xbaya-gui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>gfac-axis2-interface</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<properties>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/resources/bin/jackrabbit-server.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/resources/bin/jackrabbit-server.sh?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/resources/bin/jackrabbit-server.sh (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/resources/bin/jackrabbit-server.sh Wed Feb 15 05:13:10 2012
@@ -19,4 +19,4 @@
. `dirname $0`/setenv.sh
-$JAVA_HOME/bin/java -jar $AIRAVATA_HOME/lib/jackrabbit-standalone-2.2.7.jar -p 8081 $*
+$JAVA_HOME/bin/java -jar $AIRAVATA_HOME/standalone-server/lib/jackrabbit-standalone-2.2.7.jar -p 8081 $*
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/distribution/src/main/assembly/bin-assembly.xml Wed Feb 15 05:13:10 2012
@@ -58,25 +58,6 @@
</includes>
</fileSet>
- <!-- ********************** copymessagebrokeraar ********************** -->
- <fileSet>
- <directory>../ws-messenger/messagebroker/target</directory>
- <outputDirectory>standalone-server/repository/services
- </outputDirectory>
- <includes>
- <include>messagebroker*.aar</include>
- </includes>
- </fileSet>
-
- <!-- ********************** copy messagebox aar ********************** -->
- <fileSet>
- <directory>../ws-messenger/messagebox/target</directory>
- <outputDirectory>standalone-server/repository/services
- </outputDirectory>
- <includes>
- <include>messagebox*.aar</include>
- </includes>
- </fileSet>
<!-- ********************** copy wsmg.broker and messagebox property files ********************** -->
@@ -98,67 +79,10 @@
</includes>
</fileSet>
- <!-- ********************** copymessagebrokerjar ********************** -->
- <fileSet>
- <directory>../ws-messenger/messagebroker/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>messagebroker*.jar</include>
- </includes>
- </fileSet>
- <!-- ********************** copy messagebox jar ********************** -->
- <fileSet>
- <directory>../ws-messenger/messagebox/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>messagebox*.jar</include>
- </includes>
- </fileSet>
- <!-- ********************** copy commons and client jar ********************** -->
- <fileSet>
- <directory>../ws-messenger/commons/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>messenger-commons*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/client/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>messenger-client*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/client/target/</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/commons/target/</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/client/target/</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/commons/target/</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
+
+
<!-- ********************** copy messagebroker+ messagebox samples ********************** -->
<fileSet>
@@ -180,14 +104,7 @@
</fileSet>
- <!-- ********************** copy messenger servlet ********************** -->
- <fileSet>
- <directory>../ws-messenger/messenger/target</directory>
- <outputDirectory>messenger</outputDirectory>
- <includes>
- <include>messenger*.war</include>
- </includes>
- </fileSet>
+
<!-- ********************** copy readme files ********************** -->
@@ -227,20 +144,7 @@
<include>*sql*</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../xbaya-gui/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../commons/workflow-tracking/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
+
<fileSet>
<directory>resources/bin</directory>
<outputDirectory>bin</outputDirectory>
@@ -248,20 +152,8 @@
<include>*.sh</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../gfac-axis2/target</directory>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes>
- <include>*.aar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../xbaya-gui/target</directory>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes>
- <include>*.aar</include>
- </includes>
- </fileSet>
+
+
<fileSet>
<directory>../../samples/simple-math-service/target</directory>
<outputDirectory>standalone-server/repository/services</outputDirectory>
@@ -283,41 +175,6 @@
<include>*.aar</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../commons/gfac-schema/target</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../commons/gfac-schema/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../commons/registry-api/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../commons/utils/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../commons/workflow-execution-context/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
<fileSet>
<directory>../xbaya-gui/src/test/resources/</directory>
<outputDirectory>samples/workflows</outputDirectory>
@@ -373,15 +230,8 @@
<include>commons-configuration:commons-configuration</include>
<include>commons-lang:commons-lang</include>
<include>xpp3:xpp3</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
<include>gpel:gpel_client</include>
<include>xpp5:xpp5</include>
- <include>xpp3:xpp3</include>
<include>xpp3:xpp3_xpath</include>
<include>org.apache.jackrabbit:jackrabbit-standalone:jar</include>
<include>xsul:xsul:jar</include>
@@ -404,9 +254,29 @@
<include>ode-proxy:weps-beans</include>
<include>atomixmiser:atomixmiser</include>
<include>globus:transfer-api-client</include>
+ <include>org.apache.airavata:registry-api</include>
+ <include>org.apache.airavata:workflow-execution-context</include>
+ <include>org.apache.airavata:workflowtracking</include>
+ <include>org.apache.airavata:gfac-core</include>
+ <include>org.apache.airavata:messenger-client</include>
+ <include>org.apache.airavata:messenger-commons</include>
+ <include>org.apache.airavata:gfac-schema-utils</include>
+ <include>org.apache.airavata:common-utils</include>
+ <include>edu.berkeley:yfilter</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>javax.servlet:servlet-api</include>
</includes>
-
</dependencySet>
+
+ <dependencySet>
+ <outputDirectory>standalone-server/repository/services</outputDirectory>
+ <includes>
+ <include>org.apache.airavata:messagebox:jar</include>
+ <include>org.apache.airavata:messagebroker:jar</include>
+ <include>org.apache.airavata:xbaya-gui:jar</include>
+ <include>org.apache.airavata:gfac-axis2-interface:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-axis2/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-axis2/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-axis2/pom.xml Wed Feb 15 05:13:10 2012
@@ -9,88 +9,67 @@
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">
- <parent>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.airavata</groupId>
- <artifactId>gfac-axis2-interface</artifactId>
- <name>GFac-Axis2-Interface</name>
- <description>Axis2 Interface to the GFac-Core</description>
-
- <dependencies>
- <!-- AIRAVATA MODULES DEPENDECIES -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>registry-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>workflow-execution-context</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>workflowtracking</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- AXIS 2 -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
-
- <!-- JCR -->
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- For Concrete WSDL Generation -->
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
- </dependency>
-
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-maven-plugin</artifactId>
- <version>${axis2.version}</version>
- <configuration>
- <servicesXmlFile>src/main/resources/services.xml</servicesXmlFile>
- </configuration>
- <executions>
- <execution>
- <id>createAAR</id>
- <phase>package</phase>
- <goals>
- <goal>aar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>gfac-axis2-interface</artifactId>
+ <name>GFac-Axis2-Interface</name>
+ <description>Axis2 Interface to the GFac-Core</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>registry-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>workflow-execution-context</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>workflowtracking</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>gfac-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>restore-persistence</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <copy file="${project.build.outputDirectory}/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-core/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-core/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/gfac-core/pom.xml Wed Feb 15 05:13:10 2012
@@ -79,18 +79,6 @@
<version>${project.version}</version>
</dependency>
-<!-- <dependency>
- <groupId>j2ssh</groupId>
- <artifactId>j2ssh-core</artifactId>
- <version>0.2.9</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>j2ssh</groupId>
- <artifactId>j2ssh-common</artifactId>
- <version>0.2.9</version>
- <type>jar</type>
- </dependency>-->
<!-- Workflow Tracking -->
<dependency>
@@ -127,10 +115,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
</dependencies>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/test-suite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/test-suite/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/test-suite/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/test-suite/pom.xml Wed Feb 15 05:13:10 2012
@@ -122,10 +122,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
</dependencies>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/pom.xml Wed Feb 15 05:13:10 2012
@@ -100,6 +100,36 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>edu.berkeley</groupId>
+ <artifactId>yfilter</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messagebox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messagebroker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml Wed Feb 15 05:13:10 2012
@@ -5,7 +5,7 @@
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)*>
<!ELEMENT id (#PCDATA)>
@@ -23,135 +23,87 @@
<!ELEMENT dependencySet (outputDirectory|includes)*>
]>
<assembly>
- <id>bin</id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${archieve.name}-${version}</baseDirectory>
- <formats>
- <!--<format>tar.gz</format> //uncomment,if tar.gz archive needed-->
- <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>
+ <id>bin</id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${archieve.name}-${version}</baseDirectory>
+ <formats>
+ <!--<format>tar.gz</format> //uncomment,if tar.gz archive needed-->
+ <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>
- </fileSet>
+ </includes>
+ </fileSet>
<fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
- <outputDirectory>standalone-server/repository</outputDirectory>
- <includes>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
+ <outputDirectory>standalone-server/repository</outputDirectory>
+ <includes>
<include>services/*</include>
<include>modules/*</include>
- </includes>
- </fileSet>
+ </includes>
+ </fileSet>
<fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/classes</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/classes</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
<include>log4j.properties</include>
<include>commons-logging.properties</include>
- </includes>
- </fileSet>
+ </includes>
+ </fileSet>
<fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/conf</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
<include>axis2.xml</include>
- </includes>
- </fileSet>
-
-
- <!--
- ********************** copymessagebrokeraar **********************
- -->
-
- <fileSet>
- <directory>../messagebroker/target</directory>
- <outputDirectory>standalone-server/repository/services
- </outputDirectory>
- <includes>
- <include>messagebroker*.aar</include>
- </includes>
- </fileSet>
-
- <!--
- ********************** copy messagebox aar **********************
- -->
-
- <fileSet>
- <directory>../messagebox/target</directory>
- <outputDirectory>standalone-server/repository/services
- </outputDirectory>
- <includes>
- <include>messagebox*.aar</include>
- </includes>
- </fileSet>
-
-
- <!--
- ********************** copy wsmg.broker and messagebox property files
- **********************
- -->
-
- <fileSet>
- <directory>resources</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>*properties*</include>
- </includes>
- </fileSet>
-
-
-
-
- <!--
- ********************** replace bin directory
- **********************
- -->
-
- <fileSet>
- <directory>resources/bin</directory>
- <outputDirectory>standalone-server/bin</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
+ </includes>
+ </fileSet>
<!--
- ********************** copy messenger commons **********************
- -->
+ ********************** copy wsmg.broker and messagebox property files
+ **********************
+ -->
<fileSet>
- <directory>../commons/target</directory>
- <outputDirectory>lib</outputDirectory>
+ <directory>resources</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
<includes>
- <include>airavata*.jar</include>
+ <include>*properties*</include>
</includes>
</fileSet>
+
<!--
- ********************** copy messenger client **********************
- -->
+ ********************** replace bin directory
+ **********************
+ -->
<fileSet>
- <directory>../client/target</directory>
- <outputDirectory>lib</outputDirectory>
+ <directory>resources/bin</directory>
+ <outputDirectory>standalone-server/bin</outputDirectory>
<includes>
- <include>airavata*.jar</include>
+ <include>**/*</include>
</includes>
</fileSet>
+ <!--
+ ********************** copy messenger commons **********************
+ -->
+
+
+
<fileSet>
<directory>../../ws-messenger/client/target/</directory>
<outputDirectory>standalone-server/lib</outputDirectory>
@@ -167,133 +119,90 @@
</includes>
</fileSet>
+
+
+ <!--
+ ********************** copymessagebrokerjar **********************
+ -->
+
+
+ <!--
+ ********************** copy messagebroker+ messagebox samples **********************
+ -->
+
+ <fileSet>
+ <directory>../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+
+
+ <!--
+ ********************** copy gui start up script **********************
+ -->
+
<fileSet>
- <directory>../../ws-messenger/client/target/</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
+ <directory>resources</directory>
+ <outputDirectory>gui</outputDirectory>
<includes>
- <include>*.jar</include>
+ <include>*sh</include>
</includes>
</fileSet>
+
+
<fileSet>
- <directory>../../ws-messenger/commons/target/</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
+ <directory>../</directory>
<includes>
- <include>*.jar</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+
+ <!--
+ ********************** copy database scripts **********************
+ -->
+
+ <fileSet>
+ <directory>../messagebroker/src/main/resources/database_scripts</directory>
+ <outputDirectory>standalone-server/conf/database_scripts</outputDirectory>
+ <includes>
+ <include>*sql*</include>
</includes>
</fileSet>
- <!--
- ********************** copymessagebrokerjar **********************
- -->
-
- <fileSet>
- <directory>../messagebroker/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>messagebroker*.jar</include>
- </includes>
- </fileSet>
-
- <!--
- ********************** copy messagebox jar **********************
- -->
-
- <fileSet>
- <directory>../messagebox/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>messagebox*.jar</include>
- </includes>
- </fileSet>
-
- <!--
- ********************** copy messagebroker+ messagebox samples **********************
- -->
-
- <fileSet>
- <directory>../samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
-
-
-
-
- <!--
- ********************** copy gui start up script **********************
- -->
-
- <fileSet>
- <directory>resources</directory>
- <outputDirectory>gui</outputDirectory>
- <includes>
- <include>*sh</include>
- </includes>
- </fileSet>
-
-
-
- <!--
- ********************** copy messenger servlet **********************
- -->
-
- <!--fileSet>
- <directory>../messenger/target</directory>
- <outputDirectory>messenger</outputDirectory>
- <includes>
- <include>messenger*.war</include>
- </includes>
- </fileSet-->
-
-
- <!--
- ********************** copy licenses **********************
- -->
-
- <fileSet>
- <directory>../</directory>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- </includes>
- </fileSet>
-
-
-
- <!--
- ********************** copy database scripts **********************
- -->
-
- <fileSet>
- <directory>../messagebroker/src/main/resources/database_scripts</directory>
- <outputDirectory>standalone-server/conf/database_scripts</outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../messagebox/src/main/resources/database_scripts</directory>
- <outputDirectory>standalone-server/conf/database_scripts</outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
+ <fileSet>
+ <directory>../messagebox/src/main/resources/database_scripts</directory>
+ <outputDirectory>standalone-server/conf/database_scripts</outputDirectory>
+ <includes>
+ <include>*sql*</include>
+ </includes>
+ </fileSet>
- </fileSets>
+ </fileSets>
<dependencySets>
- <dependencySet>
- <outputDirectory>standalone-server/lib</outputDirectory>
- <includes>
- <include>org.slf4j:slf4j-api:jar</include>
- <include>org.apache.derby:derby:jar</include>
- <include>org.apache.derby:derbytools:jar</include>
- <include>mysql:mysql-connector-java</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <dependencySet>
+ <outputDirectory>standalone-server/lib</outputDirectory>
+ <includes>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>org.apache.derby:derby:jar</include>
+ <include>org.apache.derby:derbytools:jar</include>
+ <include>org.apache.airavata:messenger-client:jar</include>
+ <include>org.apache.airavata:messenger-commons:jar</include>
+ <include>edu.berkeley:yfilter:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>standalone-server/repository/services</outputDirectory>
+ <includes>
+ <include>org.apache.airavata:messagebox:jar</include>
+ <include>org.apache.airavata:messagebroker:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebox/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebox/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebox/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebox/pom.xml Wed Feb 15 05:13:10 2012
@@ -10,86 +10,79 @@
<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>ws-messenger</artifactId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.airavata</groupId>
- <artifactId>messagebox</artifactId>
- <packaging>jar</packaging>
- <name>MessageBox</name>
- <url>http://incubator.apache.org/airavata/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>messenger-commons</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <!-- Test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>messenger-client</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- Axis2 for test only -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-http</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-maven-plugin</artifactId>
- <version>${axis2.version}</version>
- <configuration>
- <servicesXmlFile>src/main/resources/services.xml</servicesXmlFile>
- </configuration>
- <executions>
- <execution>
- <id>createAAR</id>
- <phase>package</phase>
- <goals>
- <goal>aar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>resources</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>**/*.wsdl</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>ws-messenger</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messagebox</artifactId>
+ <packaging>jar</packaging>
+ <name>MessageBox</name>
+ <url>http://incubator.apache.org/airavata/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messenger-client</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Axis2 for test only -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>restore-persistence</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <copy file="${project.build.outputDirectory}/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
</project>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebroker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebroker/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebroker/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/ws-messenger/messagebroker/pom.xml Wed Feb 15 05:13:10 2012
@@ -38,43 +38,25 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-maven-plugin</artifactId>
- <version>1.5</version>
- <configuration>
- <servicesXmlFile>src/main/resources/services.xml</servicesXmlFile>
- <!--wsdlFile>src/main/resources/services.wsdl</wsdlFile -->
-
- <fileSets>
- <fileSet>
- <directory>customLibs</directory>
- <outputDirectory>lib/</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>customLibs/activeMQ</directory>
- <outputDirectory>lib/</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-
- </configuration>
- <executions>
- <execution>
- <id>createAAR</id>
- <phase>package</phase>
- <goals>
- <goal>aar</goal>
- </goals>
- </execution>
- </executions>
-
- </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>restore-persistence</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <copy file="${project.build.outputDirectory}/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+</plugin>
+
</plugins>
</build>
@@ -97,10 +79,6 @@
<version>1.5.2</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
</dependency>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/xbaya-gui/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/modules/xbaya-gui/pom.xml Wed Feb 15 05:13:10 2012
@@ -152,25 +152,25 @@
<verifyjar>true</verifyjar>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-aar-maven-plugin</artifactId>
- <version>${axis2.version}</version>
- <configuration>
- <servicesXmlFile>src/main/resources/services.xml</servicesXmlFile>
- </configuration>
- <executions>
- <execution>
- <id>createAAR</id>
- <phase>package</phase>
- <goals>
- <goal>aar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
+<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>restore-persistence</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <copy file="${project.build.outputDirectory}/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+</plugin>
+ </plugins>
</build>
<dependencies>
@@ -270,7 +270,7 @@
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>2.5.0</version>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>xbaya</groupId>
@@ -389,14 +389,17 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
</dependency>
<dependency>
<groupId>globus</groupId>
Modified: incubator/airavata/branches/0.2-incubating-SNAPSHOT/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/branches/0.2-incubating-SNAPSHOT/pom.xml?rev=1244361&r1=1244360&r2=1244361&view=diff
==============================================================================
--- incubator/airavata/branches/0.2-incubating-SNAPSHOT/pom.xml (original)
+++ incubator/airavata/branches/0.2-incubating-SNAPSHOT/pom.xml Wed Feb 15 05:13:10 2012
@@ -20,7 +20,6 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>10</version>
- <relativePath />
</parent>
<groupId>org.apache.airavata</groupId>
@@ -63,6 +62,9 @@
<log4j.version>1.2.16</log4j.version>
<axiom.version>1.2.8</axiom.version>
<surefire.version>2.10</surefire.version>
+ <jcr.version>2.0</jcr.version>
+ <xmlbeans.version>2.5.0</xmlbeans.version>
+ <xpp3.version>1.1.3_7</xpp3.version>
</properties>
<developers>
@@ -283,61 +285,20 @@
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>2.5.0</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3_7</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
-
- <dependency>
- <groupId>xsul</groupId>
- <artifactId>xsul</artifactId>
- <version>2.10.5_b</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<repositories>