Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManagerFactory.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManagerFactory.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManagerFactory.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/repository/XMLRepositoryManagerFactory.java Thu Jan 6 22:27:26 2011 @@ -51,7 +51,7 @@ public class XMLRepositoryManagerFactory */ public XMLRepositoryManagerFactory() { String productTypeDirUris = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.repositorymgr.dirs"); + .getProperty("org.apache.oodt.cas.filemgr.repositorymgr.dirs"); if (productTypeDirUris != null) { productTypeDirUris = PathUtils @@ -64,7 +64,7 @@ public class XMLRepositoryManagerFactory /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.repository.RepositoryManagerFactory#createRepositoryManager() + * @see org.apache.oodt.cas.filemgr.repository.RepositoryManagerFactory#createRepositoryManager() */ public RepositoryManager createRepositoryManager() { if (productTypeDirList != null) { @@ -81,7 +81,7 @@ public class XMLRepositoryManagerFactory Level.WARNING, "Cannot create XML Repository Manager: no product type dir uris specified: value: " + System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.repositorymgr.dirs")); + .getProperty("org.apache.oodt.cas.filemgr.repositorymgr.dirs")); return null; } }
Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/structs/Reference.java Thu Jan 6 22:27:26 2011 @@ -56,7 +56,7 @@ public class Reference { static { mimeTypeRepository = MimeTypes.buildRepository(PathUtils .replaceEnvVariables(System.getProperty( - "gov.nasa.jpl.oodt.cas.filemgr.mime.type.repository", + "org.apache.oodt.cas.filemgr.mime.type.repository", "mime-types.xml"))); } Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java Thu Jan 6 22:27:26 2011 @@ -118,9 +118,9 @@ public class XmlRpcFileManager { */ public XmlRpcFileManager(int port) throws Exception { // set up the configuration, if there is any - if (System.getProperty("gov.nasa.jpl.oodt.cas.filemgr.properties") != null) { + if (System.getProperty("org.apache.oodt.cas.filemgr.properties") != null) { String configFile = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.properties"); + .getProperty("org.apache.oodt.cas.filemgr.properties"); LOG.log(Level.INFO, "Loading File Manager Configuration Properties from: [" + configFile + "]"); @@ -132,13 +132,13 @@ public class XmlRpcFileManager { metaFactory = System .getProperty("filemgr.catalog.factory", - "gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"); + "org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"); dataFactory = System .getProperty("filemgr.repository.factory", - "gov.nasa.jpl.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory"); + "org.apache.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory"); transferFactory = System .getProperty("filemgr.datatransfer.factory", - "gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory"); + "org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory"); catalog = GenericFileManagerObjectFactory .getCatalogServiceFromFactory(metaFactory); Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java Thu Jan 6 22:27:26 2011 @@ -107,9 +107,9 @@ public class XmlRpcFileManagerClient { */ public XmlRpcFileManagerClient(final URL url) throws ConnectionException { // set up the configuration, if there is any - if (System.getProperty("gov.nasa.jpl.oodt.cas.filemgr.properties") != null) { + if (System.getProperty("org.apache.oodt.cas.filemgr.properties") != null) { String configFile = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.properties"); + .getProperty("org.apache.oodt.cas.filemgr.properties"); LOG.log(Level.INFO, "Loading File Manager Configuration Properties from: [" + configFile + "]"); @@ -136,12 +136,12 @@ public class XmlRpcFileManagerClient { int count) { if (count < Integer .getInteger( - "gov.nasa.jpl.oodt.cas.filemgr.system.xmlrpc.connection.retries", + "org.apache.oodt.cas.filemgr.system.xmlrpc.connection.retries", 3).intValue()) { try { Thread.sleep(Integer .getInteger( - "gov.nasa.jpl.oodt.cas.filemgr.system.xmlrpc.connection.retry.interval.seconds", + "org.apache.oodt.cas.filemgr.system.xmlrpc.connection.retry.interval.seconds", 0).intValue() * 1000); return true; }catch (Exception e1) {} @@ -153,11 +153,11 @@ public class XmlRpcFileManagerClient { CommonsXmlRpcTransport transport = new CommonsXmlRpcTransport(url, client); transport.setConnectionTimeout(Integer .getInteger( - "gov.nasa.jpl.oodt.cas.filemgr.system.xmlrpc.connectionTimeout.minutes", + "org.apache.oodt.cas.filemgr.system.xmlrpc.connectionTimeout.minutes", 20).intValue() * 60 * 1000); transport.setTimeout(Integer .getInteger( - "gov.nasa.jpl.oodt.cas.filemgr.system.xmlrpc.requestTimeout.minutes", + "org.apache.oodt.cas.filemgr.system.xmlrpc.requestTimeout.minutes", 60).intValue() * 60 * 1000); return transport; Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayer.java Thu Jan 6 22:27:26 2011 @@ -71,7 +71,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#addElement(gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#addElement(org.apache.oodt.cas.filemgr.structs.Element) */ public void addElement(Element element) throws ValidationLayerException { Connection conn = null; @@ -156,7 +156,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#modifyElement(gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#modifyElement(org.apache.oodt.cas.filemgr.structs.Element) */ public void modifyElement(Element element) throws ValidationLayerException { Connection conn = null; @@ -216,7 +216,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#removeElement(gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#removeElement(org.apache.oodt.cas.filemgr.structs.Element) */ public void removeElement(Element element) throws ValidationLayerException { Connection conn = null; @@ -274,8 +274,8 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#addElementToProductType(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, - * gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#addElementToProductType(org.apache.oodt.cas.filemgr.structs.ProductType, + * org.apache.oodt.cas.filemgr.structs.Element) */ public void addElementToProductType(ProductType type, Element element) throws ValidationLayerException { @@ -340,8 +340,8 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#removeElementFromProductType(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, - * gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#removeElementFromProductType(org.apache.oodt.cas.filemgr.structs.ProductType, + * org.apache.oodt.cas.filemgr.structs.Element) */ public void removeElementFromProductType(ProductType type, Element element) throws ValidationLayerException { @@ -523,7 +523,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElements(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElements(org.apache.oodt.cas.filemgr.structs.ProductType) */ public List<Element> getElements(ProductType type) throws ValidationLayerException { @@ -653,7 +653,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElements() + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElements() */ public List<Element> getElements() throws ValidationLayerException { Connection conn = null; @@ -721,7 +721,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElementById(java.lang.String) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElementById(java.lang.String) */ public Element getElementById(String elementId) throws ValidationLayerException { @@ -788,7 +788,7 @@ public class DataSourceValidationLayer i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElementByName(java.lang.String) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElementByName(java.lang.String) */ public Element getElementByName(String elementName) throws ValidationLayerException { Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/DataSourceValidationLayerFactory.java Thu Jan 6 22:27:26 2011 @@ -47,24 +47,24 @@ public class DataSourceValidationLayerFa String jdbcUrl = null, user = null, pass = null, driver = null; jdbcUrl = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.validation.datasource.jdbc.url"); + .getProperty("org.apache.oodt.cas.filemgr.validation.datasource.jdbc.url"); user = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.validation.datasource.jdbc.user"); + .getProperty("org.apache.oodt.cas.filemgr.validation.datasource.jdbc.user"); pass = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.validation.datasource.jdbc.pass"); + .getProperty("org.apache.oodt.cas.filemgr.validation.datasource.jdbc.pass"); driver = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.validation.datasource.jdbc.driver"); + .getProperty("org.apache.oodt.cas.filemgr.validation.datasource.jdbc.driver"); dataSource = DatabaseConnectionBuilder.buildDataSource(user, pass, driver, jdbcUrl); quoteFields = Boolean - .getBoolean("gov.nasa.jpl.oodt.cas.filemgr.validation.datasource.quoteFields"); + .getBoolean("org.apache.oodt.cas.filemgr.validation.datasource.quoteFields"); } /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayerFactory#createValidationLayer() + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayerFactory#createValidationLayer() */ public ValidationLayer createValidationLayer() { return new DataSourceValidationLayer(dataSource, quoteFields); Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayer.java Thu Jan 6 22:27:26 2011 @@ -88,7 +88,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#addElement(gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#addElement(org.apache.oodt.cas.filemgr.structs.Element) */ public void addElement(Element element) throws ValidationLayerException { elementMap.put(element.getElementId(), element); @@ -99,7 +99,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#modifyElement(gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#modifyElement(org.apache.oodt.cas.filemgr.structs.Element) */ public void modifyElement(Element element) throws ValidationLayerException { elementMap.put(element.getElementId(), element); @@ -110,7 +110,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#removeElement(gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#removeElement(org.apache.oodt.cas.filemgr.structs.Element) */ public void removeElement(Element element) throws ValidationLayerException { elementMap.remove(element.getElementId()); @@ -121,8 +121,8 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#addElementToProductType(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, - * gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#addElementToProductType(org.apache.oodt.cas.filemgr.structs.ProductType, + * org.apache.oodt.cas.filemgr.structs.Element) */ public void addElementToProductType(ProductType type, Element element) throws ValidationLayerException { @@ -140,8 +140,8 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#removeElementFromProductType(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType, - * gov.nasa.jpl.oodt.cas.filemgr.structs.Element) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#removeElementFromProductType(org.apache.oodt.cas.filemgr.structs.ProductType, + * org.apache.oodt.cas.filemgr.structs.Element) */ public void removeElementFromProductType(ProductType type, Element element) throws ValidationLayerException { @@ -162,7 +162,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElements(gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElements(org.apache.oodt.cas.filemgr.structs.ProductType) */ public List<Element> getElements(ProductType type) throws ValidationLayerException { @@ -185,7 +185,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElements() + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElements() */ public List<Element> getElements() throws ValidationLayerException { return Arrays.asList(elementMap.values().toArray( @@ -195,7 +195,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElementById(java.lang.String) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElementById(java.lang.String) */ public Element getElementById(String elementId) throws ValidationLayerException { @@ -205,7 +205,7 @@ public class XMLValidationLayer implemen /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayer#getElementByName(java.lang.String) + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayer#getElementByName(java.lang.String) */ public Element getElementByName(String elementName) throws ValidationLayerException { Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayerFactory.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayerFactory.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayerFactory.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/validation/XMLValidationLayerFactory.java Thu Jan 6 22:27:26 2011 @@ -48,7 +48,7 @@ public class XMLValidationLayerFactory i */ public XMLValidationLayerFactory() { String dirUris = System - .getProperty("gov.nasa.jpl.oodt.cas.filemgr.validation.dirs"); + .getProperty("org.apache.oodt.cas.filemgr.validation.dirs"); if (dirUris != null) { dirUris = PathUtils.replaceEnvVariables(dirUris); @@ -60,7 +60,7 @@ public class XMLValidationLayerFactory i /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.validation.ValidationLayerFactory#createValidationLayer() + * @see org.apache.oodt.cas.filemgr.validation.ValidationLayerFactory#createValidationLayer() */ public ValidationLayer createValidationLayer() { return new XMLValidationLayer(dirList); Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/BasicVersioner.java Thu Jan 6 22:27:26 2011 @@ -57,7 +57,7 @@ public class BasicVersioner implements V /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.versioning.Versioner#createDataStoreReferences(gov.nasa.jpl.oodt.cas.data.structs.Product) + * @see org.apache.oodt.cas.versioning.Versioner#createDataStoreReferences(org.apache.oodt.cas.data.structs.Product) */ public void createDataStoreReferences(Product product, Metadata metadata) throws VersioningException { Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/DateTimeVersioner.java Thu Jan 6 22:27:26 2011 @@ -67,7 +67,7 @@ public class DateTimeVersioner implement /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.versioning.Versioner#createDataStoreReferences(gov.nasa.jpl. + * @see org.apache.oodt.cas.versioning.Versioner#createDataStoreReferences(gov.nasa.jpl. * oodt.cas.data.structs.Product) */ public void createDataStoreReferences(Product product, Metadata metadata) Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/MetadataBasedFileVersioner.java Thu Jan 6 22:27:26 2011 @@ -67,9 +67,9 @@ public class MetadataBasedFileVersioner /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.versioning.Versioner#createDataStoreReferences(gov.nasa. + * @see org.apache.oodt.cas.filemgr.versioning.Versioner#createDataStoreReferences(gov.nasa. * jpl.oodt.cas.filemgr.structs.Product, - * gov.nasa.jpl.oodt.cas.metadata.Metadata) + * org.apache.oodt.cas.metadata.Metadata) */ public void createDataStoreReferences(Product product, Metadata metadata) throws VersioningException { Modified: oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/SingleFileBasicVersioner.java URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/SingleFileBasicVersioner.java?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/SingleFileBasicVersioner.java (original) +++ oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/versioning/SingleFileBasicVersioner.java Thu Jan 6 22:27:26 2011 @@ -57,9 +57,9 @@ public class SingleFileBasicVersioner im /* * (non-Javadoc) * - * @see gov.nasa.jpl.oodt.cas.filemgr.versioning.Versioner#createDataStoreReferences(gov.nasa. + * @see org.apache.oodt.cas.filemgr.versioning.Versioner#createDataStoreReferences(gov.nasa. * jpl.oodt.cas.filemgr.structs.Product, - * gov.nasa.jpl.oodt.cas.metadata.Metadata) + * org.apache.oodt.cas.metadata.Metadata) */ public void createDataStoreReferences(Product product, Metadata metadata) throws VersioningException { Modified: oodt/branches/wengine-branch/filemgr/src/main/python/fm.conf URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/python/fm.conf?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/python/fm.conf (original) +++ oodt/branches/wengine-branch/filemgr/src/main/python/fm.conf Thu Jan 6 22:27:26 2011 @@ -23,7 +23,7 @@ user = @USER_DB_PATH@ [factories] # There's no need to change anything here unless you really know what you're doing, # and trust me, you don't. Don't take it personally. It's just a fact. -catalog = gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory -repository = gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory -datatransfer = gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory -validation =gov.nasa.jpl.oodt.cas.filemgr.validation.XMLValidationLayerFactory +catalog = org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory +repository = org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory +datatransfer = org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory +validation =org.apache.oodt.cas.filemgr.validation.XMLValidationLayerFactory Modified: oodt/branches/wengine-branch/filemgr/src/main/python/fm.py URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/python/fm.py?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/python/fm.py (original) +++ oodt/branches/wengine-branch/filemgr/src/main/python/fm.py Thu Jan 6 22:27:26 2011 @@ -16,22 +16,22 @@ import sys, os, os.path import getopt, sha, pickle from ConfigParser import ConfigParser -from gov.nasa.jpl.oodt.cas.filemgr.system.auth import SecureWebServer, Dispatcher, Result -from gov.nasa.jpl.oodt.cas.filemgr.datatransfer import TransferStatusTracker -from gov.nasa.jpl.oodt.cas.filemgr.structs import Product -from gov.nasa.jpl.oodt.cas.filemgr.util import GenericFileManagerObjectFactory -from gov.nasa.jpl.oodt.cas.filemgr.util import XmlRpcStructFactory as Structs -from gov.nasa.jpl.oodt.cas.metadata import Metadata +from org.apache.oodt.cas.filemgr.system.auth import SecureWebServer, Dispatcher, Result +from org.apache.oodt.cas.filemgr.datatransfer import TransferStatusTracker +from org.apache.oodt.cas.filemgr.structs import Product +from org.apache.oodt.cas.filemgr.util import GenericFileManagerObjectFactory +from org.apache.oodt.cas.filemgr.util import XmlRpcStructFactory as Structs +from org.apache.oodt.cas.metadata import Metadata from java.lang import Boolean, Double, Integer from java.util import Hashtable, Vector # We choose these default factory classes because it minimizes our dependencies # on heavyweight external packages, like smelly old SQL databases. _defaultFactories = { - 'catalog': 'gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory', - 'repository': 'gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory', - 'datatransfer': 'gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory', - 'validation': 'gov.nasa.jpl.oodt.cas.filemgr.validation.XMLValidationLayerFactory' + 'catalog': 'org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory', + 'repository': 'org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory', + 'datatransfer': 'org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory', + 'validation': 'org.apache.oodt.cas.filemgr.validation.XMLValidationLayerFactory' } # All available permissions. By default, the "root" user will be in the "wheel" @@ -493,11 +493,11 @@ def _setJavaProperties(config): variables! ''' from java.lang import System - System.setProperty('gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.idxPath', config.get('index', 'path')) - System.setProperty('gov.nasa.jpl.oodt.cas.filemgr.catalog.lucene.pageSize', config.get('index', 'pageSize')) - System.setProperty('gov.nasa.jpl.oodt.cas.filemgr.repositorymgr.dirs', config.get('policies', 'repo')) - System.setProperty('gov.nasa.jpl.oodt.cas.filemgr.validation.dirs', config.get('policies', 'validation')) - System.setProperty('gov.nasa.jpl.oodt.cas.filemgr.datatransfer.remote.chunkSize', '1024') + System.setProperty('org.apache.oodt.cas.filemgr.catalog.lucene.idxPath', config.get('index', 'path')) + System.setProperty('org.apache.oodt.cas.filemgr.catalog.lucene.pageSize', config.get('index', 'pageSize')) + System.setProperty('org.apache.oodt.cas.filemgr.repositorymgr.dirs', config.get('policies', 'repo')) + System.setProperty('org.apache.oodt.cas.filemgr.validation.dirs', config.get('policies', 'validation')) + System.setProperty('org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize', '1024') System.setProperty('filemgr.repository.factory', config.get('factories', 'repository')) System.setProperty('filemgr.catalog.factory', config.get('factories', 'catalog')) System.setProperty('filemgr.datatransfer.factory', config.get('factories', 'datatransfer')) Modified: oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-beans.xml URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-beans.xml?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-beans.xml (original) +++ oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-beans.xml Thu Jan 6 22:27:26 2011 @@ -15,12 +15,12 @@ xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";> - <bean id="TestLuceneCatalogBuilder1" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> + <bean id="TestLuceneCatalogBuilder1" class="org.apache.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> <property name="catalogId" value="LuceneCatalog1"/> <property name="catalogName" value="LuceneCatalog1"/> <property name="catalogNamespace" value="TEST"/> <property name="fmCatalogFactory" ref="LuceneCatalogFactory1"/> - <property name="transactionIdClass" value="gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction.UuidTransactionId"/> + <property name="transactionIdClass" value="org.apache.oodt.cas.catalog.struct.impl.transaction.UuidTransactionId"/> <property name="ingestable" value="true"/> <property name="queriable" value="true"/> <property name="supportedProductTypeIds"> @@ -30,12 +30,12 @@ </property> </bean> - <bean id="TestLuceneCatalogBuilder2" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> + <bean id="TestLuceneCatalogBuilder2" class="org.apache.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> <property name="catalogId" value="LuceneCatalog2"/> <property name="catalogName" value="LuceneCatalog2"/> <property name="catalogNamespace" value="TEST"/> <property name="fmCatalogFactory" ref="LuceneCatalogFactory2"/> - <property name="transactionIdClass" value="gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction.UuidTransactionId"/> + <property name="transactionIdClass" value="org.apache.oodt.cas.catalog.struct.impl.transaction.UuidTransactionId"/> <property name="ingestable" value="true"/> <property name="queriable" value="true"/> <property name="supportedProductTypeIds"> @@ -45,7 +45,7 @@ </property> </bean> - <bean id="AbstractPeateCatalogBuilder" abstract="true" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> + <bean id="AbstractPeateCatalogBuilder" abstract="true" class="org.apache.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> <property name="supportedProductTypeIds"> <list> <value type="java.lang.String">urn:npp:MOA_IASI_L1C</value> @@ -65,32 +65,32 @@ </property> </bean> - <bean id="IntDataSourceCatalogBuilder" parent="AbstractPeateCatalogBuilder" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> + <bean id="IntDataSourceCatalogBuilder" parent="AbstractPeateCatalogBuilder" class="org.apache.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> <property name="catalogId" value="PeateIntegrationCatalog"/> <property name="catalogName" value="IntegrationDataSource"/> <property name="catalogNamespace" value="PEATE"/> <property name="fmCatalogFactory" ref="IntDataSourceCatalogFactory"/> - <property name="transactionIdClass" value="gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction.LongTransactionId"/> + <property name="transactionIdClass" value="org.apache.oodt.cas.catalog.struct.impl.transaction.LongTransactionId"/> <property name="ingestable" value="true"/> <property name="queriable" value="true"/> </bean> - <bean id="OpsDataSourceCatalogBuilder" parent="AbstractPeateCatalogBuilder" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> + <bean id="OpsDataSourceCatalogBuilder" parent="AbstractPeateCatalogBuilder" class="org.apache.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> <property name="catalogId" value="PeateOperationsCatalog"/> <property name="catalogName" value="OperationsDataSource"/> <property name="catalogNamespace" value="PEATE"/> <property name="fmCatalogFactory" ref="OpsDataSourceCatalogFactory"/> - <property name="transactionIdClass" value="gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction.LongTransactionId"/> + <property name="transactionIdClass" value="org.apache.oodt.cas.catalog.struct.impl.transaction.LongTransactionId"/> <property name="ingestable" value="false"/> <property name="queriable" value="true"/> </bean> - <bean id="AirsDomCatalogBuilder" parent="AbstractPeateCatalogBuilder" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> + <bean id="AirsDomCatalogBuilder" parent="AbstractPeateCatalogBuilder" class="org.apache.oodt.cas.filemgr.catalog.catalogservice.CatalogBuilder"> <property name="catalogId" value="AirsDomCatalog"/> <property name="catalogName" value="OperationsDom"/> <property name="catalogNamespace" value="AIRS"/> <property name="fmCatalogFactory" ref="DomCatalogFactory"/> - <property name="transactionIdClass" value="gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction.StringTransactionId"/> + <property name="transactionIdClass" value="org.apache.oodt.cas.catalog.struct.impl.transaction.StringTransactionId"/> <property name="ingestable" value="false"/> <property name="queriable" value="true"/> <property name="supportedProductTypeIds"> @@ -98,7 +98,7 @@ </property> </bean> - <bean id="AbstractDataSourceCatalogFactory" abstract="true" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"> + <bean id="AbstractDataSourceCatalogFactory" abstract="true" class="org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"> <!-- set to true to quote field values --> <property name="fieldIdStr"> @@ -117,7 +117,7 @@ </bean> - <bean id="IntDataSourceCatalogFactory" parent="AbstractDataSourceCatalogFactory" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"> + <bean id="IntDataSourceCatalogFactory" parent="AbstractDataSourceCatalogFactory" class="org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"> <!-- SQL datasource config --> <property name="jdbcUrl" value="jdbc:oracle:thin:@dew.jpl.nasa.gov:1521:npptest"/> <property name="user" value="nppint"/> @@ -125,7 +125,7 @@ <property name="driver" value="oracle.jdbc.driver.OracleDriver"/> </bean> - <bean id="OpsDataSourceCatalogFactory" parent="AbstractDataSourceCatalogFactory" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"> + <bean id="OpsDataSourceCatalogFactory" parent="AbstractDataSourceCatalogFactory" class="org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory"> <!-- SQL datasource config --> <property name="jdbcUrl" value="jdbc:oracle:thin:@dew.jpl.nasa.gov:1521:nppops"/> <property name="user" value="nppops"/> @@ -133,7 +133,7 @@ <property name="driver" value="oracle.jdbc.driver.OracleDriver"/> </bean> - <bean id="AbstractLuceneCatalogFactory" abstract="true" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory"> + <bean id="AbstractLuceneCatalogFactory" abstract="true" class="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory"> <!-- Path to index file --> <property name="indexFilePath"> @@ -162,7 +162,7 @@ </bean> - <bean id="LuceneCatalogFactory1" parent="AbstractLuceneCatalogFactory" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory"> + <bean id="LuceneCatalogFactory1" parent="AbstractLuceneCatalogFactory" class="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory"> <!-- Path to index file --> <property name="indexFilePath"> @@ -171,7 +171,7 @@ </bean> - <bean id="LuceneCatalogFactory2" parent="AbstractLuceneCatalogFactory" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory"> + <bean id="LuceneCatalogFactory2" parent="AbstractLuceneCatalogFactory" class="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory"> <!-- Path to index file --> <property name="indexFilePath"> @@ -180,7 +180,7 @@ </bean> - <bean id="DomCatalogFactory" class="gov.nasa.jpl.oodt.cas.filemgr.catalog.DomCatalogFactory"> + <bean id="DomCatalogFactory" class="org.apache.oodt.cas.filemgr.catalog.DomCatalogFactory"> <!-- DOM server --> <property name="serverUrl" value="http://airs-dom:0"/> Modified: oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-service-beans.xml URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-service-beans.xml?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-service-beans.xml (original) +++ oodt/branches/wengine-branch/filemgr/src/main/resources/examples/catalog-service-beans.xml Thu Jan 6 22:27:26 2011 @@ -15,7 +15,7 @@ xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";> - <bean class="gov.nasa.jpl.oodt.cas.catalog.util.CasPropertyPlaceholderConfigurer"> + <bean class="org.apache.oodt.cas.catalog.util.CasPropertyPlaceholderConfigurer"> <!-- Allow for system-level properties to override all properties below --> <property name="systemPropertiesMode" value="2"/> @@ -34,50 +34,50 @@ </bean> <!-- Catalog Services --> - <bean id="CatalogServiceLocalFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceLocalFactory"/> - <bean id="DevCatalogServiceLocalFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceLocalFactory"> + <bean id="CatalogServiceLocalFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.system.impl.CatalogServiceLocalFactory"/> + <bean id="DevCatalogServiceLocalFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.system.impl.CatalogServiceLocalFactory"> <property name="catalogRepositoryFactory" ref="SerializedCatalogRepositoryFactory"/> <property name="ingestMapperFactory" ref="OracleIngestMapperFactory"/> <property name="restrictQueryPermissions" value="false"/> <property name="restrictIngestPermissions" value="false"/> - <property name="transactionIdClass" value="gov.nasa.jpl.oodt.cas.catalog.struct.impl.transaction.UuidTransactionId"/> + <property name="transactionIdClass" value="org.apache.oodt.cas.catalog.struct.impl.transaction.UuidTransactionId"/> </bean> - <bean id="CatalogServiceClientFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClientFactory"> + <bean id="CatalogServiceClientFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.system.impl.CatalogServiceClientFactory"> <property name="communicationChannelClient" ref="XmlRpcClientFactory"/> </bean> - <bean id="CatalogServiceProxyClientFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.system.impl.CatalogServiceClientFactory"> + <bean id="CatalogServiceProxyClientFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.system.impl.CatalogServiceClientFactory"> <property name="communicationChannelClient" ref="XmlRpcProxyClientFactory"/> </bean> <!-- Communication Channels --> - <bean id="XmlRpcServerFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelServerFactory"> + <bean id="XmlRpcServerFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelServerFactory"> <property name="port" value="${filemgr.port}"/> <property name="catalogServiceFactory" ref="CatalogServiceLocalFactory"/> </bean> - <bean id="XmlRpcClientFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelClientFactory"> + <bean id="XmlRpcClientFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelClientFactory"> <property name="serverUrl" value="${filemgr.url}"/> </bean> - <bean id="XmlRpcProxyServerFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelServerFactory"> + <bean id="XmlRpcProxyServerFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelServerFactory"> <property name="port" value="${filemgr.proxy.port}"/> <property name="catalogServiceFactory" ref="CatalogServiceClientFactory"/> </bean> - <bean id="XmlRpcProxyClientFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelClientFactory"> + <bean id="XmlRpcProxyClientFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.server.channel.xmlrpc.XmlRpcCommunicationChannelClientFactory"> <property name="serverUrl" value="${filemgr.proxy.url}"/> </bean> <!-- Catalog Repositories --> - <bean id="SerializedCatalogRepositoryFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.repository.SerializedCatalogRepositoryFactory"> + <bean id="SerializedCatalogRepositoryFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.repository.SerializedCatalogRepositoryFactory"> <property name="storageFile" value="${pcs.support.home}/cas-catalog/catalog-repo.ser"/> </bean> - <bean id="MemoryBasedCatalogRepositoryFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.repository.MemoryBasedCatalogRepositoryFactory"/> + <bean id="MemoryBasedCatalogRepositoryFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.repository.MemoryBasedCatalogRepositoryFactory"/> <!-- Mapper Indexes --> - <bean id="OracleIngestMapperFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.mapping.OracleIngestMapperFactory"> + <bean id="OracleIngestMapperFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.mapping.OracleIngestMapperFactory"> <property name="jdbcUrl" value="jdbc:oracle:thin:@dew.jpl.nasa.gov:1521:npptest"/> <property name="user" value="user"/> <property name="pass" value="pass"/> <property name="driver" value="oracle.jdbc.driver.OracleDriver"/> </bean> - <bean id="MemoryBasedIngestMapperFactory" lazy-init="true" class="gov.nasa.jpl.oodt.cas.catalog.mapping.MemoryBasedIngestMapperFactory"/> + <bean id="MemoryBasedIngestMapperFactory" lazy-init="true" class="org.apache.oodt.cas.catalog.mapping.MemoryBasedIngestMapperFactory"/> </beans> Modified: oodt/branches/wengine-branch/filemgr/src/main/resources/examples/product-types.xml URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/resources/examples/product-types.xml?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/main/resources/examples/product-types.xml (original) +++ oodt/branches/wengine-branch/filemgr/src/main/resources/examples/product-types.xml Thu Jan 6 22:27:26 2011 @@ -2,7 +2,7 @@ <cas:producttypes xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas";> <type id="urn:oodt:GenericFile" name="GenericFile"> <repository path="file://[HOME]/files"/> - <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/> + <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/> <!-- You can optionally specify a 'trim' tag to identify whether or not you want newlines trimmed from the product type description. To @@ -12,7 +12,7 @@ <description>The default product type for any kind of file.</description> <metExtractors> <extractor - class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor"> + class="org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor"> <configuration> <!-- you can optionally include the envReplace tag to turn on/off environment var replacement --> <property name="nsAware" value="false" /> @@ -21,12 +21,12 @@ value="ProductReceivedTime" /> </configuration> </extractor> - <extractor class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" /> + <extractor class="org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" /> </metExtractors> </type> <type id="urn:test:TestType" name="TestType"> <repository path="file://[HOME]/files"/> - <versioner class="gov.nasa.jpl.oodt.cas.filemgr.versioning.BasicVersioner"/> + <versioner class="org.apache.oodt.cas.filemgr.versioning.BasicVersioner"/> <!-- You can optionally specify a 'trim' tag to identify whether or not you want newlines trimmed from the product type description. To @@ -36,7 +36,7 @@ <description>The default product type for any kind of file.</description> <metExtractors> <extractor - class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor"> + class="org.apache.oodt.cas.filemgr.metadata.extractors.CoreMetExtractor"> <configuration> <!-- you can optionally include the envReplace tag to turn on/off environment var replacement --> <property name="nsAware" value="false" /> @@ -45,7 +45,7 @@ value="ProductReceivedTime" /> </configuration> </extractor> - <extractor class="gov.nasa.jpl.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" /> + <extractor class="org.apache.oodt.cas.filemgr.metadata.extractors.examples.MimeTypeExtractor" /> </metExtractors> </type> </cas:producttypes> Modified: oodt/branches/wengine-branch/filemgr/src/site/xdoc/user/index.xml URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/site/xdoc/user/index.xml?rev=1056103&r1=1056102&r2=1056103&view=diff ============================================================================== --- oodt/branches/wengine-branch/filemgr/src/site/xdoc/user/index.xml (original) +++ oodt/branches/wengine-branch/filemgr/src/site/xdoc/user/index.xml Thu Jan 6 22:27:26 2011 @@ -366,7 +366,7 @@ extension point, and the local data transfer interface. These defaults can be changed quite easily by changing the factory classes that are pointed to for each extension point. For example, to use the Lucene-based cataog extension point, you would change - the following property, <code>filemgr.catalog.factory</code> to <code>gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory</code> + the following property, <code>filemgr.catalog.factory</code> to <code>org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory</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: @@ -411,22 +411,22 @@ <source># ./filemgr-client --url http://localhost:9000 --operation --ingestProduct --productName Blah.txt \ --productStructure Flat --productTypeName GenericFile --metadataFile file:/usr/local/filemgr/bin/blah.txt.met \ - --clientTransfer --dataTransfer gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory \ + --clientTransfer --dataTransfer org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory \ --refs file:/usr/local/filemgr/bin/blah.txt </source> <p>You should see a response message at the end similar to:</p> <source> - Jul 15, 2006 10:37:53 PM gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient <init><br/> + Jul 15, 2006 10:37:53 PM org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient <init><br/> INFO: Loading File Manager Configuration Properties from: [../etc/filemgr.properties]<br/> - Jul 15, 2006 10:37:54 PM gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient ingestProduct<br/> + Jul 15, 2006 10:37:54 PM org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient ingestProduct<br/> FINEST: File Manager Client: clientTransfer enabled: transfering product [Blah.txt]<br/> - Jul 15, 2006 10:37:54 PM gov.nasa.jpl.oodt.cas.filemgr.versioning.VersioningUtils <br/> + Jul 15, 2006 10:37:54 PM org.apache.oodt.cas.filemgr.versioning.VersioningUtils <br/> createBasicDataStoreRefsFlat<br/> FINE: VersioningUtils: Generated data store ref: file:/tmp/files/Blah.txt/blah.txt from<br/> origRef: file:/usr/local/filemgr/bin/blah.txt<br/> - Jul 15, 2006 10:37:54 PM gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferer <br/> + Jul 15, 2006 10:37:54 PM org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferer <br/> moveFilesToProductRepo<br/> INFO: LocalDataTransfer: Moving File: file:/usr/local/filemgr/bin/blah.txt to <br/> file:/tmp/files/Blah.txt/blah.txt<br/> @@ -475,26 +475,26 @@ <table> <tr> <td>filemgr.catalog.factory</td> - <td>gov.nasa.jpl.oodt.cas.filemgr.catalog.DataSourceCatalogFactory<br/> - gov.nasa.jpl.oodt.cas.filemgr.catalog.LuceneCatalogFactory + <td>org.apache.oodt.cas.filemgr.catalog.DataSourceCatalogFactory<br/> + org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory </td> </tr> <tr> <td>filemgr.repository.factory</td> - <td>gov.nasa.jpl.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory<br/> - gov.nasa.jpl.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory + <td>org.apache.oodt.cas.filemgr.repository.DataSourceRepositoryManagerFactory<br/> + org.apache.oodt.cas.filemgr.repository.XMLRepositoryManagerFactory </td> </tr> <tr> <td>filemgr.datatransfer.factory</td> - <td>gov.nasa.jpl.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory<br/> - gov.nasa.jpl.oodt.cas.filemgr.datatransfer.RemoteDataTransferFactory<br/> - gov.nasa.jpl.oodt.cas.filemgr.datatransfer.InPlaceDataTransferFactory + <td>org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory<br/> + org.apache.oodt.cas.filemgr.datatransfer.RemoteDataTransferFactory<br/> + org.apache.oodt.cas.filemgr.datatransfer.InPlaceDataTransferFactory </td> </tr> <tr> <td>filemgr.validationLayer.factory</td> - <td>gov.nasa.jpl.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory<br/> + <td>org.apache.oodt.cas.filemgr.validation.DataSourceValidationLayerFactory<br/> gov.nassa.jpl.oodt.cas.filemgr.validation.XMLValidationLayerFactory </td> </tr>
