You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by pr...@apache.org on 2011/11/16 07:17:41 UTC
svn commit: r1202534 - in
/oodt/trunk/mvn/archetypes/radix/src/main/resources: META-INF/maven/
archetype-resources/ archetype-resources/crawler/src/main/resources/bin/
archetype-resources/distribution/
archetype-resources/distribution/src/main/assembly...
Author: pramirez
Date: Wed Nov 16 06:17:39 2011
New Revision: 1202534
URL: http://svn.apache.org/viewvc?rev=1202534&view=rev
Log:
OODT-120 Update to include opsui and tomcat integration
Added:
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/setclasspath.sh (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/etc/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/pom.xml (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/context.xml (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pom.xml (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/logging.properties (with props)
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties (with props)
Removed:
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt_pcs
Modified:
oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/assembly/assembly.xml
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/etc/filemgr.properties
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pom.xml
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/assembly/assembly.xml
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/META-INF/maven/archetype-metadata.xml Wed Nov 16 06:17:39 2011
@@ -51,23 +51,7 @@
</fileSet>
</fileSets>-->
<modules>
- <module id="wmonitor" dir="wmonitor" name="wmonitor">
- <fileSets>
- <fileSet>
- <directory></directory>
- <includes/>
- </fileSet>
- </fileSets>
- </module>
- <module id="fmbrowser" dir="fmbrowser" name="fmbrowser">
- <fileSets>
- <fileSet>
- <directory></directory>
- <includes/>
- </fileSet>
- </fileSets>
- </module>
- <module id="fmprod" dir="fmprod" name="fmprod">
+ <module id="opsui" dir="opsui" name="opsui">
<fileSets>
<fileSet>
<directory></directory>
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/crawler/src/main/resources/bin/crawler_launcher Wed Nov 16 06:17:39 2011
@@ -15,7 +15,7 @@
# under the License.
##########################################################################
-java -Dorg.apache.oodt.cas.crawl.bean.repo=file:/usr/local/CHANGE_ME/crawler/policy/crawler-config.xml \
- -Dorg.apache.oodt.cas.filemgr.properties=/usr/local/CHANGE_ME/filemgr/etc/filemgr.properties \
+java -Dorg.apache.oodt.cas.crawl.bean.repo=file:./../policy/crawler-config.xml \
+ -Dorg.apache.oodt.cas.filemgr.properties=../../filemgr/etc/filemgr.properties \
-Djava.util.logging.config.file=../etc/logging.properties \
-Djava.ext.dirs=../lib org.apache.oodt.cas.crawl.CrawlerLauncher $*
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/pom.xml Wed Nov 16 06:17:39 2011
@@ -13,6 +13,10 @@
<artifactId>${rootArtifactId}-${artifactId}</artifactId>
<name>Distribution (RADiX Distro of OODT)</name>
<packaging>pom</packaging>
+
+ <properties>
+ <tomcat.version>5.5.23</tomcat.version>
+ </properties>
<dependencies>
<dependency>
@@ -44,10 +48,10 @@
<classifier>bin</classifier>
</dependency>
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>apache-tomcat</artifactId>
- <version>5.5.23</version>
- <type>zip</type>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}-opsui</artifactId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
</dependency>
</dependencies>
@@ -55,6 +59,39 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>unpack-tomcat</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>tomcat</groupId>
+ <artifactId>apache-tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>${groupId}</groupId>
+ <artifactId>${parent.artifactId}-opsui</artifactId>
+ <type>war</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/apache-tomcat-${tomcat.version}/webapps/opsui</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
<configuration>
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/assembly/assembly.xml Wed Nov 16 06:17:39 2011
@@ -13,6 +13,68 @@
<includes/>
<fileMode>775</fileMode>
</fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>logs</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>data</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>data/archive</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>data/staging</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>data/work</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>data/met</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>data/failure</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/apache-tomcat-${tomcat.version}</directory>
+ <outputDirectory>components/tomcat</outputDirectory>
+ <excludes>
+ <exclude>**/webapps/docs/**</exclude>
+ <exclude>**/webapps/examples/**</exclude>
+ <exclude>**/webapps/host-manager/**</exclude>
+ <exclude>**/webapps/manager/**</exclude>
+ <exclude>**/webapps/servlets-examples/**</exclude>
+ <exclude>**/webapps/jsp-examples/**</exclude>
+ <exclude>**/webapps/webdav/**</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
@@ -20,7 +82,9 @@
<unpack>true</unpack>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
- <unpackOptions/>
+ <excludes>
+ <exclude>${groupId}:${parent.artifactId}-opsui</exclude>
+ </excludes>
</dependencySet>
</dependencySets>
</assembly>
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh Wed Nov 16 06:17:39 2011
@@ -0,0 +1,171 @@
+#!/bin/sh
+
+# 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.
+
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set OODT_HOME if not already set
+[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/.." ; pwd`
+
+export OODT_HOME
+
+# Ensure that any user defined CLASSPATH variables are not used on startup,
+# but allow them to be specified in setenv.sh, in rare case when it is needed.
+CLASSPATH=
+
+if [ -r "$OODT_BASE"/bin/setenv.sh ]; then
+ . "$OODT_BASE"/bin/setenv.sh
+elif [ -r "$OODT_HOME"/bin/setenv.sh ]; then
+ . "$OODT_HOME"/bin/settenv.sh
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+ [ -n "$OODT_HOME" ] && OODT_HOME=`cygpath --unix "$OODT_HOME"`
+ [ -n "$OODT_BASE" ] && OODT_BASE=`cygpath --unix "$OODT_BASE"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# Get standard Java environment variables
+if $os400; then
+ # -r will Only work on the os400 if the files are:
+ # 1. owned by the user
+ # 2. owned by the PRIMARY group of the user
+ # this will not work if the user belongs in secondary groups
+ BASEDIR="$OODT_HOME"
+ . "$OODT_HOME"/bin/setclasspath.sh
+else
+ if [ -r "$OODT_HOME"/bin/setclasspath.sh ]; then
+ BASEDIR="$OODT_HOME"
+ . "$OODT_HOME"/bin/setclasspath.sh
+ else
+ echo "Cannot find $OODT_HOME/bin/setclasspath.sh"
+ echo "This file is needed to run this program"
+ exit 1
+ fi
+fi
+
+if [ -z "$OODT_BASE" ]; then
+ OODT_BASE="$OODT_HOME"
+fi
+
+if [ -z "$OODT_OUT" ] ; then
+ OODT_OUT="$OODT_BASE"/logs/oodt.out
+fi
+
+if [ -z "$FILEMGR_HOME" ]; then
+ FILEMGR_HOME="$OODT_HOME"/components/filemgr
+ export FILEMGR_HOME
+fi
+
+if [ -z "$WORKFLOW_HOME" ]; then
+ WORKFLOW_HOME="$OODT_HOME"/components/workflow
+ export WORKFLOW_HOME
+fi
+
+if [ -z "$CRAWLER_HOME" ]; then
+ CRAWLER_HOME="$OODT_HOME"/components/crawler
+ export CRAWLER_HOME
+fi
+
+if [ -z "$OODT_TMPDIR" ]; then
+ # Define the java.io.tmpdir to use for OODT
+ OODT_TMPDIR="$OODT_BASE"/temp
+fi
+
+if [ -z "$FILEMGR_PORT" ]; then
+ FILEMGR_PORT=9000
+fi
+
+if [ -z "$CRAWLER_PORT" ]; then
+ CRAWLER_PORT=9100
+fi
+
+if [ -z "$WORKFLOWMGR_PORT" ]; then
+ WORKFLOWMGR_PORT=9200
+fi
+
+if [ -z "$RESMGR_PORT" ]; then
+ RESMGR_PORT=9300
+fi
+
+if [ -z "$TOMCAT_PORT" ]; then
+ TOMCAT_PORT=8080
+fi
+
+if [ -z "$OODT_SERVICES_HOST" ]; then
+ OODT_SERVICES_HOST=localhost
+fi
+
+if [ -z "$FILEMGR_URL" ]; then
+ FILEMGR_URL=http://"$OODT_SERVICES_HOST":"$FILEMGR_PORT"
+ export FILEMGR_URL
+fi
+
+if [ -z "$WORKFLOW_URL" ]; then
+ WORKFLOW_URL=http://"$OODT_SERVICES_HOST":"$WORKFLOW_PORT"
+ export WORKFLOW_URL
+fi
+
+if [ -z "$CRAWLER_URL" ]; then
+ CRAWLER_URL=http://"$OODT_SERVICES_HOST":"$CRAWLER_PORT"
+ export CRAWLER_URL
+fi
+
+
+# When no TTY is available, don't output to console
+have_tty=0
+if [ "`tty`" != "not a tty" ]; then
+ have_tty=1
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+ JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
+ OODT_HOME=`cygpath --absolute --windows "$OODT_HOME"`
+ OODT_BASE=`cygpath --absolute --windows "$OODT_BASE"`
+ OODT_TMPDIR=`cygpath --absolute --windows "$OODT_TMPDIR"`
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/env.sh
------------------------------------------------------------------------------
svn:keywords = Id Revision
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt Wed Nov 16 06:17:39 2011
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# 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.
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set OODT_HOME if not already set
+[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# Get OODT environment set up
+if [ -r "$OODT_HOME"/bin/env.sh ]; then
+ . "$OODT_HOME"/bin/env.sh
+fi
+
+# Only output this if we have a TTY
+if [ $have_tty -eq 1 ]; then
+ echo "Using OODT_BASE: $OODT_BASE"
+ echo "Using OODT_HOME: $OODT_HOME"
+ echo "Using OODT_TMPDIR: $OODT_TMPDIR"
+ if [ "$1" = "debug" ] ; then
+ echo "Using JAVA_HOME: $JAVA_HOME"
+ else
+ echo "Using JRE_HOME: $JRE_HOME"
+ fi
+ echo "Using CLASSPATH: $CLASSPATH"
+fi
+
+WORKFLOW_EXEC=wmgr
+FILEMGR_EXEC=filemgr
+TOMCAT_EXEC=catalina.sh
+
+# Check that target executable exists
+if [ ! -x "$FILEMGR_HOME"/bin/"$FILEMGR_EXEC" ]; then
+ echo "Cannot find $FILEMGR_HOME/bin/$FILEMGR_EXEC"
+ echo "This file is needed to run this program"
+ exit 1
+fi
+
+# Check that target executable exists
+if [ ! -x "$WORKFLOW_HOME"/bin/"$WORKFLOW_EXEC" ]; then
+ echo "Cannot find $WORKFLOW_HOME/bin/$WORKFLOW_EXEC"
+ echo "This file is needed to run this program"
+ exit 1
+fi
+
+# Check that target executable exists
+if [ ! -x "$OODT_BASE"/components/tomcat/bin/"$TOMCAT_EXEC" ]; then
+ echo "Cannot find $OODT_BASE/components/tomcat/bin/$TOMCAT_EXEC"
+ echo "This file is needed to run this program"
+ exit 1
+fi
+
+if [ "$1" = "start" ]; then
+ exec "$FILEMGR_HOME"/bin/"$FILEMGR_EXEC" start "$@" >> "$OODT_OUT" 2>&1 &
+ exec "$WORKFLOW_HOME"/bin/"$WORKFLOW_EXEC" start "$@" >> "$OODT_OUT" 2>&1 &
+ exec "$OODT_BASE"/components/tomcat/bin/"$TOMCAT_EXEC" start "$@" >> "$OODT_OUT" 2>&1 &
+elif [ "$1" = "stop" ]; then
+ exec "$FILEMGR_HOME"/bin/"$FILEMGR_EXEC" stop "$@" >> "$OODT_OUT" 2>&1 &
+ exec "$WORKFLOW_HOME"/bin/"$WORKFLOW_EXEC" stop "$@" >> "$OODT_OUT" 2>&1 &
+ exec "$OODT_BASE"/components/tomcat/bin/"$TOMCAT_EXEC" stop "$@" >> "$OODT_OUT" 2>&1 &
+else
+ echo "Usage: oodt.sh ( commands ... )"
+ echo "commands:"
+ echo " start Start OODT in a separate window"
+ echo " stop Stop OODT, waiting up to 5 seconds for the process to end"
+# echo " version What version of OODT are you running?"
+ exit 1
+fi
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/oodt
------------------------------------------------------------------------------
svn:executable = *
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/setclasspath.sh
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/setclasspath.sh?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/setclasspath.sh (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/setclasspath.sh Wed Nov 16 06:17:39 2011
@@ -0,0 +1,116 @@
+#!/bin/sh
+
+# 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.
+
+# -----------------------------------------------------------------------------
+# Set CLASSPATH and Java options
+#
+# $Id$
+# -----------------------------------------------------------------------------
+
+# Make sure prerequisite environment variables are set
+if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
+ if $darwin; then
+ if [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then
+ export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home"
+ fi
+ else
+ JAVA_PATH=`which java 2>/dev/null`
+ if [ "x$JAVA_PATH" != "x" ]; then
+ JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null`
+ JRE_HOME=`dirname $JAVA_PATH 2>/dev/null`
+ fi
+ if [ "x$JRE_HOME" = "x" ]; then
+ # XXX: Should we try other locations?
+ if [ -x /usr/bin/java ]; then
+ JRE_HOME=/usr
+ fi
+ fi
+ fi
+ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
+ echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
+ echo "At least one of these environment variable is needed to run this program"
+ exit 1
+ fi
+fi
+if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then
+ echo "JAVA_HOME should point to a JDK in order to run in debug mode."
+ exit 1
+fi
+if [ -z "$JRE_HOME" ]; then
+ JRE_HOME="$JAVA_HOME"
+fi
+
+# If we're running under jdb, we need a full jdk.
+if [ "$1" = "debug" ] ; then
+ if [ "$os400" = "true" ]; then
+ if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly"
+ echo "This environment variable is needed to run this program"
+ echo "NB: JAVA_HOME should point to a JDK not a JRE"
+ exit 1
+ fi
+ else
+ if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly"
+ echo "This environment variable is needed to run this program"
+ echo "NB: JAVA_HOME should point to a JDK not a JRE"
+ exit 1
+ fi
+ fi
+fi
+if [ -z "$BASEDIR" ]; then
+ echo "The BASEDIR environment variable is not defined"
+ echo "This environment variable is needed to run this program"
+ exit 1
+fi
+if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then
+ if $os400; then
+ # -x will Only work on the os400 if the files are:
+ # 1. owned by the user
+ # 2. owned by the PRIMARY group of the user
+ # this will not work if the user belongs in secondary groups
+ eval
+ else
+ echo "The BASEDIR environment variable is not defined correctly"
+ echo "This environment variable is needed to run this program"
+ exit 1
+ fi
+fi
+
+# Don't override the endorsed dir if the user has set it previously
+if [ -z "$JAVA_ENDORSED_DIRS" ]; then
+ # Set the default -Djava.endorsed.dirs argument
+ JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed
+fi
+
+# OSX hack to CLASSPATH
+JIKESPATH=
+if [ `uname -s` = "Darwin" ]; then
+ OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
+ if [ -d "$OSXHACK" ]; then
+ for i in "$OSXHACK"/*.jar; do
+ JIKESPATH="$JIKESPATH":"$i"
+ done
+ fi
+fi
+
+# Set standard commands for invoking Java.
+_RUNJAVA="$JRE_HOME"/bin/java
+if [ "$os400" != "true" ]; then
+ _RUNJDB="$JAVA_HOME"/bin/jdb
+fi
+
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/distribution/src/main/resources/bin/setclasspath.sh
------------------------------------------------------------------------------
svn:keywords = Id Revision
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/assembly/assembly.xml?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/assembly/assembly.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/assembly/assembly.xml Wed Nov 16 06:17:39 2011
@@ -23,12 +23,18 @@
<fileMode>775</fileMode>
</fileSet>
<fileSet>
- <directory>${basedir}/src/main/resources/logs</directory>
+ <directory>target</directory>
<outputDirectory>filemgr/logs</outputDirectory>
- <includes>
- <include>REMOVE.log</include>
- </includes>
- <fileMode>775</fileMode>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>filemgr/run</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/resources/etc</directory>
@@ -43,7 +49,7 @@
<directory>${basedir}/src/main/resources/policy</directory>
<outputDirectory>filemgr/policy</outputDirectory>
<includes>
- <include>**.xml</include>
+ <include>**/**.xml</include>
</includes>
<fileMode>664</fileMode>
<directoryMode>775</directoryMode>
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr Wed Nov 16 06:17:39 2011
@@ -1,88 +1,162 @@
#!/bin/sh
-#/*
-# * 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.
-# */
-#
-# init script for XmlRpcFileManager
+
+# 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
#
-# chkconfig: 345 88 22
-# description: CAS File Manager
+# 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.
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
-[ -f /etc/sysconfig/java ] && . /etc/sysconfig/java
+# resolve links - $0 may be a softlink
+PRG="$0"
-FILEMGR_PORT=9102
-export FILEMGR_PORT
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set OODT_HOME if not already set
+[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/../../.." ; pwd`
+
+# Only set FILEMGR_HOME if not already set
+if [ -z "$FILEMGR_HOME" ]; then
+ FILEMGR_HOME="$OODT_HOME"/components/filemgr
+fi
-if [ -z $JAVA_HOME ] ; then
-JAVA_HOME=/path/to/java/home
-else
-JAVA_HOME=${JAVA_HOME}
+if [ -z "$FILEMGR_PID" ]; then
+ FILEMGR_PID="$FILEMGR_HOME"/run/cas.filemgr.pid
+fi
+
+# Get OODT environment set up
+if [ -r "$OODT_HOME"/bin/env.sh ]; then
+ . "$OODT_HOME"/bin/env.sh
fi
-export JAVA_HOME
-CAS_FILEMGR_HOME=..
-export CAS_FILEMGR_HOME
-RUN_HOME=${CAS_FILEMGR_HOME}/../run
-export RUN_HOME
-CAS_FILEMGR_PROPS=../conf/filemgr.properties
-export CAS_FILEMGR_PROPS
-
-PATH=${JAVA_HOME}/bin:${CAS_FILEMGR_HOME}/bin:/usr/bin:/bin:/usr/sbin:/sbin
-export PATH
-
-## make sure that casfile manager has a run directory
-## just to be on the safe side
-mkdir -p ${RUN_HOME}
-
-# See how we were called.
-case "$1" in
- start)
- echo -n "Starting cas file manager: "
- $JAVA_HOME/bin/java \
- -Djava.ext.dirs=${CAS_FILEMGR_HOME}/lib \
- -Djava.util.logging.config.file=${CAS_FILEMGR_HOME}/conf/logging.properties \
- -Dorg.apache.oodt.cas.filemgr.properties=${CAS_FILEMGR_PROPS} \
- org.apache.oodt.cas.filemgr.system.XmlRpcFileManager \
- --portNum $FILEMGR_PORT &
- echo $! > ${RUN_HOME}/cas.filemgr.pid
- echo "OK"
- sleep 5
- ;;
- stop)
- echo -n "Shutting down cas file manager: "
- kill `cat ${RUN_HOME}/cas.filemgr.pid`
- rm -f ${RUN_HOME}/cas.filemgr.pid
- echo "OK"
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- status)
- if [ -e ${RUN_HOME}/cas.filemgr.pid ] ; then
- pid=`cat ${RUN_HOME}/cas.filemgr.pid`
- echo "cas filemgr is running with pid: $pid"
- else
- echo "cas filemgr is not running"
- fi
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status}"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+ [ -n "$OODT_HOME" ] && OODT_HOME=`cygpath --unix "$OODT_HOME"`
+ [ -n "$OODT_BASE" ] && OODT_BASE=`cygpath --unix "$OODT_BASE"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ "$1" = "start" ]; then
+ if [ ! -z "$FILEMGR_PID" ]; then
+ if [ -f "$FILEMGR_PID" ]; then
+ echo "PID file ($FILEMGR_PID) found. Is File Manager still running? Start aborted."
+ exit 1
+ fi
+ fi
+
+ "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
+ -Djava.endorsed.dirs="$FILEMGR_HOME"/lib \
+ -Djava.util.logging.config.file="$FILEMGR_HOME"/etc/logging.properties \
+ -Dorg.apache.oodt.cas.filemgr.properties="$FILEMGR_HOME"/etc/filemgr.properties \
+ -Djava.io.tmpdir="$OODT_TMPDIR" \
+ org.apache.oodt.cas.filemgr.system.XmlRpcFileManager \
+ --portNum $FILEMGR_PORT 2>&1 &
+
+ if [ ! -z "$FILEMGR_PID" ]; then
+ echo $! > $FILEMGR_PID
+ fi
+
+ if [ $have_tty -eq 1 ]; then
+ echo "File Manager started PID file ($FILEMGR_PID)."
+ fi
+
+elif [ "$1" = "stop" ]; then
+
+ shift
+
+ SLEEP=5
+ if [ ! -z "$1" ]; then
+ echo $1 | grep "[^0-9]" > /dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ SLEEP=$1
+ shift
+ fi
+ fi
+
+ FORCE=0
+ if [ "$1" = "-force" ]; then
+ shift
+ FORCE=1
+ fi
+
+ if [ ! -z "$FILEMGR_PID" ]; then
+ if [ -f "$FILEMGR_PID" ]; then
+ kill `cat $FILEMGR_PID` >/dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ echo "PID file ($FILEMGR_PID) found but no matching process was found. Stop aborted."
exit 1
-esac
+ fi
+ else
+ echo "\$FILEMGR_PID was set ($FILEMGR_PID) but the specified file does not exist. Is File Manager running? Stop aborted."
+ exit 1
+ fi
+ fi
+
+ if [ ! -z "$FILEMGR_PID" ]; then
+ if [ -f "$FILEMGR_PID" ]; then
+ while [ $SLEEP -ge 0 ]; do
+ kill -0 `cat $FILEMGR_PID` >/dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ rm $FILEMGR_PID
+ break
+ fi
+ if [ $SLEEP -gt 0 ]; then
+ sleep 1
+ fi
+ if [ $SLEEP -eq 0 ]; then
+ if [ $FORCE -eq 0 ]; then
+ echo "File Manager did not stop in time. PID file was not removed."
+ fi
+ fi
+ SLEEP=`expr $SLEEP - 1 `
+ done
+ fi
+ fi
+
+ if [ $FORCE -eq 1 ]; then
+ if [ -z "$FILEMGR_PID" ]; then
+ echo "Kill failed: \$FILEMGR_PID not set"
+ else
+ if [ -f "$FILEMGR_PID" ]; then
+ echo "Killing: `cat $FILEMGR_PID`"
+ kill -9 `cat $FILEMGR_PID`
+ rm $FILEMGR_PID
+ fi
+ fi
+ fi
-exit 0
+else
+ echo "Usage: filemgr {start|stop|status}"
+ exit 1
+fi
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/etc/filemgr.properties
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/etc/filemgr.properties?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/etc/filemgr.properties (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/etc/filemgr.properties Wed Nov 16 06:17:39 2011
@@ -37,27 +37,23 @@ org.apache.oodt.cas.filemgr.system.xmlrp
#org.apache.oodt.cas.filemgr.catalog.mappeddatasource.mapFile=/path/to/ops.catalog.typemap.properties
# lucene catalog configuration
-#org.apache.oodt.cas.filemgr.catalog.lucene.idxPath=${DEPLOY_HOME}/components/filemgr/catalog
-org.apache.oodt.cas.filemgr.catalog.lucene.idxPath=/Users/cgoodale/RADiX-GIT/radix/deploy/components/filemgr/catalog
+org.apache.oodt.cas.filemgr.catalog.lucene.idxPath=[OODT_HOME]/data/catalog
org.apache.oodt.cas.filemgr.catalog.lucene.pageSize=20
org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds=60
org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds=60
org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor=20
# XML repository manager configuration
-#org.apache.oodt.cas.filemgr.repositorymgr.dirs=file://${DEPLOY_HOME}/components/filemgr/policy
-org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:///Users/cgoodale/RADiX-GIT/radix/deploy/components/filemgr/policy
+org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:[FILEMGR_HOME]/policy/oodt
# XML validation layer configuration
-#org.apache.oodt.cas.filemgr.validation.dirs=file://${DEPLOY_HOME}/components/filemgr/policy
-org.apache.oodt.cas.filemgr.validation.dirs=file:///Users/cgoodale/RADiX-GIT/radix/deploy/components/filemgr/policy
+org.apache.oodt.cas.filemgr.validation.dirs=file:[FILEMGR_HOME]/policy/oodt
# remote data transfer configuration
org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize=1024
# location of Mime-Type repository
-#org.apache.oodt.cas.filemgr.mime.type.repository=${DEPLOY_HOME}/components/filemgr/conf/mime-types.xml
-org.apache.oodt.cas.filemgr.mime.type.repository=/Users/cgoodale/RADiX-GIT/radix/deploy/components/filemgr/conf/mime-types.xml
+org.apache.oodt.cas.filemgr.mime.type.repository=[FILEMGR_HOME]/etc/mime-types.xml
############ data source configuration ##################################
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pom.xml?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pom.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/pom.xml Wed Nov 16 06:17:39 2011
@@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <oodt.version>0.3</oodt.version>
+ <oodt.version>0.4-SNAPSHOT</oodt.version>
</properties>
<repositories>
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/pom.xml?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/pom.xml (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/pom.xml Wed Nov 16 06:17:39 2011
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <name>PCS Ops Interface (Apache OODT)</name>
+ <artifactId>${rootArtifactId}-${artifactId}</artifactId>
+ <packaging>war</packaging>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-opsui</artifactId>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-opsui</artifactId>
+ <version>${oodt.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/context.xml?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/context.xml (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/context.xml Wed Nov 16 06:17:39 2011
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt 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.
+-->
+<Context path="/opsui">
+
+ <Parameter name="filemgr.url"
+ value="[FILEMGR_URL]"/>
+
+ <Parameter name="workflow.url"
+ value="[WORKFLOW_URL]"/>
+
+ <Parameter name="resmgr.url"
+ value="[RESMGR_URL]"/>
+
+ <Parameter name="org.apache.oodt.pcs.opsui.workflow.lifecycleFilePath"
+ value="[WORKFLOW_HOME]/policy/workflow-lifecycle.xml"/>
+
+ <Parameter name="org.apache.oodt.pcs.opsui.winst.statuses"
+ value="QUEUED, RSUBMIT, BUILDING CONFIG FILE, PGE EXEC, CRAWLING, STAGING INPUT, FINISHED, STARTED, PAUSED"/>
+
+ <Parameter name="org.apache.oodt.pcs.opsui.winst.metFields.filePath"
+ value="[WORKFLOW_HOME]/policy/workflow-instance-met.xml"/>
+
+ <Parameter name="org.apache.oodt.pcs.health.crawler.conf.filePath"
+ value="[PCS_HOME]/aux/pcs/pcs-crawlers.xml"/>
+
+ <Parameter name="org.apache.oodt.pcs.health.workflow.statuses.filePath"
+ value="[PCS_HOME]/aux/pcs/pcs-workflow-statuses.xml"/>
+
+ <Parameter name="ganglia.url" value="[GANGLIA_URL]"/>
+ <Parameter name="contact.email" value="user@oodt.apache.org"/>
+
+ <Parameter name="opsui.skin" value=""/>
+ <Parameter name="opsui.homepage" value="org.apache.oodt.pcs.opsui.HomePage"/>
+</Context>
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/opsui/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pom.xml?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pom.xml (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pom.xml Wed Nov 16 06:17:39 2011
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <name>Web Applications (Apache OODT)</name>
+ <packaging>pom</packaging>
+ <artifactId>${rootArtifactId}-${artifactId}</artifactId>
+
+</project>
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/webapps/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id Revision
Modified: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/assembly/assembly.xml?rev=1202534&r1=1202533&r2=1202534&view=diff
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/assembly/assembly.xml (original)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/assembly/assembly.xml Wed Nov 16 06:17:39 2011
@@ -22,11 +22,18 @@
<fileMode>755</fileMode>
</fileSet>
<fileSet>
- <directory>${basedir}/src/main/resources/logs</directory>
- <outputDirectory>workflow/logs</outputDirectory>
- <includes>
- <include>REMOVE.log</include>
- </includes>
+ <directory>target</directory>
+ <outputDirectory>filemgr/logs</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>workflow/run</outputDirectory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/resources/etc</directory>
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr Wed Nov 16 06:17:39 2011
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+# 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.
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`/"$link"
+ fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set OODT_HOME if not already set
+[ -z "$OODT_HOME" ] && OODT_HOME=`cd "$PRGDIR/../../.." ; pwd`
+
+# Only set WORKFLOW_HOME if not already set
+if [ -z "$WORKFLOW_HOME" ]; then
+ WORKFLOW_HOME="$OODT_HOME"/components/workflow
+fi
+
+if [ -z "$WORKFLOW_PID" ]; then
+ WORKFLOW_PID="$WORKFLOW_HOME"/run/cas.workflow.pid
+fi
+
+# Get OODT environment set up
+if [ -r "$OODT_HOME"/bin/env.sh ]; then
+ . "$OODT_HOME"/bin/env.sh
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+ [ -n "$OODT_HOME" ] && OODT_HOME=`cygpath --unix "$OODT_HOME"`
+ [ -n "$OODT_BASE" ] && OODT_BASE=`cygpath --unix "$OODT_BASE"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ "$1" = "start" ]; then
+ if [ ! -z "$WORKFLOW_PID" ]; then
+ if [ -f "$WORKFLOW_PID" ]; then
+ echo "PID file ($WORKFLOW_PID) found. Is Workflow Manager still running? Start aborted."
+ exit 1
+ fi
+ fi
+
+ touch "$OODT_OUT"
+ "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
+ -Djava.endorsed.dirs="$WORKFLOW_HOME"/lib \
+ -Djava.util.logging.config.file="$WORKFLOW_HOME"/etc/logging.properties \
+ -Dorg.apache.oodt.cas.workflow.properties="$WORKFLOW_HOME"/etc/filemgr.properties \
+ -Djava.io.tmpdir="$OODT_TMPDIR" \
+ org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManager \
+ --portNum $WORKFLOW_PORT 2>&1 &
+
+ if [ ! -z "$WORKFLOW_PID" ]; then
+ echo $! > $WORKFLOW_PID
+ fi
+
+ if [ $have_tty -eq 1 ]; then
+ echo "Workflow Manager started PID file ($WORKFLOW_PID)."
+ fi
+
+elif [ "$1" = "stop" ]; then
+
+ shift
+
+ SLEEP=5
+ if [ ! -z "$1" ]; then
+ echo $1 | grep "[^0-9]" > /dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ SLEEP=$1
+ shift
+ fi
+ fi
+
+ FORCE=0
+ if [ "$1" = "-force" ]; then
+ shift
+ FORCE=1
+ fi
+
+ if [ ! -z "$WORKFLOW_PID" ]; then
+ if [ -f "$WORLFLOW_PID" ]; then
+ kill `cat $WORKFLOW_PID` >/dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ echo "PID file ($WORKFLOW_PID) found but no matching process was found. Stop aborted."
+ exit 1
+ fi
+ else
+ echo "\$WORKFLOW_PID was set ($WORKFLOW_PID) but the specified file does not exist. Is Workflow Manager running? Stop aborted."
+ exit 1
+ fi
+ fi
+
+ if [ ! -z "$WORKFLOW_PID" ]; then
+ if [ -f "$WORKFLOW_PID" ]; then
+ while [ $SLEEP -ge 0 ]; do
+ kill -0 `cat $WORKFLOW_PID` >/dev/null 2>&1
+ if [ $? -eq 1 ]; then
+ rm $WORKFLOW_PID
+ break
+ fi
+ if [ $SLEEP -gt 0 ]; then
+ sleep 1
+ fi
+ if [ $SLEEP -eq 0 ]; then
+ if [ $FORCE -eq 0 ]; then
+ echo "Workflow Manager did not stop in time. PID file was not removed."
+ fi
+ fi
+ SLEEP=`expr $SLEEP - 1 `
+ done
+ fi
+ fi
+
+ if [ $FORCE -eq 1 ]; then
+ if [ -z "$WORKFLOW_PID" ]; then
+ echo "Kill failed: \$WORKFLOW_PID not set"
+ else
+ if [ -f "$WORKFLOW_PID" ]; then
+ echo "Killing: `cat $WORKFLOW_PID`"
+ kill -9 `cat $WORKFLOW_PID`
+ rm $WORKFLOW_PID
+ fi
+ fi
+ fi
+
+else
+ echo "Usage: wmgr {start|stop}"
+ exit 1
+fi
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr-client Wed Nov 16 06:17:39 2011
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE.txt 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.
+
+
+if [ -z $JAVA_HOME ] ; then
+ JAVA_HOME=/path/to/java/home
+else
+ JAVA_HOME=${JAVA_HOME}
+fi
+
+export JAVA_HOME
+
+$JAVA_HOME/bin/java -Djava.ext.dirs=../lib -Djava.util.logging.config.file=../etc/logging.properties org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient $*
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/logging.properties
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/logging.properties?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/logging.properties (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/logging.properties Wed Nov 16 06:17:39 2011
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE.txt 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.
+
+# Specify the handlers to create in the root logger
+# (all loggers are children of the root logger)
+# The following creates two handlers
+handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
+
+# Set the default logging level for the root logger
+.level = ALL
+
+# Set the default logging level for new ConsoleHandler instances
+java.util.logging.ConsoleHandler.level = ALL
+java.util.logging.FileHandler.level = ALL
+
+# Set the default formatter for new ConsoleHandler instances
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+# default file output is in user's home directory.
+java.util.logging.FileHandler.pattern = ../logs/cas_workflow%g.log
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 5
+java.util.logging.FileHandler.append = true
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+
+# Set the default logging level for the subsystems
+
+# data structures subsystem
+org.apache.oodt.cas.workflow.structs.level = INFO
+
+# engine subsystem
+org.apache.oodt.cas.workflow.engine.level = INFO
+
+# instance repository subsystem
+org.apache.oodt.cas.workflow.instrepo.level = INFO
+
+# repository subsystem
+org.apache.oodt.cas.workflow.repository.level = INFO
+
+# system subsystem
+org.apache.oodt.cas.workflow.system.level = FINE
+
+# control the underlying commons-httpclient transport layer for xmlrpc
+org.apache.commons.httpclient.level = INFO
+httpclient.wire.header.level = INFO
+httpclient.wire.level = INFO
+sun.net.level = OFF
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/logging.properties
------------------------------------------------------------------------------
svn:keywords = Id Revision
Added: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties
URL: http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties?rev=1202534&view=auto
==============================================================================
--- oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties (added)
+++ oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties Wed Nov 16 06:17:39 2011
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE.txt 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.
+#
+# Properties required to configure the Workflow Manager
+
+# workflow repository factory
+workflow.repo.factory = org.apache.oodt.cas.workflow.repository.XMLWorkflowRepositoryFactory
+
+# workflow engine factory
+workflow.engine.factory = org.apache.oodt.cas.workflow.engine.ThreadPoolWorkflowEngineFactory
+
+# workflow instance repository factory
+workflow.engine.instanceRep.factory = org.apache.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory
+
+# thread pool workflow engine properties
+org.apache.oodt.cas.workflow.engine.queueSize=
+org.apache.oodt.cas.workflow.engine.maxPoolSize=
+org.apache.oodt.cas.workflow.engine.minPoolSize=6
+org.apache.oodt.cas.workflow.engine.threadKeepAlive.minutes=5
+org.apache.oodt.cas.workflow.engine.unlimitedQueue=true
+org.apache.oodt.cas.workflow.engine.preConditionWaitTime=10
+
+# set this if you want the workflow manager to submit jobs through the resource mgr
+org.apache.oodt.cas.workflow.engine.resourcemgr.url=
+
+# if you use the resource mgr submission, you can specify how many seconds the
+# workflow manager should wait inbetween checking to see if a job is complete
+org.apache.oodt.cas.workflow.engine.resourcemgr.pollingWaitTime=10
+
+# workflow instance repository general properties
+# default page size to page through WorkflowInstances with
+org.apache.oodt.cas.workflow.instanceRep.pageSize=20
+
+# lucene workflow instance repository properties
+org.apache.oodt.cas.workflow.instanceRep.lucene.idxPath=/path/to/index
+
+# data source workflow instance repository properties
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.url=jdbc:url
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.user=user
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.pass=pass
+org.apache.oodt.cas.workflow.instanceRep.datasource.jdbc.driver=your.jdbc.Driver
+org.apache.oodt.cas.workflow.instanceRep.datasource.quoteFields=false
+
+# XML workflow repository properties
+org.apache.oodt.cas.workflow.repo.dirs=file:///path/to/your/repo1, file:///path/to/your/repo2
+
+# wengine-style packaged workflow repo properties
+org.apache.oodt.cas.workflow.wengine.packagedRepo.dir.path = /path/to/wengine/workflow/files
+
+# data source workflow repository properties
+org.apache.oodt.cas.workflow.repo.datasource.jdbc.url=jdbc:url
+org.apache.oodt.cas.workflow.repo.datasource.jdbc.user=user
+org.apache.oodt.cas.workflow.repo.datasource.jdbc.pass=pass
+org.apache.oodt.cas.workflow.repo.datasource.jdbc.driver=your.jdbc.Driver
Propchange: oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/etc/workflow.properties
------------------------------------------------------------------------------
svn:keywords = Id Revision