incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964919 - in /incubator/oodt/trunk: ./ pge/ pge/src/main/assembly/ pge/src/main/bin/ pge/src/main/resources/ pge/src/main/resources/examples/PgeConfigFiles/ pge/src/main/resources/examples/WorkflowMgrInput/ pge/src/main/resources/examples/X...
Date Fri, 16 Jul 2010 19:36:48 GMT
Author: kelly
Date: Fri Jul 16 19:36:47 2010
New Revision: 964919

URL: http://svn.apache.org/viewvc?rev=964919&view=rev
Log:
WIP OODT-15 OODT-16
"pge" module now functional; replace gov.nasa.jpl imports and package decls with org.apache;
replace Caltech notices with ASF notices; add missing XML PI; add missing notice; fix dependencies.

Modified:
    incubator/oodt/trunk/pge/pom.xml
    incubator/oodt/trunk/pge/src/main/assembly/assembly.xml
    incubator/oodt/trunk/pge/src/main/bin/pgetask
    incubator/oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml
    incubator/oodt/trunk/pge/src/main/resources/examples/WorkflowMgrInput/pcs-pge-task-workflow.properties
    incubator/oodt/trunk/pge/src/main/resources/examples/XsltFiles/xslt_prop_eq_val.xml
    incubator/oodt/trunk/pge/src/main/resources/logging.properties
    incubator/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/util/UtilsTest.java
    incubator/oodt/trunk/pom.xml

Modified: incubator/oodt/trunk/pge/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/pom.xml?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/pom.xml (original)
+++ incubator/oodt/trunk/pge/pom.xml Fri Jul 16 19:36:47 2010
@@ -1,15 +1,32 @@
 <?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 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>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-pge</artifactId>
+  <artifactId>pge</artifactId>
   <name>CAS PGE Adaptor Framework</name>
   <version>1.2.0-dev</version>
   <description>Allows data processing jobs not written in comformance with the
@@ -35,7 +52,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>gov.nasa.jpl.oodt.cas.pge.PGETask</mainClass>
+              <mainClass>org.apache.oodt.cas.pge.PGETask</mainClass>
             </manifest>
           </archive>
         </configuration>
@@ -52,28 +69,28 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
+      <groupId>org.apache.oodt</groupId>
       <artifactId>cas-metadata</artifactId>
-      <version>1.7.0-dev</version>
+      <version>${oodt.version}</version>
     </dependency>
     <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>
-      <artifactId>cas-filemgr</artifactId>
-      <version>1.7.2</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>filemgr</artifactId>
+      <version>1.9.0-dev</version>
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-workflow</artifactId>
-      <version>1.5.1</version>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>workflow</artifactId>
+      <version>${oodt.version}</version>
     </dependency>
     <dependency>
-      <groupId>gov.nasa.jpl.oodt</groupId>
-      <artifactId>cas-crawler</artifactId>
+      <groupId>org.apache.oodt</groupId>
+      <artifactId>crawler</artifactId>
       <version>2.3.0-dev</version>
     </dependency>
     <dependency>

Modified: incubator/oodt/trunk/pge/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/assembly/assembly.xml?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/assembly/assembly.xml (original)
+++ incubator/oodt/trunk/pge/src/main/assembly/assembly.xml Fri Jul 16 19:36:47 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>
@@ -52,15 +63,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/pge/src/main/bin/pgetask
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/bin/pgetask?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/bin/pgetask (original)
+++ incubator/oodt/trunk/pge/src/main/bin/pgetask Fri Jul 16 19:36:47 2010
@@ -1,8 +1,22 @@
 #!/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.    
 
 $JAVA_HOME/bin/java -Djava.ext.dirs=../lib \
         -Djava.util.logging.config.file=../etc/logging.properties \
         -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl \
-        gov.nasa.jpl.oodt.cas.pge.PGETask --metadata ../etc/examples/WorkflowMgrInput/pcs-pge-dyn-metadata.met
\
+        org.apache.oodt.cas.pge.PGETask --metadata ../etc/examples/WorkflowMgrInput/pcs-pge-dyn-metadata.met
\
         --config ../etc/examples/WorkflowMgrInput/pcs-pge-task-workflow.properties \
-        --instanceClass gov.nasa.jpl.oodt.cas.pge.StdPGETaskInstance
\ No newline at end of file
+        --instanceClass org.apache.oodt.cas.pge.StdPGETaskInstance

