Author: tucu
Date: Thu Oct 11 22:42:32 2012
New Revision: 1397343
URL: http://svn.apache.org/viewvc?rev=1397343&view=rev
Log:
OOZIE-976 add workflowgenerator into distro tarball (egashira via tucu)
Modified:
oozie/trunk/distro/pom.xml
oozie/trunk/distro/src/main/bin/oozie-setup.sh
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
oozie/trunk/src/main/assemblies/distro.xml
oozie/trunk/workflowgenerator/README.txt
oozie/trunk/workflowgenerator/pom.xml
Modified: oozie/trunk/distro/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/distro/pom.xml?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/distro/pom.xml (original)
+++ oozie/trunk/distro/pom.xml Thu Oct 11 22:42:32 2012
@@ -7,9 +7,9 @@
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.
@@ -123,5 +123,22 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>wfgen</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-workflowgenerator</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: oozie/trunk/distro/src/main/bin/oozie-setup.sh
URL:
http://svn.apache.org/viewvc/oozie/trunk/distro/src/main/bin/oozie-setup.sh?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/distro/src/main/bin/oozie-setup.sh (original)
+++ oozie/trunk/distro/src/main/bin/oozie-setup.sh Thu Oct 11 22:42:32 2012
@@ -7,9 +7,9 @@
# 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.
@@ -138,7 +138,14 @@ if [ -d "${libext}" ]; then
if [ -f "${libext}/ext-2.2.zip" ]; then
extjsHome=${libext}/ext-2.2.zip
addExtjs=true
- fi
+ fi
+# find war files (e.g., workflowgenerator) under /libext and deploy
+ if [ `ls ${libext} | grep \.war\$ | wc -c` != 0 ]; then
+ for i in "${libext}/"*.war; do
+ echo "INFO: Deploying extention: $i"
+ cp $i ${CATALINA_BASE}/webapps/
+ done
+ fi
fi
if [ "${addExtjs}" == "" ]; then
Modified: oozie/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Thu Oct 11 22:42:32 2012
@@ -69,7 +69,7 @@
<hadoop.version>1.0.1</hadoop.version>
<hadooplib.version>${hadoop.version}.oozie-${project.version}</hadooplib.version>
-
+
<clover.license>/home/jenkins/tools/clover/latest/lib/clover.license</clover.license>
<!--
This is required while we support a a pre 0.23 version of Hadoop which
does not have
@@ -889,10 +889,13 @@
</properties>
</profile>
<profile>
- <id>testPatchCompile</id>
+ <id>wfgen</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
+ <modules>
+ <module>workflowgenerator</module>
+ </modules>
<build>
<plugins>
<plugin>
@@ -922,5 +925,4 @@
</properties>
</profile>
</profiles>
-
</project>
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Oct 11 22:42:32 2012
@@ -24,6 +24,7 @@ OOZIE-979 bump up trunk version to 3.4.0
-- Oozie 3.3.0 release (unreleased)
+OOZIE-976 add workflowgenerator into distro tarball (egashira via tucu)
OOZIE-993 Hadoop 23 doesn't accept user defined jobtracker (virag)
OOZIE-1013 Build failing as the license header comment is appearing before xml
declaration in some files (virag)
OOZIE-1007 Add license headers to all files don't have them (egashira via
tucu)
Modified: oozie/trunk/src/main/assemblies/distro.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/src/main/assemblies/distro.xml?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/src/main/assemblies/distro.xml (original)
+++ oozie/trunk/src/main/assemblies/distro.xml Thu Oct 11 22:42:32 2012
@@ -99,6 +99,15 @@
</includes>
<fileMode>0555</fileMode>
</fileSet>
+ <fileSet>
+ <directory>${basedir}/../workflowgenerator/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>oozie-wfgen.war</include>
+ </includes>
+ <fileMode>0555</fileMode>
+ </fileSet>
+
</fileSets>
<files>
<!-- Oozie configuration files -->
Modified: oozie/trunk/workflowgenerator/README.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/workflowgenerator/README.txt?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/workflowgenerator/README.txt (original)
+++ oozie/trunk/workflowgenerator/README.txt Thu Oct 11 22:42:32 2012
@@ -2,71 +2,83 @@
Workflow Generator Tool
=========================
+-----------------------------------------------
What is Workflow Generator Tool
-----------------------
+-----------------------------------------------
Workflow generator tool is a web application where a user can construct Oozie
workflow through GUI.
Since it is based on html and javascript, a user needs only browser to access
the tool. (major browsers such as Chrome, Firefox, IE supported)
It is developed using Google Web Toolkit (
https://developers.google.com/web-toolkit/ ), which provides functionality to
compile java code into javascript.
Therefore, although final product is in javascript, development process is
performed in java.
-How to build and launch Workflow Generator Tool
-----------------------
+-------------------------------------------------------------------------------------
+How to build and launch Workflow Generator Tool as part of entire oozie
package build
+-------------------------------------------------------------------------------------
-There are three possible options
-Option-A) launch app using bundled tomcat
-Option-B) launch app using web server that you are already running (without
using bundled tomcat)
-Option-C) launch app in dev mode using bundled internal web server provided by
GWT.
-
-Option-A would be good for easy start since you don't have to install and run
tomcat server by yourself.
-Option-B would be suitable when you want to host this application on the
existing tomcat instance. You need to copy war file into webapp directory of
existing tomcat.
-Option-C would be suitable for development of the tool since you can see error
messages for debugging, and don't need to create and copy war file every time
-
-Option-C internally using java class (servlet), not javascript.
-On browser UI, therefore, DOM operation (e.g., creating/deleting nodewidget)
might be slower than using pure javascript (Option-A and B)
-
-============================
-<Option-A>
-
-1. build project
+1. run mkdistro.sh on top-level directory
---------------------
-mvn clean package -Dmaven.test.skip=true
+bin/mkdistro.sh -P wfgen
---------------------
[NOTE]
-test case not implemented yet, so please skip test, otherwise may fail
-during the build process, tomcat package is automatically downloaded from
apache site. war file is also generated and copied into webapps directory of
tomcat.
+currently workflow generator is not included in build as default, thus need to
specify maven profile (-P wfgen)
-2. start web server
----------------------
-target/workflowgenerator-1.0-SNAPSHOT-tomcat/bin/startup.sh
----------------------
+2. move to output directory
+--------------------
+cd distro/target/oozie-<version>-distro/oozie-<version>
+--------------------
+
+3-(a). copy the war file to oozie-server/webapps/
+--------------------
+cp oozie-wfgen.war ./oozie-server/webapps
+--------------------
+
+or
+
+3-(b). create /libext and copy the war file to it
+--------------------
+mkdir libext
+cp oozie-wfgen.war ./libext
+--------------------
+[NOTE]
+bin/oozie-setup.sh is implemented such that wfgen.war is automatically picked
up and deployed to oozie server
-3. check through browser
+4. start oozie server (using bin/oozie-setup.sh and bin/oozie-start.sh) and
check through browser
---------------------
-http://localhost:8080/workflowgenerator-1.0-SNAPSHOT/
+http://localhost:11000/oozie-wfgen
---------------------
[NOTE]
-using default port number, which is 8080. tomcat server may fail to start if
other application already using the same port. please make sure the port is not
used. If you want to change the port number, please edit
target/workflowgenerator-1.0-SNAPSHOT-tomcat/conf/server.xml
+using default port number, which is 11000. tomcat server may fail to start if
other application already using the same port. please make sure the port is not
used.
-4. stop web server
----------------------
-target/workflowgenerator-1.0-SNAPSHOT-tomcat/bin/shutdown.sh
----------------------
-============================
-<Option-B>
+----------------------------------------------------------------------------------------
+How to build and launch Workflow Generator Tool only (not whole package build)
+----------------------------------------------------------------------------------------
+
+There are two possible options
+Option-A) launch app using web server that you are already running (without
using bundled tomcat)
+Option-B) launch app in dev mode using bundled internal web server provided by
GWT.
+
+Option-A would be suitable when you want to host this application on the
existing tomcat instance. You need to copy war file into webapp directory of
existing tomcat.
+Option-B would be suitable for development of the tool since you can see error
messages for debugging, and don't need to create and copy war file every time
+
+Option-B internally using java class (servlet), not javascript.
+On browser UI, therefore, DOM operation (e.g., creating/deleting nodewidget)
might be slower than using pure javascript (Option-A)
-1. build project and create war file
+===============================================
+<Option-A>
+
+1. build workflowgenerator and create war file
---------------------
-mvn clean package -Dmaven.test.skip=true
+cd workflowgenerator // assuming you are on top directory
+mvn clean package
---------------------
[NOTE]
-test case not implemented yet, so please skip test, otherwise may fail
+test case not implemented yet
2. copy war file to webapps directory of web server
---------------------
-cp target/workflowgenerator-1.0-SNAPSHOT.war
<webserver-installed-directory>/webapps/
+cp target/oozie-wfgen.war <webserver-installed-directory>/webapps/
---------------------
3. start web server
@@ -78,10 +90,10 @@ name of start script might be different
4. check through browser
---------------------
-http://localhost:8080/workflowgenerator-1.0-SNAPSHOT/
+http://localhost:8080/oozie-wfgen
---------------------
[NOTE]
-port number might not be 8080 in your web-server setting, please change
accordingly
+port number might not be 8080 in your web-server setting (usually it's default
in tomcat), please change accordingly
5. stop web server
---------------------
@@ -89,12 +101,12 @@ port number might not be 8080 in your we
---------------------
[NOTE] name of shutdown script might be different in your web-server, please
change accordingly
-
-============================
-<Option-C>
+===============================================
+<Option-B>
1. compile and start GWT launcher
---------------------
+cd workflowgenerator // assuming you are on top directory
mvn clean gwt:run
---------------------
you will see GWT launcher program automatically starts
Modified: oozie/trunk/workflowgenerator/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/workflowgenerator/pom.xml?rev=1397343&r1=1397342&r2=1397343&view=diff
==============================================================================
--- oozie/trunk/workflowgenerator/pom.xml (original)
+++ oozie/trunk/workflowgenerator/pom.xml Thu Oct 11 22:42:32 2012
@@ -21,13 +21,18 @@
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";>
- <!-- POM file generated with GWT webAppCreator -->
+ <parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-main</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.oozie</groupId>
- <artifactId>workflowgenerator</artifactId>
+ <artifactId>oozie-workflowgenerator</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>war</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>GWT Maven Archetype</name>
+ <description>Apache Oozie WorkflowGenerator</description>
+ <name>Apache Oozie WorkflowGenerator</name>
<properties>
<!-- Convenience property to set the GWT version -->
@@ -89,6 +94,7 @@
<build>
<!-- Generate compiled stuff in the folder used for developing mode -->
<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
+ <finalName>oozie-wfgen</finalName>
<plugins>
@@ -162,55 +168,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <configuration>
- <target>
- <mkdir dir="downloads"/>
- <get
src="http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz";
- dest="downloads/tomcat.tar.gz" verbose="true"
skipexisting="true"/>
- <delete dir="target/tomcat-pkg"/>
- <mkdir dir="target/tomcat-pkg"/>
- <delete
dir="target/${project.artifactId}-${project.version}-tomcat"/>
- <mkdir
dir="target/${project.artifactId}-${project.version}-tomcat"/>
- <gunzip src="downloads/tomcat.tar.gz"
dest="target/tomcat-pkg/tomcat.tar"/>
- <untar src="target/tomcat-pkg/tomcat.tar"
dest="target/tomcat-pkg"/>
- <move
file="target/tomcat-pkg/apache-tomcat-6.0.32"
tofile="target/${project.artifactId}-${project.version}-tomcat"/>
- <delete dir="target/tomcat-pkg"/>
- <delete
dir="target/${project.artifactId}-${project.version}-tomcat/webapps"/>
- <mkdir
dir="target/${project.artifactId}-${project.version}-tomcat/webapps"/>
- <copy
file="target/${project.artifactId}-${project.version}.war"
toDir="target/${project.artifactId}-${project.version}-tomcat/webapps"/>
- <chmod
dir="target/${project.artifactId}-${project.version}-tomcat/bin" perm="ugo+rx"
includes="**/*.sh"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>assembly</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assemblies/workflowgenerator.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
</plugins>
<resources>
<resource>
