Author: smarru
Date: Thu Jul 11 11:39:38 2013
New Revision: 1502191
URL: http://svn.apache.org/r1502191
Log:
Creating a defualt profile which address AIRAVATA-884
Modified:
airavata/trunk/modules/distribution/xbaya-gui/pom.xml
Modified: airavata/trunk/modules/distribution/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/pom.xml?rev=1502191&r1=1502190&r2=1502191&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/pom.xml Thu Jul 11 11:39:38
2013
@@ -8,7 +8,8 @@
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">
+<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>distribution</artifactId>
@@ -22,211 +23,222 @@
<packaging>pom</packaging>
<url>http://airavata.apache.org/</url>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- <executions>
- <execution>
- <id>default</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.4</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>unpack-axis2</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-webapp</artifactId>
- <version>${axis2.version}</version>
- <type>war</type>
- <overWrite>true</overWrite>
-
<outputDirectory>target/axis2-${axis2.version}</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution-package</id>
- <phase>compile</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
-
<finalName>${archieve.name}-${project.version}</finalName>
- <descriptors>
-
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
- <!--
<descriptor>src/main/assembly/src-assembly.xml</descriptor> -->
- </descriptors>
- <attach>false</attach>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- JNLP -->
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>0-copy-xbaya</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.dependency.classpath" />
- <unzip
src="target/apache-airavata-xbaya-gui-${project.version}-bin.zip"
dest="${project.build.directory}/temp" />
- <mkdir dir="${jnlp.direcotry}" />
- <mkdir dir="${jnlp.direcotry}/lib" />
- <copy todir="${jnlp.direcotry}/lib">
- <fileset dir="${xbaya.directory}/lib" />
- </copy>
- <copy
todir="${jnlp.direcotry}">
- <fileset
dir="${project.basedir}/src/main/resources/jnlp" />
- </copy>
- <copy
file="${project.basedir}/src/main/resources/airavata-logo.gif"
todir="${jnlp.direcotry}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>1-sign</id>
- <phase>compile</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archiveDirectory>${jnlp.direcotry}/lib</archiveDirectory>
-
<keystore>${project.basedir}/src/main/resources/xbaya.jks</keystore>
- <alias>xbaya</alias>
- <storepass>xbaya-secret</storepass>
- <keypass>xbaya-secret</keypass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <id>2-execute-jnlp-modifier</id>
- <phase>compile</phase>
- <goals>
- <goal>java</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
-
<mainClass>org.apache.airavata.distribution.xbaya.jnlp.Main</mainClass>
- <arguments>
- <argument>${jnlp.direcotry}/lib</argument>
-
<argument>${jnlp.direcotry}/xbaya.jnlp</argument>
- </arguments>
+ <encoding>UTF-8</encoding>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>3-zip-xbaya-jnlp</id>
- <phase>package</phase>
+ <executions>
+ <execution>
+ <id>default</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--plugin> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version> <inherited>false</inherited>
<executions> <execution> <id>unpack-axis2</id> <phase>package</phase>
+ <goals> <goal>unpack</goal> </goals> <configuration>
<artifactItems> <artifactItem> <groupId>org.apache.axis2</groupId>
<artifactId>axis2-webapp</artifactId>
+ <version>${axis2.version}</version> <type>war</type>
<overWrite>true</overWrite>
<outputDirectory>target/axis2-${axis2.version}</outputDirectory>
+ </artifactItem> </artifactItems> </configuration>
</execution> </executions> </plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+
<finalName>${archieve.name}-${project.version}</finalName>
+ <descriptors>
+
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>bin-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>${airavata.xbaya-bin.zip}</file>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ </artifact>
+ <artifact>
+
<file>${airavata.xbaya-bin.tar.gz}</file>
+ <type>tar.gz</type>
+ <classifier>bin</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jnlp</id>
+ <build>
+ <plugins>
+ <!-- JNLP -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>0-copy-xbaya</id>
+ <phase>compile</phase>
+ <configuration>
+ <target>
+ <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
+
classpathref="maven.dependency.classpath" />
+ <unzip
src="target/apache-airavata-xbaya-gui-${project.version}-bin.zip"
+
dest="${project.build.directory}/temp" />
+ <mkdir dir="${jnlp.direcotry}" />
+ <mkdir dir="${jnlp.direcotry}/lib" />
+ <copy todir="${jnlp.direcotry}/lib">
+ <fileset
dir="${xbaya.directory}/lib" />
+ </copy>
+ <copy todir="${jnlp.direcotry}">
+ <fileset
dir="${project.basedir}/src/main/resources/jnlp" />
+ </copy>
+ <copy
file="${project.basedir}/src/main/resources/airavata-logo.gif"
todir="${jnlp.direcotry}" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>1-sign</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <target>
- <zip destfile="${airavata.xbaya-jnlp.zip}"
basedir="${jnlp.direcotry}" />
- <tar
destfile="${project.build.directory}/xbaya-jnlp-${project.version}.tar"
basedir="${jnlp.direcotry}" />
- <gzip destfile="${airavata.xbaya-jnlp.tar.gz}"
src="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
- <delete
file="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
- </target>
+
<archiveDirectory>${jnlp.direcotry}/lib</archiveDirectory>
+
<keystore>${project.basedir}/src/main/resources/xbaya.jks</keystore>
+ <alias>xbaya</alias>
+ <storepass>xbaya-secret</storepass>
+ <keypass>xbaya-secret</keypass>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- END JNLP -->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>4-attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${airavata.xbaya-bin.zip}</file>
- <type>zip</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
-
<file>${airavata.xbaya-bin.tar.gz}</file>
- <type>tar.gz</type>
- <classifier>bin</classifier>
- </artifact>
- <artifact>
-
<file>${airavata.xbaya-jnlp.zip}</file>
- <type>zip</type>
- <classifier>jnlp</classifier>
- </artifact>
- <artifact>
-
<file>${airavata.xbaya-jnlp.zip}</file>
- <type>tar.gz</type>
- <classifier>jnlp</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>2-execute-jnlp-modifier</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+
<mainClass>org.apache.airavata.distribution.xbaya.jnlp.Main</mainClass>
+ <arguments>
+
<argument>${jnlp.direcotry}/lib</argument>
+
<argument>${jnlp.direcotry}/xbaya.jnlp</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>3-zip-xbaya-jnlp</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <zip
destfile="${airavata.xbaya-jnlp.zip}" basedir="${jnlp.direcotry}" />
+ <tar
destfile="${project.build.directory}/xbaya-jnlp-${project.version}.tar"
+ basedir="${jnlp.direcotry}" />
+ <gzip
destfile="${airavata.xbaya-jnlp.tar.gz}"
+
src="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
+ <delete
file="${project.build.directory}/xbaya-jnlp-${project.version}.tar" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- END JNLP -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>4-attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+
<file>${airavata.xbaya-jnlp.zip}</file>
+ <type>zip</type>
+ <classifier>jnlp</classifier>
+ </artifact>
+ <artifact>
+
<file>${airavata.xbaya-jnlp.zip}</file>
+ <type>tar.gz</type>
+ <classifier>jnlp</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
- <dependency>
+ <dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3_xpath</artifactId>
<version>1.1.4c</version>
@@ -377,7 +389,7 @@
</dependency>
<!-- AIRAVATA modules -->
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-xbaya-gui</artifactId>
<version>${project.version}</version>
@@ -474,11 +486,8 @@
<artifactId>airavata-workflow-execution-context</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-jpa-registry</artifactId>
<version>${project.version}</version>
+ </dependency -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
@@ -534,7 +543,7 @@
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
@@ -562,13 +571,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<archieve.name>apache-airavata-xbaya-gui</archieve.name>
<used.axis2.release>${axis2.version}</used.axis2.release>
-
<airavata.xbaya-dist.name>${archieve.name}-${project.version}</airavata.xbaya-dist.name>
-
<airavata.xbaya-bin.zip>${project.build.directory}/${airavata.xbaya-dist.name}-bin.zip</airavata.xbaya-bin.zip>
-
<airavata.xbaya-bin.tar.gz>${project.build.directory}/${airavata.xbaya-dist.name}-bin.tar.gz</airavata.xbaya-bin.tar.gz>
-
<airavata.xbaya-jnlp.name>xbaya-jnlp-${project.version}</airavata.xbaya-jnlp.name>
-
<airavata.xbaya-jnlp.zip>${project.build.directory}/${airavata.xbaya-jnlp.name}.zip</airavata.xbaya-jnlp.zip>
-
<airavata.xbaya-jnlp.tar.gz>${project.build.directory}/${airavata.xbaya-jnlp.name}.tar.gz</airavata.xbaya-jnlp.tar.gz>
-
<xbaya.directory>${project.build.directory}/temp/apache-airavata-xbaya-gui-${project.version}</xbaya.directory>
+
<airavata.xbaya-dist.name>${archieve.name}-${project.version}</airavata.xbaya-dist.name>
+
<airavata.xbaya-bin.zip>${project.build.directory}/${airavata.xbaya-dist.name}-bin.zip</airavata.xbaya-bin.zip>
+
<airavata.xbaya-bin.tar.gz>${project.build.directory}/${airavata.xbaya-dist.name}-bin.tar.gz</airavata.xbaya-bin.tar.gz>
+
<airavata.xbaya-jnlp.name>xbaya-jnlp-${project.version}</airavata.xbaya-jnlp.name>
+
<airavata.xbaya-jnlp.zip>${project.build.directory}/${airavata.xbaya-jnlp.name}.zip</airavata.xbaya-jnlp.zip>
+
<airavata.xbaya-jnlp.tar.gz>${project.build.directory}/${airavata.xbaya-jnlp.name}.tar.gz</airavata.xbaya-jnlp.tar.gz>
+
<xbaya.directory>${project.build.directory}/temp/apache-airavata-xbaya-gui-${project.version}</xbaya.directory>
<jnlp.direcotry>${project.build.directory}/jnlp</jnlp.direcotry>
</properties>
</project>