Modified: incubator/oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml (original)
+++ incubator/oodt/trunk/pge/src/main/resources/examples/PgeConfigFiles/pge-config.xml Fri
Jul 16 19:36:47 2010
@@ -1,9 +1,19 @@
 <?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.
 -->
 <pgeConfig>
     

Modified: incubator/oodt/trunk/pge/src/main/resources/examples/WorkflowMgrInput/pcs-pge-task-workflow.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/resources/examples/WorkflowMgrInput/pcs-pge-task-workflow.properties?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/resources/examples/WorkflowMgrInput/pcs-pge-task-workflow.properties
(original)
+++ incubator/oodt/trunk/pge/src/main/resources/examples/WorkflowMgrInput/pcs-pge-task-workflow.properties
Fri Jul 16 19:36:47 2010
@@ -1,6 +1,16 @@
-# 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
+#
+# 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.    
 
-foobar=foo
\ No newline at end of file
+foobar=foo

Modified: incubator/oodt/trunk/pge/src/main/resources/examples/XsltFiles/xslt_prop_eq_val.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/resources/examples/XsltFiles/xslt_prop_eq_val.xml?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/resources/examples/XsltFiles/xslt_prop_eq_val.xml (original)
+++ incubator/oodt/trunk/pge/src/main/resources/examples/XsltFiles/xslt_prop_eq_val.xml Fri
Jul 16 19:36:47 2010
@@ -1,10 +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 Converts cas-metadata xml output to a property equals comma segregated value pge config
file$
- -->
+<!--
+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.
+-->
 <xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
 
     <xsl:output method="text"/>    
@@ -29,4 +39,4 @@
         <xsl:value-of select="$newline"/>
     </xsl:template>
             
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

Modified: incubator/oodt/trunk/pge/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/resources/logging.properties?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/resources/logging.properties (original)
+++ incubator/oodt/trunk/pge/src/main/resources/logging.properties Fri Jul 16 19:36:47 2010
@@ -1,8 +1,17 @@
-# 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
+#
+# 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)
@@ -29,25 +38,25 @@ java.util.logging.FileHandler.formatter 
 # Set the default logging level for the subsystems
 
 # catalog subsystem
-gov.nasa.jpl.oodt.cas.filemgr.catalog.level = INFO
+org.apache.oodt.cas.filemgr.catalog.level = INFO
 
 # repository subsystem
-gov.nasa.jpl.oodt.cas.filemgr.repository.level = FINE
+org.apache.oodt.cas.filemgr.repository.level = FINE
 
 # system subsystem
-gov.nasa.jpl.oodt.cas.filemgr.system.level = INFO
+org.apache.oodt.cas.filemgr.system.level = INFO
 
 # versioning subsystem
-gov.nasa.jpl.oodt.cas.filemgr.versioning.level = INFO
+org.apache.oodt.cas.filemgr.versioning.level = INFO
 
 # data transfer subsystem
-gov.nasa.jpl.oodt.cas.filemgr.datatransfer.level = FINE
+org.apache.oodt.cas.filemgr.datatransfer.level = FINE
 
 # util
-gov.nasa.jpl.oodt.cas.filemgr.util.level = INFO
+org.apache.oodt.cas.filemgr.util.level = INFO
 
 # validation
-gov.nasa.jpl.oodt.cas.filemgr.validation.level = INFO
+org.apache.oodt.cas.filemgr.validation.level = INFO
 
 # control the underlying commons-httpclient transport layer for xmlrpc 
 org.apache.commons.httpclient.level = INFO

Modified: incubator/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/util/UtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/util/UtilsTest.java?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/util/UtilsTest.java (original)
+++ incubator/oodt/trunk/pge/src/test/org/apache/oodt/cas/pge/util/UtilsTest.java Fri Jul
16 19:36:47 2010
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package gov.nasa.jpl.oodt.cas.pge.util;
+package org.apache.oodt.cas.pge.util;
 
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ConnectionException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.QueryFormulationException;
-import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.QueryFormulationException;
+import org.apache.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
 
 import java.net.MalformedURLException;
 

Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964919&r1=964918&r2=964919&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 19:36:47 2010
@@ -48,7 +48,7 @@ the License.
         <module>crawler</module>
         <module>resource</module>
         <module>curator</module>
-        <!-- broken: <module>pge</module> -->
+        <module>pge</module>
         <!-- broken: <module>mvn/plugins/cas-install</module> -->
         <module>pushpull</module>
         <module>product</module>



Mime
View raw message