You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2012/07/24 13:27:02 UTC
svn commit: r1364981 - /incubator/airavata/trunk/modules/xbaya-gui/pom.xml
Author: smarru
Date: Tue Jul 24 11:27:02 2012
New Revision: 1364981
URL: http://svn.apache.org/viewvc?rev=1364981&view=rev
Log:
Reverting pom to 1340614. The JNLP additions were improperly inherited from a stand alone pom.
Modified:
incubator/airavata/trunk/modules/xbaya-gui/pom.xml
Modified: incubator/airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1364981&r1=1364980&r2=1364981&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/pom.xml Tue Jul 24 11:27:02 2012
@@ -1,14 +1,29 @@
-<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">
+<?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">
+
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata</artifactId>
+ <version>0.4-incubating-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.airavata</groupId>
- <version>0.4-incubating-SNAPSHOT</version>
<artifactId>airavata-xbaya-gui</artifactId>
<packaging>jar</packaging>
<name>Airavata XBaya</name>
<url>http://incubator.apache.org/airavata/</url>
+ <!-- Edit the following properties. -->
<profiles>
<profile>
<id>standalone</id>
@@ -16,29 +31,30 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <trustedCertsLocation>${project.home}/certificates/</trustedCertsLocation>
+ <trustedCertsLocation>${project.home}/certificates/
+ </trustedCertsLocation>
<ssl.trustedCertsFile>${trustedCertsLocation}</ssl.trustedCertsFile>
<build.scope>provided</build.scope>
<build.jsf>compile</build.jsf>
- <airavata.properties>0.3-incubating</airavata.properties>
- <used.axis2.release>${axis2.version}</used.axis2.release>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <axis2.version>1.5.1</axis2.version>
- <derby.version>10.7.1.1</derby.version>
- <jackrabbit.version>2.2.7</jackrabbit.version>
- <logback.version>0.9.20</logback.version>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.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>
<!-- JNLP Properties -->
- <jnlpURLPrefix>http://demo.airavata.org/airavata</jnlpURLPrefix>
+ <!-- Deployment Information -->
+ <jnlpURLPrefix>http://localhost/airavata-xbaya</jnlpURLPrefix>
<jnlpFileName>xbaya.jnlp</jnlpFileName>
+
+ <registryEPR>
+ http://localhost:8090/jackrabbit-webapp-2.4.0/rmi
+ </registryEPR>
+ <gfacEPR>
+ http://localhost:8080/axis2/services/GFacService
+ </gfacEPR>
+ <messagebrokerEPR>
+ http://localhost:8080/axis2/services/EventingService
+ </messagebrokerEPR>
+ <messageboxEPR>
+ http://localhost:8080/axis2/services/MsgBoxService
+ </messageboxEPR>
+
</properties>
</profile>
@@ -57,44 +73,6 @@
</properties>
</profile>
</profiles>
-
- <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>
- <!--updatePolicy>daily</updatePolicy -->
- <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>OW2</id>
- <name>OW2 Repository</name>
- <url>http://maven.ow2.org/maven2</url>
- </repository>
- </repositories>
-
<build>
<plugins>
<plugin>
@@ -106,7 +84,7 @@
<phase>prepare-package</phase>
<configuration>
<tasks>
- <copy file="src/main/resources/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml" />
+ <copy file="${project.build.outputDirectory}/services.xml" tofile="${project.build.outputDirectory}/META-INF/services.xml" />
<copy file="src/main/resources/WorkflowInterpretor.wsdl" tofile="${project.build.outputDirectory}/META-INF/service.wsdl" />
</tasks>
</configuration>
@@ -131,19 +109,36 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/jnlp/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ <excludeTransitive>false</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId>
<version>1.0-beta-3</version>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>jnlp</goal>
</goals>
</execution>
</executions>
<configuration>
- <resourcesDirectory>src/main/resources/</resourcesDirectory>
<jnlp>
<inputTemplate>src/main/resources/xbaya-jnlp-template.vm</inputTemplate>
<outputFile>${jnlpFileName}</outputFile>
@@ -152,14 +147,14 @@
<libPath>lib</libPath>
<sign>
<keystore>${basedir}/target/keystore</keystore>
- <keypass>paramberoo-secret</keypass>
- <storepass>paramberoo-secret</storepass>
- <alias>paramberoo</alias>
+ <keypass>xbaya-secret</keypass>
+ <storepass>xbaya-secret</storepass>
+ <alias>xbaya</alias>
<validity>365</validity>
- <dnameCn>Paramberoo</dnameCn>
- <dnameOu>Airavata</dnameOu>
- <dnameO>Open Gateway Computing Environments</dnameO>
+ <dnameCn>Airavata</dnameCn>
+ <dnameOu>Apache</dnameOu>
+ <dnameO>Apache Software Foundation</dnameO>
<keystoreConfig>
<delete>true</delete>
@@ -175,51 +170,24 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <!-- airavata libs -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_xpath</artifactId>
+ <version>1.1.4c</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.4c</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>${jackrabbit.version}</version>
+ <groupId>xpp5</groupId>
+ <artifactId>xpp5</artifactId>
+ <version>1.2.6</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-server</artifactId>
- <version>${jackrabbit.version}</version>
+ <groupId>xpp5</groupId>
+ <artifactId>xpp5_xpath</artifactId>
+ <version>1.2.6</version>
</dependency>
<dependency>
<groupId>xsul5-ogce</groupId>
@@ -227,59 +195,28 @@
<version>1</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-servlet</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi-commons</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>gpel</groupId>
<artifactId>gpel_client</artifactId>
<version>1.0.7-BETA</version>
</dependency>
<dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
+ <groupId>atomixmiser</groupId>
+ <artifactId>atomixmiser</artifactId>
+ <version>0.9.4</version>
</dependency>
<dependency>
- <groupId>xpp5</groupId>
- <artifactId>xpp5</artifactId>
- <version>1.2.6</version>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_xpath</artifactId>
- <version>1.1.4c</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>lead-security</groupId>
@@ -312,6 +249,10 @@
<version>1.8.0_1</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>xsul</groupId>
<artifactId>xsul</artifactId>
<version>2.10.5_d</version>
@@ -319,7 +260,7 @@
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>2.5.0</version>
+ <version>${xmlbeans.version}</version>
</dependency>
<dependency>
<groupId>xbaya</groupId>
@@ -327,68 +268,77 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.1.8</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
</dependency>
<dependency>
- <groupId>amazon</groupId>
- <artifactId>MapReduce.Service.Client</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
</dependency>
<dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.8.0</version>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>1.2.8</version>
</dependency>
<dependency>
- <groupId>ode-proxy</groupId>
- <artifactId>weps-beans</artifactId>
- <version>0.1</version>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>1.2.8</version>
</dependency>
<dependency>
- <groupId>atomixmiser</groupId>
- <artifactId>atomixmiser</artifactId>
- <version>0.9.4</version>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>1.2.8</version>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>1.4.2</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>2.0.4</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>${axis2.version}</version>
</dependency>
<dependency>
- <groupId>globus</groupId>
- <artifactId>transfer-api-client</artifactId>
- <version>0.10</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${axis2.version}</version>
</dependency>
+
+ <!-- AMAZON STUFFS -->
<dependency>
- <groupId>edu.berkeley</groupId>
- <artifactId>yfilter</artifactId>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>amazon</groupId>
+ <artifactId>MapReduce.Service.Client</artifactId>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <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-messenger-client</artifactId>
+ <artifactId>airavata-workflow-model-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-messenger-commons</artifactId>
+ <artifactId>airavata-message-broker</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -396,59 +346,74 @@
<artifactId>airavata-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-service</artifactId>
+ <artifactId>airavata-common-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-model-core</artifactId>
+ <artifactId>airavata-workflow-tracking</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- JCR Support -->
+ <!-- TODO need clean up -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-execution-context</artifactId>
+ <artifactId>airavata-gfac-schema-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-workflow-tracking</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-core</artifactId>
+ <artifactId>airavata-registry-migrator</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-schema-utils</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-common-utils</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-message-box</artifactId>
- <version>${project.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-message-broker</artifactId>
- <version>${project.version}</version>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>${jcr.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-xbaya-gui</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.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-gfac-axis2-interface</artifactId>
+ <artifactId>airavata-workflow-execution-context</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -456,16 +421,5 @@
<artifactId>airavata-common-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>1.45</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15</artifactId>
- <version>1.45</version>
- </dependency>
-
</dependencies>
</project>