incubator-oodt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r964909 - in /incubator/oodt/trunk: ./ pushpull/ pushpull/src/main/assembly/ pushpull/src/main/bin/ pushpull/src/main/resources/ pushpull/src/main/resources/examples/RemoteSpecsFiles/ pushpull/src/main/resources/policy/
Date Fri, 16 Jul 2010 19:06:57 GMT
Author: kelly
Date: Fri Jul 16 19:06:56 2010
New Revision: 964909

URL: http://svn.apache.org/viewvc?rev=964909&view=rev
Log:
WIP OODT-15 OODT-16
"pushpull" module now functional; add std ignores; replace Caltech notices with ASF notices;
add ASF notices to noticeless files; add missing XML PI; replace gov.nasa.jpl with org.apache
in XML configs, properties files, and example files; adjust dependencies and fix versions.

Modified:
    incubator/oodt/trunk/pom.xml
    incubator/oodt/trunk/pushpull/   (props changed)
    incubator/oodt/trunk/pushpull/pom.xml
    incubator/oodt/trunk/pushpull/src/main/assembly/assembly.xml
    incubator/oodt/trunk/pushpull/src/main/bin/pushpull
    incubator/oodt/trunk/pushpull/src/main/bin/url-downloader
    incubator/oodt/trunk/pushpull/src/main/resources/default.properties
    incubator/oodt/trunk/pushpull/src/main/resources/examples/RemoteSpecsFiles/RemoteSpecs.xml
    incubator/oodt/trunk/pushpull/src/main/resources/jssecacerts
    incubator/oodt/trunk/pushpull/src/main/resources/logging.properties
    incubator/oodt/trunk/pushpull/src/main/resources/policy/ParserToRetrievalMethodMap.xml
    incubator/oodt/trunk/pushpull/src/main/resources/policy/ProtocolFactoryInfo.xml
    incubator/oodt/trunk/pushpull/src/main/resources/push_pull_framework.properties

Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 19:06:56 2010
@@ -50,7 +50,7 @@ the License.
         <module>curator</module>
         <!-- broken: <module>pge</module> -->
         <!-- broken: <module>mvn/plugins/cas-install</module> -->
-        <!-- broken: <module>pushpull</module> -->
+        <module>pushpull</module>
         <module>product</module>
         <module>profile</module>
         <!-- broken: <module>query</module> -->

Propchange: incubator/oodt/trunk/pushpull/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 19:06:56 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target

Modified: incubator/oodt/trunk/pushpull/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/pom.xml?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/pom.xml (original)
+++ incubator/oodt/trunk/pushpull/pom.xml Fri Jul 16 19:06:56 2010
@@ -5,11 +5,12 @@
   
   <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-pushpull</artifactId>
+  <artifactId>pushpull</artifactId>
   <name>CAS Push-Pull-Framework</name>
   <version>1.4.0-dev</version>
   <url>http://jpl.nasa.gov</url>
@@ -34,7 +35,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>gov.nasa.jpl.oodt.cas.pushpull.daemon.DaemonLauncher</mainClass>
+              <mainClass>org.apache.oodt.cas.pushpull.daemon.DaemonLauncher</mainClass>
             </manifest>
           </archive>
         </configuration>
@@ -81,14 +82,14 @@
       <version>0.2.2</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>
+      <groupId>org.apache.oodt</groupId>
       <artifactId>cas-metadata</artifactId>
-      <version>1.6.1</version>
+      <version>${oodt.version}</version>
     </dependency>
     <dependency>
       <groupId>xmlrpc</groupId>

Modified: incubator/oodt/trunk/pushpull/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/assembly/assembly.xml?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/assembly/assembly.xml (original)
+++ incubator/oodt/trunk/pushpull/src/main/assembly/assembly.xml Fri Jul 16 19:06:56 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>
@@ -60,15 +71,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/pushpull/src/main/bin/pushpull
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/bin/pushpull?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/bin/pushpull (original)
+++ incubator/oodt/trunk/pushpull/src/main/bin/pushpull Fri Jul 16 19:06:56 2010
@@ -1,8 +1,18 @@
 #!/bin/csh
