airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1516862 [1/8] - in /airavata/trunk: ./ modules/distribution/airavata-server/ modules/distribution/airavata-server/src/main/assembly/ modules/integration-tests/ samples/ samples/airavata-client/create-application/ samples/airavata-client/wo...
Date Fri, 23 Aug 2013 14:36:59 GMT
Author: samindaw
Date: Fri Aug 23 14:36:58 2013
New Revision: 1516862

URL: http://svn.apache.org/r1516862
Log:
samples distribution

Added:
    airavata/trunk/samples/applications/
    airavata/trunk/samples/applications/echo.bat
      - copied unchanged from r1516598, airavata/trunk/samples/echo.bat
    airavata/trunk/samples/applications/echo.sh
      - copied unchanged from r1516598, airavata/trunk/samples/echo.sh
    airavata/trunk/samples/applications/echo_out.sh
      - copied unchanged from r1516598, airavata/trunk/samples/echo_out.sh
    airavata/trunk/samples/distribution/
    airavata/trunk/samples/distribution/pom.xml
    airavata/trunk/samples/distribution/src/
    airavata/trunk/samples/distribution/src/main/
    airavata/trunk/samples/distribution/src/main/assembly/
    airavata/trunk/samples/distribution/src/main/assembly/bin-assembly.xml
    airavata/trunk/samples/distribution/src/main/resources/
    airavata/trunk/samples/distribution/src/main/resources/INSTALL
    airavata/trunk/samples/distribution/src/main/resources/LICENSE
    airavata/trunk/samples/distribution/src/main/resources/NOTICE
    airavata/trunk/samples/distribution/src/main/resources/README
    airavata/trunk/samples/workflows/
    airavata/trunk/samples/workflows/ComplexForEach.xwf
    airavata/trunk/samples/workflows/ComplexMath.xwf
    airavata/trunk/samples/workflows/LevenshteinDistance.xwf
    airavata/trunk/samples/workflows/SimpleEcho.xwf
    airavata/trunk/samples/workflows/SimpleForEach.xwf
    airavata/trunk/samples/workflows/SimpleMath.xwf
Removed:
    airavata/trunk/samples/echo.bat
    airavata/trunk/samples/echo.sh
    airavata/trunk/samples/echo_out.sh
Modified:
    airavata/trunk/modules/distribution/airavata-server/pom.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/integration-tests/pom.xml
    airavata/trunk/pom.xml
    airavata/trunk/samples/airavata-client/create-application/build.xml
    airavata/trunk/samples/airavata-client/workflow-run/build.xml

Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1516862&r1=1516861&r2=1516862&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Fri Aug 23 14:36:58 2013
@@ -32,7 +32,7 @@
                 <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>unpack-axis2</id>
+                        <id>unpack-dependencies</id>
                         <phase>package</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -46,9 +46,16 @@
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.build.directory}/axis2-${axis2.version}</outputDirectory>
+		                            <excludes>**/icu4j-2.6.1.jar</excludes>
                                 </artifactItem>
-                            </artifactItems>
-                            <excludes>**/icu4j-2.6.1.jar</excludes>
+                                <artifactItem>
+                                    <groupId>org.apache.airavata</groupId>
+                                    <artifactId>apache-airavata-samples</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/samples</outputDirectory>
+                                </artifactItem>
+	                        </artifactItems>
                         </configuration>
                     </execution>
                     <execution>
@@ -218,16 +225,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>axis2-${axis2.version}</directory>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1516862&r1=1516861&r2=1516862&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
Fri Aug 23 14:36:58 2013
@@ -149,54 +149,39 @@
             </includes>
         </fileSet>
 
-        <!--fileSet> <directory>../../samples/simple-math-service/target</directory>
<outputDirectory>standalone-server/repository/services</outputDirectory> 
-            <includes> <include>*.aar</include> </includes> </fileSet
-->
         <fileSet>
-            <directory>../../../samples/complex-math-service/target</directory>
-            <outputDirectory>repository/services
-            </outputDirectory>
+            <directory>src/main/resources/conf</directory>
+            <outputDirectory>bin</outputDirectory>
             <includes>
