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 2011/08/09 16:54:05 UTC
svn commit: r1155387 - in /incubator/airavata/trunk: ./ modules/commons/
modules/commons/workflow-tracking/ modules/gfac-axis2/
modules/ws-messenger/ modules/ws-messenger/distribution/src/main/assembly/
modules/xbaya-gui/
Author: lahiru
Date: Tue Aug 9 14:54:05 2011
New Revision: 1155387
URL: http://svn.apache.org/viewvc?rev=1155387&view=rev
Log:
fixing build issues.
Added:
incubator/airavata/trunk/modules/commons/pom.xml
Modified:
incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
incubator/airavata/trunk/modules/gfac-axis2/pom.xml
incubator/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/ws-messenger/pom.xml
incubator/airavata/trunk/modules/xbaya-gui/pom.xml
incubator/airavata/trunk/pom.xml
Added: incubator/airavata/trunk/modules/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/pom.xml?rev=1155387&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/commons/pom.xml (added)
+++ incubator/airavata/trunk/modules/commons/pom.xml Tue Aug 9 14:54:05 2011
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>airavata-commons</artifactId>
+ <groupId>airavata</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Airavat Commons</name>
+ <url>http://maven.apache.org</url>
+
+ <repositories>
+ <repository>
+ <id>m2-snapshot-repository</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio Repository</name>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2
+ </url>
+ </repository>
+ <repository>
+ <id>maven 2 java.net</id>
+ <name>2 java.net Maven Repository</name>
+ <url>http://download.java.net/maven/2/
+ </url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>apache-repo</id>
+ <name>Apache Yfilter repo</name>
+ <url>http://people.apache.org/~lahiru/maven-repo</url>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0-alpha-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>messenger/axis2-${axis2.version}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>profile-workflow-tracking</id>
+ <activation>
+ <property>
+ <name>module</name>
+ <value>workflow-tracking</value>
+ </property>
+ </activation>
+ <modules>
+ <module>workflow-tracking</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>profile-xbaya</id>
+ <activation>
+ <property>
+ <name>module</name>
+ <value>xbaya</value>
+ </property>
+ </activation>
+ <modules>
+ <module>workflow-tracking</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>profile-gfac</id>
+ <activation>
+ <property>
+ <name>module</name>
+ <value>gfac</value>
+ </property>
+ </activation>
+ <modules>
+ <module>gfac-schema</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>workflow-tracking</module>
+ <module>gfac-schema</module>
+ </modules>
+ </profile>
+ </profiles>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <airavata.version>0.0.1-SNAPSHOT</airavata.version>
+ <release.version>1.1.1</release.version>
+ <axis2.version>1.5.1</axis2.version>
+ <derby.version>10.7.1.1</derby.version>
+ </properties>
+
+</project>
Modified: incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml?rev=1155387&r1=1155386&r2=1155387&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/workflow-tracking/pom.xml Tue Aug 9 14:54:05 2011
@@ -65,6 +65,24 @@
</xmlConfigs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<dependencies>
Modified: incubator/airavata/trunk/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/pom.xml?rev=1155387&r1=1155386&r2=1155387&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/pom.xml Tue Aug 9 14:54:05 2011
@@ -22,7 +22,7 @@
<properties>
<org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
- <axis2.version>1.5.4</axis2.version>
+ <axis2.version>1.5.1</axis2.version>
<axiom.version>1.2.8</axiom.version>
</properties>
<dependencies>
@@ -44,7 +44,7 @@
<dependency>
<groupId>Airavata</groupId>
<artifactId>GFac-Core</artifactId>
- <version>0.0.1-20110626.224602-1</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -68,4 +68,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml?rev=1155387&r1=1155386&r2=1155387&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml Tue Aug 9 14:54:05 2011
@@ -145,20 +145,6 @@
</fileSet>
<!--
- ********************** copy workflow tracking jar
- **********************
- -->
-
- <fileSet>
- <directory>../workflow-tracking/target</directory>
- <outputDirectory>client-api/lib</outputDirectory>
- <includes>
- <include>airavata-workflow*.jar</include>
- </includes>
- </fileSet>
-
-
- <!--
********************** copy messagebroker+ messagebox samples **********************
-->
Modified: incubator/airavata/trunk/modules/ws-messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/pom.xml?rev=1155387&r1=1155386&r2=1155387&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/pom.xml Tue Aug 9 14:54:05 2011
@@ -206,18 +206,6 @@
</modules>
</profile>
<profile>
- <id>profile-workflowtracking</id>
- <activation>
- <property>
- <name>module</name>
- <value>workflowtracking</value>
- </property>
- </activation>
- <modules>
- <module>workflow-tracking</module>
- </modules>
- </profile>
- <profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -227,7 +215,6 @@
<module>messagebox</module>
<module>messagebroker</module>
<module>messenger</module>
- <module>workflow-tracking-deprecated</module>
<module>distribution</module>
</modules>
</profile>
Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1155387&r1=1155386&r2=1155387&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Tue Aug 9 14:54:05 2011
@@ -75,7 +75,7 @@
<properties>
<axis2.version>1.5.1</axis2.version>
- <airavata.version>0.0.1-SNAPSHOT</airavata.version>
+ <airavata.version>0.0.1-SNAPSHOT</airavata.version>
</properties>
<!--
@@ -396,4 +396,4 @@
<version>${airavata.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/pom.xml?rev=1155387&r1=1155386&r2=1155387&view=diff
==============================================================================
--- incubator/airavata/trunk/pom.xml (original)
+++ incubator/airavata/trunk/pom.xml Tue Aug 9 14:54:05 2011
@@ -64,7 +64,7 @@
</property>
</activation>
<modules>
- <module>xregistry</module>
+ <module>modules/xregistry</module>
</modules>
</profile>
<profile>
@@ -76,8 +76,9 @@
</property>
</activation>
<modules>
- <module>gfac-core</module>
- <module>gfac-axis2</module>
+ <module>modules/gfac-core</module>
+ <module>modules/gfac-axis2</module>
+ <module>modules/commons</module>
</modules>
</profile>
<profile>
@@ -89,7 +90,7 @@
</property>
</activation>
<modules>
- <module>ws-messaging</module>
+ <module>modules/ws-messaging</module>
</modules>
</profile>
<profile>
@@ -101,9 +102,23 @@
</property>
</activation>
<modules>
- <module>workflow-interpreter</module>
+ <module>modules/workflow-interpreter</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>profile-workflow-tracking</id>
+ <activation>
+ <property>
+ <name>module</name>
+ <value>workflow-tracking</value>
+ </property>
+ </activation>
+ <modules>
+ <module>modules/commons</module>
</modules>
</profile>
+
<profile>
<id>profile-xbaya</id>
<activation>
@@ -113,7 +128,8 @@
</property>
</activation>
<modules>
- <module>xbaya-gui</module>
+ <module>modules/xbaya-gui</module>
+ <module>modules/commons</module>
</modules>
</profile>
<profile>
@@ -128,6 +144,7 @@
<module>modules/ws-messenger</module>
<module>modules/workflow-interpreter</module>
<module>modules/xbaya-gui</module>
+ <module>modules/commons</module>
</modules>
</profile>
</profiles>