-# 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.    
 
 set LIB_DEPS
 foreach file (`find ../lib/*.jar`)
@@ -16,7 +26,7 @@ ${JAVA_HOME}/bin/java \
      -cp ${LIB_DEPS} -Dcom.sun.management.jmxremote \
      -Djava.util.logging.config.file=../etc/logging.properties \
      -Djavax.net.ssl.trustStore=${CAS_PP_RESOURCES}/jssecacerts \
-     gov.nasa.jpl.oodt.cas.pushpull.daemon.DaemonLauncher \
+     org.apache.oodt.cas.pushpull.daemon.DaemonLauncher \
      --rmiRegistryPort ${DAEMONLAUNCHER_PORT} \
      --propertiesFile ${CAS_PP_RESOURCES}/push_pull_framework.properties \
      --remoteSpecsFile ${CAS_PP_RESOURCES}/examples/RemoteSpecsFiles/RemoteSpecs.xml 

Modified: incubator/oodt/trunk/pushpull/src/main/bin/url-downloader
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/bin/url-downloader?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/bin/url-downloader (original)
+++ incubator/oodt/trunk/pushpull/src/main/bin/url-downloader Fri Jul 16 19:06:56 2010
@@ -1,7 +1,21 @@
 #!/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 \
-        gov.nasa.jpl.oodt.cas.pushpull.protocol.http.HttpClient \
+        org.apache.oodt.cas.pushpull.protocol.http.HttpClient \
         --url $1 \
         --downloadToDir $2

Modified: incubator/oodt/trunk/pushpull/src/main/resources/default.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/default.properties?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/resources/default.properties (original)
+++ incubator/oodt/trunk/pushpull/src/main/resources/default.properties Fri Jul 16 19:06:56
2010
@@ -1,11 +1,21 @@
-# Copyright (c) 2007 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: Configuration properties for the Crawler $
+#     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.    
 
 #-------------------------------------------------------#
 #-----------------Protocol Defaults---------------------#
 #-------------------------------------------------------#
 
 #configuration to make java.net.URL accept unsupported protocols
-java.protocol.handler.pkgs=gov.nasa.jpl.oodt.cas.pushpull.url.handlers
+java.protocol.handler.pkgs=org.apache.oodt.cas.pushpull.url.handlers

Modified: incubator/oodt/trunk/pushpull/src/main/resources/examples/RemoteSpecsFiles/RemoteSpecs.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/examples/RemoteSpecsFiles/RemoteSpecs.xml?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/resources/examples/RemoteSpecsFiles/RemoteSpecs.xml
(original)
+++ incubator/oodt/trunk/pushpull/src/main/resources/examples/RemoteSpecsFiles/RemoteSpecs.xml
Fri Jul 16 19:06:56 2010
@@ -11,7 +11,7 @@
         <daemon alias="DewFtp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="IASI\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="IASI\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="DewFtp" deleteFromServer="no"/>               
         </daemon>
@@ -20,7 +20,7 @@
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_TEMP_PROPS]/WeatherSftp">
                 <downloadInfo alias="WeatherSftp" remoteDir="junkTest"/>
-                <propFiles regExp="IASI\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="IASI\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="DewFtp" deleteFromServer="no"/>
         </daemon>
@@ -28,7 +28,7 @@
         <daemon alias="CalPolySftp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="CalPoly\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="CalPoly\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="CalPolySftp" deleteFromServer="no"/>
         </daemon>
@@ -36,7 +36,7 @@
         <daemon alias="WeatherSftp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="IASI\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="IASI\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="WeatherSftp" deleteFromServer="no"/>           

         </daemon>
@@ -45,7 +45,7 @@
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_TEMP_PROPS]/WeatherSftp">
                 <downloadInfo alias="WeatherSftp" remoteDir="junkTest"/>
-                <propFiles regExp="IASI\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="IASI\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="WeatherSftp" deleteFromServer="no" queryElement="RetrievedFromLoc"/>
               
         </daemon>
