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/12/05 20:58:20 UTC
svn commit: r1417611 - in /airavata/trunk/modules/distribution:
airavata-client/pom.xml airavata-client/src/main/assembly/bin-assembly.xml
xbaya-gui/src/main/assembly/bin-assembly.xml
Author: lahiru
Date: Wed Dec 5 19:58:15 2012
New Revision: 1417611
URL: http://svn.apache.org/viewvc?rev=1417611&view=rev
Log:
adding more changes in to new pack building.
Added:
airavata/trunk/modules/distribution/airavata-client/pom.xml
- copied, changed from r1417603, airavata/trunk/modules/distribution/xbaya-gui/pom.xml
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
Copied: airavata/trunk/modules/distribution/airavata-client/pom.xml (from r1417603, airavata/trunk/modules/distribution/xbaya-gui/pom.xml)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?p2=airavata/trunk/modules/distribution/airavata-client/pom.xml&p1=airavata/trunk/modules/distribution/xbaya-gui/pom.xml&r1=1417603&r2=1417611&rev=1417611&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Wed Dec 5 19:58:15 2012
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>airavata-xbaya-gui</artifactId>
- <name>xbaya-gui-distribution</name>
+ <name>airavata-client-distribution</name>
<packaging>pom</packaging>
<url>http://airavata.apache.org/</url>
@@ -329,7 +329,7 @@
<jersey.version>1.13</jersey.version>
<grizzly.version>2.0.0-M3</grizzly.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <archieve.name>apache-airavata-xbaya-gui</archieve.name>
+ <archieve.name>apache-airavata-client</archieve.name>
<used.axis2.release>${axis2.version}</used.axis2.release>
</properties>
</project>
Modified: airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml?rev=1417611&r1=1417610&r2=1417611&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml Wed Dec 5 19:58:15 2012
@@ -47,14 +47,7 @@
<exclude>xom*.jar</exclude>
</excludes>
</fileSet>
- <fileSet>
- <directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
- <outputDirectory>repository</outputDirectory>
- <includes>
- <include>services/*</include>
- <include>modules/*</include>
- </includes>
- </fileSet>
+
<!-- ********************** copy readme files ********************** -->
<fileSet>
@@ -76,57 +69,10 @@
</includes>
</fileSet>
- <!-- ********************** copy database scripts ********************** -->
- <fileSet>
- <directory>../ws-messenger/messagebroker/src/main/resources/database_scripts
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../ws-messenger/messagebox/src/main/resources/database_scripts
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../registry/airavata-jpa-registry/src/main/resources
- </directory>
- <outputDirectory>bin/database_scripts
- </outputDirectory>
- <includes>
- <include>*sql*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../rest/webapp/src/main/resources
- </directory>
- <outputDirectory>bin
- </outputDirectory>
- <includes>
- <include>authenticators.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../distribution/src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- <include>logo.txt</include>
- <include>startNetworkServer</include>
- </includes>
- </fileSet>
+
<fileSet>
- <directory>../distribution/src/main/resources/conf</directory>
- <outputDirectory>bin</outputDirectory>
+ <directory>../airavata-client/src/main/resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
<includes>
<include>airavata-server.properties</include>
<include>registry.properties</include>
@@ -136,48 +82,15 @@
<include>provenance.sql</include>
</includes>
</fileSet>
-
- <!-- ********************** Copy Axis2 startup scripts to stand alone server
- ********************** -->
- <fileSet>
- <directory>../distribution/src/main/resources/axis2-standalone-bin
- </directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>777</fileMode>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
- </fileSet>
-
- <!--fileSet> <directory>../../samples/simple-math-service/target</directory>
- <outputDirectory>standalone-server/repository/services</outputDirectory>
- <includes> <include>*.aar</include> </includes> </fileSet -->
- <fileSet>
- <directory>../../samples/complex-math-service/target</directory>
- <outputDirectory>repository/services
- </outputDirectory>
- <includes>
- <include>*.aar</include>
- </includes>
- </fileSet>
<fileSet>
- <directory>../../samples/levenshtein-distance-service/target
- </directory>
- <outputDirectory>repository/services</outputDirectory>
- <includes>
- <include>*.aar</include>
- </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>
@@ -185,7 +98,7 @@
</fileSet>
<fileSet>
<directory>src/main/resources/conf</directory>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>conf</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -206,10 +119,6 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <!--<include>org.apache.derby:derby:jar</include> -->
- <!--<include>org.apache.derby:derbytools:jar</include> -->
- <!--<include>org.apache.derby:derbyclient:jar</include> -->
- <!--<include>org.apache.derby:derbynet:jar</include> -->
<include>org.slf4j:slf4j-api:jar</include>
<include>org.slf4j:slf4j-jcl:jar</include>
<include>org.slf4j:slf4j-log4j12:jar</include>
@@ -225,17 +134,11 @@
<include>xsul5-ogce:xsul5-2007-02-27:jar</include>
<include>xutil:xutil</include>
<include>jython:jython</include>
- <include>cog-jglobus:cog-jglobus</include>
- <!--include>edu.iub.soic.damsl:jXSP</include> -->
- <include>lead-security:puretls</include>
- <include>lead-security:cryptix32</include>
- <include>lead-security:cryptix-asn1</include>
<include>xmlbeans:xbean</include>
<include>com.amazonaws:aws-java-sdk</include>
<include>amazon:MapReduce.Service.Client</include>
<include>net.java.dev.jets3t:jets3t</include>
<include>atomixmiser:atomixmiser</include>
- <include>globus:transfer-api-client</include>
<include>org.apache.airavata:airavata-registry-api</include>
<include>org.apache.airavata:airavata-workflow-execution-context</include>
<include>org.apache.airavata:airavata-workflow-tracking</include>
@@ -249,46 +152,8 @@
<include>org.apache.airavata:airavata-message-monitor:jar</include>
<include>org.apache.airavata:airavata-client-api:jar</include>
<include>org.apache.airavata:airavata-jpa-registry:jar</include>
- <include>org.apache.airavata:airavata-rest-mappings:jar</include>
<include>org.apache.airavata:airavata-rest-client:jar</include>
- <include>org.apache.airavata:airavata-server:jar</include>
- <include>org.apache.airavata:airavata-rest-mappings</include>
- <include>org.apache.airavata:airavata-rest-services</include>
- <include>org.apache.airavata:airavata-security</include>
<include>org.apache.openjpa:openjpa-all:jar</include>
- <include>com.sun.jersey:jersey-client:jar</include>
- <include>com.sun.jersey:jersey-core:jar</include>
- <include>edu.berkeley:yfilter</include>
- <include>edu.berkeley:yfilter</include>
- <include>org.bouncycastle:bcprov-jdk15</include>
- <include>org.bouncycastle:bcmail-jdk15</include>
- <include>org.apache.tomcat:tomcat-jasper</include>
- <include>org.apache.tomcat:tomcat-jasper-el</include>
- <include>org.apache.tomcat:tomcat-jsp-api</include>
- <include>org.apache.tomcat.embed:tomcat-embed-core</include>
- <include>org.apache.tomcat.embed:tomcat-embed-jasper</include>
- <include>org.apache.tomcat.embed:tomcat-embed-logging-juli</include>
- <include>javax.servlet:javax.servlet-api</include>
- <include>org.apache.shiro:shiro-core</include>
- <include>com.sun.jersey:jersey-servlet</include>
- <include>com.sun.jersey:jersey-json</include>
- <include>com.sun.jersey.contribs:jersey-multipart</include>
- <include>com.sun.jersey:jersey-server</include>
- <include>com.sun.jersey:jersey-client</include>
- <include>org.codehaus.jackson:jackson-jaxrs</include>
- <include>org.codehaus.jackson:jackson-core-asl</include>
- <include>org.codehaus.jackson:jackson-mapper-asl</include>
- <include>org.codehaus.jackson:jackson-xc</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>repository/services</outputDirectory>
- <includes>
- <include>org.apache.airavata:airavata-message-box:jar</include>
- <include>org.apache.airavata:airavata-message-broker:jar</include>
- <include>org.apache.airavata:airavata-xbaya-gui:jar</include>
- <include>org.apache.airavata:airavata-gfac-axis2-interface:jar</include>
- <include>org.apache.airavata:airavata-registry-service:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml?rev=1417611&r1=1417610&r2=1417611&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml Wed Dec 5 19:58:15 2012
@@ -66,7 +66,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>../xbaya-gui/src/main/resources/bin</directory>
+ <directory>../../xbaya-gui/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -77,7 +77,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>../xbaya-gui/src/main/resources/conf</directory>
+ <directory>../../xbaya-gui/src/main/resources/conf</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>airavata-server.properties</include>
@@ -91,14 +91,14 @@
<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>