airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1417648 - in /airavata/trunk/modules: distribution/airavata-server/pom.xml distribution/airavata-server/src/main/assembly/bin-assembly.xml registry/airavata-registry-service/pom.xml
Date Wed, 05 Dec 2012 21:06:30 GMT
Author: chathuri
Date: Wed Dec  5 21:06:28 2012
New Revision: 1417648

URL: http://svn.apache.org/viewvc?rev=1417648&view=rev
Log:
fixing paths

Modified:
    airavata/trunk/modules/distribution/airavata-server/pom.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/registry/airavata-registry-service/pom.xml

Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1417648&r1=1417647&r2=1417648&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Wed Dec  5 21:06:28 2012
@@ -400,11 +400,11 @@
             <artifactId>jersey-client</artifactId>
             <version>${jersey.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jasper</artifactId>
@@ -461,11 +461,11 @@
             <artifactId>jersey-server</artifactId>
             <version>${jersey.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-client</artifactId>
             <version>${jersey.version}</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1417648&r1=1417647&r2=1417648&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Wed Dec  5 21:06:28 2012
@@ -45,7 +45,7 @@
 			<excludes>
 				<exclude>commons-logging*.jar</exclude>
 				<exclude>xom*.jar</exclude>
-                <exclude>xercesImpl</exclude>
+                <exclude>xercesImpl*.jar</exclude>
 			</excludes>
 		</fileSet>
 		<fileSet>
@@ -79,7 +79,7 @@
 
 		<!-- ********************** copy database scripts ********************** -->
 		<fileSet>
-			<directory>../ws-messenger/messagebroker/src/main/resources/database_scripts
+			<directory>../../ws-messenger/messagebroker/src/main/resources/database_scripts
 			</directory>
 			<outputDirectory>bin/database_scripts
 			</outputDirectory>
@@ -88,7 +88,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../ws-messenger/messagebox/src/main/resources/database_scripts
+			<directory>../../ws-messenger/messagebox/src/main/resources/database_scripts
 			</directory>
 			<outputDirectory>bin/database_scripts
 			</outputDirectory>
@@ -97,7 +97,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../registry/airavata-jpa-registry/src/main/resources
+			<directory>../../registry/airavata-jpa-registry/src/main/resources
 			</directory>
 			<outputDirectory>bin/database_scripts
 			</outputDirectory>
@@ -106,7 +106,7 @@
 			</includes>
 		</fileSet>
         <fileSet>
-			<directory>../rest/webapp/src/main/resources
+			<directory>../../rest/webapp/src/main/resources
 			</directory>
 			<outputDirectory>bin
 			</outputDirectory>
@@ -115,7 +115,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../distribution/src/main/resources/bin</directory>
+			<directory>src/main/resources/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>777</fileMode>
 			<includes>
@@ -126,7 +126,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../distribution/src/main/resources/conf</directory>
+			<directory>src/main/resources/conf</directory>
 			<outputDirectory>bin</outputDirectory>
 			<includes>
 				<include>airavata-server.properties</include>
@@ -141,7 +141,7 @@
 		<!-- ********************** Copy Axis2 startup scripts to stand alone server 
 			********************** -->
 		<fileSet>
-			<directory>../distribution/src/main/resources/axis2-standalone-bin
+			<directory>src/main/resources/axis2-standalone-bin
 			</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>777</fileMode>
@@ -155,7 +155,7 @@
 			<outputDirectory>standalone-server/repository/services</outputDirectory> 
 			<includes> <include>*.aar</include> </includes> </fileSet -->
 		<fileSet>
-			<directory>../../samples/complex-math-service/target</directory>
+			<directory>../../../samples/complex-math-service/target</directory>
 			<outputDirectory>repository/services
 			</outputDirectory>
 			<includes>
@@ -163,7 +163,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../../samples/levenshtein-distance-service/target
+			<directory>../../../samples/levenshtein-distance-service/target
 			</directory>
 			<outputDirectory>repository/services</outputDirectory>
 			<includes>
@@ -171,14 +171,14 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../xbaya-gui/src/test/resources/</directory>
+			<directory>../../xbaya-gui/src/test/resources/</directory>
 			<outputDirectory>samples/workflows</outputDirectory>
 			<includes>
 				<include>*.xwf</include>
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>../../samples</directory>
+			<directory>../../../samples</directory>
 			<outputDirectory>samples</outputDirectory>
 			<includes>
 				<include>*.sh</include>

Modified: airavata/trunk/modules/registry/airavata-registry-service/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/pom.xml?rev=1417648&r1=1417647&r2=1417648&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/pom.xml (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/pom.xml Wed Dec  5 21:06:28
2012
@@ -33,7 +33,7 @@
             <artifactId>axis2-kernel</artifactId>
             <version>${axis2.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
             <version>1.2.8</version>
@@ -42,7 +42,7 @@
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
             <version>1.2.8</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>



Mime
View raw message