@@ -53,7 +53,7 @@
         <daemon alias="WeatherSftp" active="no">
             <runInfo firstRunDateTime="2007-12-24T00:10:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/FileListParserFiles">
-                <propFiles regExp="DownloadList\.txt" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.FileListParser"/>
+                <propFiles regExp="DownloadList\.txt" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.FileListParser"/>
             </propInfo>
             <dataInfo stagingArea="WeatherSftp" deleteFromServer="no" queryElement="RetrievedFromLoc"/>
         </daemon>
@@ -61,7 +61,7 @@
         <daemon alias="ClassFtp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="IASI_2.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="IASI_2.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="ClassFtp" deleteFromServer="no" queryElement="Filename"/>
         </daemon>
@@ -69,7 +69,7 @@
         <daemon alias="ClassFtp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/ClassNoaaEmailParserFiles">
-                <propFiles regExp="[^\.].*" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
+                <propFiles regExp="[^\.].*" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
             </propInfo>
             <dataInfo stagingArea="ClassFtp" deleteFromServer="no" queryElement="Filename"/>
         </daemon>
@@ -79,9 +79,9 @@
             <propInfo dir="[CAS_PP_TEMP_PROPS]/ClassFtp/Emails">
                 <downloadInfo alias="PeateImaps" deleteFromServer="yes" renamingConv="CLASS_[HOST]_[DATE.UTC]_[FILENAME].email">
                     <propFile path="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles/CLASS_Email.xml"

-                        parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                        parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
                 </downloadInfo>
-                <propFiles regExp=".*\.email" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
+                <propFiles regExp=".*\.email" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
                 <afterUse moveToOnSuccess="[CAS_PP_TEMP_PROPS]/ClassFtp/ProcessedEmails"

                     moveToOnFail="[CAS_PP_TEMP_PROPS]/ClassFtp/FailedEmails"/>
             </propInfo>
@@ -94,9 +94,9 @@
             <propInfo dir="[CAS_PP_TEMP_PROPS]/ClassFtp/Emails">
                 <downloadInfo alias="localhost" deleteFromServer="yes" renamingConv="CLASS_[HOST]_[DATE.UTC]_[FILENAME].email">
                     <propFile path="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles/CLASS_Text_Email.xml"

-                        parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                        parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
                 </downloadInfo>
-                <propFiles regExp=".*\.email" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
+                <propFiles regExp=".*\.email" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
                 <afterUse moveToOnSuccess="[CAS_PP_TEMP_PROPS]/ClassFtp/ProcessedEmails"

                     moveToOnFail="[CAS_PP_TEMP_PROPS]/ClassFtp/FailedEmails"/>
             </propInfo>
@@ -107,7 +107,7 @@
         <daemon alias="GfsFtp" active="no">
             <runInfo firstRunDateTime="2007-11-27T00:00:00Z" period="3m" epsilon="20s"
runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="GFS\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="GFS\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="GfsFtp" renamingConv="[PARENT_FILENAME]_[FILENAME]"
queryElement="RetrievedFromLoc"/>
         </daemon>
@@ -115,7 +115,7 @@
         <daemon alias="PolarNcepNoaaFtp" active="no">
             <runInfo firstRunDateTime="2007-11-27T00:00:00Z" period="3m" epsilon="20s"
runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="RTG_SST\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="RTG_SST\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="RtgSstFtp" queryElement="Filename"/>
         </daemon>
@@ -123,7 +123,7 @@
         <daemon alias="ModisFtp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="MODIS\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="MODIS\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="ModisFtp" deleteFromServer="no" queryElement="RetrievedFromLoc"/>
         </daemon>
@@ -131,7 +131,7 @@
         <daemon alias="GdaacFtp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="AIRABRAD\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="AIRABRAD\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="GdaccFtp" deleteFromServer="no" queryElement="RetrievedFromLoc"/>
         </daemon>
