airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ami...@apache.org
Subject svn commit: r1431136 - in /airavata/trunk/modules: distribution/ distribution/xbaya-gui-jnlp/ distribution/xbaya-gui-jnlp/src/ distribution/xbaya-gui-jnlp/src/main/ distribution/xbaya-gui-jnlp/src/main/resources/ xbaya-gui/ xbaya-gui/src/main/resources/
Date Wed, 09 Jan 2013 23:02:07 GMT
Author: amilaj
Date: Wed Jan  9 23:02:06 2013
New Revision: 1431136

URL: http://svn.apache.org/viewvc?rev=1431136&view=rev
Log:
Adding jnlp distribution, also removing jnlp related configurations from xbaya-gui

Added:
    airavata/trunk/modules/distribution/xbaya-gui-jnlp/
    airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml
    airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/
    airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/
    airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/
    airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm
Removed:
    airavata/trunk/modules/xbaya-gui/pom_jnlp.xml
    airavata/trunk/modules/xbaya-gui/src/main/resources/xbaya-jnlp-template.vm
Modified:
    airavata/trunk/modules/distribution/pom.xml

Modified: airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1431136&r1=1431135&r2=1431136&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Wed Jan  9 23:02:06 2013
@@ -32,6 +32,7 @@
                 <module>airavata-server</module>
                 <module>airavata-client</module>
                 <module>xbaya-gui</module>
+                <module>xbaya-gui-jnlp</module>
             </modules>
         </profile>
     </profiles>

Added: 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=1431136&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml (added)
+++ airavata/trunk/modules/distribution/xbaya-gui-jnlp/pom.xml Wed Jan  9 23:02:06 2013
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements. See the NOTICE file 
+    distributed with this work for additional information regarding copyright ownership.
The ASF licenses this file to you under 
+    the Apache License, Version 2.0 (theÏ "License"); you may not use this file except
in compliance with the License. You may 
+    obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
by applicable law or agreed to 
+    in writing, software distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF 
+    ANY ~ KIND, either express or implied. See the License for the specific language governing
permissions and limitations under 
+    the License. -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+     TODO: This is not the best way to create the JNLP. Due to some reason when we refer
to a parent pom file
+     JNLP does not include appropriated jar files. Therefore we have remove referring to
parent pom file.
+     We need to fix this in future as this duplicates lot of artifact information.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>airavata-xbaya-gui-jnlp</artifactId>
+    <groupId>org.apache.airavata</groupId>
+    <name>Airavata xbaya-gui JNLP distribution</name>
+    <version>0.6-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <url>http://airavata.apache.org/</url>
+
+    <repositories>
+
+        <repository>
+            <id>central</id>
+            <name>Maven Central</name>
+            <url>http://repo1.maven.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <name>ogce.m2.all</name>
+            <id>ogce.m2.all</id>
+            <url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>m2-snapshot-repository</id>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>unicore.eu</id>
+            <name>UNICORE repository</name>
+            <url>http://unicore-dev.zam.kfa-juelich.de/maven</url>
+        </repository>
+    </repositories>
+
+
+    <!-- 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/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>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>webstart-maven-plugin</artifactId>
+                <version>1.0-beta-3</version>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <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>
+
+    <dependencies>
+          <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3_xpath</artifactId>
+            <version>${xpp3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>${xpp3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xpp5</groupId>
+            <artifactId>xpp5</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>xpp5</groupId>
+            <artifactId>xpp5_xpath</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>xsul5-ogce</groupId>
+            <artifactId>xsul5-2007-02-27</artifactId>
+            <version>1</version>
+        </dependency>
+        <dependency>
+            <groupId>gpel</groupId>
+            <artifactId>gpel_client</artifactId>
+            <version>1.0.7-BETA</version>
+        </dependency>
+        <dependency>
+            <groupId>atomixmiser</groupId>
+            <artifactId>atomixmiser</artifactId>
+            <version>0.9.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>xutil</groupId>
+            <artifactId>xutil</artifactId>
+            <version>0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>jython</groupId>
+            <artifactId>jython</artifactId>
+            <version>2.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>cog-jglobus</groupId>
+            <artifactId>cog-jglobus</artifactId>
+            <version>1.8.0_1</version>
+        </dependency>
+        <dependency>
+            <groupId>xsul</groupId>
+            <artifactId>xsul</artifactId>
+            <version>2.10.5_d</version>
+        </dependency>
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeans.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-adb</artifactId>
+            <version>${axis2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-kernel</artifactId>
+            <version>${axis2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-dom</artifactId>
+            <version>1.2.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.neethi</groupId>
+            <artifactId>neethi</artifactId>
+            <version>2.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-transport-local</artifactId>
+            <version>${axis2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-transport-http</artifactId>
+            <version>${axis2.version}</version>
+        </dependency>
+
+        <!-- AMAZON STUFFS -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk</artifactId>
+            <version>1.3.20</version>
+        </dependency>
+        <dependency>
+            <groupId>amazon</groupId>
+            <artifactId>MapReduce.Service.Client</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jets3t</groupId>
+            <artifactId>jets3t</artifactId>
+            <version>0.8.0</version>
+        </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>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-workflow-model-component</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-message-monitor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-client-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-message-broker</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-common-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-workflow-tracking</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-jpa-registry</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-registry-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-rest-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- JCR Support -->
+        <!-- TODO need clean up -->
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-gfac-schema-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-gfac-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <version>${jcr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>globus</groupId>
+            <artifactId>transfer-api-client</artifactId>
+            <version>0.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-workflow-execution-context</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <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>
+        <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>
+        <used.axis2.release>${axis2.version}</used.axis2.release>
+
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <axis2.version>1.5.1</axis2.version>
+        <derby.version>10.9.1.0</derby.version>
+        <org.slf4j.version>1.7.2</org.slf4j.version>
+        <axiom.version>1.2.8</axiom.version>
+        <surefire.version>2.12</surefire.version>
+        <jcr.version>2.0</jcr.version>
+        <xmlbeans.version>2.5.0</xmlbeans.version>
+        <xpp3.version>1.1.3_7</xpp3.version>
+    </properties>
+</project>

Added: airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm?rev=1431136&view=auto
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm
(added)
+++ airavata/trunk/modules/distribution/xbaya-gui-jnlp/src/main/resources/xbaya-jnlp-template.vm
Wed Jan  9 23:02:06 2013
@@ -0,0 +1,41 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0+"
+   codebase="$jnlpURLPrefix/"
+   href="$outputFile">
+<information>
+	<title>XBaya</title>
+	<vendor>Apache Airavata</vendor>
+	<icon href="airavata-logo.png"/>
+	<offline-allowed/>
+</information>
+<security>
+	<all-permissions/>
+</security>
+<resources>
+	<j2se version="1.5+" java-vm-args="-Xmx1024m" />
+	<property name="log" value="org.apache.airavata.xbaya:ALL"/>
+	$dependencies
+</resources>
+<application-desc main-class="$mainClass">
+
+</application-desc>
+</jnlp>



Mime
View raw message