svn commit: r1476800 - in /incubator/climate/trunk/filemgr: deploy/conf/ src/main/java/gov/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/climate/ src/main/java/org/apache/climate/catalog/ src/main/java/org/apache/climate/reposi...

[sm...@apache.org]

Author: smarru
Date: Sun Apr 28 17:15:26 2013
New Revision: 1476800

URL: http://svn.apache.org/r1476800
Log:
updating packages to org.apache.climate prefix partially addressing CLIMATE-2

Added:
    incubator/climate/trunk/filemgr/src/main/java/org/
    incubator/climate/trunk/filemgr/src/main/java/org/apache/
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/
      - copied from r1476799, incubator/climate/trunk/filemgr/src/main/java/gov/nasa/jpl/wrm/catalog/
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/
      - copied from r1476799, incubator/climate/trunk/filemgr/src/main/java/gov/nasa/jpl/wrm/repository/
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/util/
      - copied from r1476799, incubator/climate/trunk/filemgr/src/main/java/gov/nasa/jpl/wrm/util/
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/
      - copied from r1476799, incubator/climate/trunk/filemgr/src/main/java/gov/nasa/jpl/wrm/validation/
Removed:
    incubator/climate/trunk/filemgr/src/main/java/gov/
Modified:
    incubator/climate/trunk/filemgr/deploy/conf/filemgr.properties
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/ISO8601DateParser.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalog.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalogFactory.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMMetadataUtils.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManager.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManagerFactory.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/util/DatabaseStructFactory.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayer.java
    incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayerFactory.java

Modified: incubator/climate/trunk/filemgr/deploy/conf/filemgr.properties
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/deploy/conf/filemgr.properties?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/deploy/conf/filemgr.properties (original)
+++ incubator/climate/trunk/filemgr/deploy/conf/filemgr.properties Sun Apr 28 17:15:26 2013
@@ -6,17 +6,17 @@
 # Configuration properties for the File Manager
 
 # repository factory
-filemgr.repository.factory=gov.nasa.jpl.wrm.repository.WRMRepositoryManagerFactory
+filemgr.repository.factory=org.apache.climate.repository.WRMRepositoryManagerFactory
 
 # catalog factory
 #filemgr.catalog.factory=gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory
-filemgr.catalog.factory=gov.nasa.jpl.wrm.catalog.WRMCatalogFactory
+filemgr.catalog.factory=org.apache.climate.catalog.WRMCatalogFactory
 
 # data transfer factory
 filemgr.datatransfer.factory=gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
 
 # validation layer factory
-filemgr.validationLayer.factory=gov.nasa.jpl.wrm.validation.WRMValidationLayerFactory
+filemgr.validationLayer.factory=org.apache.climate.validation.WRMValidationLayerFactory
 
 # xml rpc client configuration
 gov.nasa.jpl.oodt.cas.filemgr.system.xmlrpc.connectionTimeout.minutes=20
@@ -33,15 +33,15 @@ gov.nasa.jpl.oodt.cas.filemgr.catalog.da
 
 #WRM Catalog config
 #DEV db connection
-gov.nasa.jpl.wrm.catalog.datasource.jdbc.url=jdbc:mysql://localhost:3306/wrm_dev?autoReconnect=true
+org.apache.climate.catalog.datasource.jdbc.url=jdbc:mysql://localhost:3306/wrm_dev?autoReconnect=true
 #TEST db connection
-#gov.nasa.jpl.wrm.catalog.datasource.jdbc.url=jdbc:mysql://localhost:3306/wrm_test?autoReconnect=true
+#org.apache.climate.catalog.datasource.jdbc.url=jdbc:mysql://localhost:3306/wrm_test?autoReconnect=true
 #PROD db connection