@@ -139,8 +139,8 @@
         <daemon alias="AcdiscGsfcFtp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="AIRS3STD\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
-                <propFiles regExp="AIRS3ST8\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="AIRS3STD\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="AIRS3ST8\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="AcdiscGsfcFtp" deleteFromServer="no" queryElement="RetrievedFromLoc"/>
         </daemon>
@@ -148,7 +148,7 @@
         <daemon alias="Signal42ApacheMirrorHttp" active="no">
             <runInfo firstRunDateTime="2007-12-01T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="IBIBLIO\.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="IBIBLIO\.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="Signal42ApacheMirrorHttp" deleteFromServer="no" queryElement="RetrievedFromLoc"/>
         </daemon>
@@ -156,7 +156,7 @@
         <daemon alias="RimeSftp" active="no">
             <runInfo firstRunDateTime="2008-02-19T00:00:00Z" period="3m" runOnReboot="yes"/>
             <propInfo dir="[CAS_PP_RESOURCES]/examples/DirStructXmlParserFiles">
-                <propFiles regExp="RimeDIRSTRUCT.xml" parser="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+                <propFiles regExp="RimeDIRSTRUCT.xml" parser="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
             </propInfo>
             <dataInfo stagingArea="RimeSftp" renamingConv="[PATH_NO_FILENAME]/[FILENAME]"
deleteFromServer="no" queryElement="RetrievedFromLoc"/>
         </daemon>

Modified: incubator/oodt/trunk/pushpull/src/main/resources/jssecacerts
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/jssecacerts?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/oodt/trunk/pushpull/src/main/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/logging.properties?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/resources/logging.properties (original)
+++ incubator/oodt/trunk/pushpull/src/main/resources/logging.properties Fri Jul 16 19:06:56
2010
@@ -1,7 +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

Modified: incubator/oodt/trunk/pushpull/src/main/resources/policy/ParserToRetrievalMethodMap.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/policy/ParserToRetrievalMethodMap.xml?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/resources/policy/ParserToRetrievalMethodMap.xml
(original)
+++ incubator/oodt/trunk/pushpull/src/main/resources/policy/ParserToRetrievalMethodMap.xml
Fri Jul 16 19:06:56 2010
@@ -2,13 +2,13 @@
 
 <rtvlMethods>
     
-    <rtvlMethod class="gov.nasa.jpl.oodt.cas.pushpull.retrievalmethod.RemoteCrawler">
-        <parser class="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
+    <rtvlMethod class="org.apache.oodt.cas.pushpull.retrievalmethod.RemoteCrawler">
+        <parser class="org.apache.oodt.cas.pushpull.filerestrictions.parsers.DirStructXmlParser"/>
     </rtvlMethod>
     
-    <rtvlMethod class="gov.nasa.jpl.oodt.cas.pushpull.retrievalmethod.ListRetriever">
-        <parser class="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.FileListParser"/>
-        <parser class="gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
+    <rtvlMethod class="org.apache.oodt.cas.pushpull.retrievalmethod.ListRetriever">
+        <parser class="org.apache.oodt.cas.pushpull.filerestrictions.parsers.FileListParser"/>
+        <parser class="org.apache.oodt.cas.pushpull.filerestrictions.parsers.ClassNoaaEmailParser"/>
     </rtvlMethod>
     
 </rtvlMethods>

Modified: incubator/oodt/trunk/pushpull/src/main/resources/policy/ProtocolFactoryInfo.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/policy/ProtocolFactoryInfo.xml?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/resources/policy/ProtocolFactoryInfo.xml (original)
+++ incubator/oodt/trunk/pushpull/src/main/resources/policy/ProtocolFactoryInfo.xml Fri Jul
16 19:06:56 2010
@@ -3,26 +3,26 @@
 <protocols>
     
     <protocol type="ftp">
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.jvftp.FtpClientFactory_jvftp"/>
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.apache.FtpClientFactory_apache"/>
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.ftp4che.FtpClientFactory_ftp4che"/>
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.ftp.cog.FtpClientFactory_cog"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.ftp.jvftp.FtpClientFactory_jvftp"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.ftp.apache.FtpClientFactory_apache"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.ftp.ftp4che.FtpClientFactory_ftp4che"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.ftp.cog.FtpClientFactory_cog"/>
     </protocol>
     
     <protocol type="http">
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.http.HttpClientFactory"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.http.HttpClientFactory"/>
     </protocol>
     
     <protocol type="sftp">
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.sftp.jsch.SftpClientFactory_jsch"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.sftp.jsch.SftpClientFactory_jsch"/>
     </protocol>
     
     <protocol type="imaps">
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.imaps.ImapsClientFactory"/>
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.imaps.ImapsClientFactory"/>
     </protocol>
     
     <protocol type="file">
