You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/12/05 23:05:11 UTC
svn commit: r1417664 - in /airavata/trunk/modules/distribution/xbaya-gui: ./
src/main/assembly/ src/main/resources/bin/ src/main/resources/conf/
Author: chathuri
Date: Wed Dec 5 22:05:10 2012
New Revision: 1417664
URL: http://svn.apache.org/viewvc?rev=1417664&view=rev
Log:
fixing paths in xbaya distribution
Removed:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/airavata-server.bat
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/bin/airavata-server.sh
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-server.properties
Modified:
airavata/trunk/modules/distribution/xbaya-gui/pom.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/registry.properties
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1417664&r1=1417663&r2=1417664&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Wed Dec 5 22:05:10 2012
@@ -323,6 +323,56 @@
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
</dependencies>
<properties>
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=1417664&r1=1417663&r2=1417664&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 22:05:10 2012
@@ -45,6 +45,7 @@
<excludes>
<exclude>commons-logging*.jar</exclude>
<exclude>xom*.jar</exclude>
+ <exclude>xercesImpl*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -66,32 +67,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>../../xbaya-gui/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>../../xbaya-gui/src/main/resources/conf</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>airavata-server.properties</include>
- <include>registry.properties</include>
- <include>log4j.properties</include>
- <include>host.xml</include>
- <include>persistence.xml</include>
- <include>provenance.sql</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>
@@ -111,6 +87,13 @@
<include>**/*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
@@ -127,6 +110,7 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>javax.jcr:jcr:jar</include>
<include>commons-collections:commons-collections</include>
<include>commons-configuration:commons-configuration</include>
<include>commons-lang:commons-lang</include>
@@ -165,12 +149,16 @@
<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>com.sun.jersey:jersey-servlet</include>
+ <include>com.sun.jersey:jersey-json</include>
+ <include>com.sun.jersey.contribs:jersey-multipart</include>
<include>edu.berkeley:yfilter</include>
<include>edu.berkeley:yfilter</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>
+ <include>xerces:xercesImpl:jar:2.9.1</include>
</includes>
</dependencySet>
</dependencySets>
Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/registry.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/registry.properties?rev=1417664&r1=1417663&r2=1417664&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/registry.properties (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/registry.properties Wed Dec 5 22:05:10 2012
@@ -29,8 +29,8 @@
###---------------------------REGISTRY API IMPLEMENTATION---------------------------###
-class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------###