-#gov.nasa.jpl.wrm.catalog.datasource.jdbc.url=jdbc:mysql://localhost:3306/wrm_prod?autoReconnect=true
-gov.nasa.jpl.wrm.catalog.datasource.jdbc.user=wrm_data
-gov.nasa.jpl.wrm.catalog.datasource.jdbc.pass=wrm_data
-gov.nasa.jpl.wrm.catalog.datasource.jdbc.driver=com.mysql.jdbc.Driver
-gov.nasa.jpl.wrm.catalog.datasource.pageSize=20
+#org.apache.climate.catalog.datasource.jdbc.url=jdbc:mysql://localhost:3306/wrm_prod?autoReconnect=true
+org.apache.climate.catalog.datasource.jdbc.user=wrm_data
+org.apache.climate.catalog.datasource.jdbc.pass=wrm_data
+org.apache.climate.catalog.datasource.jdbc.driver=com.mysql.jdbc.Driver
+org.apache.climate.catalog.datasource.pageSize=20
 
 
 # mapped data source catalog configuration
@@ -73,10 +73,10 @@ gov.nasa.jpl.wrm.repositorymgr.jdbc.driv
 #gov.nasa.jpl.oodt.cas.filemgr.validation.dirs=file:///usr/local/wrm/deploy/filemgr/policy
 
 # WRM validation layer configuration
-gov.nasa.jpl.wrm.validation.jdbc.url=jdbc:mysql://localhost:3306/wrm_dev?autoReconnect=true
-gov.nasa.jpl.wrm.validation.jdbc.user=wrm_data
-gov.nasa.jpl.wrm.validation.jdbc.pass=wrm_data
-gov.nasa.jpl.wrm.validation.jdbc.driver=com.mysql.jdbc.Driver
+org.apache.climate.validation.jdbc.url=jdbc:mysql://localhost:3306/wrm_dev?autoReconnect=true
+org.apache.climate.validation.jdbc.user=wrm_data
+org.apache.climate.validation.jdbc.pass=wrm_data
+org.apache.climate.validation.jdbc.driver=com.mysql.jdbc.Driver
 
 
 # data source validation layer configuration

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/ISO8601DateParser.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/ISO8601DateParser.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/ISO8601DateParser.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/ISO8601DateParser.java Sun Apr 28 17:15:26 2013
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package gov.nasa.jpl.wrm.catalog;
+package org.apache.climate.catalog;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalog.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalog.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalog.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalog.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.catalog;
+package org.apache.climate.catalog;
 
 //JDK imports
 import java.sql.Connection;
@@ -18,6 +18,9 @@ import java.util.List;
 import java.util.Vector;
 import java.util.logging.Level;
 import javax.sql.DataSource;
+
+import org.apache.climate.util.DatabaseStructFactory;
+
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
@@ -33,7 +36,6 @@ import gov.nasa.jpl.oodt.cas.filemgr.val
 import gov.nasa.jpl.oodt.cas.metadata.Metadata;
 
 //WRM imports
