You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ke...@apache.org on 2010/07/16 05:00:31 UTC
svn commit: r964663 [5/5] - in /incubator/oodt/trunk: ./ commons/
commons/src/main/java/org/apache/oodt/commons/date/ core/
crawler/src/main/java/org/apache/oodt/cas/crawl/
crawler/src/main/java/org/apache/oodt/cas/crawl/action/
crawler/src/main/java/o...
Added: incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java?rev=964663&view=auto
==============================================================================
--- incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java (added)
+++ incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEConfigFileWriterTest.java Fri Jul 16 03:00:26 2010
@@ -0,0 +1,83 @@
+// 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.
+
+package org.apache.oodt.pcs.input;
+
+//OODT imports
+import org.apache.oodt.commons.xml.XMLUtils;
+
+//JDK imports
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import org.w3c.dom.Document;
+
+//Junit imports
+import junit.framework.TestCase;
+
+/**
+ * <p>
+ * A Testcase for the PGEConfigFileWriter.
+ * </p>
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class PGEConfigFileWriterTest extends TestCase {
+
+ private PGEConfigurationFile configFile = null;
+
+ private PGEConfigFileWriter configFileWriter = null;
+
+ /**
+ *
+ */
+ public PGEConfigFileWriterTest() {
+ configFile = new PGEConfigurationFile();
+ configFileWriter = new PGEConfigFileWriter(configFile);
+ }
+
+ public void testWriteRead() {
+ configFile.setPgeName(new PGEScalar("PGEName", "fts_sliceipp"));
+
+ Document configFileDoc = null;
+
+ try {
+ configFileDoc = configFileWriter.getConfigFileXml();
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ XMLUtils.writeXmlToStream(configFileDoc, out);
+
+ ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+ PGEConfigFileReader reader = new PGEConfigFileReader();
+
+ PGEConfigurationFile readConfigFile = null;
+
+ try {
+ readConfigFile = reader.read(in);
+ } catch (PGEConfigFileException e) {
+ fail(e.getMessage());
+ }
+
+ assertNotNull(readConfigFile);
+ assertEquals("fts_sliceipp", readConfigFile.getPgeName().getValue());
+
+ }
+
+}
Added: incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java?rev=964663&view=auto
==============================================================================
--- incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java (added)
+++ incubator/oodt/trunk/pcs-input/src/test/org/apache/oodt/pcs/input/PGEDataHandlerTest.java Fri Jul 16 03:00:26 2010
@@ -0,0 +1,99 @@
+// 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.
+
+package org.apache.oodt.pcs.input;
+
+//JDK imports
+import java.io.File;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+//Junit imports
+import junit.framework.TestCase;
+
+/**
+ * <p>
+ * Test suite for the {@link PGEDataHandler}
+ * </p>
+ * .
+ *
+ * @author mattmann
+ * @version $Revision$
+ *
+ */
+public class PGEDataHandlerTest extends TestCase {
+
+ private static final String testFilePath = "./src/main/resources/pge-data-sax-example.xml";
+
+ private static final String expectedVecValSixthElement = "5.462772487746047e-18";
+
+ public void testGetScalars() {
+ PGEDataHandler handler = new PGEDataHandler();
+ doParse(handler);
+ assertNotNull(handler.getScalars());
+ assertNotNull(handler.getScalars().keySet());
+ assertEquals(1, handler.getScalars().keySet().size());
+ assertTrue(handler.getScalars().containsKey("foo"));
+ assertNotNull(handler.getScalars().entrySet());
+ PGEScalar scalar = (PGEScalar) handler.getScalars().get("foo");
+ assertEquals("bar", scalar.getValue());
+
+ }
+
+ public void testGetMatrices() {
+ PGEDataHandler handler = new PGEDataHandler();
+ doParse(handler);
+ assertNotNull(handler.getMatrices());
+ assertNotNull(handler.getMatrices().keySet());
+ assertEquals(1, handler.getMatrices().keySet().size());
+ assertTrue(handler.getMatrices().containsKey("foomatrix"));
+ PGEMatrix matrix = (PGEMatrix) handler.getMatrices().get("foomatrix");
+ assertNotNull(matrix);
+ assertEquals(2, matrix.getNumCols());
+ assertEquals(2, matrix.getRows().size());
+ assertEquals("194", matrix.getValue(0, 0));
+ assertEquals("2.2", matrix.getValue(1, 1));
+ }
+
+ public void testGetVectors() {
+ PGEDataHandler handler = new PGEDataHandler();
+ doParse(handler);
+ assertNotNull(handler.getVectors());
+ assertNotNull(handler.getVectors().keySet());
+ assertEquals(1, handler.getVectors().keySet().size());
+ assertTrue(handler.getVectors().containsKey(
+ "solar_degrad_stddev_pixel_strong_co2"));
+ PGEVector vec = (PGEVector) handler.getVectors().get(
+ "solar_degrad_stddev_pixel_strong_co2");
+ assertNotNull(vec);
+ assertEquals(expectedVecValSixthElement, vec.getElements().get(5));
+
+ }
+
+ private void doParse(PGEDataHandler handler) {
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ try {
+ // Parse the input
+ SAXParser saxParser = factory.newSAXParser();
+ saxParser.parse(new File(testFilePath), handler);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("exception reading data out of: [" + testFilePath + "]: Message: "
+ + e.getMessage());
+ }
+
+ }
+
+}
Propchange: incubator/oodt/trunk/pge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 03:00:26 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java (original)
+++ incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java Fri Jul 16 03:00:26 2010
@@ -44,7 +44,7 @@ import org.apache.oodt.cas.crawl.StdProd
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.SerializableMetadata;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.exec.ExecUtils;
+import org.apache.oodt.commons.exec.ExecUtils;
import org.apache.oodt.cas.pge.config.DynamicConfigFile;
import org.apache.oodt.cas.pge.config.OutputDir;
import org.apache.oodt.cas.pge.config.PgeConfig;
Modified: incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java (original)
+++ incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/config/XmlFilePgeConfigBuilder.java Fri Jul 16 03:00:26 2010
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.filemgr.util.QueryUtils;
import org.apache.oodt.cas.filemgr.util.SqlParser;
Modified: incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/query/conv/DateVersionConverter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/query/conv/DateVersionConverter.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/query/conv/DateVersionConverter.java (original)
+++ incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/query/conv/DateVersionConverter.java Fri Jul 16 03:00:26 2010
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.pge.query.conv;
//OODT imports
-import org.apache.oodt.cas.commons.date.DateUtils;
+import org.apache.oodt.commons.date.DateUtils;
import org.apache.oodt.cas.filemgr.structs.query.conv.VersionConverter;
//JDK imports
Modified: incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java (original)
+++ incubator/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/writers/metlist/MetadataListPcsMetFileWriter.java Fri Jul 16 03:00:26 2010
@@ -30,7 +30,7 @@ import org.w3c.dom.NodeList;
//OODT imports
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.pge.writers.PcsMetFileWriter;
/**
Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 03:00:26 2010
@@ -37,9 +37,25 @@ the License.
<modules>
<module>core</module>
- <module>mvn/skin</module>
+ <!-- broken: <module>commons</module> -->
+ <module>xmlquery</module>
+ <module>sso</module>
+ <!-- broken: <module>metadata</module> -->
+ <!-- broken: <module>filemgr</module> -->
+ <module>catalog</module>
+ <module>workflow</module>
+ <module>crawler</module>
+ <module>resource</module>
+ <module>curator</module>
+ <module>pge</module>
+ <module>mvn/plugins/cas-install</module>
+ <module>pushpull</module>
<module>product</module>
- <!-- TODO: Add the rest of the modules! -->
+ <module>profile</module>
+ <module>query</module>
+ <module>webapp/filemgr</module>
+ <module>webapp/fmprod</module>
+ <module>webapp/workflow</module>
+ <!-- broken: <module>app/fmbrowser</module> -->
</modules>
-
</project>
Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ParserInfo.java Fri Jul 16 03:00:26 2010
@@ -33,7 +33,7 @@ import org.apache.oodt.cas.pushpull.exce
import org.apache.oodt.cas.pushpull.filerestrictions.Parser;
import org.apache.oodt.cas.pushpull.retrievalmethod.RetrievalMethod;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
/**
*
Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/ProtocolInfo.java Fri Jul 16 03:00:26 2010
@@ -22,7 +22,7 @@ package org.apache.oodt.cas.pushpull.con
import org.apache.oodt.cas.pushpull.exceptions.ConfigException;
import org.apache.oodt.cas.pushpull.protocol.ProtocolFactory;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java (original)
+++ incubator/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/config/RemoteSpecs.java Fri Jul 16 03:00:26 2010
@@ -25,7 +25,7 @@ import org.apache.oodt.cas.pushpull.file
import org.apache.oodt.cas.pushpull.objectfactory.PushPullObjectFactory;
import org.apache.oodt.cas.pushpull.protocol.RemoteSite;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/AssignmentMonitor.java Fri Jul 16 03:00:26 2010
@@ -39,7 +39,7 @@ import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.resource.util.XmlStructFactory;
import org.apache.oodt.cas.resource.structs.ResourceNode;
import org.apache.oodt.cas.resource.structs.exceptions.MonitorException;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java Fri Jul 16 03:00:26 2010
@@ -40,7 +40,7 @@ import org.w3c.dom.NodeList;
import org.apache.oodt.cas.resource.jobqueue.JobQueue;
import org.apache.oodt.cas.resource.monitor.Monitor;
import org.apache.oodt.cas.resource.batchmgr.Batchmgr;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.resource.structs.JobSpec;
import org.apache.oodt.cas.resource.structs.ResourceNode;
import org.apache.oodt.cas.resource.structs.exceptions.JobExecutionException;
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/JobBuilder.java Fri Jul 16 03:00:26 2010
@@ -25,7 +25,7 @@ import java.io.FileInputStream;
import org.w3c.dom.Document;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.resource.structs.JobSpec;
/**
Modified: incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java (original)
+++ incubator/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlStructFactory.java Fri Jul 16 03:00:26 2010
@@ -29,7 +29,7 @@ import org.w3c.dom.NodeList;
import org.w3c.dom.Element;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.resource.structs.Job;
import org.apache.oodt.cas.resource.structs.JobInput;
import org.apache.oodt.cas.resource.structs.JobSpec;
Propchange: incubator/oodt/trunk/sso/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 03:00:26 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DataUtils.java Fri Jul 16 03:00:26 2010
@@ -23,7 +23,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.metadata.Metadata;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.ByteArrayInputStream;
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReader.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFConfigReader.java Fri Jul 16 03:00:26 2010
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.product.rdf;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import static org.apache.oodt.cas.product.rdf.RDFConfigReaderMetKeys.*;
//JDK imports
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java Fri Jul 16 03:00:26 2010
@@ -48,7 +48,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
/**
*
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFProductServlet.java Fri Jul 16 03:00:26 2010
@@ -51,7 +51,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.metadata.Metadata;
/**
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFUtils.java Fri Jul 16 03:00:26 2010
@@ -21,7 +21,7 @@ package org.apache.oodt.cas.product.rdf;
//OODT imports
import static org.apache.oodt.cas.product.rdf.RDFConfigMetKeys.RDF_CONTEXT_CONF_KEY;
import org.apache.oodt.cas.metadata.util.PathUtils;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReader.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSConfigReader.java Fri Jul 16 03:00:26 2010
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.product.rss;
//OODT imports
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java Fri Jul 16 03:00:26 2010
@@ -54,7 +54,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.Reference;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.metadata.Metadata;
import jpl.eda.util.DateConvert;
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductTransferServlet.java Fri Jul 16 03:00:26 2010
@@ -51,7 +51,7 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.exceptions.ConnectionException;
import org.apache.oodt.cas.filemgr.structs.FileTransferStatus;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.metadata.Metadata;
import jpl.eda.util.DateConvert;
Modified: incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java (original)
+++ incubator/oodt/trunk/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSUtils.java Fri Jul 16 03:00:26 2010
@@ -20,7 +20,7 @@ package org.apache.oodt.cas.product.rss;
//OODT imports
import static org.apache.oodt.cas.product.rss.RSSConfigMetKeys.RSS_CONTEXT_CONF_KEY;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.XMLUtils;
import org.apache.oodt.cas.metadata.Metadata;
import org.apache.oodt.cas.metadata.util.PathUtils;
Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/AbstractPaginatibleInstanceRepository.java Fri Jul 16 03:00:26 2010
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
import org.apache.oodt.cas.workflow.structs.WorkflowInstance;
import org.apache.oodt.cas.workflow.structs.WorkflowInstancePage;
import org.apache.oodt.cas.workflow.structs.exceptions.InstanceRepositoryException;
-import org.apache.oodt.cas.commons.pagination.PaginationUtils;
+import org.apache.oodt.commons.pagination.PaginationUtils;
/**
* @author mattmann
Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/WorkflowInstanceMetadataReader.java Fri Jul 16 03:00:26 2010
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.workflow.webapp.util;
//OODT imports
-import org.apache.oodt.cas.commons.xml.DOMUtil;
+import org.apache.oodt.commons.xml.DOMUtil;
//JDK imports
import java.io.File;
Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java?rev=964663&r1=964662&r2=964663&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecyclesReader.java Fri Jul 16 03:00:26 2010
@@ -19,8 +19,8 @@
package org.apache.oodt.cas.workflow.lifecycle;
//OODT imports
-import org.apache.oodt.cas.commons.xml.DOMUtil;
-import org.apache.oodt.cas.commons.xml.XMLUtils;
+import org.apache.oodt.commons.xml.DOMUtil;
+import org.apache.oodt.commons.xml.XMLUtils;
//JDK imports
import java.io.File;