Author: kelly
Date: Fri Jul 16 14:34:19 2010
New Revision: 964810
URL: http://svn.apache.org/viewvc?rev=964810&view=rev
Log:
WIP OODT-15 OODT-16
Enable "resource" module as it now works; add std ignores; replace gov.nasa.jpl
with org.apache in package decls, imports, and resource file paths; add missing
XML processing instruction decls; include ASF notices on XML config files and
batch files; fix dependencies; update properties files with proper apache names.
Modified:
incubator/oodt/trunk/pom.xml
incubator/oodt/trunk/resource/ (props changed)
incubator/oodt/trunk/resource/pom.xml
incubator/oodt/trunk/resource/src/main/assembly/assembly.xml
incubator/oodt/trunk/resource/src/main/bin/batch_stub
incubator/oodt/trunk/resource/src/main/bin/remote
incubator/oodt/trunk/resource/src/main/bin/resmgr
incubator/oodt/trunk/resource/src/main/bin/resmgr-client
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java
incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exJob.xml
incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exLongJob.xml
incubator/oodt/trunk/resource/src/main/resources/examples/node-to-queue-mapping.xml
incubator/oodt/trunk/resource/src/main/resources/examples/nodes.xml
incubator/oodt/trunk/resource/src/main/resources/logging.properties
incubator/oodt/trunk/resource/src/main/resources/resource.properties
incubator/oodt/trunk/resource/src/site/resources/images/cas-resource.psd
incubator/oodt/trunk/resource/src/site/site.xml
incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/util/TestUlimit.java
incubator/oodt/trunk/resource/src/testdata/test.logging.properties
Modified: incubator/oodt/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 14:34:19 2010
@@ -46,7 +46,7 @@ the License.
<!-- broken: <module>catalog</module> -->
<!-- broken: <module>workflow</module> -->
<!-- broken: <module>crawler</module> -->
- <!-- broken: <module>resource</module> -->
+ <module>resource</module>
<!-- broken: <module>curator</module> -->
<!-- broken: <module>pge</module> -->
<!-- broken: <module>mvn/plugins/cas-install</module> -->
Propchange: incubator/oodt/trunk/resource/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 14:34:19 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/resource/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/pom.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/pom.xml (original)
+++ incubator/oodt/trunk/resource/pom.xml Fri Jul 16 14:34:19 2010
@@ -1,11 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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.
+-->
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>2.0</version>
+ <version>${oodt.version}</version>
+ <relativePath>../core/pom.xml</relativePath>
</parent>
- <artifactId>cas-resource</artifactId>
+ <artifactId>resource</artifactId>
<name>Catalog and Archive Resource Management Component</name>
<version>1.4.0-dev</version>
<description>The resource management component of a Catalog and Archive
Service. This component
@@ -51,7 +69,7 @@
</descriptors>
<archive>
<manifest>
-
<mainClass>gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient</mainClass>
+
<mainClass>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</mainClass>
</manifest>
</archive>
</configuration>
@@ -68,19 +86,14 @@
</build>
<dependencies>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>cas-commons</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>edm-commons</artifactId>
- <version>2.2.11-dev</version>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: incubator/oodt/trunk/resource/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/assembly/assembly.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/assembly/assembly.xml (original)
+++ incubator/oodt/trunk/resource/src/main/assembly/assembly.xml Fri Jul 16
14:34:19 2010
@@ -1,26 +1,37 @@
-<!--
-Copyright 2008 California Institute of Technology. ALL RIGHTS
-RESERVED. U.S. Government Sponsorship acknowledged.
+<?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
-$Id$
--->
-<assembly>
- <id>dist</id>
- <formats>
+ 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.
+-->
+<assembly>
+ <id>dist</id>
+ <formats>
<format>tar.gz</format>
- <format>zip</format>
- </formats>
+ <format>zip</format>
+ </formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
- <includeSiteDirectory>false</includeSiteDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>CHANGES.txt</include>
- </includes>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>CHANGES.txt</include>
+ </includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/bin</directory>
@@ -53,15 +64,15 @@ $Id$
<filtered>false</filtered>
<outputDirectory>doc</outputDirectory>
<excludes/>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>true</useProjectArtifact>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <unpackOptions/>
- </dependencySet>
- </dependencySets>
-</assembly>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpackOptions/>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: incubator/oodt/trunk/resource/src/main/bin/batch_stub
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/bin/batch_stub?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/bin/batch_stub (original)
+++ incubator/oodt/trunk/resource/src/main/bin/batch_stub Fri Jul 16 14:34:19
2010
@@ -1,6 +1,18 @@
#!/bin/tcsh
-# Copyright (c) 2008 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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.
#
# $Id$
#
@@ -14,6 +26,6 @@ if ( $#argv != 1 ) then
exit 1
else
java -Djava.ext.dirs=../lib \
- gov.nasa.jpl.oodt.cas.resource.system.extern.XmlRpcBatchStub \
+ org.apache.oodt.cas.resource.system.extern.XmlRpcBatchStub \
--portNum $1&
endif
Modified: incubator/oodt/trunk/resource/src/main/bin/remote
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/bin/remote?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/bin/remote (original)
+++ incubator/oodt/trunk/resource/src/main/bin/remote Fri Jul 16 14:34:19 2010
@@ -2,7 +2,20 @@
#
# Script to run a command on all nodes specified in a nodes.xml config file
#
-# Copyright (c) 2006 California Institute of Technology
+# 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.
#
# $Id$
@@ -21,4 +34,4 @@ do
ssh $NODE $"${@// /\\ }" 2>&1 | sed "s/^/$NODE: /" &
done
-exit 0
\ No newline at end of file
+exit 0
Modified: incubator/oodt/trunk/resource/src/main/bin/resmgr
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/bin/resmgr?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/bin/resmgr (original)
+++ incubator/oodt/trunk/resource/src/main/bin/resmgr Fri Jul 16 14:34:19 2010
@@ -5,8 +5,20 @@
# chkconfig: 345 88 22
# description: CAS Resource Manager
#
-# Copyright (c) 2006 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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.
#
# $Id$
@@ -38,8 +50,8 @@ case "$1" in
echo -n "Starting cas resource manager: "
$JAVA_HOME/bin/java -Djava.ext.dirs=${CAS_RESMGR_HOME}/lib \
-Djava.util.logging.config.file=${CAS_RESMGR_HOME}/etc/logging.properties \
- -Dgov.nasa.jpl.oodt.cas.resource.properties=${CAS_RESMGR_PROPS} \
- gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManager --portNum
$SERVER_PORT &
+ -Dorg.apache.oodt.cas.resource.properties=${CAS_RESMGR_PROPS} \
+ org.apache.oodt.cas.resource.system.XmlRpcResourceManager --portNum
$SERVER_PORT &
echo $! >${RUN_HOME}/cas.resmgr.pid
echo "OK"
sleep 5
Modified: incubator/oodt/trunk/resource/src/main/bin/resmgr-client
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/bin/resmgr-client?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/bin/resmgr-client (original)
+++ incubator/oodt/trunk/resource/src/main/bin/resmgr-client Fri Jul 16
14:34:19 2010
@@ -1,6 +1,18 @@
#!/bin/sh
-# Copyright (c) 2006 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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.
#
# $Id$
@@ -13,4 +25,4 @@ fi
export JAVA_HOME
-$JAVA_HOME/bin/java -Djava.ext.dirs=../lib
-Dgov.nasa.jpl.oodt.cas.resource.properties=../etc/resource.properties
-Djava.util.logging.config.file=../etc/logging.properties
gov.nasa.jpl.oodt.cas.resource.system.XmlRpcResourceManagerClient $*
+$JAVA_HOME/bin/java -Djava.ext.dirs=../lib
-Dorg.apache.oodt.cas.resource.properties=../etc/resource.properties
-Djava.util.logging.config.file=../etc/logging.properties
org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient $*
Modified:
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
---
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java
(original)
+++
incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/jobrepo/MemoryJobRepository.java
Fri Jul 16 14:34:19 2010
@@ -23,7 +23,7 @@ import java.util.Date;
import java.util.HashMap;
//OODT imports
-import jpl.eda.util.DateConvert;
+import org.apache.oodt.commons.util.DateConvert;
import org.apache.oodt.cas.resource.structs.JobSpec;
import org.apache.oodt.cas.resource.structs.JobStatus;
import org.apache.oodt.cas.resource.structs.exceptions.JobRepositoryException;
Modified:
incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exJob.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exJob.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exJob.xml
(original)
+++ incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exJob.xml
Fri Jul 16 14:34:19 2010
@@ -2,13 +2,13 @@
<cas:job xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"; id="abcd"
name="TestJob">
<instanceClass
- name="gov.nasa.jpl.oodt.cas.resource.examples.HelloWorldJob" />
+ name="org.apache.oodt.cas.resource.examples.HelloWorldJob" />
<inputClass
- name="gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput">
+ name="org.apache.oodt.cas.resource.structs.NameValueJobInput">
<properties>
<property name="user.name" value="Homer!" />
</properties>
</inputClass>
<queue>quick</queue>
<load>1</load>
-</cas:job>
\ No newline at end of file
+</cas:job>
Modified:
incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exLongJob.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exLongJob.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
---
incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exLongJob.xml
(original)
+++
incubator/oodt/trunk/resource/src/main/resources/examples/jobs/exLongJob.xml
Fri Jul 16 14:34:19 2010
@@ -2,13 +2,13 @@
<cas:job xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"; id="abcd"
name="TestJob">
<instanceClass
- name="gov.nasa.jpl.oodt.cas.resource.examples.LongJob" />
+ name="org.apache.oodt.cas.resource.examples.LongJob" />
<inputClass
- name="gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput">
+ name="org.apache.oodt.cas.resource.structs.NameValueJobInput">
<properties>
<property name="wait" value="60" />
</properties>
</inputClass>
<queue>quick</queue>
<load>1</load>
-</cas:job>
\ No newline at end of file
+</cas:job>
Modified:
incubator/oodt/trunk/resource/src/main/resources/examples/node-to-queue-mapping.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/resources/examples/node-to-queue-mapping.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
---
incubator/oodt/trunk/resource/src/main/resources/examples/node-to-queue-mapping.xml
(original)
+++
incubator/oodt/trunk/resource/src/main/resources/examples/node-to-queue-mapping.xml
Fri Jul 16 14:34:19 2010
@@ -1,8 +1,19 @@
-<!--
-Copyright 2006 California Institute of Technology. ALL RIGHTS
-RESERVED. U.S. Government Sponsorship acknowledged.
+<?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
-$Id$
+ 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.
-->
<cas:node-to-queue-mapping xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas";>
<node id="localhost">
@@ -12,4 +23,4 @@ $Id$
<queue name="long"/>
</queues>
</node>
-</cas:node-to-queue-mapping>
\ No newline at end of file
+</cas:node-to-queue-mapping>
Modified: incubator/oodt/trunk/resource/src/main/resources/examples/nodes.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/resources/examples/nodes.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/resources/examples/nodes.xml
(original)
+++ incubator/oodt/trunk/resource/src/main/resources/examples/nodes.xml Fri Jul
16 14:34:19 2010
@@ -1,9 +1,20 @@
-<!--
-Copyright 2006 California Institute of Technology. ALL RIGHTS
-RESERVED. U.S. Government Sponsorship acknowledged.
+<?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
-$Id$
+ 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.
-->
<cas:resourcenodes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas";>
<node nodeId="localhost" ip="http://localhost:2001"; capacity="8"/>
-</cas:resourcenodes>
\ No newline at end of file
+</cas:resourcenodes>
Modified: incubator/oodt/trunk/resource/src/main/resources/logging.properties
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/resources/logging.properties?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/resources/logging.properties
(original)
+++ incubator/oodt/trunk/resource/src/main/resources/logging.properties Fri Jul
16 14:34:19 2010
@@ -1,8 +1,18 @@
-# Copyright (c) 2006 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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.
#
-# $Id$
-
# Specify the handlers to create in the root logger
# (all loggers are children of the root logger)
@@ -29,21 +39,21 @@ java.util.logging.FileHandler.formatter
# Set the default logging level for the subsystems
# batchmgr subsystem
-gov.nasa.jpl.oodt.cas.resource.batchmgr.level = INFO
+org.apache.oodt.cas.resource.batchmgr.level = INFO
# monitor subsystem
-gov.nasa.jpl.oodt.cas.resource.monitor.level = INFO
+org.apache.oodt.cas.resource.monitor.level = INFO
# jobqueue subsystem
-gov.nasa.jpl.oodt.cas.resource.jobqueue.level = INFO
+org.apache.oodt.cas.resource.jobqueue.level = INFO
# scheduler subsystem
-gov.nasa.jpl.oodt.cas.resource.scheduler.level = INFO
+org.apache.oodt.cas.resource.scheduler.level = INFO
# system subsystem
-gov.nasa.jpl.oodt.cas.resource.system.level = FINE
+org.apache.oodt.cas.resource.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
\ No newline at end of file
+httpclient.wire.level = INFO
Modified: incubator/oodt/trunk/resource/src/main/resources/resource.properties
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/resources/resource.properties?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/resources/resource.properties
(original)
+++ incubator/oodt/trunk/resource/src/main/resources/resource.properties Fri
Jul 16 14:34:19 2010
@@ -1,38 +1,49 @@
-# Copyright (c) 2006 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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.
#
-# $Id$
#
# Properties required to configure the Resource Manager
# resource batchmgr factory
-resource.batchmgr.factory =
gov.nasa.jpl.oodt.cas.resource.batchmgr.XmlRpcBatchMgrFactory
+resource.batchmgr.factory =
org.apache.oodt.cas.resource.batchmgr.XmlRpcBatchMgrFactory
# resource monitor factory
-resource.monitor.factory =
gov.nasa.jpl.oodt.cas.resource.monitor.AssignmentMonitorFactory
+resource.monitor.factory =
org.apache.oodt.cas.resource.monitor.AssignmentMonitorFactory
# resource scheduler factory
-resource.scheduler.factory =
gov.nasa.jpl.oodt.cas.resource.scheduler.LRUSchedulerFactory
+resource.scheduler.factory =
org.apache.oodt.cas.resource.scheduler.LRUSchedulerFactory
# resource jobqueue factory
-resource.jobqueue.factory =
gov.nasa.jpl.oodt.cas.resource.jobqueue.JobStackJobQueueFactory
+resource.jobqueue.factory =
org.apache.oodt.cas.resource.jobqueue.JobStackJobQueueFactory
# resource job repository factory
-resource.jobrepo.factory =
gov.nasa.jpl.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory
+resource.jobrepo.factory =
org.apache.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory
# XML Assignment Monitor config properties
-gov.nasa.jpl.oodt.cas.resource.monitor.nodes.dirs=file://[HOME]/nodes,file://[HOME]/nodes2
+org.apache.oodt.cas.resource.monitor.nodes.dirs=file://[HOME]/nodes,file://[HOME]/nodes2
# JobStack JobQueue config properties
-gov.nasa.jpl.oodt.cas.resource.jobqueue.jobstack.maxstacksize=1000
+org.apache.oodt.cas.resource.jobqueue.jobstack.maxstacksize=1000
# XML LRUScheduler config properties
-gov.nasa.jpl.oodt.cas.resource.scheduler.nodetoqueues.dirs=file://[HOME]/nodes,file://[HOME]/nodes2
-gov.nasa.jpl.oodt.cas.resource.scheduler.wait.seconds=20
+org.apache.oodt.cas.resource.scheduler.nodetoqueues.dirs=file://[HOME]/nodes,file://[HOME]/nodes2
+org.apache.oodt.cas.resource.scheduler.wait.seconds=20
# XML-RPC configuration props
-gov.nasa.jpl.oodt.cas.resource.system.xmlrpc.requestTimeout.minutes=20
-gov.nasa.jpl.oodt.cas.resource.system.xmlrpc.connectionTimeout.minutes=60
+org.apache.oodt.cas.resource.system.xmlrpc.requestTimeout.minutes=20
+org.apache.oodt.cas.resource.system.xmlrpc.connectionTimeout.minutes=60
Modified:
incubator/oodt/trunk/resource/src/site/resources/images/cas-resource.psd
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/site/resources/images/cas-resource.psd?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/oodt/trunk/resource/src/site/site.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/site/site.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/site/site.xml (original)
+++ incubator/oodt/trunk/resource/src/site/site.xml Fri Jul 16 14:34:19 2010
@@ -1,13 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- Copyright (c) 2008 California Institute of Technology.
- ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+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
- $Id$
--->
+ http://www.apache.org/licenses/LICENSE-2.0
-<project name="cas-resource" href="http://oodt.jpl.nasa.gov/cas-resource/";>
+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 name="cas-resource">
<body>
<links>
@@ -19,4 +27,4 @@
<item name="User Guide" href="user/"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml (original)
+++ incubator/oodt/trunk/resource/src/site/xdoc/user/index.xml Fri Jul 16
14:34:19 2010
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2008 California Institute of Technology.
- ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
- $Id$
+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.
-->
-
<document>
<properties>
<title>CAS Resource Manager User Guide</title>
@@ -330,7 +339,7 @@
extension points.. These defaults can be changed quite easily by
changing the factory classes
that are pointed to for each extension point. For example, to use
your own own home Scheduler
extension point, you would change the following property,
<code>resmgr.scheduler.factory</code> to
-
<code>gov.nasa.jpl.oodt.cas.resmgr.scheduler.YourNewSchedulerFactory</code>
+
<code>org.apache.oodt.cas.resmgr.scheduler.YourNewSchedulerFactory</code>
</li>
<li>You need to configure the properties for each of the extension
points that you are
using. By default, you would at least need to configure:
@@ -369,9 +378,9 @@
<cas:job xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas"; id="abcd"
name="TestJob">
<instanceClass
- name="gov.nasa.jpl.oodt.cas.resource.examples.HelloWorldJob"
/>
+ name="org.apache.oodt.cas.resource.examples.HelloWorldJob" />
<inputClass
-
name="gov.nasa.jpl.oodt.cas.resource.structs.NameValueJobInput">
+
name="org.apache.oodt.cas.resource.structs.NameValueJobInput">
<properties>
<property name="user.name" value="Homer!" />
</properties>
@@ -381,7 +390,7 @@
</cas:job>
</source>
- <p>The above job definition tells the resource manager to execute the
<code>gov.nasa.jpl.oodt.cas.resource.examples.HelloWorldJob</code>,
+ <p>The above job definition tells the resource manager to execute the
<code>org.apache.oodt.cas.resource.examples.HelloWorldJob</code>,
which is one of the example Jobs that is shipped with the Resource
Manager. The job simply echoes the name provided in the <code>user.name</code>
property back to the screen, saying <code>Hello ${user.name}!</code>.
</p>
@@ -394,7 +403,7 @@
<p>The command to run the job, assuming that you started the Resource
Manager on the default port of <code>9002</code>:</p>
<source>
- java -Djava.ext.dirs=../lib
gov.nasa.jpl.oodt.cas.resource.tools.JobSubmitter \
+ java -Djava.ext.dirs=../lib
org.apache.oodt.cas.resource.tools.JobSubmitter \
--rUrl http://localhost:9002 \
--file /usr/local/resmgr/examples/exJob.xml
</source>
@@ -402,16 +411,16 @@
<p>You should see a response message at the end similar to:</p>
<source>
- Mar 5, 2008 10:45:26 AM gov.nasa.jpl.oodt.cas.resource.jobqueue.JobStack
addJob<br/>
+ Mar 5, 2008 10:45:26 AM org.apache.oodt.cas.resource.jobqueue.JobStack
addJob<br/>
INFO: Added Job: [2008-03-05T10:45:26.148-08:00] to queue<br/>
- Mar 5, 2008 10:45:26 AM
gov.nasa.jpl.oodt.cas.resource.tools.JobSubmitter main<br/>
+ Mar 5, 2008 10:45:26 AM org.apache.oodt.cas.resource.tools.JobSubmitter
main<br/>
INFO: Job Submitted: id: [2008-03-05T10:45:26.148-08:00]<br/>
- Mar 5, 2008 10:45:27 AM
gov.nasa.jpl.oodt.cas.resource.scheduler.LRUScheduler run<br/>
+ Mar 5, 2008 10:45:27 AM
org.apache.oodt.cas.resource.scheduler.LRUScheduler run<br/>
INFO: Obtained Job: [2008-03-05T10:45:26.148-08:00] from Queue:
Scheduling for execution<br/>
- Mar 5, 2008 10:45:27 AM
gov.nasa.jpl.oodt.cas.resource.scheduler.LRUScheduler schedule<br/>
+ Mar 5, 2008 10:45:27 AM
org.apache.oodt.cas.resource.scheduler.LRUScheduler schedule<br/>
INFO: Assigning job: [TestJob] to node: [node001] <br/>
- Mar 5, 2008 10:45:27 AM
gov.nasa.jpl.oodt.cas.resource.system.extern.XmlRpcBatchStub
genericExecuteJob<br/>
- INFO: stub attempting to execute class:
[gov.nasa.jpl.oodt.cas.resource.examples.HelloWorldJob]<br/>
+ Mar 5, 2008 10:45:27 AM
org.apache.oodt.cas.resource.system.extern.XmlRpcBatchStub
genericExecuteJob<br/>
+ INFO: stub attempting to execute class:
[org.apache.oodt.cas.resource.examples.HelloWorldJob]<br/>
Hello world! How are you Homer!!
</source>
@@ -450,31 +459,31 @@
<table>
<tr>
<td>resource.batchmgr.factory</td>
- <td>gov.nasa.jpl.oodt.cas.resource.batchmgr.XmlRpcBatchMgrFactory
+ <td>org.apache.oodt.cas.resource.batchmgr.XmlRpcBatchMgrFactory
</td>
</tr>
<tr>
<td>resource.monitor.factory</td>
-
<td>gov.nasa.jpl.oodt.cas.resource.monitor.XMLAssignmentMonitorFactory
+ <td>org.apache.oodt.cas.resource.monitor.XMLAssignmentMonitorFactory
</td>
</tr>
<tr>
<td>resource.scheduler.factory</td>
- <td>gov.nasa.jpl.oodt.cas.resource.scheduler.LRUSchedulerFactory
+ <td>org.apache.oodt.cas.resource.scheduler.LRUSchedulerFactory
</td>
</tr>
<tr>
<td>resource.jobqueue.factory</td>
- <td>gov.nasa.jpl.oodt.cas.resource.jobqueue.JobStackJobQueueFactory
+ <td>org.apache.oodt.cas.resource.jobqueue.JobStackJobQueueFactory
</td>
</tr>
<tr>
<td>resource.jobrepo.factory</td>
-
<td>gov.nasa.jpl.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory</td>
+
<td>org.apache.oodt.cas.resource.jobrepo.MemoryJobRepositoryFactory</td>
</tr>
</table>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified:
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
---
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
(original)
+++
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/jobqueue/TestJobStack.java
Fri Jul 16 14:34:19 2010
@@ -16,17 +16,17 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.jobqueue;
+package org.apache.oodt.cas.resource.jobqueue;
//JDK imports
import java.util.List;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.JobRepository;
-import gov.nasa.jpl.oodt.cas.resource.jobrepo.MemoryJobRepository;
-import gov.nasa.jpl.oodt.cas.resource.structs.Job;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobInput;
-import gov.nasa.jpl.oodt.cas.resource.structs.JobSpec;
+import org.apache.oodt.cas.resource.jobrepo.JobRepository;
+import org.apache.oodt.cas.resource.jobrepo.MemoryJobRepository;
+import org.apache.oodt.cas.resource.structs.Job;
+import org.apache.oodt.cas.resource.structs.JobInput;
+import org.apache.oodt.cas.resource.structs.JobSpec;
//Junit imports
import junit.framework.TestCase;
Modified:
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
---
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
(original)
+++
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/monitor/TestAssignmentMonitor.java
Fri Jul 16 14:34:19 2010
@@ -16,11 +16,11 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.monitor;
+package org.apache.oodt.cas.resource.monitor;
//OODT imports
-import gov.nasa.jpl.oodt.cas.resource.structs.ResourceNode;
-import gov.nasa.jpl.oodt.cas.resource.structs.exceptions.MonitorException;
+import org.apache.oodt.cas.resource.structs.ResourceNode;
+import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
//JDK imports
import java.io.File;
Modified:
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/util/TestUlimit.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/util/TestUlimit.java?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
---
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/util/TestUlimit.java
(original)
+++
incubator/oodt/trunk/resource/src/test/org/apache/oodt/cas/resource/util/TestUlimit.java
Fri Jul 16 14:34:19 2010
@@ -16,7 +16,7 @@
*/
-package gov.nasa.jpl.oodt.cas.resource.util;
+package org.apache.oodt.cas.resource.util;
//JDK imports
import junit.framework.TestCase;
Modified: incubator/oodt/trunk/resource/src/testdata/test.logging.properties
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/testdata/test.logging.properties?rev=964810&r1=964809&r2=964810&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/testdata/test.logging.properties
(original)
+++ incubator/oodt/trunk/resource/src/testdata/test.logging.properties Fri Jul
16 14:34:19 2010
@@ -1,8 +1,18 @@
-# Copyright (c) 2006 California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government Sponsorship acknowledged.
+# 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.
#
-# $Id$
-
# Specify the handlers to create in the root logger
# (all loggers are children of the root logger)
@@ -21,21 +31,21 @@ java.util.logging.ConsoleHandler.formatt
# Set the default logging level for the subsystems
# batchmgr subsystem
-gov.nasa.jpl.oodt.cas.resource.batchmgr.level = INFO
+org.apache.oodt.cas.resource.batchmgr.level = INFO
# monitor subsystem
-gov.nasa.jpl.oodt.cas.resource.monitor.level = INFO
+org.apache.oodt.cas.resource.monitor.level = INFO
# jobqueue subsystem
-gov.nasa.jpl.oodt.cas.resource.jobqueue.level = INFO
+org.apache.oodt.cas.resource.jobqueue.level = INFO
# scheduler subsystem
-gov.nasa.jpl.oodt.cas.resource.scheduler.level = INFO
+org.apache.oodt.cas.resource.scheduler.level = INFO
# system subsystem
-gov.nasa.jpl.oodt.cas.resource.system.level = FINE
+org.apache.oodt.cas.resource.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
\ No newline at end of file
+httpclient.wire.level = INFO