-        <protocolFactory class="gov.nasa.jpl.oodt.cas.pushpull.protocol.local.LocalClientFactory"/>
   
+        <protocolFactory class="org.apache.oodt.cas.pushpull.protocol.local.LocalClientFactory"/>
   
     </protocol>
     
 </protocols>

Modified: incubator/oodt/trunk/pushpull/src/main/resources/push_pull_framework.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/resources/push_pull_framework.properties?rev=964909&r1=964908&r2=964909&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/resources/push_pull_framework.properties (original)
+++ incubator/oodt/trunk/pushpull/src/main/resources/push_pull_framework.properties Fri Jul
16 19:06:56 2010
@@ -1,6 +1,17 @@
-# Copyright (c) 2007 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: Configuration properties for the CAS Push-Pull-Framework$
 
 #---------------------------------------------------------------#
@@ -8,7 +19,7 @@
 #---------------------------------------------------------------#
 
 #external configuration files
-gov.nasa.jpl.oodt.cas.pushpull.config.external.properties.files=[CAS_PP_RESOURCES]/default.properties
+org.apache.oodt.cas.pushpull.config.external.properties.files=[CAS_PP_RESOURCES]/default.properties
 
 
 #---------------------------------------------------------------#
@@ -16,28 +27,28 @@ gov.nasa.jpl.oodt.cas.pushpull.config.ex
 #---------------------------------------------------------------#
 
 #ingester classpath
-gov.nasa.jpl.oodt.cas.filemgr.ingester=gov.nasa.jpl.oodt.cas.filemgr.ingest.StdIngester
+org.apache.oodt.cas.filemgr.ingester=org.apache.oodt.cas.filemgr.ingest.StdIngester
 
 #ingester transferer
-gov.nasa.jpl.oodt.cas.filemgr.datatransfer.factory=gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
+org.apache.oodt.cas.filemgr.datatransfer.factory=org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
 
 # ingester filemgr url
-gov.nasa.jpl.oodt.cas.filemgr.url=[FILEMGR_LOC]
+org.apache.oodt.cas.filemgr.url=[FILEMGR_LOC]
 
 #---------------------------------------------------------------#
 #-------------------- Cached Ingester Properties  --------------#
 #---------------------------------------------------------------#
-gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.factory=
+org.apache.oodt.cas.filemgr.ingest.cache.factory=
 
-gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.rangeQueryElementName=
+org.apache.oodt.cas.filemgr.ingest.cache.rangeQueryElementName=
 
-gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.range.start=
+org.apache.oodt.cas.filemgr.ingest.cache.range.start=
 
-gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.range.end=
+org.apache.oodt.cas.filemgr.ingest.cache.range.end=
 
-gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.uniqueElementName=
+org.apache.oodt.cas.filemgr.ingest.cache.uniqueElementName=
 
-gov.nasa.jpl.oodt.cas.filemgr.ingest.cache.productType=
+org.apache.oodt.cas.filemgr.ingest.cache.productType=
 
 
 #-------------------------------------------------------------#
@@ -45,10 +56,10 @@ gov.nasa.jpl.oodt.cas.filemgr.ingest.cac
 #-------------------------------------------------------------#
 
 #set the paging size (use -1 to turn paging off)
