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/09/09 01:00:57 UTC
svn commit: r1166937 - in /incubator/airavata/trunk/modules: distribution/
distribution/src/main/assembly/ gfac-axis2/ ws-messenger/
ws-messenger/distribution/ ws-messenger/distribution/src/main/assembly/
Author: lahiru
Date: Thu Sep 8 23:00:57 2011
New Revision: 1166937
URL: http://svn.apache.org/viewvc?rev=1166937&view=rev
Log:
fixing build issues.
Modified:
incubator/airavata/trunk/modules/distribution/pom.xml
incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/gfac-axis2/pom.xml
incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml
incubator/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/ws-messenger/pom.xml
Modified: incubator/airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/pom.xml?rev=1166937&r1=1166936&r2=1166937&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/distribution/pom.xml Thu Sep 8 23:00:57 2011
@@ -34,7 +34,7 @@
<version>${axis2.version}</version>
<type>war</type>
<overWrite>true</overWrite>
- <outputDirectory>axis2-${axis2.version}</outputDirectory>
+ <outputDirectory>target/axis2-${axis2.version}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -61,6 +61,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>axis2-${axis2.version}</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -100,6 +111,15 @@
<version>${jackrabbit.version}</version>
</dependency>
<dependency>
+ <groupId>xsul</groupId>
+ <artifactId>xsul</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xsul5-ogce</groupId>
+ <artifactId>xsul5-2007-02-27</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-servlet</artifactId>
<version>${jackrabbit.version}</version>
Modified: incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1166937&r1=1166936&r2=1166937&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Thu Sep 8 23:00:57 2011
@@ -30,7 +30,7 @@
-->
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/lib</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
<outputDirectory>standalone-server/lib</outputDirectory>
<includes>
<include>**/*</include>
@@ -38,7 +38,7 @@
</fileSet>
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
<outputDirectory>standalone-server/repository</outputDirectory>
<includes>
<include>services/*</include>
@@ -47,7 +47,7 @@
</fileSet>
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/classes</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/classes</directory>
<outputDirectory>standalone-server/conf</outputDirectory>
<includes>
<include>log4j.properties</include>
@@ -297,14 +297,9 @@
<directory>resources/conf</directory>
<outputDirectory>standalone-server/conf</outputDirectory>
<includes>
- <include>axis2.xml</include>
+ <include>axis2.xml</include>
</includes>
</fileSet>
-
-
-
-
-
</fileSets>
<dependencySets>
Modified: incubator/airavata/trunk/modules/gfac-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/pom.xml?rev=1166937&r1=1166936&r2=1166937&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/pom.xml Thu Sep 8 23:00:57 2011
@@ -12,80 +12,84 @@
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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>airavata</artifactId>
- <groupId>airavata</groupId>
- <version>0.0.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
+ <artifactId>airavata</artifactId>
+ <groupId>airavata</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>airavata</groupId>
- <artifactId>airavata-gfac-axis2-interface</artifactId>
- <name>GFac-Axis2-Interface</name>
- <description>Axis2 Interface to the GFac-Core</description>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>airavata</groupId>
+ <artifactId>airavata-gfac-axis2-interface</artifactId>
+ <name>GFac-Axis2-Interface</name>
+ <description>Axis2 Interface to the GFac-Core</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>airavata</groupId>
- <artifactId>gfac-core</artifactId>
- <version>${airavata.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.2</version>
- </dependency>
- <dependency>
- <groupId>xsul5-ogce</groupId>
- <artifactId>xsul5-2007-02-27</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5</artifactId>
- <version>1.2.6</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>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>airavata</groupId>
+ <artifactId>gfac-core</artifactId>
+ <version>${airavata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xsul5-ogce</groupId>
+ <artifactId>xsul5-2007-02-27</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp5</groupId>
+ <artifactId>xpp5</artifactId>
+ <version>1.2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </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>
</project>
Modified: incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml?rev=1166937&r1=1166936&r2=1166937&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml Thu Sep 8 23:00:57 2011
@@ -14,27 +14,31 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>axis2-${axis2.version}/WEB-INF/lib</directory>
- <targetPath>WEB-INF/lib</targetPath>
- <includes>
- <include>*.jar</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- <targetPath>WEB-INF/classes</targetPath>
- <includes>
- <include>database_scripts*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
+ <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>target/axis2-${axis2.version}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
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=1166937&r1=1166936&r2=1166937&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 Thu Sep 8 23:00:57 2011
@@ -30,7 +30,7 @@
-->
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/lib</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
<outputDirectory>standalone-server/lib</outputDirectory>
<includes>
<include>**/*</include>
@@ -38,7 +38,7 @@
</fileSet>
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
<outputDirectory>standalone-server/repository</outputDirectory>
<includes>
<include>services/*</include>
@@ -47,7 +47,7 @@
</fileSet>
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/classes</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/classes</directory>
<outputDirectory>standalone-server/conf</outputDirectory>
<includes>
<include>log4j.properties</include>
@@ -56,7 +56,7 @@
</fileSet>
<fileSet>
- <directory>axis2-${used.axis2.release}/WEB-INF/conf</directory>
+ <directory>target/axis2-${used.axis2.release}/WEB-INF/conf</directory>
<outputDirectory>standalone-server/conf</outputDirectory>
<includes>
<include>axis2.xml</include>
Modified: incubator/airavata/trunk/modules/ws-messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/pom.xml?rev=1166937&r1=1166936&r2=1166937&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/pom.xml Thu Sep 8 23:00:57 2011
@@ -121,33 +121,7 @@
</dependencyManagement>
<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>distribution/axis2-${axis2.version}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>