Author: bfoster
Date: Thu Jan 6 22:07:42 2011
New Revision: 1056099
URL: http://svn.apache.org/viewvc?rev=1056099&view=rev
Log:
gov.nasa.jpl -> org.apache
-----------------
Modified:
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogServiceCatalogFactory.java
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
Modified:
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogServiceCatalogFactory.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogServiceCatalogFactory.java?rev=1056099&r1=1056098&r2=1056099&view=diff
==============================================================================
---
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogServiceCatalogFactory.java
(original)
+++
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/CatalogServiceCatalogFactory.java
Thu Jan 6 22:07:42 2011
@@ -49,18 +49,18 @@ public class CatalogServiceCatalogFactor
public CatalogServiceCatalogFactory() {
this.validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
-
"gov.nasa.jpl.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory");
+
"org.apache.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory");
this.repositoryManagerFactoryClass = System
.getProperty("filemgr.repository.factory",
-
"gov.nasa.jpl.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory");
+
"org.apache.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory");
- this.pageSize =
Integer.getInteger("gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.pageSize",
50);
+ this.pageSize =
Integer.getInteger("org.apache.oodt.cas.filemgr.catalog.catalogservice.pageSize",
50);
}
/*
* (non-Javadoc)
- * @see
gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#setValidationLayer(gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer)
+ * @see
org.apache.oodt.cas.filemgr.catalog.CatalogFactory#setValidationLayer(org.apache.oodt.cas.filemgr.validation.ValidationLayer)
*/
public void setValidationLayer(ValidationLayer validationLayer) {
this.validationLayer = validationLayer;
@@ -68,23 +68,23 @@ public class CatalogServiceCatalogFactor
/*
* (non-Javadoc)
- * @see
gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
+ * @see
org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
*/
public Catalog createCatalog() {
try {
if (validationLayer == null)
validationLayer =
GenericFileManagerObjectFactory.getValidationLayerFromFactory(validationLayerFactoryClass);
RepositoryManager repositoryManager =
GenericFileManagerObjectFactory.getRepositoryManagerServiceFromFactory(System.getProperty("filemgr.repository.factory"));
- String configFile =
System.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.config");
+ String configFile =
System.getProperty("org.apache.oodt.cas.filemgr.catalog.catalogservice.config");
if (configFile != null) {
FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(configFile);
- CatalogService catalogService =
((CatalogServiceFactory)
appContext.getBean(System.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.factory.bean.id"),
CatalogServiceFactory.class)).createCatalogService();
+ CatalogService catalogService =
((CatalogServiceFactory)
appContext.getBean(System.getProperty("org.apache.oodt.cas.filemgr.catalog.catalogservice.factory.bean.id"),
CatalogServiceFactory.class)).createCatalogService();
// Map<String, CatalogBuilder> catalogBuilders =
appContext.getBeansOfType(CatalogBuilder.class);
// Set<String> hitList =
catalogService.getCurrentCatalogIds();
// for (CatalogBuilder catalogBuilder :
catalogBuilders.values()) {
//
catalogBuilder.setValidationLayer(this.validationLayer);
//
catalogBuilder.setRepositoryManager(this.repositoryManager);
-//
gov.nasa.jpl.oodt.cas.catalog.system.Catalog catalog =
catalogBuilder.buildCatalogServiceCatalog();
+//
org.apache.oodt.cas.catalog.system.Catalog catalog =
catalogBuilder.buildCatalogServiceCatalog();
// hitList.remove(catalog.getUrnId());
// if
(catalogBuilder.getCatalogClassLoaderUrls() != null &&
catalogBuilder.getCatalogClassLoaderUrls().size() > 0)
//
catalogService.addCustomClassLoaderUrls(catalogBuilder.getCatalogClassLoaderUrls());
@@ -101,7 +101,7 @@ public class CatalogServiceCatalogFactor
return new
CatalogServiceCatalog(catalogService, repositoryManager, this.validationLayer,
this.pageSize);
}else {
- throw new Exception("Must specify property
'gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.config'");
+ throw new Exception("Must specify property
'org.apache.oodt.cas.filemgr.catalog.catalogservice.config'");
}
}catch (Exception e) {
LOG.log(Level.SEVERE, "Failed to create
CatalogServiceCatalog : " + e.getMessage(), e);
Modified:
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java?rev=1056099&r1=1056098&r2=1056099&view=diff
==============================================================================
---
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
(original)
+++
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalogFactory.java
Thu Jan 6 22:07:42 2011
@@ -69,30 +69,30 @@ public class DataSourceCatalogFactory im
public DataSourceCatalogFactory() {
jdbcUrl = PathUtils
.replaceEnvVariables(System
-
.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.url",
"some_datasource_url"));
+
.getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.url",
"some_datasource_url"));
user = PathUtils
.replaceEnvVariables(System
-
.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.user",
"user"));
+
.getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.user",
"user"));
pass = PathUtils
.replaceEnvVariables(System
-
.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.pass",
"pass"));
+
.getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.pass",
"pass"));
driver = PathUtils
.replaceEnvVariables(System
-
.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.jdbc.driver",
"some_driver_class"));
+
.getProperty("org.apache.oodt.cas.filemgr.catalog.datasource.jdbc.driver",
"some_driver_class"));
validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
-
"gov.nasa.jpl.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory");
+
"org.apache.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory");
fieldIdStr = Boolean
-
.getBoolean("gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.quoteFields");
+
.getBoolean("org.apache.oodt.cas.filemgr.catalog.datasource.quoteFields");
pageSize = Integer
.getInteger(
-
"gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.pageSize",
+
"org.apache.oodt.cas.filemgr.catalog.datasource.pageSize",
20).intValue();
cacheUpdateMinutes = Long
.getLong(
-
"gov.nasa.jpl.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes",
+
"org.apache.oodt.cas.filemgr.catalog.datasource.cacheUpdateMinutes",
5L).longValue();
}
@@ -108,7 +108,7 @@ public class DataSourceCatalogFactory im
this.dataSource = ds;
this.validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
-
"gov.nasa.jpl.oodt.cas.validation.DataSourceValidationLayerFactory");
+
"org.apache.oodt.cas.validation.DataSourceValidationLayerFactory");
}
@@ -176,7 +176,7 @@ public class DataSourceCatalogFactory im
/*
* (non-Javadoc)
*
- * @see
gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
+ * @see org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
*/
public Catalog createCatalog() {
if (validationLayer == null)
Modified:
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java?rev=1056099&r1=1056098&r2=1056099&view=diff
==============================================================================
---
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
(original)
+++
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalogFactory.java
Thu Jan 6 22:07:42 2011
@@ -57,11 +57,11 @@ public class LuceneCatalogFactory implem
*/
public LuceneCatalogFactory() throws IllegalArgumentException {
indexFilePath = System
-
.getProperty("gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath");
+
.getProperty("org.apache.oodt.cas.filemgr.catalog.lucene.idxPath");
if (indexFilePath == null) {
throw new IllegalArgumentException(
"error initializing lucene catalog: "
- +
"[gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath="
+ +
"[org.apache.oodt.cas.filemgr.catalog.lucene.idxPath="
+ indexFilePath);
}
@@ -70,20 +70,20 @@ public class LuceneCatalogFactory implem
validationLayerFactoryClass = System
.getProperty("filemgr.validationLayer.factory",
-
"gov.nasa.jpl.oodt.cas.validation.DataSourceValidationLayerFactory");
+
"org.apache.oodt.cas.validation.DataSourceValidationLayerFactory");
- pageSize =
Integer.getInteger("gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.pageSize",
20).intValue();
+ pageSize =
Integer.getInteger("org.apache.oodt.cas.filemgr.catalog.lucene.pageSize",
20).intValue();
commitLockTimeOut = Long
.getLong(
-
"gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
+
"org.apache.oodt.cas.filemgr.catalog.lucene.commitLockTimeout.seconds",
60).longValue();
writeLockTimeOut = Long
.getLong(
-
"gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
+
"org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds",
60).longValue();
mergeFactor = Integer.getInteger(
-
"gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
+
"org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor", 20)
.intValue();
}
@@ -134,7 +134,7 @@ public class LuceneCatalogFactory implem
/*
* (non-Javadoc)
*
- * @see
gov.nasa.jpl.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
+ * @see
org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
*/
public Catalog createCatalog() {
if (validationLayer == null)
Modified:
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
URL:
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java?rev=1056099&r1=1056098&r2=1056099&view=diff
==============================================================================
---
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
(original)
+++
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java
Thu Jan 6 22:07:42 2011
@@ -41,7 +41,7 @@ import org.apache.oodt.cas.metadata.util
*/
public class MappedDataSourceCatalogFactory extends DataSourceCatalogFactory {
- private static final String TYPE_MAP_KEY = "gov.nasa.jpl.oodt.cas.filemgr."
+ private static final String TYPE_MAP_KEY = "org.apache.oodt.cas.filemgr."
+ "catalog.mappeddatasource.mapFile";
protected String mapFilePath;
@@ -64,7 +64,7 @@ public class MappedDataSourceCatalogFact
/*
* (non-Javadoc)
*
- * @see
gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory#createCatalog()
+ * @see
org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory#createCatalog()
*/
@Override
public Catalog createCatalog() {
