You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by am...@apache.org on 2013/01/15 23:15:56 UTC
svn commit: r1433698 - in /airavata/trunk/modules:
distribution/xbaya-gui-jnlp/pom.xml
distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm
distribution/xbaya-gui-jnlp/src/main/resources/xbaya.jnlp xbaya-gui/pom.xml
Author: amilaj
Date: Tue Jan 15 22:15:56 2013
New Revision: 1433698
URL: http://svn.apache.org/viewvc?rev=1433698&view=rev
Log:
Fixing jnlp distribution issues
Removed:
airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm
Modified:
airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml
airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya.jnlp
airavata/trunk/modules/xbaya-gui/pom.xml
Modified: airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml?rev=1433698&r1=1433697&r2=1433698&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml Tue Jan 15 22:15:56 2013
@@ -43,6 +43,7 @@
<fileset dir="${xbaya.directory}/lib"/>
</copy>
<copy file="${project.basedir}/src/main/resources/xbaya.jnlp" todir="${jnlp.direcotry}"/>
+ <copy file="${project.basedir}/src/main/resources/airavata-logo.gif" todir="${jnlp.direcotry}"/>
</target>
</configuration>
<goals>
Modified: airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya.jnlp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya.jnlp?rev=1433698&r1=1433697&r2=1433698&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya.jnlp (original)
+++ airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya.jnlp Tue Jan 15 22:15:56 2013
@@ -5,7 +5,7 @@
<information>
<title>XBaya</title>
<vendor>Apache Airavata</vendor>
- <icon href="airavata-logo.png"/>
+ <icon href="airavata-logo.gif"/>
<offline-allowed/>
</information>
<security>
@@ -13,9 +13,10 @@
</security>
<resources>
<j2se version="1.5+" java-vm-args="-Xmx1024m" />
- <property name="log" value="org.apache.airavata.xbaya:ALL"/>
+
DEPENDENT_JARS
+ <property name="log" value="org.apache.airavata.xbaya:ALL"/>
</resources>
<application-desc main-class="org.apache.airavata.xbaya.XBaya">
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1433698&r1=1433697&r2=1433698&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Tue Jan 15 22:15:56 2013
@@ -23,47 +23,6 @@
<name>Airavata XBaya</name>
<url>http://airavata.apache.org/</url>
- <!-- Edit the following properties. -->
- <profiles>
- <profile>
- <id>standalone</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <trustedCertsLocation>${project.home}/certificates/
- </trustedCertsLocation>
- <ssl.trustedCertsFile>${trustedCertsLocation}</ssl.trustedCertsFile>
- <build.scope>provided</build.scope>
- <build.jsf>compile</build.jsf>
-
- <!-- JNLP Properties -->
- <!-- Deployment Information -->
- <jnlpURLPrefix>http://localhost/airavata-xbaya</jnlpURLPrefix>
- <jnlpFileName>xbaya.jnlp</jnlpFileName>
- <!--
- <registryEPR>
- http://localhost:8090/jackrabbit-webapp-2.4.0/rmi
- </registryEPR>
- -->
- </properties>
- </profile>
-
- <profile>
- <id>collective</id>
- <activation>
- <file>
- <exists>betacollective</exists>
- </file>
- </activation>
- <properties>
- <!-- Inherited from the parent in this collective build. -->
- <ssl.trustedCertsFile>${trustedCertsLocation}</ssl.trustedCertsFile>
- <build.scope>provided</build.scope>
- <build.jsf>compile</build.jsf>
- </properties>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
@@ -118,44 +77,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
- <executions>
- <execution>
- <goals>
- <goal>jnlp</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jnlp>
- <inputTemplate>src/main/resources/xbaya-jnlp-template.vm</inputTemplate>
- <outputFile>${jnlpFileName}</outputFile>
- <mainClass>org.apache.airavata.xbaya.XBaya</mainClass>
- </jnlp>
- <libPath>lib</libPath>
- <sign>
- <keystore>${basedir}/target/keystore</keystore>
- <keypass>xbaya-secret</keypass>
- <storepass>xbaya-secret</storepass>
- <alias>xbaya</alias>
- <validity>365</validity>
-
- <dnameCn>Airavata</dnameCn>
- <dnameOu>Apache</dnameOu>
- <dnameO>Apache Software Foundation</dnameO>
-
- <keystoreConfig>
- <delete>true</delete>
- <gen>true</gen>
- </keystoreConfig>
- </sign>
- <verifyjar>true</verifyjar>
- </configuration>
- </plugin>
-
</plugins>
</build>