-gov.nasa.jpl.oodt.cas.pushpull.protocol.page_size=8
+org.apache.oodt.cas.pushpull.protocol.page_size=8
 
 #protocolfactory specification for protocol types
-gov.nasa.jpl.oodt.cas.pushpull.config.protocolfactory.info.files=[CAS_PP_HOME]/policy/ProtocolFactoryInfo.xml
+org.apache.oodt.cas.pushpull.config.protocolfactory.info.files=[CAS_PP_HOME]/policy/ProtocolFactoryInfo.xml
 
 
 #-------------------------------------------------------------#
@@ -56,34 +67,34 @@ gov.nasa.jpl.oodt.cas.pushpull.config.pr
 #-------------------------------------------------------------#
 
 #parser to retrievalmethod map
-gov.nasa.jpl.oodt.cas.pushpull.config.parser.info.files=[CAS_PP_HOME]/policy/ParserToRetrievalMethodMap.xml
+org.apache.oodt.cas.pushpull.config.parser.info.files=[CAS_PP_HOME]/policy/ParserToRetrievalMethodMap.xml
 
 #unique metadata element info
-gov.nasa.jpl.oodt.cas.pushpull.config.type.detection.file=[CAS_PP_HOME]/policy/mimetypes.xml
+org.apache.oodt.cas.pushpull.config.type.detection.file=[CAS_PP_HOME]/policy/mimetypes.xml
 
 #directory below which all data file will be downloaded to
-gov.nasa.jpl.oodt.cas.pushpull.data.files.base.staging.area=[CAS_PP_STAGING_AREA]
+org.apache.oodt.cas.pushpull.data.files.base.staging.area=[CAS_PP_STAGING_AREA]
 
 #list of metadata values to print to metadata file
-gov.nasa.jpl.oodt.cas.pushpull.metadata.list.to.print=ProductName,RetrievedFromLoc,DataProvider,FileSize,RenamingString,ProductType,DownloadToDir,DeleteAfterDownload,SuperType
+org.apache.oodt.cas.pushpull.metadata.list.to.print=ProductName,RetrievedFromLoc,DataProvider,FileSize,RenamingString,ProductType,DownloadToDir,DeleteAfterDownload,SuperType
 
 #extension for temporary metadata file
-gov.nasa.jpl.oodt.cas.pushpull.write.met.file=true
-gov.nasa.jpl.oodt.cas.pushpull.met.file.extension=info.tmp
+org.apache.oodt.cas.pushpull.write.met.file=true
+org.apache.oodt.cas.pushpull.met.file.extension=info.tmp
 
 #tracker varries the number of threads used to download files to find the optimized
 # number of threads in order to get the best download time
-gov.nasa.jpl.oodt.cas.pushpull.crawler.use.tracker=false
+org.apache.oodt.cas.pushpull.crawler.use.tracker=false
 
 #the recommended number of threads (will be the static number of 
 # threads used if the tracker is turned off)
-gov.nasa.jpl.oodt.cas.pushpull.file.retrieval.system.recommended.thread.count=30
+org.apache.oodt.cas.pushpull.file.retrieval.system.recommended.thread.count=30
 
 #the FileRetrievalSystem will stop accepting files for download once this number
 # of failed downloads is reached
-gov.nasa.jpl.oodt.cas.pushpull.file.retrieval.system.max.number.allowed.failed.downloads=10
+org.apache.oodt.cas.pushpull.file.retrieval.system.max.number.allowed.failed.downloads=10
 
 #if true, any file not defined in the file type detection file will not be downloaded
-gov.nasa.jpl.oodt.cas.pushpull.allow.only.defined.types=true
+org.apache.oodt.cas.pushpull.allow.only.defined.types=true
 
-gov.nasa.jpl.oodt.cas.pushpull.filerestrictions.parsers.class.noaa.email.parser.contains.exprs=CLASS\
has\ processed,anonymous
+org.apache.oodt.cas.pushpull.filerestrictions.parsers.class.noaa.email.parser.contains.exprs=CLASS\
has\ processed,anonymous



Mime
View raw message