-import gov.nasa.jpl.wrm.util.DatabaseStructFactory;
 
 /**
  * WRMCatalog

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalogFactory.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalogFactory.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalogFactory.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMCatalogFactory.java Sun Apr 28 17:15:26 2013
@@ -3,15 +3,16 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.catalog;
+package org.apache.climate.catalog;
 
 import javax.sql.DataSource;
 
+import org.apache.climate.validation.WRMValidationLayerFactory;
+
 import gov.nasa.jpl.oodt.cas.commons.database.DatabaseConnectionBuilder;
 import gov.nasa.jpl.oodt.cas.filemgr.catalog.Catalog;
 import gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory;
 import gov.nasa.jpl.oodt.cas.metadata.util.PathUtils;
-import gov.nasa.jpl.wrm.validation.WRMValidationLayerFactory;
 
 /**
  * WRMCatalogFactory
@@ -36,20 +37,20 @@ public class WRMCatalogFactory implement
         String jdbcUrl = null, user = null, pass = null, driver = null;
 
         jdbcUrl = PathUtils.replaceEnvVariables(System
-                .getProperty("gov.nasa.jpl.wrm.catalog.datasource.jdbc.url"));
+                .getProperty("org.apache.climate.catalog.datasource.jdbc.url"));
         user = PathUtils.replaceEnvVariables(System
-                .getProperty("gov.nasa.jpl.wrm.catalog.datasource.jdbc.user"));
+                .getProperty("org.apache.climate.catalog.datasource.jdbc.user"));
         pass = PathUtils.replaceEnvVariables(System
-                .getProperty("gov.nasa.jpl.wrm.catalog.datasource.jdbc.pass"));
+                .getProperty("org.apache.climate.catalog.datasource.jdbc.pass"));
         driver = PathUtils
                 .replaceEnvVariables(System
-                        .getProperty("gov.nasa.jpl.wrm.catalog.datasource.jdbc.driver"));
+                        .getProperty("org.apache.climate.catalog.datasource.jdbc.driver"));
         
 
         dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass,
                 driver, jdbcUrl);
         pageSize = Integer.valueOf(PathUtils.replaceEnvVariables(System
-            .getProperty("gov.nasa.jpl.wrm.catalog.datasource.pageSize")));
+            .getProperty("org.apache.climate.catalog.datasource.pageSize")));
 
     }
 

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMMetadataUtils.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMMetadataUtils.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMMetadataUtils.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/catalog/WRMMetadataUtils.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.catalog;
+package org.apache.climate.catalog;
 
 import java.util.logging.Logger;
 import java.util.regex.Matcher;

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManager.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManager.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManager.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManager.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.repository;
+package org.apache.climate.repository;
 
 //JDK imports
 import java.sql.Connection;
@@ -17,11 +17,12 @@ import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
+import org.apache.climate.util.DatabaseStructFactory;
+
 //OODT imports
 import gov.nasa.jpl.oodt.cas.filemgr.repository.RepositoryManager;
 import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
 import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.RepositoryManagerException;
-import gov.nasa.jpl.wrm.util.DatabaseStructFactory;
 
 /**
  * 

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManagerFactory.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManagerFactory.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/repository/WRMRepositoryManagerFactory.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.repository;
+package org.apache.climate.repository;
 
 //JDK imports
 import javax.sql.DataSource;

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/util/DatabaseStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/util/DatabaseStructFactory.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/util/DatabaseStructFactory.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/util/DatabaseStructFactory.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.util;
+package org.apache.climate.util;
 
 //JDK imports
 import java.sql.ResultSet;

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayer.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayer.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayer.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayer.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.validation;
+package org.apache.climate.validation;
 
 //JDK imports
 import java.sql.Connection;
@@ -15,12 +15,13 @@ import java.util.Vector;
 
 import javax.sql.DataSource;
 
+import org.apache.climate.util.DatabaseStructFactory;
+
 //OODT imports
 import gov.nasa.jpl.oodt.cas.filemgr.structs.Element;
 import gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType;
 import gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
 import gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer;
-import gov.nasa.jpl.wrm.util.DatabaseStructFactory;
 
 /**
  * 

Modified: incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayerFactory.java
URL: http://svn.apache.org/viewvc/incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayerFactory.java?rev=1476800&r1=1476799&r2=1476800&view=diff
==============================================================================
--- incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayerFactory.java (original)
+++ incubator/climate/trunk/filemgr/src/main/java/org/apache/climate/validation/WRMValidationLayerFactory.java Sun Apr 28 17:15:26 2013
@@ -3,7 +3,7 @@
 //
 //$Id$
 
-package gov.nasa.jpl.wrm.validation;
+package org.apache.climate.validation;
 
 //JDK imports
 import javax.sql.DataSource;
@@ -30,13 +30,13 @@ public class WRMValidationLayerFactory i
     String jdbcUrl = null, user = null, pass = null, driver = null;
 
     jdbcUrl = PathUtils.replaceEnvVariables(System
-        .getProperty("gov.nasa.jpl.wrm.validation.jdbc.url"));
+        .getProperty("org.apache.climate.validation.jdbc.url"));
     user = PathUtils.replaceEnvVariables(System
-        .getProperty("gov.nasa.jpl.wrm.validation.jdbc.user"));
+        .getProperty("org.apache.climate.validation.jdbc.user"));
     pass = PathUtils.replaceEnvVariables(System
-        .getProperty("gov.nasa.jpl.wrm.validation.jdbc.pass"));
+        .getProperty("org.apache.climate.validation.jdbc.pass"));
     driver = PathUtils.replaceEnvVariables(System
-        .getProperty("gov.nasa.jpl.wrm.validation.jdbc.driver"));
+        .getProperty("org.apache.climate.validation.jdbc.driver"));
 
     this.dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass,
         driver, jdbcUrl);