airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1166843 - in /incubator/airavata/trunk/modules: commons/gfac-schema/pom.xml commons/pom.xml gfac-core/pom.xml ws-messenger/distribution/pom.xml ws-messenger/distribution/src/main/assembly/bin-assembly.xml ws-messenger/pom.xml
Date Thu, 08 Sep 2011 18:30:12 GMT
Author: lahiru
Date: Thu Sep  8 18:30:12 2011
New Revision: 1166843

URL: http://svn.apache.org/viewvc?rev=1166843&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-90 and more build structuring work.

Modified:
    incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml
    incubator/airavata/trunk/modules/commons/pom.xml
    incubator/airavata/trunk/modules/gfac-core/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/commons/gfac-schema/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml?rev=1166843&r1=1166842&r2=1166843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml Thu Sep  8 18:30:12 2011
@@ -82,20 +82,6 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.4</version>
-					<configuration>
-						<filesets>
-							<fileset>
-								<directory>generated</directory>
-								<includes>
-									<include>*.jar</include>
-								</includes>
-							</fileset>
-						</filesets>
-					</configuration>
-				</plugin>
-				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.3.2</version>
@@ -104,6 +90,8 @@
 						<target>1.5</target>
 					</configuration>
 				</plugin>
+			
+
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -142,7 +130,7 @@
 					<xmlConfigs>
 						<xmlConfig implementation="java.io.File">schemas/gfac-schemas.xsdconfig</xmlConfig>
 					</xmlConfigs>
-					<outputJar>generated/${artifactId}-${version}.jar</outputJar>
+					<outputJar>target/generated/${artifactId}-${version}.jar</outputJar>
 				</configuration>
 			</plugin>
 		</plugins>

Modified: incubator/airavata/trunk/modules/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/pom.xml?rev=1166843&r1=1166842&r2=1166843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/pom.xml (original)
+++ incubator/airavata/trunk/modules/commons/pom.xml Thu Sep  8 18:30:12 2011
@@ -16,64 +16,8 @@
     <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>
@@ -91,7 +35,6 @@
                         <skipTests>true</skipTests>
                     </configuration>
                 </plugin>
-
             </plugins>
     </build>
     <profiles>

Modified: incubator/airavata/trunk/modules/gfac-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/pom.xml?rev=1166843&r1=1166842&r2=1166843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/pom.xml (original)
+++ incubator/airavata/trunk/modules/gfac-core/pom.xml Thu Sep  8 18:30:12 2011
@@ -12,19 +12,19 @@
     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>gfac-core</artifactId>
     <name>GFac-Core</name>
-    <description>The core GFAC functionality independent from any webservice implementation.
</description>
+    <description>The core GFAC functionality independent from any webservice implementation.</description>
 
 
     <dependencies>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-	    <version>1.5.11</version>
+            <version>1.5.11</version>
         </dependency>
 
         <!-- GFAC schemas -->
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-	    <version>1.5.11</version>
+            <version>1.5.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -133,7 +133,25 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                  <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+                    <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>.</directory>
+                            <includes>
+                                <include>*.log</include>
+                            </includes>
+                        </fileset>
+		<fileset>
+                            <directory>jackrabbit</directory>
+                        </fileset>
+
+                    </filesets>
                 </configuration>
             </plugin>
         </plugins>

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=1166843&r1=1166842&r2=1166843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/distribution/pom.xml Thu Sep  8 18:30:12
2011
@@ -1,54 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-	<parent>
-		<artifactId>airavata-ws-messenger</artifactId>
-		<groupId>airavata</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>Airavata</groupId>
-	<artifactId>ws-messenger-distribution</artifactId>
-	<name>distribution</name>
-	<url>http://incubator.apache.org/airavata</url>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<executions>
-					<execution>
-						<id>distribution-package</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<finalName>${archieve.name}-${version}</finalName>
-							<descriptors>
-								<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>${derby.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derbytools</artifactId>
-			<version>${derby.version}</version>
-		</dependency>
-		</dependencies>
-<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<archieve.name>airavta-ws-messenger</archieve.name>
-		<used.axis2.release>${axis2.version}</used.axis2.release>
-	</properties>
+    <parent>
+        <artifactId>airavata-ws-messenger</artifactId>
+        <groupId>airavata</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>Airavata</groupId>
+    <artifactId>ws-messenger-distribution</artifactId>
+    <name>distribution</name>
+    <url>http://incubator.apache.org/airavata</url>
+    <build>
+        <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>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-5</version>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>${archieve.name}-${version}</finalName>
+                            <descriptors>
+                                <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </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>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derby.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>${derby.version}</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <archieve.name>airavta-ws-messenger</archieve.name>
+        <used.axis2.release>${axis2.version}</used.axis2.release>
+    </properties>
 </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=1166843&r1=1166842&r2=1166843&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 18:30:12 2011
@@ -30,7 +30,7 @@
 		-->
 
 		<fileSet>
-			<directory>../messenger/axis2-${used.axis2.release}/WEB-INF/lib</directory>
+			<directory>axis2-${used.axis2.release}/WEB-INF/lib</directory>
 			<outputDirectory>standalone-server/lib</outputDirectory>
 			<includes>
 				<include>**/*</include>
@@ -38,7 +38,7 @@
 		</fileSet>
 
         <fileSet>
-			<directory>../messenger/axis2-${used.axis2.release}/WEB-INF/</directory>
+			<directory>axis2-${used.axis2.release}/WEB-INF/</directory>
 			<outputDirectory>standalone-server/repository</outputDirectory>
 			<includes>
                 <include>services/*</include>
@@ -47,7 +47,7 @@
 		</fileSet>
 
         <fileSet>
-			<directory>../messenger/axis2-${used.axis2.release}/WEB-INF/classes</directory>
+			<directory>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>../messenger/axis2-${used.axis2.release}/WEB-INF/conf</directory>
+			<directory>axis2-${used.axis2.release}/WEB-INF/conf</directory>
 			<outputDirectory>standalone-server/conf</outputDirectory>
 			<includes>
                 <include>axis2.xml</include>
@@ -177,13 +177,13 @@
 			********************** copy messenger servlet **********************
 		-->
 
-		<fileSet>
+		<!--fileSet>
 			<directory>../messenger/target</directory>
 			<outputDirectory>messenger</outputDirectory>
 			<includes>
 				<include>airavata-messenger*.war</include>
 			</includes>
-		</fileSet>
+		</fileSet-->
 
 
 		<!--

Modified: incubator/airavata/trunk/modules/ws-messenger/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/pom.xml?rev=1166843&r1=1166842&r2=1166843&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/pom.xml (original)
+++ incubator/airavata/trunk/modules/ws-messenger/pom.xml Thu Sep  8 18:30:12 2011
@@ -141,7 +141,7 @@
                                     <version>${axis2.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>messenger/axis2-${axis2.version}</outputDirectory>
+                                    <outputDirectory>distribution/axis2-${axis2.version}</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -214,7 +214,6 @@
                 <!--module>wsmg-commons</module-->
                 <module>messagebox</module>
                 <module>messagebroker</module>
-                <module>messenger</module>
             	<module>distribution</module>
 	    </modules>
         </profile>



Mime
View raw message