You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2010/07/16 07:33:49 UTC
svn commit: r964686 - in /incubator/oodt/trunk: metadata/pom.xml
metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
pcs/input/pom.xml pom.xml workflow/pom.xml
Author: mattmann
Date: Fri Jul 16 05:33:48 2010
New Revision: 964686
URL: http://svn.apache.org/viewvc?rev=964686&view=rev
Log:
- progress towards OODT-15 One trunk for all OODT components with top level build: fix more projects to include oodt- or cas- prefix; start to work on unit tests for CAS metadata. getting tired, so heading to bed. Will pick it up tomorrow.
Modified:
incubator/oodt/trunk/metadata/pom.xml
incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
incubator/oodt/trunk/pcs/input/pom.xml
incubator/oodt/trunk/pom.xml
incubator/oodt/trunk/workflow/pom.xml
Modified: incubator/oodt/trunk/metadata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/pom.xml?rev=964686&r1=964685&r2=964686&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/pom.xml (original)
+++ incubator/oodt/trunk/metadata/pom.xml Fri Jul 16 05:33:48 2010
@@ -23,11 +23,11 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>2.0</version>
+ <version>${oodt.version}</version>
+ <relativePath>../core/pom.xml</relativePath>
</parent>
- <artifactId>metadata</artifactId>
+ <artifactId>cas-metadata</artifactId>
<name>Catalog and Archive Service Generic Multi-valued Metadata Container</name>
- <version>1.7.0-dev</version>
<description>A Multi-valued, generic Metadata container class. The class uses an internal
Map of string keys pointing to vectors of strings. The data
structure looks like the following:
@@ -85,13 +85,13 @@ the License.
<dependencies>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>commons</artifactId>
- <version>1.2.0-dev</version>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>pcs-input</artifactId>
- <version>1.0-dev</version>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java?rev=964686&r1=964685&r2=964686&view=diff
==============================================================================
--- incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java (original)
+++ incubator/oodt/trunk/metadata/src/test/org/apache/oodt/cas/metadata/preconditions/TestPreCondEvalUtils.java Fri Jul 16 05:33:48 2010
@@ -25,6 +25,8 @@ import java.util.LinkedList;
import org.springframework.context.support.FileSystemXmlApplicationContext;
+import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
+
//Junit imports
import junit.framework.TestCase;
@@ -57,7 +59,7 @@ public class TestPreCondEvalUtils extend
}
public void testEval(){
- File prodFile = new File(MET_EXTR_TEST_FILE);
+ File prodFile = new File(GetReflectionFactoryAction);
try{
assertTrue(this.evalUtils.eval(this.preconditions, prodFile));
}
Modified: incubator/oodt/trunk/pcs/input/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pcs/input/pom.xml?rev=964686&r1=964685&r2=964686&view=diff
==============================================================================
--- incubator/oodt/trunk/pcs/input/pom.xml (original)
+++ incubator/oodt/trunk/pcs/input/pom.xml Fri Jul 16 05:33:48 2010
@@ -24,10 +24,10 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>2.0</version>
+ <version>${oodt.version}</version>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<name>Process Control System Input Data Package</name>
- <version>1.0-dev</version>
<packaging>jar</packaging>
<description>The Process Control System's data handling package. This package contains data structures
and readers and writers to write an input file format similar to HDF, as represented in XML.
@@ -67,8 +67,8 @@ the License.
<dependencies>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>commons</artifactId>
- <version>1.2.0-dev</version>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964686&r1=964685&r2=964686&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 05:33:48 2010
@@ -37,10 +37,11 @@ the License.
<modules>
<module>core</module>
- <!-- broken: <module>commons</module> -->
+ <module>commons</module>
+ <module>pcs/input</module>
+ <!-- broken: <module>metadata</module> -->
<module>xmlquery</module>
<module>sso</module>
- <!-- broken: <module>metadata</module> -->
<!-- broken: <module>filemgr</module> -->
<module>catalog</module>
<module>workflow</module>
Modified: incubator/oodt/trunk/workflow/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/pom.xml?rev=964686&r1=964685&r2=964686&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/pom.xml (original)
+++ incubator/oodt/trunk/workflow/pom.xml Fri Jul 16 05:33:48 2010
@@ -1,17 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt file distributed with this work for
+additional information regarding copyright ownership. The ASF licenses this
+file to you under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+ 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>2.0</version>
+ <version>${oodt.version}</version>
+ <relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-workflow</artifactId>
<name>Catalog and Archive Workflow Management Component</name>
- <version>1.6.0-dev</version>
<description>The workflow management component of a Catalog and Archive Service. This component
purposefully separates workflow repositories and workflow engines standard interfaces, and
provides some out of the box backend implementations of them (including one based
@@ -57,7 +73,7 @@
</descriptors>
<archive>
<manifest>
- <mainClass>gov.nasa.jpl.oodt.cas.resource.system.XmlRpcWorkflowManagerClient</mainClass>
+ <mainClass>org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient</mainClass>
</manifest>
</archive>
</configuration>
@@ -74,29 +90,24 @@
</build>
<dependencies>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-commons</artifactId>
- <version>1.1.1</version>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>1.6.1</version>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-resource</artifactId>
- <version>1.3.1</version>
+ <version>${oodt.version}1</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>edm-commons</artifactId>
- <version>2.2.11-dev</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>