-                <include>*.aar</include>
+                <include>**/*</include>
             </includes>
         </fileSet>
+
+        <!-- ********************** Copy samples ********************** -->
         <fileSet>
-            <directory>../../../samples/levenshtein-distance-service/target
-            </directory>
-            <outputDirectory>repository/services</outputDirectory>
-            <includes>
-                <include>*.aar</include>
-            </includes>
-        </fileSet>
-		<fileSet>
-            <directory>../../../samples/echo-service/target
-            </directory>
-            <outputDirectory>repository/services</outputDirectory>
+            <directory>${project.build.directory}/samples/services</directory>
+            <outputDirectory>repository/services
+            </outputDirectory>
             <includes>
                 <include>*.aar</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../../xbaya-gui/src/test/resources/</directory>
+            <directory>${project.build.directory}/samples/workflows</directory>
             <outputDirectory>samples/workflows</outputDirectory>
             <includes>
                 <include>*.xwf</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../../../samples</directory>
+            <directory>${project.build.directory}/samples/applications</directory>
             <outputDirectory>samples</outputDirectory>
             <includes>
                 <include>*.sh</include>
                 <include>*.bat</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>src/main/resources/conf</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
+
     </fileSets>
 
     <dependencySets>

Modified: airavata/trunk/modules/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/pom.xml?rev=1516862&r1=1516861&r2=1516862&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/pom.xml (original)
+++ airavata/trunk/modules/integration-tests/pom.xml Fri Aug 23 14:36:58 2013
@@ -76,26 +76,6 @@
 					</executions>	
 			</plugin>
             <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <version>2.3.1</version>
-                <executions>
-                    <execution>
-                        <id>install-tomcat-distribution</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>install-file</goal>
-                        </goals>
-                        <configuration>
-                            <groupId>org.apache.airavata.integration.tomcat</groupId>
-                            <artifactId>apache-tomcat</artifactId>
-                            <version>${tomcat.version}</version>
-                            <packaging>zip</packaging>
-                            <file>${project.build.directory}/apache-tomcat-${tomcat.version}.zip</file>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
                 <version>1.3.1</version>
@@ -182,25 +162,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>tomcat-zip</id>
-                        <phase>install</phase>
-                        <configuration>
-                            <target>
-                                <echo message="Creating airavata tomcat distribution.
This may take a while ..." />
-                                <sleep seconds="20" />
-                                <zip destfile="${airavata.tomcat.distribution}" basedir="${tomcat.work.dir}"
/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -235,30 +196,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-rest-service-webapp</artifactId>
-            <type>war</type>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-webapp</artifactId>
-            <version>${axis2.version}</version>
-            <type>war</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-rest-client</artifactId>
             <version>${project.version}</version>
             <exclusions>

Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1516862&r1=1516861&r2=1516862&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Fri Aug 23 14:36:58 2013
@@ -438,14 +438,9 @@
                 <module>modules/credential-store</module>
                 <module>modules/rest</module>
                 <module>tools</module>
-                <module>samples/simple-math-service</module>
-                <module>samples/complex-math-service</module>
-                <module>samples/levenshtein-distance-service</module>
-                <module>samples/sample-gateway</module>
-                <module>samples/echo-service</module>
+                <module>samples</module>
                 <module>modules/server</module>
                 <module>modules/test-suite</module>
-                <module>samples/airavata-client</module>
                 <module>modules/distribution</module>
                 <module>modules/integration-tests</module>
             </modules>

Modified: airavata/trunk/samples/airavata-client/create-application/build.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/create-application/build.xml?rev=1516862&r1=1516861&r2=1516862&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/create-application/build.xml (original)
+++ airavata/trunk/samples/airavata-client/create-application/build.xml Fri Aug 23 14:36:58
2013
@@ -17,7 +17,7 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-    <project name="samples" default="help" basedir=".">
+<project name="samples" default="help" basedir=".">
     <property name="airavata.home" value="../.."/>
     <property name="lib.dir" value="${airavata.home}/lib"/>
     <target name="help">

Modified: airavata/trunk/samples/airavata-client/workflow-run/build.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/build.xml?rev=1516862&r1=1516861&r2=1516862&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/build.xml (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/build.xml Fri Aug 23 14:36:58 2013
@@ -17,7 +17,7 @@
   ~  specific language governing permissions and limitations
   ~  under the License.
   -->
-    <project name="samples" default="help" basedir=".">
+<project name="samples" default="help" basedir=".">
     <property name="airavata.home" value="../.."/>
     <property name="lib.dir" value="${airavata.home}/lib"/>
     <target name="help">

Added: airavata/trunk/samples/distribution/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/distribution/pom.xml?rev=1516862&view=auto
==============================================================================
--- airavata/trunk/samples/distribution/pom.xml (added)
+++ airavata/trunk/samples/distribution/pom.xml Fri Aug 23 14:36:58 2013
@@ -0,0 +1,101 @@
+<?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.9-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>apache-airavata-samples</artifactId>
+    <name>Airavata Samples</name>
+    <packaging>pom</packaging>
+    <url>http://airavata.apache.org/</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>${archieve.name}</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>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/${archieve.name}-bin.zip</file>
+                                    <type>zip</type>
+                                </artifact>
+                                <artifact>
+                                    <file>${project.build.directory}/${archieve.name}-bin.tar.gz</file>
+                                    <type>tar.gz</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-complex-math-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>echo-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-levenshtein-distance-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-simple-math-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <archieve.name>apache-airavata-samples</archieve.name>
+    </properties>
+</project>

Added: airavata/trunk/samples/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/distribution/src/main/assembly/bin-assembly.xml?rev=1516862&view=auto
==============================================================================
--- airavata/trunk/samples/distribution/src/main/assembly/bin-assembly.xml (added)
+++ airavata/trunk/samples/distribution/src/main/assembly/bin-assembly.xml Fri Aug 23 14:36:58
2013
@@ -0,0 +1,101 @@
+<!--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. -->
+
+<!DOCTYPE assembly [
+        <!ELEMENT assembly (id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
+        <!ELEMENT id (#PCDATA)>
+        <!ELEMENT includeBaseDirectory (#PCDATA)>
+        <!ELEMENT baseDirectory (#PCDATA)>
+        <!ELEMENT formats (format)*>
+        <!ELEMENT format (#PCDATA)>
+        <!ELEMENT fileSets (fileSet)*>
+        <!ELEMENT fileSet (directory|outputDirectory|includes)*>
+        <!ELEMENT directory (#PCDATA)>
+        <!ELEMENT outputDirectory (#PCDATA)>
+        <!ELEMENT includes (include)*>
+        <!ELEMENT include (#PCDATA)>
+        <!ELEMENT dependencySets (dependencySet)*>
+        <!ELEMENT dependencySet (outputDirectory|includes)*>
+        ]>
+<assembly>
+    <id>bin</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>${archieve.name}-${version}</baseDirectory>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+
+        <!-- ********************** copy release notes files ********************** -->
+        <fileSet>
+            <directory>../../</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>RELEASE_NOTES</include>
+            </includes>
+        </fileSet>
+        <!-- ********************** copy licenses, readme etc. **********************
-->
+        <fileSet>
+            <directory>src/main/resources/</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>LICENSE</include>
+                <include>NOTICE</include>
+                <include>README</include>
+                <include>INSTALL</include>
+            </includes>
+        </fileSet>
+
+        <!-- ********************** copy sample services ********************** -->
		
+        <fileSet>
+            <directory>../complex-math-service/target</directory>
+            <outputDirectory>services
+            </outputDirectory>
+            <includes>
+                <include>*.aar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../levenshtein-distance-service/target
+            </directory>
+            <outputDirectory>services</outputDirectory>
+            <includes>
+                <include>*.aar</include>
+            </includes>
+        </fileSet>
+		<fileSet>
+            <directory>../echo-service/target
+            </directory>
+            <outputDirectory>services</outputDirectory>
+            <includes>
+                <include>*.aar</include>
+            </includes>
+        </fileSet>
+		<fileSet>
+            <directory>../simple-math-service/target
+            </directory>
+            <outputDirectory>services</outputDirectory>
+            <includes>
+                <include>*.aar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../workflows</directory>
+            <outputDirectory>workflows</outputDirectory>
+            <includes>
+                <include>*.xwf</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../applications</directory>
+            <outputDirectory>applications</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: airavata/trunk/samples/distribution/src/main/resources/INSTALL
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/distribution/src/main/resources/INSTALL?rev=1516862&view=auto
==============================================================================
--- airavata/trunk/samples/distribution/src/main/resources/INSTALL (added)
+++ airavata/trunk/samples/distribution/src/main/resources/INSTALL Fri Aug 23 14:36:58 2013
@@ -0,0 +1,55 @@
+Installing  Apache Airavata 0.7
+-------------------------------
+
+Prerequisites
+-------------
+Java 1.5 or later
+Maven (tested on v 3.0.2)
+
+Build Apache Airavata from Source
+---------------------------------
+* Unzip/untar the source file or check out from svn.
+* cd to project folder and type
+	$ mvn clean install
+	Note: in order to skip tests use the command
+			$ mvn clean install -Dmaven.test.skip=true
+* The compressed binary distribution is created at <PROJECT DIR>/modules/distribution/airavata-server/target/apache-airavata-server-<airavata-version>-bin.zip
+
+Installing the Airavata Server
+------------------------------
+No installation is necessary. Just extract the compressed distribution.
+Note: For customizing the default configurations of the Airavata Server please 
+      refer to Airavata web-site (http://airavata.apache.org/) and/or Airavata 
+      mailing lists (http://airavata.apache.org/community/mailing-lists.html)
+
+Starting Apache Airavata Server
+-------------------------------
+* Navigate to <AIRAVATA_HOME>/bin
+* type for following command to start the Airavata Server
+	MAC/Unix systems
+		$ sh airavata-server.sh
+	Windows
+		> airavata-server.bat
+	Note: Pass "-h" as parameters to see more options when starting the server
+
+Starting Apache Derby Server
+-------------------------------
+Users have the option to star the derby server separately
+* Navigate to <AIRAVATA_HOME>/bin
+* type for following command to start the Airavata Server
+	MAC/Unix systems
+		$ sh derby.sh
+	Windows
+		<Not supported in this version>
+	Note: Pass "-h" as parameters to see more options when starting the server
+
+Running Tests
+-------------
+Once the binary is unzipped, instructions to run the tests should be followed from README
+
+Tutorials 
+----------
+The airavata website has instructions for basic tutorials:
+* For basic understanding of how Airavata works - http://airavata.apache.org/documentation/tutorials/airavata-in-5-minutes.html
+* Describing and executing applications using Airavata - http://airavata.apache.org/documentation/tutorials/airavata-in-10-minutes.html
+* Advanced tutorial to provide understanding of how to run sample workflows distributed with
Airavata - http://airavata.apache.org/documentation/tutorials/advanced-workflow-samples.html



Mime
View raw message