Author: lahiru
Date: Wed Dec 5 19:39:21 2012
New Revision: 1417603
URL: http://svn.apache.org/viewvc?rev=1417603&view=rev
Log:
changing xbaya-gui distribution.
Removed:
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/src-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/axis2.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/host.xml
Modified:
airavata/trunk/modules/distribution/xbaya-gui/pom.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1417603&r1=1417602&r2=1417603&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Wed Dec 5 19:39:21
2012
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>airavata-xbaya-gui</artifactId>
- <name>distribution</name>
+ <name>xbaya-gui-distribution</name>
<packaging>pom</packaging>
<url>http://airavata.apache.org/</url>
@@ -27,6 +27,33 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.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>
<executions>
<execution>
@@ -189,6 +216,11 @@
</dependency>
<!-- AIRAVATA modules -->
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-xbaya-gui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-workflow-model-core</artifactId>
@@ -291,6 +323,7 @@
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
</dependency>
+
</dependencies>
<properties>
<jersey.version>1.13</jersey.version>
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=1417603&r1=1417602&r2=1417603&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:39:21 2012
@@ -35,8 +35,8 @@
</formats>
<fileSets>
- <!-- ********************** copy axis2 distribution
dependencies ********************** -->
- <fileSet>
+ <!-- ********************** copy readme files
********************** -->
+ <fileSet>
<directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -48,16 +48,6 @@
</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>
<directory>../../</directory>
<outputDirectory>.</outputDirectory>
<includes>
@@ -75,46 +65,8 @@
<include>NOTICE</include>
</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>
+
<directory>../xbaya-gui/src/main/resources/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
@@ -125,7 +77,7 @@
</includes>
</fileSet>
<fileSet>
-
<directory>../distribution/src/main/resources/conf</directory>
+
<directory>../xbaya-gui/src/main/resources/conf</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>airavata-server.properties</include>
@@ -137,38 +89,7 @@
</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>
<outputDirectory>samples/workflows</outputDirectory>
@@ -206,14 +127,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>
- <include>javax.jcr:jcr:jar</include>
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration</include>
<include>commons-lang:commons-lang</include>
@@ -227,9 +140,6 @@
<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>
@@ -251,46 +161,17 @@
<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.airavata:airavata-xbaya-gui</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>
-
</assembly>
