Author: chathuri
Date: Wed Jan 9 18:42:17 2013
New Revision: 1431006
URL: http://svn.apache.org/viewvc?rev=1431006&view=rev
Log:
fixing AIRAVATA-713
Added:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
- copied unchanged from r1430888,
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Removed:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/data.sql
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/derby.sh
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/logo.txt
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/startNetworkServer
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/registry.properties
Modified:
airavata/trunk/modules/distribution/airavata-client/pom.xml
airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
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/airavata-client/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?rev=1431006&r1=1431005&r2=1431006&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Wed Jan 9
18:42:17 2013
@@ -25,7 +25,7 @@
<build>
<plugins>
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
@@ -51,7 +51,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
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=1431006&r1=1431005&r2=1431006&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 Jan 9 18:42:17 2013
@@ -35,55 +35,6 @@
</formats>
<fileSets>
- <!-- ********************** copy axis2 distribution
dependencies ********************** -->
- <fileSet>
-
<directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>commons-logging*.jar</exclude>
- <exclude>xom*.jar</exclude>
- <exclude>xercesImpl*.jar</exclude>
- <exclude>axis2-corba*.jar</exclude>
- <exclude>axis2-fastinfoset*.jar</exclude>
- <exclude>axis2-java2wsdl*.jar</exclude>
- <exclude>axis2-jaxbri*.jar</exclude>
- <exclude>axis2-jaxws*.jar</exclude>
- <exclude>axis2-jibx*.jar</exclude>
- <exclude>axis2-json*.jar</exclude>
- <exclude>axis2-metadata*.jar</exclude>
- <exclude>axis2-mtompolicy*.jar</exclude>
- <exclude>axis2-saaj*.jar</exclude>
- <exclude>axis2-spring*.jar</exclude>
- <exclude>axis2-xmlbeans*.jar</exclude>
- <exclude>bcel*.jar</exclude>
- <exclude>dom4j*.jar</exclude>
- <exclude>geronimo-annotation_1.0_spec*.jar</exclude>
- <exclude>geronimo-jaxws_2.1_spec-1.0*.jar</exclude>
- <exclude>geronimo-saaj_1.3_spec-1.0.1*.jar</exclude>
- <exclude>icu4j*.jar</exclude>
- <exclude>jibx-bind*.jar</exclude>
- <exclude>jibx-run*.jar</exclude>
- <exclude>mex*.jar</exclude>
- <exclude>soapmonitor*.jar</exclude>
- <exclude>xml-resolver*.jar</exclude>
- <exclude>jaxb-xjc*.jar</exclude>
- </excludes>
- </fileSet>
-
-
- <!-- ********************** copy readme files
********************** -->
- <fileSet>
- <directory>../../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
<!-- ********************** copy binary licenses
********************** -->
<fileSet>
<directory>src/main/resources/</directory>
@@ -166,6 +117,23 @@
<include>com.sun.jersey:jersey-core:jar</include>
<include>com.sun.jersey:jersey-client:jar</include>
<include>org.apache.airavata:airavata-rest-mappings:jar</include>
+
+ <include>commons-codec:commons-codec:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>org.apache.axis2:axis2-kernel:jar</include>
+ <include>commons-httpclient:commons-httpclient:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-api:jar</include>
+ <include>org.apache.axis2:axis2:jar</include>
+ <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-impl:jar</include>
+ <include>org.apache.neethi:neethi:jar</include>
+ <include>org.apache.axis2:axis2-transport-local:jar</include>
+ <include>org.apache.axis2:axis2-transport-http:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>org.apache.woden:woden-api:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>org.apache.axis2:axis2-adb:jar</include>
+ <include>log4j:log4j:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1431006&r1=1431005&r2=1431006&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Wed Jan 9 18:42:17
2013
@@ -25,7 +25,7 @@
<build>
<plugins>
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
@@ -51,7 +51,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
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=1431006&r1=1431005&r2=1431006&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 Jan 9 18:42:17 2013
@@ -35,52 +35,6 @@
</formats>
<fileSets>
- <!-- ********************** copy readme files
********************** -->
- <fileSet>
-
<directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
- <exclude>commons-logging*.jar</exclude>
- <exclude>xom*.jar</exclude>
- <exclude>xercesImpl*.jar</exclude>
- <exclude>axis2-corba*.jar</exclude>
- <exclude>axis2-fastinfoset*.jar</exclude>
- <exclude>axis2-java2wsdl*.jar</exclude>
- <exclude>axis2-jaxbri*.jar</exclude>
- <exclude>axis2-jaxws*.jar</exclude>
- <exclude>axis2-jibx*.jar</exclude>
- <exclude>axis2-json*.jar</exclude>
- <exclude>axis2-metadata*.jar</exclude>
- <exclude>axis2-mtompolicy*.jar</exclude>
- <exclude>axis2-saaj*.jar</exclude>
- <exclude>axis2-spring*.jar</exclude>
- <exclude>axis2-xmlbeans*.jar</exclude>
- <exclude>bcel*.jar</exclude>
- <exclude>dom4j*.jar</exclude>
- <exclude>geronimo-annotation_1.0_spec*.jar</exclude>
- <exclude>geronimo-jaxws_2.1_spec-1.0*.jar</exclude>
- <exclude>geronimo-saaj_1.3_spec-1.0.1*.jar</exclude>
- <exclude>icu4j*.jar</exclude>
- <exclude>jibx-bind*.jar</exclude>
- <exclude>jibx-run*.jar</exclude>
- <exclude>mex*.jar</exclude>
- <exclude>soapmonitor*.jar</exclude>
- <exclude>xml-resolver*.jar</exclude>
- <exclude>jaxb-xjc*.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../../</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>INSTALL</include>
- <include>README</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
<!-- ********************** copy binary licenses
********************** -->
<fileSet>
<directory>src/main/resources/</directory>
@@ -184,6 +138,22 @@
<include>org.codehaus.jackson:jackson-xc</include>
<include>xerces:xercesImpl:jar:2.9.1</include>
<include>de.fzj.unicore:jsdl-xmlbeans:jar:2.1.0</include>
+
+ <include>commons-codec:commons-codec:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>org.apache.axis2:axis2-kernel:jar</include>
+ <include>commons-httpclient:commons-httpclient:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-api:jar</include>
+ <include>org.apache.axis2:axis2:jar</include>
+ <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
+ <include>org.apache.ws.commons.axiom:axiom-impl:jar</include>
+ <include>org.apache.neethi:neethi:jar</include>
+ <include>org.apache.axis2:axis2-transport-local:jar</include>
+ <include>org.apache.axis2:axis2-transport-http:jar</include>
+ <include>javax.mail:mail:jar</include>
+ <include>org.apache.woden:woden-api:jar</include>
+ <include>org.apache.httpcomponents:httpcore:jar</include>
+ <include>org.apache.axis2:axis2-adb:jar</include>
</includes>
</dependencySet>
</dependencySets>
