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 2015/10/06 12:39:11 UTC
[01/15] oodt git commit: Create a branch to revamp OODT dependency
management
Repository: oodt
Updated Branches:
refs/heads/master 53e3477e2 -> be35c7898
Create a branch to revamp OODT dependency management
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1696489 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/58391832
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/58391832
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/58391832
Branch: refs/heads/master
Commit: 58391832b2bd7379b155213da643277033b483d8
Parents: f91720d
Author: Tom Barber <ma...@apache.org>
Authored: Tue Aug 18 19:50:00 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Tue Aug 18 19:50:00 2015 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/15] oodt git commit: OODT-839 add comment to the poms explaining
how it works
Posted by ma...@apache.org.
OODT-839 add comment to the poms explaining how it works
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/9e5af9f9
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/9e5af9f9
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/9e5af9f9
Branch: refs/heads/master
Commit: 9e5af9f947ed2e5c6942eb2608c11f6760c70702
Parents: 2af8305
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sat Oct 3 00:24:20 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sat Oct 3 00:24:20 2015 +0100
----------------------------------------------------------------------
app/fmbrowser/pom.xml | 19 +++++++++++++++++++
app/weditor/pom.xml | 19 +++++++++++++++++++
catalog/pom.xml | 19 +++++++++++++++++++
cli/pom.xml | 19 +++++++++++++++++++
commons/pom.xml | 19 +++++++++++++++++++
core/pom.xml | 19 +++++++++++++++++++
crawler/pom.xml | 19 +++++++++++++++++++
curator/services/pom.xml | 19 +++++++++++++++++++
curator/webapp/pom.xml | 19 +++++++++++++++++++
filemgr/pom.xml | 19 +++++++++++++++++++
grid/pom.xml | 19 +++++++++++++++++++
metadata/pom.xml | 19 +++++++++++++++++++
opendapps/pom.xml | 19 +++++++++++++++++++
pcs/core/pom.xml | 19 +++++++++++++++++++
pcs/input/pom.xml | 19 +++++++++++++++++++
pcs/opsui/pom.xml | 19 +++++++++++++++++++
pcs/services/pom.xml | 19 +++++++++++++++++++
pge/pom.xml | 19 +++++++++++++++++++
product/pom.xml | 19 +++++++++++++++++++
profile/pom.xml | 19 +++++++++++++++++++
protocol/api/pom.xml | 19 +++++++++++++++++++
protocol/ftp/pom.xml | 19 +++++++++++++++++++
protocol/http/pom.xml | 19 +++++++++++++++++++
protocol/imaps/pom.xml | 19 +++++++++++++++++++
protocol/sftp/pom.xml | 19 +++++++++++++++++++
pushpull/pom.xml | 19 +++++++++++++++++++
resource/pom.xml | 19 +++++++++++++++++++
sso/pom.xml | 19 +++++++++++++++++++
webapp/components/pom.xml | 19 +++++++++++++++++++
webapp/fmbrowser/pom.xml | 19 +++++++++++++++++++
webapp/fmprod/pom.xml | 19 +++++++++++++++++++
webapp/wmonitor/pom.xml | 19 +++++++++++++++++++
workflow/pom.xml | 19 +++++++++++++++++++
xmlps/pom.xml | 19 +++++++++++++++++++
xmlquery/pom.xml | 19 +++++++++++++++++++
35 files changed, 665 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/app/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/app/fmbrowser/pom.xml b/app/fmbrowser/pom.xml
index 543ae1c..95cffce 100644
--- a/app/fmbrowser/pom.xml
+++ b/app/fmbrowser/pom.xml
@@ -29,6 +29,25 @@ the License.
provides the user of the CAS File Manager with a graphical environment in which they
can view archived products' metadata, query for products with particular metadata,
and export results of queries to the MS Excel(c) file format.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+-->
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/app/weditor/pom.xml
----------------------------------------------------------------------
diff --git a/app/weditor/pom.xml b/app/weditor/pom.xml
index ab0366e..7eab38c 100644
--- a/app/weditor/pom.xml
+++ b/app/weditor/pom.xml
@@ -26,6 +26,25 @@ the License.
<artifactId>weditor</artifactId>
<name>Catalog and Archive Workflow Management GUI Editor</name>
<description>Apache OODT Workflow Editor GUI</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>jgraph</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/catalog/pom.xml b/catalog/pom.xml
index f8c843b..86b00d2 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -29,6 +29,25 @@
catalogs for use in the CAS system. Heterogeneous catalog models
are mapped to a common dictionary, and then integrated locally so that
they may be queried across and ingested into.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index b2639b5..610bcff 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -28,6 +28,25 @@
</parent>
<artifactId>cas-cli</artifactId>
<name>CAS Command Line Interface</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 14267d0..16b091b 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -28,6 +28,25 @@
<packaging>jar</packaging>
<name>Common Utilities</name>
<description>Apache OODT Common Utilities Project</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-collections</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d6f0f9a..403b32b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,6 +40,25 @@ the License.
<wicket.version>1.4.17</wicket.version>
<jetty.version>6.1.25</jetty.version>
</properties>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencyManagement>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/crawler/pom.xml
----------------------------------------------------------------------
diff --git a/crawler/pom.xml b/crawler/pom.xml
index a6d7f7c..7f51275 100644
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -27,6 +27,25 @@ the License.
<artifactId>cas-crawler</artifactId>
<name>Catalog and Archive Crawling Framework</name>
<description>The Catalog and Archive Service Crawling Framework.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/curator/services/pom.xml
----------------------------------------------------------------------
diff --git a/curator/services/pom.xml b/curator/services/pom.xml
index 5b7a43a..b7b2e9b 100644
--- a/curator/services/pom.xml
+++ b/curator/services/pom.xml
@@ -27,6 +27,25 @@ the License.
<packaging>war</packaging>
<name>CAS Curation Web Services</name>
<description>Services for ingesting files into the file manager and iteratively extracting metadata.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/curator/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/curator/webapp/pom.xml b/curator/webapp/pom.xml
index fb0eafe..9a21e1b 100644
--- a/curator/webapp/pom.xml
+++ b/curator/webapp/pom.xml
@@ -30,6 +30,25 @@ the License.
<properties>
<wicket.version>1.4.17</wicket.version>
</properties>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/filemgr/pom.xml
----------------------------------------------------------------------
diff --git a/filemgr/pom.xml b/filemgr/pom.xml
index c05633c..1079200 100644
--- a/filemgr/pom.xml
+++ b/filemgr/pom.xml
@@ -30,6 +30,25 @@
provides some out of the box backend implementations of them (including one based
on the javax.sql.DataSource interface). This component provides everything that you need
to catalog, archive and manage files, and directories, and their associated metadata.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/grid/pom.xml
----------------------------------------------------------------------
diff --git a/grid/pom.xml b/grid/pom.xml
index 07dbbff..6c9aa02 100644
--- a/grid/pom.xml
+++ b/grid/pom.xml
@@ -57,6 +57,25 @@ the License.
profiles. Further, it provides a password-protected mechanism to
add new sets of product and profile query handlers, enabling
seamless activation of additional capabilities.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
index 2630183..48187a8 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -36,6 +36,25 @@ the License.
container. Since all values are stored internally as string vectors, the difference
between a scalar value and a non-scalar is handled by determining whether the list of
values for a particular key is greater than 1.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/opendapps/pom.xml
----------------------------------------------------------------------
diff --git a/opendapps/pom.xml b/opendapps/pom.xml
index 59e8b8d..f2703f1 100644
--- a/opendapps/pom.xml
+++ b/opendapps/pom.xml
@@ -29,6 +29,25 @@
implementation that easily connects to OPeNDAP data sources. Connections
are configured via an XML configuration file, providing information on how
to extract and translate datasets from OPeNDAP and THREDDS into OODT profiles.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>edu.ucar</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/pcs/core/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/core/pom.xml b/pcs/core/pom.xml
index 67ed78b..2c70984 100644
--- a/pcs/core/pom.xml
+++ b/pcs/core/pom.xml
@@ -29,6 +29,25 @@ the License.
<name>Process Control System Core Package</name>
<description>The Process Control System's core system framework. PCS is an agglomeration of
CAS services and components needed to build a science data system.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/pcs/input/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/input/pom.xml b/pcs/input/pom.xml
index a6e74a4..892c7e3 100644
--- a/pcs/input/pom.xml
+++ b/pcs/input/pom.xml
@@ -29,6 +29,25 @@ the License.
<name>Process Control System Input Data Package</name>
<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.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/pcs/opsui/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml
index 3c2012f..7c002ed 100755
--- a/pcs/opsui/pom.xml
+++ b/pcs/opsui/pom.xml
@@ -33,6 +33,25 @@ the License.
<slf4j.version>1.5.8</slf4j.version>
<log4j.version>1.2.14</log4j.version>
</properties>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<!-- JUNIT DEPENDENCY FOR TESTING -->
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/pcs/services/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml
index 4a2c494..578420e 100644
--- a/pcs/services/pom.xml
+++ b/pcs/services/pom.xml
@@ -29,6 +29,25 @@ the License.
<name>OODT Process Control System JAX-RS service layer</name>
<description>A web application for exposing services form the underlying
OODT Process Control System via the JAX-RS specification.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>net.sf.json-lib</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/pge/pom.xml
----------------------------------------------------------------------
diff --git a/pge/pom.xml b/pge/pom.xml
index 1492d20..fd9ee04 100644
--- a/pge/pom.xml
+++ b/pge/pom.xml
@@ -28,6 +28,25 @@ the License.
<name>CAS PGE Adaptor Framework</name>
<description>Allows data processing jobs not written in conformance with the
PCS PGE interface to be run within the PCS.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/product/pom.xml
----------------------------------------------------------------------
diff --git a/product/pom.xml b/product/pom.xml
index 86b1438..3e7e3e9 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -32,6 +32,25 @@
In addition, the product service can transform products from proprietary
formats and into Internet standard formats or run other transformations, all
without impacting local stores or operations.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/profile/pom.xml
----------------------------------------------------------------------
diff --git a/profile/pom.xml b/profile/pom.xml
index fd5b936..885318b 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -31,6 +31,25 @@
Dublin Core and ISO-11179 metadata as well as URIs for locations.
The Profile Service catalogs metadata descriptions and provides
creating, updating, and querying capabilities.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.ibm.icu</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/protocol/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/api/pom.xml b/protocol/api/pom.xml
index 779876c..c05ee3a 100644
--- a/protocol/api/pom.xml
+++ b/protocol/api/pom.xml
@@ -20,6 +20,25 @@
</parent>
<artifactId>cas-protocol-api</artifactId>
<name>CAS Protocol</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/protocol/ftp/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/ftp/pom.xml b/protocol/ftp/pom.xml
index c7545cb..be8e6c8 100644
--- a/protocol/ftp/pom.xml
+++ b/protocol/ftp/pom.xml
@@ -20,6 +20,25 @@
</parent>
<artifactId>cas-protocol-ftp</artifactId>
<name>CAS Protocol FTP Implementation</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-net</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/protocol/http/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml
index 640e001..3229eba 100644
--- a/protocol/http/pom.xml
+++ b/protocol/http/pom.xml
@@ -20,6 +20,25 @@
</parent>
<artifactId>cas-protocol-http</artifactId>
<name>CAS Protocol HTTP Implementation</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-httpclient</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/protocol/imaps/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/imaps/pom.xml b/protocol/imaps/pom.xml
index 1796d34..6b2f560 100644
--- a/protocol/imaps/pom.xml
+++ b/protocol/imaps/pom.xml
@@ -20,6 +20,25 @@
</parent>
<artifactId>cas-protocol-imaps</artifactId>
<name>CAS Protocol IMAPS Implementation</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.icegreen</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/protocol/sftp/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/sftp/pom.xml b/protocol/sftp/pom.xml
index 163f861..80c5d4b 100644
--- a/protocol/sftp/pom.xml
+++ b/protocol/sftp/pom.xml
@@ -20,6 +20,25 @@
</parent>
<artifactId>cas-protocol-sftp</artifactId>
<name>CAS Protocol SFTP Implementation</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.jcraft</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/pushpull/pom.xml
----------------------------------------------------------------------
diff --git a/pushpull/pom.xml b/pushpull/pom.xml
index d1ee157..48730ce 100644
--- a/pushpull/pom.xml
+++ b/pushpull/pom.xml
@@ -26,6 +26,25 @@
</parent>
<artifactId>cas-pushpull</artifactId>
<name>CAS Push-Pull-Framework</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/resource/pom.xml
----------------------------------------------------------------------
diff --git a/resource/pom.xml b/resource/pom.xml
index 49ab3ce..ef21585 100644
--- a/resource/pom.xml
+++ b/resource/pom.xml
@@ -28,6 +28,25 @@ the License.
<description>The resource management component of a Catalog and Archive Service. This component
provides job management, and management of the underlying software system hardware
and resources, such as disk space, computational resources, and shared identity.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/sso/pom.xml
----------------------------------------------------------------------
diff --git a/sso/pom.xml b/sso/pom.xml
index 0d80bf8..d060ed0 100644
--- a/sso/pom.xml
+++ b/sso/pom.xml
@@ -27,6 +27,25 @@ the License.
<packaging>jar</packaging>
<name>OODT Single Sign On Security Package</name>
<properties></properties>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/webapp/components/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/components/pom.xml b/webapp/components/pom.xml
index 236551e..1705412 100644
--- a/webapp/components/pom.xml
+++ b/webapp/components/pom.xml
@@ -27,6 +27,25 @@ the License.
<artifactId>oodt-webapp-components</artifactId>
<packaging>jar</packaging>
<name>OODT Wicket Web Components</name>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/webapp/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml
index c6cc6e9..dd2cf76 100644
--- a/webapp/fmbrowser/pom.xml
+++ b/webapp/fmbrowser/pom.xml
@@ -35,6 +35,25 @@ the License.
<slf4j.version>1.5.8</slf4j.version>
<log4j.version>1.2.14</log4j.version>
</properties>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<!-- JUNIT DEPENDENCY FOR TESTING -->
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/webapp/fmprod/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmprod/pom.xml b/webapp/fmprod/pom.xml
index 397e6d0..faf2f50 100644
--- a/webapp/fmprod/pom.xml
+++ b/webapp/fmprod/pom.xml
@@ -31,6 +31,25 @@
component. All-in-all, this project contributes an OODT LargeProductHandler
component, that can be used to deliver and format a CAS product structure
into an OODT XML Query Result Set.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/webapp/wmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml
index 73abab3..4349073 100644
--- a/webapp/wmonitor/pom.xml
+++ b/webapp/wmonitor/pom.xml
@@ -35,6 +35,25 @@ the License.
<slf4j.version>1.5.8</slf4j.version>
<log4j.version>1.2.14</log4j.version>
</properties>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<!-- JUNIT DEPENDENCY FOR TESTING -->
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/workflow/pom.xml
----------------------------------------------------------------------
diff --git a/workflow/pom.xml b/workflow/pom.xml
index 58241c5..310cace 100644
--- a/workflow/pom.xml
+++ b/workflow/pom.xml
@@ -31,6 +31,25 @@ the License.
provides some out of the box backend implementations of them (including one based
on the javax.sql.DataSource interface). This component provides everything that you need
to execute workflows, and science processing pipelines.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/xmlps/pom.xml
----------------------------------------------------------------------
diff --git a/xmlps/pom.xml b/xmlps/pom.xml
index 190cfad..041a39c 100644
--- a/xmlps/pom.xml
+++ b/xmlps/pom.xml
@@ -28,6 +28,25 @@
<description>An XML-configured DBMS-based Product and Profile meant to easily
sit on top of Web-Grid and other Product and Profile server contexts
for rapid deployment and integration.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>commons-collections</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/9e5af9f9/xmlquery/pom.xml
----------------------------------------------------------------------
diff --git a/xmlquery/pom.xml b/xmlquery/pom.xml
index 4d92234..fdb8a7b 100644
--- a/xmlquery/pom.xml
+++ b/xmlquery/pom.xml
@@ -34,6 +34,25 @@
query. It's used by many other components as the standard way to
pass a query and its results between servers, clients, nodes, and
other components.</description>
+ <!-- All dependencies should be listed in core/pom.xml and be ordered alphabetically by package and artifact.
+ Once the dependency is in the core pom, it can then be used in other modules without the version tags.
+ For example, within core/pom.xml:
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+
+ Elsewhere in the platform:
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ Where possible the same dependency version should be used across the whole platform but if required the version
+ can be overridden in a specific pom and should have a comment explaing why the version has been overridden
+ -->
<dependencies>
<dependency>
<groupId>junit</groupId>
[04/15] oodt git commit: OODT-839 patch to update deps
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/product/pom.xml
----------------------------------------------------------------------
diff --git a/product/pom.xml b/product/pom.xml
index 208254a..16a6c2b 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -16,109 +16,107 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
- <artifactId>oodt-product</artifactId>
- <name>Product Service</name>
- <description>
- The Product Service provides access to data products. Products can be
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>oodt-product</artifactId>
+ <name>Product Service</name>
+ <description>The Product Service provides access to data products. Products can be
scientific datasets, images, documents, or anything with an electronic
representation. The Product Service accepts standard query expressions (see
the Query Expression component) and returns zero or more matching products.
In addition, the product service can transform products from proprietary
formats and into Internet standard formats or run other transformations, all
- without impacting local stores or operations.
- </description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/product</url>
- </scm>
- <build>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/product</targetPath>
- <directory>${basedir}/src/main/conf</directory>
- <includes>
- <include>displayableTypes.xml</include>
- </includes>
- </resource>
- </resources>
+ without impacting local stores or operations.</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-xmlquery</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/product</targetPath>
+ <directory>${basedir}/src/main/conf</directory>
+ <includes>
+ <include>displayableTypes.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/product</url>
+ </scm>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/profile/pom.xml
----------------------------------------------------------------------
diff --git a/profile/pom.xml b/profile/pom.xml
index 5ed0182..fd5b936 100644
--- a/profile/pom.xml
+++ b/profile/pom.xml
@@ -31,11 +31,55 @@
Dublin Core and ISO-11179 metadata as well as URIs for locations.
The Profile Service catalogs metadata descriptions and provides
creating, updating, and querying capabilities.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/profile</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0-alpha1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <version>${jena.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-xmlquery</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -54,6 +98,11 @@
</plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/profile</url>
+ </scm>
<profiles>
<profile>
<id>audit</id>
@@ -73,10 +122,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -84,53 +133,4 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <type>pom</type>
- <version>${jena.version}</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.4.4</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0-alpha1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/protocol/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/api/pom.xml b/protocol/api/pom.xml
index 59ad500..7273065 100644
--- a/protocol/api/pom.xml
+++ b/protocol/api/pom.xml
@@ -11,70 +11,62 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-protocol-api</artifactId>
- <name>CAS Protocol</name>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/resources/examples/**/*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.apache.oodt.cas.protocol.system.CLProtocolManager</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-protocol-api</artifactId>
+ <name>CAS Protocol</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also an Apache incompatible
+ license -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
+ <build>
<resources>
<resource>
<targetPath>org/apache/oodt/cas/protocol</targetPath>
@@ -84,51 +76,59 @@
</includes>
</resource>
</resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <exclusions>
- <exclusion>
- <!-- xom is an optional dependency of xstream. Its also an Apache incompatible
- license -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.oodt.cas.protocol.system.CLProtocolManager</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/examples/**/*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/protocol/ftp/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/ftp/pom.xml b/protocol/ftp/pom.xml
index 00874a9..e200794 100644
--- a/protocol/ftp/pom.xml
+++ b/protocol/ftp/pom.xml
@@ -11,44 +11,61 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-protocol-ftp</artifactId>
- <name>CAS Protocol FTP Implementation</name>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/resources/examples/**/*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-protocol-ftp</artifactId>
+ <name>CAS Protocol FTP Implementation</name>
+ <dependencies>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <version>1.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jglobus</groupId>
+ <artifactId>gss</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jglobus</groupId>
+ <artifactId>JGlobus-GridFTP</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -60,50 +77,33 @@
</resource>
</resources>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jglobus</groupId>
- <artifactId>JGlobus-GridFTP</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.jglobus</groupId>
- <artifactId>gss</artifactId>
- <version>2.0.6</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <version>1.0.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/examples/**/*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/protocol/http/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml
index 5e3f508..06a017f 100644
--- a/protocol/http/pom.xml
+++ b/protocol/http/pom.xml
@@ -11,80 +11,80 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-protocol-http</artifactId>
- <name>CAS Protocol HTTP Implementation</name>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/resources/examples/**/*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/cas/protocol/http</targetPath>
- <directory>${basedir}/src/main/resources/policy</directory>
- <includes>
- <include>http-protocol-config.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-protocol-http</artifactId>
+ <name>CAS Protocol HTTP Implementation</name>
+ <dependencies>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/cas/protocol/http</targetPath>
+ <directory>${basedir}/src/main/resources/policy</directory>
+ <includes>
+ <include>http-protocol-config.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/examples/**/*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/protocol/imaps/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/imaps/pom.xml b/protocol/imaps/pom.xml
index 0ed683c..0bf1f6d 100644
--- a/protocol/imaps/pom.xml
+++ b/protocol/imaps/pom.xml
@@ -11,44 +11,53 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-protocol-imaps</artifactId>
- <name>CAS Protocol IMAPS Implementation</name>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/resources/examples/**/*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-protocol-imaps</artifactId>
+ <name>CAS Protocol IMAPS Implementation</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.icegreen</groupId>
+ <artifactId>greenmail</artifactId>
+ <version>1.3.1b</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -60,42 +69,33 @@
</resource>
</resources>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- </dependency>
- <dependency>
- <groupId>com.icegreen</groupId>
- <artifactId>greenmail</artifactId>
- <version>1.3.1b</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/examples/**/*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/protocol/sftp/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/sftp/pom.xml b/protocol/sftp/pom.xml
index 5e122be..163f861 100644
--- a/protocol/sftp/pom.xml
+++ b/protocol/sftp/pom.xml
@@ -11,112 +11,111 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-protocol-sftp</artifactId>
- <name>CAS Protocol SFTP Implementation</name>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/resources/examples/**/*</exclude>
- </excludes>
- <numUnapprovedLicenses>3</numUnapprovedLicenses>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/cas/protocol/sftp</targetPath>
- <directory>${basedir}/src/main/resources/policy</directory>
- <includes>
- <include>sftp-protocol-config.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.42</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-protocol-sftp</artifactId>
+ <name>CAS Protocol SFTP Implementation</name>
+ <dependencies>
<dependency>
- <groupId>sshtools</groupId>
- <artifactId>j2ssh-core</artifactId>
- <version>0.2.9</version>
- <scope>test</scope>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.42</version>
</dependency>
- <dependency>
- <groupId>sshtools</groupId>
- <artifactId>j2ssh-daemon</artifactId>
- <version>0.2.9</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.0.4</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>sshtools</groupId>
+ <artifactId>j2ssh-core</artifactId>
+ <version>0.2.9</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>sshtools</groupId>
+ <artifactId>j2ssh-daemon</artifactId>
+ <version>0.2.9</version>
<scope>test</scope>
</dependency>
-
- </dependencies>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/cas/protocol/sftp</targetPath>
+ <directory>${basedir}/src/main/resources/policy</directory>
+ <includes>
+ <include>sftp-protocol-config.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/examples/**/*</exclude>
+ </excludes>
+ <numUnapprovedLicenses>3</numUnapprovedLicenses>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pushpull/pom.xml
----------------------------------------------------------------------
diff --git a/pushpull/pom.xml b/pushpull/pom.xml
index 3e5616f..d1ee157 100644
--- a/pushpull/pom.xml
+++ b/pushpull/pom.xml
@@ -16,23 +16,88 @@
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>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
<version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
- </parent>
+ </parent>
<artifactId>cas-pushpull</artifactId>
<name>CAS Push-Pull-Framework</name>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/pushpull</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>10.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-ftp</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-http</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-imaps</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-sftp</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -50,15 +115,20 @@
</configuration>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/pushpull</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/pushpull</url>
+ </scm>
<profiles>
<profile>
<id>audit</id>
@@ -77,10 +147,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -88,74 +158,4 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-ftp</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-http</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-imaps</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-protocol-sftp</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>10.0.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/resource/pom.xml
----------------------------------------------------------------------
diff --git a/resource/pom.xml b/resource/pom.xml
index 85fcaa4..49ab3ce 100644
--- a/resource/pom.xml
+++ b/resource/pom.xml
@@ -28,72 +28,33 @@ the License.
<description>The resource management component of a Catalog and Archive Service. This component
provides job management, and management of the underlying software system hardware
and resources, such as disk space, computational resources, and shared identity.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/resource</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <forkMode>pertest</forkMode>
- <useSystemClassLoader>false</useSystemClassLoader>
- <systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/src/test/resources/test.logging.properties</value>
- </property>
- </systemProperties>
- <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -105,19 +66,9 @@ the License.
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
@@ -125,6 +76,12 @@ the License.
<version>1.2</version>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.1</version>
@@ -135,6 +92,16 @@ the License.
<version>2.0.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.safehaus.jug</groupId>
<artifactId>jug</artifactId>
<version>2.0.0</version>
@@ -145,23 +112,56 @@ the License.
<artifactId>xmlrpc</artifactId>
<version>2.0.1</version>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <exclusions>
- <exclusion>
- <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <systemProperties>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/test/resources/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/resource</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/sso/pom.xml
----------------------------------------------------------------------
diff --git a/sso/pom.xml b/sso/pom.xml
index e1629fb..0d80bf8 100644
--- a/sso/pom.xml
+++ b/sso/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -24,33 +24,33 @@ the License.
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-sso</artifactId>
- <name>OODT Single Sign On Security Package</name>
<packaging>jar</packaging>
- <properties />
- <build>
- <plugins />
- </build>
+ <name>OODT Single Sign On Security Package</name>
+ <properties></properties>
<dependencies>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
- <distributionManagement />
+ <build>
+ <plugins></plugins>
+ </build>
+ <distributionManagement></distributionManagement>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/webapp/components/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/components/pom.xml b/webapp/components/pom.xml
index 2110987..25bec12 100644
--- a/webapp/components/pom.xml
+++ b/webapp/components/pom.xml
@@ -16,148 +16,148 @@ 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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>oodt-webapp-components</artifactId>
- <packaging>jar</packaging>
- <name>OODT Wicket Web Components</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>1.4.16</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>0.11-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-workflow</artifactId>
- <version>0.11-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>pcs-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.9-RC1</version>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <numUnapprovedLicenses>2</numUnapprovedLicenses>
- <excludes>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/prototype.js</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/progress.js</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery/*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/jquery*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/demo/*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/lib/*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/*</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/MIT-License.txt</exclude>
- <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/media/Bach-SuiteNo2.mp3</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>true</optimize>
- <debug>true</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>oodt-webapp-components</artifactId>
+ <packaging>jar</packaging>
+ <name>OODT Wicket Web Components</name>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>1.4.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.9-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <numUnapprovedLicenses>2</numUnapprovedLicenses>
+ <excludes>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/prototype.js</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/instance/progress.js</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery/*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/jquery*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/demo/*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-treeview/lib/*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/*</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/jquery-ui/css/smoothness/jquery-ui-1.7.2.custom.css</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/src/MIT-License.txt</exclude>
+ <exclude>webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/**/media/Bach-SuiteNo2.mp3</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/webapp/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml
index 74b1ae3..d6ea986 100644
--- a/webapp/fmbrowser/pom.xml
+++ b/webapp/fmbrowser/pom.xml
@@ -16,123 +16,123 @@ 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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.oodt</groupId>
- <artifactId>fmbrowser</artifactId>
- <packaging>war</packaging>
- <version>0.11-SNAPSHOT</version>
- <name>CAS File Manager Browser Web App</name>
- <properties>
- <wicket.version>1.4.17</wicket.version>
- <jetty.version>6.1.25</jetty.version>
- <slf4j.version>1.5.8</slf4j.version>
- <log4j.version>1.2.14</log4j.version>
- </properties>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/fmbrowser</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/fmbrowser</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/fmbrowser</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-webapp-components</artifactId>
- <version>0.11-SNAPSHOT</version>
- </dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>fmbrowser</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>CAS File Manager Browser Web App</name>
+ <properties>
+ <wicket.version>1.4.17</wicket.version>
+ <jetty.version>6.1.25</jetty.version>
+ <slf4j.version>1.5.8</slf4j.version>
+ <log4j.version>1.2.14</log4j.version>
+ </properties>
+ <dependencies>
+
+ <!-- JUNIT DEPENDENCY FOR TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-webapp-components</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
- <!-- JUNIT DEPENDENCY FOR TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
+ <!-- JETTY DEPENDENCIES FOR TESTING -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>true</optimize>
- <debug>true</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </project>
+ <!-- LOGGING DEPENDENCIES - LOG4J -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/fmbrowser</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/fmbrowser</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/fmbrowser</url>
+ </scm>
+</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/webapp/fmprod/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmprod/pom.xml b/webapp/fmprod/pom.xml
index bd19154..baf69d2 100644
--- a/webapp/fmprod/pom.xml
+++ b/webapp/fmprod/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -26,68 +26,54 @@
<artifactId>cas-product</artifactId>
<packaging>war</packaging>
<name>CAS Product Server Web Application</name>
- <description>
- This project builds on top of the CAS file management component and exposes
+ <description>This project builds on top of the CAS file management component and exposes
its underlying data delivery capabilities using the OODT ProductServer
component. All-in-all, this project contributes an OODT LargeProductHandler
component, that can be used to deliver and format a CAS product structure
- into an OODT XML Query Result Set.
- </description>
- <build>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <plugins>
+ into an OODT XML Query Result Set.</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<!--
- For plugins by Maven we don't need to specify a groupId because the
- groupId org.apache.maven.plugins is assumed by default.
+ Zip4j is released under the Apache License, Version 2.0
+ For reference, see: http://www.lingala.net/zip4j/about.php
-->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>CHANGES.txt</include>
- </includes>
- <targetPath>META-INF/</targetPath>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>
- jar-with-dependencies
- </descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>
- ${basedir}/src/test/resources/test.logging.properties
- </value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>
- org/apache/oodt/cas/product/service/resources/ResourceTestBase.java
- </exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
+ <groupId>net.lingala.zip4j</groupId>
+ <artifactId>zip4j</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>2.6.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>2.6.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>2.6.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.5</version>
+ </dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-filemgr</artifactId>
@@ -118,28 +104,13 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <!--
- Zip4j is released under the Apache License, Version 2.0
- For reference, see: http://www.lingala.net/zip4j/about.php
- -->
- <groupId>net.lingala.zip4j</groupId>
- <artifactId>zip4j</artifactId>
- <version>1.3.1</version>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
@@ -147,43 +118,64 @@
<version>1.3.4</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>2.6.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>2.6.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-local</artifactId>
- <version>2.6.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
</dependencies>
+ <build>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <plugins>
+ <!--
+ For plugins by Maven we don't need to specify a groupId because the
+ groupId org.apache.maven.plugins is assumed by default.
+ -->
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>CHANGES.txt</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/test/resources/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <excludes>
+ <exclude>org/apache/oodt/cas/product/service/resources/ResourceTestBase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
[10/15] oodt git commit: fix context
Posted by ma...@apache.org.
fix context
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705319 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/365a241f
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/365a241f
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/365a241f
Branch: refs/heads/master
Commit: 365a241fc3d25f7bb4620ce07cb518ee9950c2f6
Parents: 62ef5c0
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 15:13:42 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 15:13:42 2015 +0000
----------------------------------------------------------------------
.../commons/object/jndi/ObjectContextTest.java | 14 +-
.../oodt/commons/object/jndi/TContext.java | 204 ++++++++++++++++++
.../oodt/commons/object/jndi/TestContext.java | 208 -------------------
.../commons/object/jndi/TestContextTest.java | 2 +-
4 files changed, 212 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/365a241f/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java b/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
index e328afa..899c1e7 100644
--- a/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/object/jndi/ObjectContextTest.java
@@ -24,7 +24,7 @@ import javax.naming.Binding;
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import org.apache.oodt.commons.object.jndi.ObjectContext;
+
import junit.framework.TestCase;
/**
@@ -54,9 +54,9 @@ public class ObjectContextTest extends TestCase {
aliases.save(out, "Temporary properties");
out.close();
- a1 = new TestContext("urn:a");
- a2 = new TestContext("urn:a");
- b = new TestContext("urn:b");
+ a1 = new TContext("urn:a");
+ a2 = new TContext("urn:a");
+ b = new TContext("urn:b");
oldValue = System.getProperty("org.apache.oodt.commons.object.jndi.aliases");
System.setProperty("org.apache.oodt.commons.object.jndi.aliases", aliasFile.toString());
@@ -184,13 +184,13 @@ public class ObjectContextTest extends TestCase {
}
/** First delegate context for "urn:a" namespace. */
- private TestContext a1;
+ private TContext a1;
/** Second delegate context for "urn:a" namespace. */
- private TestContext a2;
+ private TContext a2;
/** Delegate context for "urn:b" namespace. */
- private TestContext b;
+ private TContext b;
/** Test subject: the object context. */
private ObjectContext context;
http://git-wip-us.apache.org/repos/asf/oodt/blob/365a241f/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
new file mode 100644
index 0000000..b5acdf6
--- /dev/null
+++ b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TContext.java
@@ -0,0 +1,204 @@
+// 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.commons.object.jndi;
+
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import javax.naming.Binding;
+import javax.naming.CompositeName;
+import javax.naming.Context;
+import javax.naming.InvalidNameException;
+import javax.naming.Name;
+import javax.naming.NameAlreadyBoundException;
+import javax.naming.NameClassPair;
+import javax.naming.NameNotFoundException;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.OperationNotSupportedException;
+
+/**
+ * A context for testing. This context uses a simple {@link Map} to track bindings.
+ * Names must start with a given prefix string or they cause {@link
+ * InvalidNameException}s.
+ *
+ * @author Kelly
+ * @version $Revision: 1.1 $
+ */
+public class TContext implements Context {
+
+ /**
+ * Creates a new <code>TestContext</code> instance.
+ *
+ * @param prefix What every name must start with.
+ */
+ public TContext(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ return lookup(name.toString());
+ }
+ public Object lookup(String name) throws NamingException {
+ Object rc = bindings.get(name);
+ if (rc == null)
+ throw new NameNotFoundException(name);
+ return rc;
+ }
+ public void bind(Name name, Object obj) throws NamingException {
+ bind(name.toString(), obj);
+ }
+ public void bind(String name, Object obj) throws NamingException {
+ if (!name.startsWith(prefix)) throw new InvalidNameException("Name doesn't start with " + prefix);
+ if (bindings.containsKey(name))
+ throw new NameAlreadyBoundException(name);
+ bindings.put(name, obj);
+ }
+ public void rebind(Name name, Object obj) throws NamingException {
+ rebind(name.toString(), obj);
+ }
+ public void rebind(String name, Object obj) throws NamingException {
+ if (!name.startsWith(prefix)) throw new InvalidNameException("Name doesn't start with " + prefix);
+ bindings.put(name, obj);
+ }
+ public void unbind(Name name) throws NamingException {
+ unbind(name.toString());
+ }
+ public void unbind(String name) throws NamingException {
+ if (bindings.remove(name) == null)
+ throw new NameNotFoundException(name);
+ }
+ public void rename(Name oldName, Name newName) throws NamingException {
+ rename(oldName.toString(), newName.toString());
+ }
+ public void rename(String oldName, String newName) throws NamingException {
+ if (!bindings.containsKey(oldName))
+ throw new NameNotFoundException(oldName);
+ if (bindings.containsKey(newName))
+ throw new NameAlreadyBoundException(newName);
+ if (!newName.startsWith(prefix))
+ throw new InvalidNameException("Name doesn't start with " + prefix);
+ bindings.put(newName, bindings.remove(oldName));
+ }
+ public NamingEnumeration list(Name name) throws NamingException {
+ return list(name.toString());
+ }
+ public NamingEnumeration list(String name) throws NamingException {
+ if (name.length() > 0)
+ throw new OperationNotSupportedException("subcontexts not supported");
+ final Iterator i = bindings.entrySet().iterator();
+ return new NamingEnumeration() {
+ public Object next() {
+ Map.Entry e = (Map.Entry) i.next();
+ return new NameClassPair((String) e.getKey(), e.getValue().getClass().getName());
+ }
+ public boolean hasMore() {
+ return i.hasNext();
+ }
+ public void close() {}
+ public boolean hasMoreElements() {
+ return hasMore();
+ }
+ public Object nextElement() {
+ return next();
+ }
+ };
+ }
+ public NamingEnumeration listBindings(Name name) throws NamingException {
+ return listBindings(name.toString());
+ }
+ public NamingEnumeration listBindings(String name) throws NamingException {
+ if (name.length() > 0)
+ throw new OperationNotSupportedException("subcontexts not supported");
+ final Iterator i = bindings.entrySet().iterator();
+ return new NamingEnumeration() {
+ public Object next() {
+ Map.Entry e = (Map.Entry) i.next();
+ return new Binding((String) e.getKey(), e.getValue());
+ }
+ public boolean hasMore() {
+ return i.hasNext();
+ }
+ public void close() {}
+ public boolean hasMoreElements() {
+ return hasMore();
+ }
+ public Object nextElement() {
+ return next();
+ }
+
+ };
+ }
+ public void destroySubcontext(Name name) throws NamingException {
+ destroySubcontext(name.toString());
+ }
+ public void destroySubcontext(String name) throws NamingException {
+ throw new OperationNotSupportedException("subcontexts not supported");
+ }
+ public Context createSubcontext(Name name) throws NamingException {
+ return createSubcontext(name.toString());
+ }
+ public Context createSubcontext(String name) throws NamingException {
+ throw new OperationNotSupportedException("subcontexts not supported");
+ }
+ public Object lookupLink(Name name) throws NamingException {
+ return lookupLink(name.toString());
+ }
+ public Object lookupLink(String name) throws NamingException {
+ return lookup(name);
+ }
+ public NameParser getNameParser(Name name) {
+ return getNameParser(name.toString());
+ }
+ public NameParser getNameParser(String name) {
+ return new ObjectNameParser();
+ }
+ public String composeName(String name, String prefix) throws NamingException {
+ return composeName(new CompositeName(name), new CompositeName(prefix)).toString();
+ }
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ Name result = (Name) prefix.clone();
+ result.addAll(name);
+ return result;
+ }
+ public Object addToEnvironment(String key, Object val) {
+ if (environment == null) environment = new Hashtable();
+ return environment.put(key, val);
+ }
+ public Object removeFromEnvironment(String key) {
+ if (environment == null) environment = new Hashtable();
+ return environment.remove(key);
+ }
+ public Hashtable getEnvironment() {
+ if (environment == null) environment = new Hashtable();
+ return environment;
+ }
+ public void close() {}
+ public String getNameInNamespace() {
+ return "";
+ }
+
+ /** What holds the bindings. Keys are {@link String}s, values are {@link Object}s. */
+ Map bindings = new HashMap();
+
+ /** What every key must start with. */
+ private String prefix;
+
+ /** Context's environment. */
+ private Hashtable environment;
+}
http://git-wip-us.apache.org/repos/asf/oodt/blob/365a241f/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
deleted file mode 100644
index 72711b0..0000000
--- a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
+++ /dev/null
@@ -1,208 +0,0 @@
-// 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.commons.object.jndi;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import javax.naming.Binding;
-import javax.naming.CompositeName;
-import javax.naming.Context;
-import javax.naming.InvalidNameException;
-import javax.naming.Name;
-import javax.naming.NameAlreadyBoundException;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.OperationNotSupportedException;
-
-/**
- * A context for testing. This context uses a simple {@link Map} to track bindings.
- * Names must start with a given prefix string or they cause {@link
- * InvalidNameException}s.
- *
- * @author Kelly
- * @version $Revision: 1.1 $
- */
-public class TestContext implements Context {
-
-
- public TestContext() {
- }
-
- /**
- * Creates a new <code>TestContext</code> instance.
- *
- * @param prefix What every name must start with.
- */
- public TestContext(String prefix) {
- this.prefix = prefix;
- }
-
- public Object lookup(Name name) throws NamingException {
- return lookup(name.toString());
- }
- public Object lookup(String name) throws NamingException {
- Object rc = bindings.get(name);
- if (rc == null)
- throw new NameNotFoundException(name);
- return rc;
- }
- public void bind(Name name, Object obj) throws NamingException {
- bind(name.toString(), obj);
- }
- public void bind(String name, Object obj) throws NamingException {
- if (!name.startsWith(prefix)) throw new InvalidNameException("Name doesn't start with " + prefix);
- if (bindings.containsKey(name))
- throw new NameAlreadyBoundException(name);
- bindings.put(name, obj);
- }
- public void rebind(Name name, Object obj) throws NamingException {
- rebind(name.toString(), obj);
- }
- public void rebind(String name, Object obj) throws NamingException {
- if (!name.startsWith(prefix)) throw new InvalidNameException("Name doesn't start with " + prefix);
- bindings.put(name, obj);
- }
- public void unbind(Name name) throws NamingException {
- unbind(name.toString());
- }
- public void unbind(String name) throws NamingException {
- if (bindings.remove(name) == null)
- throw new NameNotFoundException(name);
- }
- public void rename(Name oldName, Name newName) throws NamingException {
- rename(oldName.toString(), newName.toString());
- }
- public void rename(String oldName, String newName) throws NamingException {
- if (!bindings.containsKey(oldName))
- throw new NameNotFoundException(oldName);
- if (bindings.containsKey(newName))
- throw new NameAlreadyBoundException(newName);
- if (!newName.startsWith(prefix))
- throw new InvalidNameException("Name doesn't start with " + prefix);
- bindings.put(newName, bindings.remove(oldName));
- }
- public NamingEnumeration list(Name name) throws NamingException {
- return list(name.toString());
- }
- public NamingEnumeration list(String name) throws NamingException {
- if (name.length() > 0)
- throw new OperationNotSupportedException("subcontexts not supported");
- final Iterator i = bindings.entrySet().iterator();
- return new NamingEnumeration() {
- public Object next() {
- Map.Entry e = (Map.Entry) i.next();
- return new NameClassPair((String) e.getKey(), e.getValue().getClass().getName());
- }
- public boolean hasMore() {
- return i.hasNext();
- }
- public void close() {}
- public boolean hasMoreElements() {
- return hasMore();
- }
- public Object nextElement() {
- return next();
- }
- };
- }
- public NamingEnumeration listBindings(Name name) throws NamingException {
- return listBindings(name.toString());
- }
- public NamingEnumeration listBindings(String name) throws NamingException {
- if (name.length() > 0)
- throw new OperationNotSupportedException("subcontexts not supported");
- final Iterator i = bindings.entrySet().iterator();
- return new NamingEnumeration() {
- public Object next() {
- Map.Entry e = (Map.Entry) i.next();
- return new Binding((String) e.getKey(), e.getValue());
- }
- public boolean hasMore() {
- return i.hasNext();
- }
- public void close() {}
- public boolean hasMoreElements() {
- return hasMore();
- }
- public Object nextElement() {
- return next();
- }
-
- };
- }
- public void destroySubcontext(Name name) throws NamingException {
- destroySubcontext(name.toString());
- }
- public void destroySubcontext(String name) throws NamingException {
- throw new OperationNotSupportedException("subcontexts not supported");
- }
- public Context createSubcontext(Name name) throws NamingException {
- return createSubcontext(name.toString());
- }
- public Context createSubcontext(String name) throws NamingException {
- throw new OperationNotSupportedException("subcontexts not supported");
- }
- public Object lookupLink(Name name) throws NamingException {
- return lookupLink(name.toString());
- }
- public Object lookupLink(String name) throws NamingException {
- return lookup(name);
- }
- public NameParser getNameParser(Name name) {
- return getNameParser(name.toString());
- }
- public NameParser getNameParser(String name) {
- return new ObjectNameParser();
- }
- public String composeName(String name, String prefix) throws NamingException {
- return composeName(new CompositeName(name), new CompositeName(prefix)).toString();
- }
- public Name composeName(Name name, Name prefix) throws NamingException {
- Name result = (Name) prefix.clone();
- result.addAll(name);
- return result;
- }
- public Object addToEnvironment(String key, Object val) {
- if (environment == null) environment = new Hashtable();
- return environment.put(key, val);
- }
- public Object removeFromEnvironment(String key) {
- if (environment == null) environment = new Hashtable();
- return environment.remove(key);
- }
- public Hashtable getEnvironment() {
- if (environment == null) environment = new Hashtable();
- return environment;
- }
- public void close() {}
- public String getNameInNamespace() {
- return "";
- }
-
- /** What holds the bindings. Keys are {@link String}s, values are {@link Object}s. */
- Map bindings = new HashMap();
-
- /** What every key must start with. */
- private String prefix;
-
- /** Context's environment. */
- private Hashtable environment;
-}
http://git-wip-us.apache.org/repos/asf/oodt/blob/365a241f/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
index acf195f..f433a1f 100644
--- a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
+++ b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContextTest.java
@@ -46,7 +46,7 @@ public class TestContextTest extends TestCase {
* @throws NamingException if an error occurs.
*/
public void testTestContext() throws NamingException {
- TestContext ctx = new TestContext("urn:x:"); // Make it
+ TContext ctx = new TContext("urn:x:"); // Make it
try {
ctx.lookup("urn:x:y"); // Lookup a nonexistent binding
fail("Got a binding that doesn't exist"); // Got something? Yikes.
[05/15] oodt git commit: OODT-839 patch to update deps
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/curator/services/pom.xml
----------------------------------------------------------------------
diff --git a/curator/services/pom.xml b/curator/services/pom.xml
index 37e0b3e..5b7a43a 100644
--- a/curator/services/pom.xml
+++ b/curator/services/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -27,44 +27,89 @@ the License.
<packaging>war</packaging>
<name>CAS Curation Web Services</name>
<description>Services for ingesting files into the file manager and iteratively extracting metadata.</description>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <type>jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-sso</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ </dependency>
+ </dependencies>
<build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
<plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <port>8181</port>
- <systemProperties>
- <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <port>8181</port>
+ <systemProperties>
+ <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
-server -Xms1536m -Xmx1536m
-XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
-XX:MaxPermSize=512m -XX:+DisableExplicitGC
@@ -72,13 +117,12 @@ the License.
-XX:+CMSIncrementalMode
-XX:+CMSIncrementalPacing
-XX:CMSIncrementalDutyCycleMin=0
- -XX:-TraceClassUnloading
- </CATALINA_OPTS>
- </systemProperties>
- <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
+ -XX:-TraceClassUnloading</CATALINA_OPTS>
+ </systemProperties>
+ <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -99,68 +143,16 @@ the License.
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-sso</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>2.6.0</version>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.9-RC1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.4</version>
- <classifier>jdk15</classifier>
- </dependency>
- </dependencies>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/curator/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/curator/webapp/pom.xml b/curator/webapp/pom.xml
index 1d916ef..fb0eafe 100644
--- a/curator/webapp/pom.xml
+++ b/curator/webapp/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -26,48 +26,98 @@ the License.
<artifactId>cas-curator</artifactId>
<packaging>war</packaging>
<name>CAS Curation Interface</name>
- <properties>
- <wicket.version>1.4.17</wicket.version>
- </properties>
<description>A web application for managing policy for products and files and metadata that have been ingested via the CAS component.</description>
+ <properties>
+ <wicket.version>1.4.17</wicket.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>curator-services</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-sso</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-webapp-components</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
<plugins>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <port>8181</port>
- <systemProperties>
- <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <port>8181</port>
+ <systemProperties>
+ <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
-server -Xms1536m -Xmx1536m
-XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
-XX:MaxPermSize=512m -XX:+DisableExplicitGC
@@ -75,13 +125,12 @@ the License.
-XX:+CMSIncrementalMode
-XX:+CMSIncrementalPacing
-XX:CMSIncrementalDutyCycleMin=0
- -XX:-TraceClassUnloading
- </CATALINA_OPTS>
- </systemProperties>
- <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
+ -XX:-TraceClassUnloading</CATALINA_OPTS>
+ </systemProperties>
+ <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -95,76 +144,19 @@ the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <configuration>
- </configuration>
+ <configuration></configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
- </profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>curator-services</artifactId>
- <version>${project.parent.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-webapp-components</artifactId>
- <version>${project.parent.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>cas-filemgr</artifactId>
- <groupId>org.apache.oodt</groupId>
- </exclusion>
- <exclusion>
- <artifactId>cas-workflow</artifactId>
- <groupId>org.apache.oodt</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-sso</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- </dependencies>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/filemgr/pom.xml
----------------------------------------------------------------------
diff --git a/filemgr/pom.xml b/filemgr/pom.xml
index 573cc8b..c05633c 100644
--- a/filemgr/pom.xml
+++ b/filemgr/pom.xml
@@ -30,29 +30,157 @@
provides some out of the box backend implementations of them (including one based
on the javax.sql.DataSource interface). This component provides everything that you need
to catalog, archive and manage files, and directories, and their associated metadata.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/filemgr</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/filemgr</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/filemgr</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-lucene-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.safehaus.jug</groupId>
+ <artifactId>jug</artifactId>
+ <classifier>asl</classifier>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ </dependency>
+ </dependencies>
<build>
<directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
<finalName>${project.artifactId}-${project.version}</finalName>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
<directory>${project.basedir}/src/test/resources</directory>
<includes>
<include>**/*</include>
@@ -62,24 +190,25 @@
</testResources>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
<!--forkMode>pertest</forkMode-->
- <forkMode>none</forkMode> <!-- so we can DEBUG -->
+ <forkMode>none</forkMode>
+ <!-- so we can DEBUG -->
<argLine>-enableassertions</argLine>
<useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>src/test/resources/test.logging.properties</value>
- </property>
- </systemProperties>
- <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>src/test/resources/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
</configuration>
</plugin>
<plugin>
@@ -98,15 +227,32 @@
</configuration>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/filemgr</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/filemgr</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/filemgr</url>
+ </scm>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>sonatype-nexus</id>
+ <url>https://oss.sonatype.org/content/groups/public</url>
+ </repository>
+ </repositories>
<profiles>
<profile>
<id>audit</id>
@@ -126,10 +272,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -137,173 +283,4 @@
</build>
</profile>
</profiles>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <id>sonatype-nexus</id>
- <url>https://oss.sonatype.org/content/groups/public</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>10.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <version>1.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-lucene-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <version>1.3.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-lucene-core</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>wstx-asl</artifactId>
- <groupId>woodstox</groupId>
- </exclusion>
- </exclusions>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.safehaus.jug</groupId>
- <artifactId>jug</artifactId>
- <version>2.0.0</version>
- <classifier>asl</classifier>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.python</groupId>
- <artifactId>jython</artifactId>
- <version>2.2-beta1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.26</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.7.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/grid/pom.xml
----------------------------------------------------------------------
diff --git a/grid/pom.xml b/grid/pom.xml
index 0a98086..07dbbff 100644
--- a/grid/pom.xml
+++ b/grid/pom.xml
@@ -24,8 +24,8 @@ the License.
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>web-grid</artifactId>
- <name>OODT Web Grid</name>
<packaging>war</packaging>
+ <name>OODT Web Grid</name>
<description>The OODT grid services (product and profile services) use CORBA or
RMI as their underlying network transport. However, limitations
of CORBA and RMI make them inappropriate for large-scale
@@ -57,71 +57,62 @@ the License.
profiles. Further, it provides a password-protected mechanism to
add new sets of product and profile query handlers, enabling
seamless activation of additional capabilities.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/grid</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/grid</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/grid</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources />
- <warSourceDirectory>src/main/webapp</warSourceDirectory>
- </configuration>
- <version>2.5</version>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-profile</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>oodt-product</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>oodt-commons</artifactId>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>oodt-product</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <type>pom</type>
- <version>${jena.version}</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-profile</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-xmlquery</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <webResources></webResources>
+ <warSourceDirectory>src/main/webapp</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/grid</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/grid</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/grid</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
index ff9d103..2630183 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -36,11 +36,69 @@ the License.
container. Since all values are stored internally as string vectors, the difference
between a scalar value and a non-scalar is handled by determining whether the list of
values for a particular key is greater than 1.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/metadata</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/metadata</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/metadata</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-input</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -58,17 +116,17 @@ the License.
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
+ <systemProperties>
+ <property>
<name>java.io.tmpdir</name>
<value>${project.build.outputDirectory}</value>
- </property>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/src/main/resources/logging.properties</value>
</property>
- </systemProperties>
- <forkMode>never</forkMode>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/main/resources/logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkMode>never</forkMode>
<includes>
<include>**/*Test*.java</include>
</includes>
@@ -79,6 +137,11 @@ the License.
</plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/metadata</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/metadata</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/metadata</url>
+ </scm>
<profiles>
<profile>
<id>audit</id>
@@ -98,10 +161,10 @@ the License.
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -109,78 +172,4 @@ the License.
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>pcs-input</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>10.0.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/mvn/archetypes/opsui/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/archetypes/opsui/pom.xml b/mvn/archetypes/opsui/pom.xml
index 1551bb6..6b53f5d 100644
--- a/mvn/archetypes/opsui/pom.xml
+++ b/mvn/archetypes/opsui/pom.xml
@@ -29,13 +29,6 @@
<name>OODT :: Archetypes :: OpsUI</name>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-5</version>
- </extension>
- </extensions>
<pluginManagement>
<plugins>
@@ -46,5 +39,12 @@
</plugin>
</plugins>
</pluginManagement>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-5</version>
+ </extension>
+ </extensions>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/mvn/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/archetypes/pom.xml b/mvn/archetypes/pom.xml
index bae120b..1f450f9 100644
--- a/mvn/archetypes/pom.xml
+++ b/mvn/archetypes/pom.xml
@@ -26,9 +26,9 @@
</parent>
<artifactId>archetypes</artifactId>
+ <packaging>pom</packaging>
<name>OODT :: Archetypes</name>
<description>Ways to quickly get started with some of OODT's components</description>
- <packaging>pom</packaging>
<modules>
<module>opsui</module>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/mvn/archetypes/radix/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/archetypes/radix/pom.xml b/mvn/archetypes/radix/pom.xml
index 7239845..0da3911 100644
--- a/mvn/archetypes/radix/pom.xml
+++ b/mvn/archetypes/radix/pom.xml
@@ -17,7 +17,7 @@
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
@@ -30,13 +30,6 @@
<name>OODT :: Archetypes :: RADiX</name>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-5</version>
- </extension>
- </extensions>
<pluginManagement>
<plugins>
@@ -47,5 +40,12 @@
</plugin>
</plugins>
</pluginManagement>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-5</version>
+ </extension>
+ </extensions>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/mvn/plugins/cas-install/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/plugins/cas-install/pom.xml b/mvn/plugins/cas-install/pom.xml
index 5c4fd3f..5ddf461 100644
--- a/mvn/plugins/cas-install/pom.xml
+++ b/mvn/plugins/cas-install/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -28,14 +28,9 @@ the License.
<name>CAS Installer Maven Mojo</name>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -50,46 +45,45 @@ the License.
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>compile</scope>
- </dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [3.3,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <versionRange>[3.3,)</versionRange>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/opendapps/pom.xml
----------------------------------------------------------------------
diff --git a/opendapps/pom.xml b/opendapps/pom.xml
index 0fdd5fa..59e8b8d 100644
--- a/opendapps/pom.xml
+++ b/opendapps/pom.xml
@@ -17,24 +17,32 @@
-->
<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>
- <artifactId>opendapps</artifactId>
- <name>Apache OODT Configurable OPeNDAP Profile Server</name>
- <description>A generic, configurable Apache OODT profile server
- implementation that easily connects to OPeNDAP data sources. Connections
- are configured via an XML configuration file, providing information on how
- to extract and translate datasets from OPeNDAP and THREDDS into OODT profiles.
- </description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/opendapps</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/opendapps</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/opendapps</url>
- </scm>
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
<version>0.11-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
+ <artifactId>opendapps</artifactId>
+ <name>Apache OODT Configurable OPeNDAP Profile Server</name>
+ <description>A generic, configurable Apache OODT profile server
+ implementation that easily connects to OPeNDAP data sources. Connections
+ are configured via an XML configuration file, providing information on how
+ to extract and translate datasets from OPeNDAP and THREDDS into OODT profiles.</description>
+ <dependencies>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>netcdf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-profile</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-xmlquery</artifactId>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -47,31 +55,21 @@
<!-- enable creation of single jar to use this module stand alone -->
<executions>
<execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
+ <id>make-assembly</id>
+ <!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
+ <!-- this is used for inheritance merges -->
+ <phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>netcdf</artifactId>
- <version>4.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-profile</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- </dependencies>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/opendapps</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/opendapps</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/opendapps</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pcs/core/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/core/pom.xml b/pcs/core/pom.xml
index 71347d5..67ed78b 100644
--- a/pcs/core/pom.xml
+++ b/pcs/core/pom.xml
@@ -18,91 +18,82 @@ 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>
- <artifactId>pcs-core</artifactId>
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
<version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
- <name>Process Control System Core Package</name>
+ <artifactId>pcs-core</artifactId>
<packaging>jar</packaging>
+ <name>Process Control System Core Package</name>
<description>The Process Control System's core system framework. PCS is an agglomeration of
- CAS services and components needed to build a science data system.
- </description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.apache.oodt.pcs.tools.PCSHealthMonitor</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ CAS services and components needed to build a science data system.</description>
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>cas-crawler</artifactId>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>pcs-input</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>cas-filemgr</artifactId>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>cas-workflow</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+ <artifactId>cas-resource</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>cas-resource</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>cas-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>oodt-commons</artifactId>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
- <artifactId>cas-crawler</artifactId>
- <version>${project.parent.version}</version>
+ <artifactId>pcs-input</artifactId>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
<artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.oodt.pcs.tools.PCSHealthMonitor</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pcs/input/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/input/pom.xml b/pcs/input/pom.xml
index aab1bc9..a6e74a4 100644
--- a/pcs/input/pom.xml
+++ b/pcs/input/pom.xml
@@ -18,19 +18,40 @@ 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>
- <artifactId>pcs-input</artifactId>
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
<version>0.11-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
- <name>Process Control System Input Data Package</name>
+ <artifactId>pcs-input</artifactId>
<packaging>jar</packaging>
+ <name>Process Control System Input Data Package</name>
<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.
- </description>
+ and readers and writers to write an input file format similar to HDF, as represented in XML.</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
<build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/pcs/input</targetPath>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>pge-config-example.xml</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -44,35 +65,13 @@ the License.
<value>com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl</value>
</property>
</systemProperties>
- <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/pcs/input</targetPath>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>pge-config-example.xml</include>
- </includes>
- </resource>
- </resources>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pcs/opsui/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml
index 5174556..8b5adc2 100755
--- a/pcs/opsui/pom.xml
+++ b/pcs/opsui/pom.xml
@@ -16,193 +16,166 @@ 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>
- <artifactId>pcs-opsui</artifactId>
- <packaging>war</packaging>
- <parent>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <name>Process Control System Operator Interface Webapp</name>
- <properties>
- <wicket.version>1.4.17</wicket.version>
- <jetty.version>6.1.25</jetty.version>
- <slf4j.version>1.5.8</slf4j.version>
- <log4j.version>1.2.14</log4j.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-webapp-components</artifactId>
- <version>${project.parent.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>cas-filemgr</artifactId>
- <groupId>org.apache.oodt</groupId>
- </exclusion>
- <exclusion>
- <artifactId>cas-workflow</artifactId>
- <groupId>org.apache.oodt</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-product</artifactId>
- <version>${project.parent.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>curator-services</artifactId>
- <version>${project.parent.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>pcs-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>pcs-opsui</artifactId>
+ <packaging>war</packaging>
+ <name>Process Control System Operator Interface Webapp</name>
+ <properties>
+ <wicket.version>1.4.17</wicket.version>
+ <jetty.version>6.1.25</jetty.version>
+ <slf4j.version>1.5.8</slf4j.version>
+ <log4j.version>1.2.14</log4j.version>
+ </properties>
+ <dependencies>
- <!-- JUNIT DEPENDENCY FOR TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
+ <!-- JUNIT DEPENDENCY FOR TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-product</artifactId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>curator-services</artifactId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-webapp-components</artifactId>
+ <version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
- <!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <numUnapprovedLicenses>1</numUnapprovedLicenses>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>true</optimize>
- <debug>true</debug>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <port>8181</port>
- <systemProperties>
- <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
+ <!-- JETTY DEPENDENCIES FOR TESTING -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- LOGGING DEPENDENCIES - LOG4J -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <port>8181</port>
+ <systemProperties>
+ <CATALINA_OPTS>-Djava.awt.headless=true -Dfile.encoding=UTF-8
-server -Xms1536m -Xmx1536m
-XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m
-XX:MaxPermSize=512m -XX:+DisableExplicitGC
@@ -210,13 +183,39 @@ the License.
-XX:+CMSIncrementalMode
-XX:+CMSIncrementalPacing
-XX:CMSIncrementalDutyCycleMin=0
- -XX:-TraceClassUnloading
- </CATALINA_OPTS>
- </systemProperties>
- <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
- <path>/${project.build.finalName}</path>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </project>
+ -XX:-TraceClassUnloading</CATALINA_OPTS>
+ </systemProperties>
+ <contextFile>${basedir}/src/main/webapp/META-INF/context.xml</contextFile>
+ <path>/${project.build.finalName}</path>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <numUnapprovedLicenses>1</numUnapprovedLicenses>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pcs/services/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml
index caab386..4a2c494 100644
--- a/pcs/services/pom.xml
+++ b/pcs/services/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -31,27 +31,27 @@ the License.
OODT Process Control System via the JAX-RS specification.</description>
<dependencies>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>pcs-core</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.3</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>2.6.0</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pge/pom.xml
----------------------------------------------------------------------
diff --git a/pge/pom.xml b/pge/pom.xml
index f14aafd..1492d20 100644
--- a/pge/pom.xml
+++ b/pge/pom.xml
@@ -16,7 +16,7 @@ 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>org.apache.oodt</groupId>
@@ -28,8 +28,87 @@ the License.
<name>CAS PGE Adaptor Framework</name>
<description>Allows data processing jobs not written in conformance with the
PCS PGE interface to be run within the PCS.</description>
- <build>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>10.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-crawler</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -47,15 +126,15 @@ the License.
</configuration>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
<profiles>
<profile>
<id>audit</id>
@@ -75,94 +154,15 @@ the License.
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-workflow</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-crawler</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>10.0.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-dom</artifactId>
- <version>8.7</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 601ba26..23a3eca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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
@@ -16,91 +16,89 @@ 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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>core/pom.xml</relativePath>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>core/pom.xml</relativePath>
+ </parent>
- <artifactId>oodt</artifactId>
- <name>Apache OODT</name>
- <packaging>pom</packaging>
- <description>
- Apache OODT is middleware for metadata.
- </description>
+ <artifactId>oodt</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache OODT</name>
+ <description>Apache OODT is middleware for metadata.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk</url>
- </scm>
+ <modules>
+ <module>core</module>
+ <module>commons</module>
+ <module>cli</module>
+ <module>pcs/input</module>
+ <module>metadata</module>
+ <module>protocol/api</module>
+ <module>protocol/ftp</module>
+ <module>protocol/http</module>
+ <module>protocol/imaps</module>
+ <module>protocol/sftp</module>
+ <module>xmlquery</module>
+ <module>sso</module>
+ <module>filemgr</module>
+ <module>catalog</module>
+ <module>workflow</module>
+ <module>crawler</module>
+ <module>resource</module>
+ <module>curator/services</module>
+ <module>curator/webapp</module>
+ <module>pge</module>
+ <module>mvn/plugins/cas-install</module>
+ <module>mvn/archetypes</module>
+ <module>pushpull</module>
+ <module>product</module>
+ <module>profile</module>
+ <module>grid</module>
+ <module>xmlps</module>
+ <module>opendapps</module>
+ <module>webapp/components</module>
+ <module>webapp/fmbrowser</module>
+ <module>webapp/fmprod</module>
+ <module>webapp/wmonitor</module>
+ <module>app/fmbrowser</module>
+ <module>app/weditor</module>
+ <module>pcs/core</module>
+ <module>pcs/opsui</module>
+ <module>pcs/services</module>
+ </modules>
- <modules>
- <module>core</module>
- <module>commons</module>
- <module>cli</module>
- <module>pcs/input</module>
- <module>metadata</module>
- <module>protocol/api</module>
- <module>protocol/ftp</module>
- <module>protocol/http</module>
- <module>protocol/imaps</module>
- <module>protocol/sftp</module>
- <module>xmlquery</module>
- <module>sso</module>
- <module>filemgr</module>
- <module>catalog</module>
- <module>workflow</module>
- <module>crawler</module>
- <module>resource</module>
- <module>curator/services</module>
- <module>curator/webapp</module>
- <module>pge</module>
- <module>mvn/plugins/cas-install</module>
- <module>mvn/archetypes</module>
- <module>pushpull</module>
- <module>product</module>
- <module>profile</module>
- <module>grid</module>
- <module>xmlps</module>
- <module>opendapps</module>
- <module>webapp/components</module>
- <module>webapp/fmbrowser</module>
- <module>webapp/fmprod</module>
- <module>webapp/wmonitor</module>
- <module>app/fmbrowser</module>
- <module>app/weditor</module>
- <module>pcs/core</module>
- <module>pcs/opsui</module>
- <module>pcs/services</module>
- </modules>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <numUnapprovedLicenses>11</numUnapprovedLicenses>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk</url>
+ </scm>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <numUnapprovedLicenses>11</numUnapprovedLicenses>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
[06/15] oodt git commit: OODT-839 patch to update deps
Posted by ma...@apache.org.
OODT-839 patch to update deps
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705302 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/42587f4c
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/42587f4c
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/42587f4c
Branch: refs/heads/master
Commit: 42587f4c2a9f249d49574763ff71385a6c3a6ff7
Parents: 0daa5db
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 13:35:50 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 13:35:50 2015 +0000
----------------------------------------------------------------------
app/fmbrowser/pom.xml | 35 +-
app/weditor/pom.xml | 151 ++---
catalog/pom.xml | 244 ++++---
cli/pom.xml | 183 +++--
commons/pom.xml | 172 +++--
core/pom.xml | 1232 +++++++++++++++++++++-------------
crawler/pom.xml | 314 ++++-----
curator/services/pom.xml | 188 +++---
curator/webapp/pom.xml | 206 +++---
filemgr/pom.xml | 383 +++++------
grid/pom.xml | 83 +--
metadata/pom.xml | 165 +++--
mvn/archetypes/opsui/pom.xml | 14 +-
mvn/archetypes/pom.xml | 2 +-
mvn/archetypes/radix/pom.xml | 16 +-
mvn/plugins/cas-install/pom.xml | 90 ++-
opendapps/pom.xml | 60 +-
pcs/core/pom.xml | 95 ++-
pcs/input/pom.xml | 63 +-
pcs/opsui/pom.xml | 387 ++++++-----
pcs/services/pom.xml | 26 +-
pge/pom.xml | 174 ++---
pom.xml | 168 +++--
product/pom.xml | 194 +++---
profile/pom.xml | 110 +--
protocol/api/pom.xml | 222 +++---
protocol/ftp/pom.xml | 168 ++---
protocol/http/pom.xml | 152 ++---
protocol/imaps/pom.xml | 152 ++---
protocol/sftp/pom.xml | 171 +++--
pushpull/pom.xml | 164 ++---
resource/pom.xml | 182 ++---
sso/pom.xml | 30 +-
webapp/components/pom.xml | 290 ++++----
webapp/fmbrowser/pom.xml | 234 +++----
webapp/fmprod/pom.xml | 198 +++---
webapp/wmonitor/pom.xml | 246 +++----
workflow/pom.xml | 244 +++----
xmlps/pom.xml | 245 ++++---
xmlquery/pom.xml | 40 +-
40 files changed, 3834 insertions(+), 3659 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/app/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/app/fmbrowser/pom.xml b/app/fmbrowser/pom.xml
index a6caaef..543ae1c 100644
--- a/app/fmbrowser/pom.xml
+++ b/app/fmbrowser/pom.xml
@@ -29,35 +29,32 @@ the License.
provides the user of the CAS File Manager with a graphical environment in which they
can view archived products' metadata, query for products with particular metadata,
and export results of queries to the MS Excel(c) file format.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/app/fmbrowser</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/app/fmbrowser</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/app/fmbrowser</url>
- </scm>
- <build>
- <plugins />
- </build>
<dependencies>
<dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.2-FINAL</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
</dependency>
+
</dependencies>
+ <build>
+ <plugins></plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/app/fmbrowser</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/app/fmbrowser</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/app/fmbrowser</url>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/app/weditor/pom.xml
----------------------------------------------------------------------
diff --git a/app/weditor/pom.xml b/app/weditor/pom.xml
index f6bf653..ab0366e 100644
--- a/app/weditor/pom.xml
+++ b/app/weditor/pom.xml
@@ -16,83 +16,76 @@ 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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <artifactId>weditor</artifactId>
- <name>Catalog and Archive Workflow Management GUI Editor</name>
- <description>Apache OODT Workflow Editor GUI</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/cas/workflow/gui/util</targetPath>
- <directory>${basedir}/src/main/resources/icons</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-workflow</artifactId>
- <version>0.11-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jung</groupId>
- <artifactId>jung-api</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jung</groupId>
- <artifactId>jung-visualization</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jung</groupId>
- <artifactId>jung-algorithms</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jung</groupId>
- <artifactId>jung-graph-impl</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>jgraph</groupId>
- <artifactId>jgraph</artifactId>
- <version>5.13.0.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>weditor</artifactId>
+ <name>Catalog and Archive Workflow Management GUI Editor</name>
+ <description>Apache OODT Workflow Editor GUI</description>
+ <dependencies>
+ <dependency>
+ <groupId>jgraph</groupId>
+ <artifactId>jgraph</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-algorithms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-graph-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-visualization</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/cas/workflow/gui/util</targetPath>
+ <directory>${basedir}/src/main/resources/icons</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/catalog/pom.xml
----------------------------------------------------------------------
diff --git a/catalog/pom.xml b/catalog/pom.xml
index ce0e5bd..f8c843b 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -28,13 +28,109 @@
<description>CAS Catalog is an effort to virtualize underlying
catalogs for use in the CAS system. Heterogeneous catalog models
are mapped to a common dictionary, and then integrated locally so that
- they may be queried across and ingested into.
- </description>
+ they may be queried across and ingested into.</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/cas/catalog/config</targetPath>
+ <directory>${basedir}/src/main/resources/policy</directory>
+ <includes>
+ <include>catserv-properties.xml</include>
+ <include>catserv-beans.xml</include>
+ <include>catserv-server-config.xml</include>
+ <include>catserv-server-cmd-line-beans.xml</include>
+ <include>catserv-client-config.xml</include>
+ <include>catserv-client-action-beans.xml</include>
+ <include>catserv-client-cmd-line-beans.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <archive></archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/catalog</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/catalog</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/catalog</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/catalog</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/catalog</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/catalog</url>
</scm>
+ <ciManagement>
+ <notifiers>
+ <notifier>
+ <configuration>
+ <address>chris.mattmann@jpl.nasa.gov</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
<profiles>
<profile>
<id>audit</id>
@@ -53,10 +149,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -67,134 +163,28 @@
<id>tmpdir</id>
<activation>
<property>
- <name>test.tmpdir</name>
+ <name>test.tmpdir</name>
</property>
</activation>
- <build>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>java.io.tmpdir</name>
- <value>${test.tmpdir}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>java.io.tmpdir</name>
+ <value>${test.tmpdir}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <archive />
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/cas/catalog/config</targetPath>
- <directory>${basedir}/src/main/resources/policy</directory>
- <includes>
- <include>catserv-properties.xml</include>
- <include>catserv-beans.xml</include>
- <include>catserv-server-config.xml</include>
- <include>catserv-server-cmd-line-beans.xml</include>
- <include>catserv-client-config.xml</include>
- <include>catserv-client-action-beans.xml</include>
- <include>catserv-client-cmd-line-beans.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
- <ciManagement>
- <notifiers>
- <notifier>
- <configuration>
- <address>chris.mattmann@jpl.nasa.gov</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <exclusions>
- <exclusion>
- <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-<!--
+ <!--
<reporting>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index 474ea70..b2639b5 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -19,98 +19,93 @@
-->
<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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-cli</artifactId>
- <name>CAS Command Line Interface</name>
- <profiles>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/resources/examples/**/*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>10.0.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-cli</artifactId>
+ <name>CAS Command Line Interface</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/resources/examples/**/*</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 26b750a..14267d0 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -16,7 +16,7 @@
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>org.apache.oodt</groupId>
@@ -25,30 +25,73 @@
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-commons</artifactId>
- <name>Common Utilities</name>
<packaging>jar</packaging>
+ <name>Common Utilities</name>
<description>Apache OODT Common Utilities Project</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/commons</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ </dependency>
+ </dependencies>
<build>
<resources>
- <resource>
- <targetPath>org/apache/oodt/commons</targetPath>
- <directory>${basedir}/src/main/resources/dtd</directory>
- <includes>
- <include>Configuration.dtd</include>
- </includes>
- </resource>
- <resource>
- <targetPath>org/apache/oodt/commons/util</targetPath>
- <directory>${basedir}/src/main/resources/conf</directory>
- <includes>
- <include>entities.xml</include>
- </includes>
- </resource>
+ <resource>
+ <targetPath>org/apache/oodt/commons</targetPath>
+ <directory>${basedir}/src/main/resources/dtd</directory>
+ <includes>
+ <include>Configuration.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>org/apache/oodt/commons/util</targetPath>
+ <directory>${basedir}/src/main/resources/conf</directory>
+ <includes>
+ <include>entities.xml</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
@@ -58,21 +101,26 @@
<forkMode>pertest</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/src/test/resources/test.logging.properties</value>
- </property>
- </systemProperties>
- <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/test/resources/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/commons</url>
+ </scm>
<profiles>
<profile>
<id>audit</id>
@@ -93,10 +141,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -104,62 +152,4 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate3</artifactId>
- <version>2.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6d1df88..27b519d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,396 +16,432 @@ 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>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>16</version>
- <relativePath />
- </parent>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <name>OODT Core</name>
- <packaging>pom</packaging>
- <properties>
- <organizationLogo>http://www.apache.org/images/feather.gif</organizationLogo>
- <logo>/images/${project.artifactId}.jpg</logo>
- <xdocVersion>${project.version}</xdocVersion>
- <genDownloadLinks>false</genDownloadLinks>
- <docsSrc>${basedir}/src/site/xdoc</docsSrc>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <jena.version>3.0.0</jena.version>
- </properties>
- <url>http://oodt.apache.org/</url>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/OODT</url>
- </issueManagement>
- <inceptionYear>1999</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>dev</name>
- <subscribe>dev-subscribe@oodt.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@oodt.apache.org</unsubscribe>
- <post>dev@oodt.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/oodt-dev/</archive>
- </mailingList>
- <mailingList>
- <name>commits</name>
- <subscribe>commits-subscribe@oodt.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@oodt.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/oodt-commits/</archive>
- </mailingList>
- <mailingList>
- <name>private</name>
- <subscribe>private-subscribe@oodt.apache.org</subscribe>
- <unsubscribe>private-unsubscribe@oodt.apache.org</unsubscribe>
- <post>private@oodt.apache.org</post>
- </mailingList>
- </mailingLists>
- <developers>
- <developer>
- <id>thomas</id>
- <name>Thomas Bennett</name>
- <email>thomas@apache.org</email>
- <organization>SKA South Africa</organization>
- <timezone>+2</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>crichton</id>
- <name>Daniel Crichton</name>
- <email>crichton@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>bfoster</id>
- <name>Brian Foster</name>
- <email>bfoster@apache.org</email>
- <organization>Google</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>joshuaga</id>
- <name>Joshua Garcia</name>
- <email>joshuaga@apache.org</email>
- <organization>University of Southern California</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>goodale</id>
- <name>Cameron Goodale</name>
- <email>goodale@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- <properties>
- <aim>nonflyt</aim>
- <gtalk>sigep311@gmail.com</gtalk>
- </properties>
- </developer>
- <developer>
- <id>shardman</id>
- <name>Sean Hardman</name>
- <email>shardman@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>ahart</id>
- <name>Andrew Hart</name>
- <email>ahart@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>davekale</id>
- <name>Dave Kale</name>
- <email>davekale@apache.org</email>
- <organization>Childrens Hospital Los Angeles</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>kelly</id>
- <name>Sean Kelly</name>
- <email>kelly@apache.org</email>
- <url>http://seankelly.biz/</url>
- <organization>Independent Consultant</organization>
- <roles>
- <role>committer</role>
- <role>technologist</role>
- </roles>
- <timezone>-6</timezone>
- <properties>
- <picUrl>http://seankelly.biz/Members/kelly/sean-kelly/image</picUrl>
- <blogUrl>http://seankelly.biz/blog</blogUrl>
- <foaf>http://seankelly.biz/Members/kelly/sean-kellys-foaf</foaf>
- <aim>InsanityPoet</aim>
- <skype>InsanityPoet</skype>
- <gtalk>sean.c.kelly@gmail.com</gtalk>
- <mobileme>sean.c.kelly@me.com</mobileme>
- </properties>
- </developer>
- <developer>
- <id>mattmann</id>
- <name>Chris Mattmann</name>
- <email>Chris.Mattmann@jpl.nasa.gov</email>
- <url>http://www-scf.usc.edu/~mattmann/</url>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- <role>mentor</role>
- <role>release engineer</role>
- </roles>
- </developer>
- <developer>
- <id>pramirez</id>
- <name>Paul Ramirez</name>
- <email>pramirez@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>smcclees</id>
- <name>Sean McCleese</name>
- <email>smcclees@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>gabe</id>
- <name>Gabe Resneck</name>
- <email>gabriel.m.resneck@jpl.nasa.gov</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>pvee</id>
- <name>Paul Vee</name>
- <email>pvee@apache.org</email>
- <organization>Childrens Hospital Los Angeles</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>riverma</id>
- <name>Rishi Verma</name>
- <email>riverma@apache.org</email>
- <organization>NASA Jet Propulsion Laboratory</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>woollard</id>
- <name>David Woollard</name>
- <email>woollard@apache.org</email>
- <organization>Project WBS</organization>
- <timezone>-8</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- <developer>
- <id>siriwardana</id>
- <name>Rajith Siriwardana</name>
- <email>siriwardana@apache.org</email>
- <organization>Independent Consultant</organization>
- <timezone>+5:30</timezone>
- <roles>
- <role>committer</role>
- </roles>
- </developer>
- </developers>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <comments>The standard OSI-approved Apache license, friendly to commercial interests yet open.</comments>
- <distribution>manual</distribution>
- </license>
- </licenses>
- <organization>
- <name>Apache OODT</name>
- <url>http://oodt.apache.org/</url>
- </organization>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/core</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/core</url>
- </scm>
- <build>
- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <index>true</index>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <outputEncoding>UTF-8</outputEncoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <version>3.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <profiles>
- <profile>
- <id>jdk1.8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
- <configuration>
- <outputEncoding>UTF-8</outputEncoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>audit</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <reporting>
- <plugins>
- <!-- FIXME: currently produces a NullPointerException
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>16</version>
+ <relativePath></relativePath>
+ </parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>OODT Core</name>
+ <properties>
+ <organizationLogo>http://www.apache.org/images/feather.gif</organizationLogo>
+ <logo>/images/${project.artifactId}.jpg</logo>
+ <xdocVersion>${project.version}</xdocVersion>
+ <genDownloadLinks>false</genDownloadLinks>
+ <docsSrc>${basedir}/src/site/xdoc</docsSrc>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <jena.version>3.0.0</jena.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.7.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>10.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also an Apache incompatible license -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.ucar</groupId>
+ <artifactId>netcdf</artifactId>
+ <version>4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>jgraph</groupId>
+ <artifactId>jgraph</artifactId>
+ <version>5.13.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.26</version>
+ </dependency>
+ <dependency>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.4</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-algorithms</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-graph-impl</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jung</groupId>
+ <artifactId>jung-visualization</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <version>${jena.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-crawler</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-resource</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>curator-services</artifactId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-product</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-profile</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-sso</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-webapp-components</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-xmlquery</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-input</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.2-FINAL</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-parsers</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ <version>2.2-beta1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.9-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.safehaus.jug</groupId>
+ <artifactId>jug</artifactId>
+ <version>2.0.0</version>
+ <classifier>asl</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-hibernate3</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <outputEncoding>UTF-8</outputEncoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <!-- FIXME: currently produces a NullPointerException
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
@@ -424,69 +460,357 @@ the License.
</reportSet>
</reportSets>
</plugin> -->
- <!-- Produce JavaDoc -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <outputEncoding>UTF-8</outputEncoding>
- <charset>UTF-8</charset>
- <docencoding>UTF-8</docencoding>
- <encoding>UTF-8</encoding>
- <aggregate>true</aggregate>
- <source>1.5</source>
- </configuration>
- </plugin>
- <!-- Produce Source cross references -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <!-- Unit tests report -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <!-- "Release Audit" report (checks license headers etc.) -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- </plugin>
- <!-- FindBugs Report -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- </configuration>
- </plugin>
- <!-- Checkstyle report -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <!--configLocation>checkstyle.xml</configLocation-->
- <enableRulesSummary>false</enableRulesSummary>
- </configuration>
- </plugin>
- <!-- Project website generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <outputEncoding>UTF-8</outputEncoding>
- </configuration>
- </plugin>
+ <!-- Produce JavaDoc -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <outputEncoding>UTF-8</outputEncoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <encoding>UTF-8</encoding>
+ <aggregate>true</aggregate>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ <!-- Produce Source cross references -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <!-- Unit tests report -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <!-- "Release Audit" report (checks license headers etc.) -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ </plugin>
+ <!-- FindBugs Report -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ </configuration>
+ </plugin>
+ <!-- Checkstyle report -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <!--configLocation>checkstyle.xml</configLocation-->
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <!-- Project website generation -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <outputEncoding>UTF-8</outputEncoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <url>http://oodt.apache.org/</url>
+ <inceptionYear>1999</inceptionYear>
+ <organization>
+ <name>Apache OODT</name>
+ <url>http://oodt.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>manual</distribution>
+ <comments>The standard OSI-approved Apache license, friendly to commercial interests yet open.</comments>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>thomas</id>
+ <name>Thomas Bennett</name>
+ <email>thomas@apache.org</email>
+ <organization>SKA South Africa</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>+2</timezone>
+ </developer>
+ <developer>
+ <id>crichton</id>
+ <name>Daniel Crichton</name>
+ <email>crichton@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>bfoster</id>
+ <name>Brian Foster</name>
+ <email>bfoster@apache.org</email>
+ <organization>Google</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>joshuaga</id>
+ <name>Joshua Garcia</name>
+ <email>joshuaga@apache.org</email>
+ <organization>University of Southern California</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>goodale</id>
+ <name>Cameron Goodale</name>
+ <email>goodale@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ <properties>
+ <aim>nonflyt</aim>
+ <gtalk>sigep311@gmail.com</gtalk>
+ </properties>
+ </developer>
+ <developer>
+ <id>shardman</id>
+ <name>Sean Hardman</name>
+ <email>shardman@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>ahart</id>
+ <name>Andrew Hart</name>
+ <email>ahart@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>davekale</id>
+ <name>Dave Kale</name>
+ <email>davekale@apache.org</email>
+ <organization>Childrens Hospital Los Angeles</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>kelly</id>
+ <name>Sean Kelly</name>
+ <email>kelly@apache.org</email>
+ <url>http://seankelly.biz/</url>
+ <organization>Independent Consultant</organization>
+ <roles>
+ <role>committer</role>
+ <role>technologist</role>
+ </roles>
+ <timezone>-6</timezone>
+ <properties>
+ <picUrl>http://seankelly.biz/Members/kelly/sean-kelly/image</picUrl>
+ <blogUrl>http://seankelly.biz/blog</blogUrl>
+ <foaf>http://seankelly.biz/Members/kelly/sean-kellys-foaf</foaf>
+ <aim>InsanityPoet</aim>
+ <skype>InsanityPoet</skype>
+ <gtalk>sean.c.kelly@gmail.com</gtalk>
+ <mobileme>sean.c.kelly@me.com</mobileme>
+ </properties>
+ </developer>
+ <developer>
+ <id>mattmann</id>
+ <name>Chris Mattmann</name>
+ <email>Chris.Mattmann@jpl.nasa.gov</email>
+ <url>http://www-scf.usc.edu/~mattmann/</url>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ <role>mentor</role>
+ <role>release engineer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>pramirez</id>
+ <name>Paul Ramirez</name>
+ <email>pramirez@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>smcclees</id>
+ <name>Sean McCleese</name>
+ <email>smcclees@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>gabe</id>
+ <name>Gabe Resneck</name>
+ <email>gabriel.m.resneck@jpl.nasa.gov</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>pvee</id>
+ <name>Paul Vee</name>
+ <email>pvee@apache.org</email>
+ <organization>Childrens Hospital Los Angeles</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>riverma</id>
+ <name>Rishi Verma</name>
+ <email>riverma@apache.org</email>
+ <organization>NASA Jet Propulsion Laboratory</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>woollard</id>
+ <name>David Woollard</name>
+ <email>woollard@apache.org</email>
+ <organization>Project WBS</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>-8</timezone>
+ </developer>
+ <developer>
+ <id>siriwardana</id>
+ <name>Rajith Siriwardana</name>
+ <email>siriwardana@apache.org</email>
+ <organization>Independent Consultant</organization>
+ <roles>
+ <role>committer</role>
+ </roles>
+ <timezone>+5:30</timezone>
+ </developer>
+ </developers>
+ <mailingLists>
+ <mailingList>
+ <name>dev</name>
+ <subscribe>dev-subscribe@oodt.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@oodt.apache.org</unsubscribe>
+ <post>dev@oodt.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/oodt-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>commits</name>
+ <subscribe>commits-subscribe@oodt.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@oodt.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/oodt-commits/</archive>
+ </mailingList>
+ <mailingList>
+ <name>private</name>
+ <subscribe>private-subscribe@oodt.apache.org</subscribe>
+ <unsubscribe>private-unsubscribe@oodt.apache.org</unsubscribe>
+ <post>private@oodt.apache.org</post>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/core</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/core</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/OODT</url>
+ </issueManagement>
+ <profiles>
+ <profile>
+ <id>jdk1.8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ <configuration>
+ <outputEncoding>UTF-8</outputEncoding>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration></configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>audit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </reporting>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/crawler/pom.xml
----------------------------------------------------------------------
diff --git a/crawler/pom.xml b/crawler/pom.xml
index dc1685c..a6d7f7c 100644
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -17,175 +17,157 @@ 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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
- <artifactId>cas-crawler</artifactId>
- <name>Catalog and Archive Crawling Framework</name>
- <description>The Catalog and Archive Service Crawling Framework.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/crawler</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/crawler</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/crawler</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <forkMode>pertest</forkMode>
- <useSystemClassLoader>false</useSystemClassLoader>
- <systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/src/testdata/test.logging.properties</value>
- </property>
- </systemProperties>
- <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.apache.oodt.cas.crawl.CrawlerLauncher</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/cas/crawl</targetPath>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>action-beans.xml</include>
- <include>crawler-beans.xml</include>
- <include>crawler-config.xml</include>
- <include>precondition-beans.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-workflow</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.5.4</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-crawler</artifactId>
+ <name>Catalog and Archive Crawling Framework</name>
+ <description>The Catalog and Archive Service Crawling Framework.</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/cas/crawl</targetPath>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>action-beans.xml</include>
+ <include>crawler-beans.xml</include>
+ <include>crawler-config.xml</include>
+ <include>precondition-beans.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <systemProperties>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/testdata/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.oodt.cas.crawl.CrawlerLauncher</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/crawler</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/crawler</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/crawler</url>
+ </scm>
</project>
[15/15] oodt git commit: closes apache/oodt#32 OODT-882 Merge
dependency update
Posted by ma...@apache.org.
closes apache/oodt#32 OODT-882 Merge dependency update
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/be35c789
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/be35c789
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/be35c789
Branch: refs/heads/master
Commit: be35c7898f70fa4b980d814917f3d7faf61776fe
Parents: 9e5af9f
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Oct 6 11:38:55 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Oct 6 11:38:55 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/be35c789/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d8acbbc..968467f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ Release 0.11 - Current Development
* OODT-872 Upgrade Jena dependencies to org.apache.jena 3.0.0 (lewismc, mattmann)
+* OODT-882 Merge dependency update into master (magicaltrout)
+
Release 0.10 - 08/30/2015
* OODT-871 Issues with OODT 0.10 RC#1 (lewismc, mattmann)
[09/15] oodt git commit: OODT-839 update test runner
Posted by ma...@apache.org.
OODT-839 update test runner
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705317 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/62ef5c08
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/62ef5c08
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/62ef5c08
Branch: refs/heads/master
Commit: 62ef5c08843cac269b274a5ad35c5405ddd87361
Parents: 23f6be7
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 14:53:41 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 14:53:41 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/commons/object/jndi/TestContext.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/62ef5c08/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
----------------------------------------------------------------------
diff --git a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
index 59e5cc5..72711b0 100644
--- a/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
+++ b/commons/src/test/java/org/apache/oodt/commons/object/jndi/TestContext.java
@@ -40,8 +40,13 @@ import javax.naming.OperationNotSupportedException;
* @author Kelly
* @version $Revision: 1.1 $
*/
-class TestContext implements Context {
- /**
+public class TestContext implements Context {
+
+
+ public TestContext() {
+ }
+
+ /**
* Creates a new <code>TestContext</code> instance.
*
* @param prefix What every name must start with.
[13/15] oodt git commit: OODT-839 remove versions
Posted by ma...@apache.org.
OODT-839 remove versions
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705351 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/2af83059
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/2af83059
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/2af83059
Branch: refs/heads/master
Commit: 2af83059cd6a70cd8e11c569241f4e78429eeee8
Parents: 01ed20f
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 20:59:05 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 20:59:05 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++
webapp/fmprod/pom.xml | 16 ----------------
2 files changed, 45 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/2af83059/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c1cdbea..d6f0f9a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -187,11 +187,36 @@ the License.
<version>2.0.1</version>
</dependency>
<dependency>
+ <!--
+ Zip4j is released under the Apache License, Version 2.0
+ For reference, see: http://www.lingala.net/zip4j/about.php
+ -->
+ <groupId>net.lingala.zip4j</groupId>
+ <artifactId>zip4j</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>2.6.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
+ <version>2.6.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>2.6.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
<version>1.0.5</version>
@@ -207,6 +232,11 @@ the License.
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.jena</groupId>
<artifactId>apache-jena-libs</artifactId>
<version>${jena.version}</version>
@@ -340,6 +370,11 @@ the License.
<version>1.7</version>
</dependency>
<dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
<version>${wicket.version}</version>
@@ -350,6 +385,11 @@ the License.
<version>${wicket.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.1</version>
@@ -477,6 +517,11 @@ the License.
<artifactId>xmlrpc</artifactId>
<version>2.0.1</version>
</dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.4</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/2af83059/webapp/fmprod/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmprod/pom.xml b/webapp/fmprod/pom.xml
index baf69d2..397e6d0 100644
--- a/webapp/fmprod/pom.xml
+++ b/webapp/fmprod/pom.xml
@@ -35,13 +35,11 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -51,56 +49,46 @@
-->
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
- <version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>2.6.8</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>2.6.8</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>2.6.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-product</artifactId>
- <version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -110,23 +98,19 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.4</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.4</version>
<scope>test</scope>
</dependency>
</dependencies>
[11/15] oodt git commit: OODT-839 update slf4j
Posted by ma...@apache.org.
OODT-839 update slf4j
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705320 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/76e09711
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/76e09711
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/76e09711
Branch: refs/heads/master
Commit: 76e09711b73c71a2c4d5988a067df26a3d931e67
Parents: 365a241
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 15:23:11 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 15:23:11 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/76e09711/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3b198bf..b30b804 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -399,18 +399,23 @@ the License.
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.3.1</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j</artifactId>
- <version>1.3.1</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.3.1</version>
+ <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
[12/15] oodt git commit: OODT-839 remove ftp version and fix test
Posted by ma...@apache.org.
OODT-839 remove ftp version and fix test
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705327 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/01ed20ff
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/01ed20ff
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/01ed20ff
Branch: refs/heads/master
Commit: 01ed20ff2c4bc3ea46756134eb62f2b79cd4fafd
Parents: 76e0971
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 15:52:30 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 15:52:30 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 15 +++++++++++++++
protocol/ftp/pom.xml | 6 ------
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/01ed20ff/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b30b804..c1cdbea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -192,6 +192,11 @@ the License.
<version>2.6.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<version>1.8.1</version>
@@ -357,6 +362,16 @@ the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jglobus</groupId>
+ <artifactId>gss</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jglobus</groupId>
+ <artifactId>JGlobus-GridFTP</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
http://git-wip-us.apache.org/repos/asf/oodt/blob/01ed20ff/protocol/ftp/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/ftp/pom.xml b/protocol/ftp/pom.xml
index e200794..c7545cb 100644
--- a/protocol/ftp/pom.xml
+++ b/protocol/ftp/pom.xml
@@ -29,13 +29,11 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
- <version>1.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -46,23 +44,19 @@
<dependency>
<groupId>org.jglobus</groupId>
<artifactId>gss</artifactId>
- <version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.jglobus</groupId>
<artifactId>JGlobus-GridFTP</artifactId>
- <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
[07/15] oodt git commit: OODT-839 remove more dependency versions
Posted by ma...@apache.org.
OODT-839 remove more dependency versions
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705303 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/18ffbae1
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/18ffbae1
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/18ffbae1
Branch: refs/heads/master
Commit: 18ffbae19cd7411d57530e4cde0835254396fd78
Parents: 42587f4
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 13:36:03 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 13:36:03 2015 +0000
----------------------------------------------------------------------
pcs/opsui/pom.xml | 14 --------------
product/pom.xml | 4 ----
protocol/api/pom.xml | 6 ------
protocol/http/pom.xml | 4 ----
protocol/imaps/pom.xml | 6 ------
webapp/components/pom.xml | 9 ---------
webapp/fmbrowser/pom.xml | 8 --------
webapp/wmonitor/pom.xml | 8 --------
xmlps/pom.xml | 11 -----------
9 files changed, 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/pcs/opsui/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml
index 8b5adc2..3c2012f 100755
--- a/pcs/opsui/pom.xml
+++ b/pcs/opsui/pom.xml
@@ -39,40 +39,33 @@ the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-filemgr</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-product</artifactId>
- <version>${project.parent.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>curator-services</artifactId>
- <version>${project.parent.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-webapp-components</artifactId>
- <version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.oodt</groupId>
@@ -87,36 +80,30 @@ the License.
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>pcs-core</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
</dependency>
<!-- JETTY DEPENDENCIES FOR TESTING -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
@@ -124,7 +111,6 @@ the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/product/pom.xml
----------------------------------------------------------------------
diff --git a/product/pom.xml b/product/pom.xml
index 16a6c2b..86b1438 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -45,24 +45,20 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/protocol/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/api/pom.xml b/protocol/api/pom.xml
index 7273065..779876c 100644
--- a/protocol/api/pom.xml
+++ b/protocol/api/pom.xml
@@ -37,33 +37,27 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
<artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/protocol/http/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml
index 06a017f..640e001 100644
--- a/protocol/http/pom.xml
+++ b/protocol/http/pom.xml
@@ -24,23 +24,19 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/protocol/imaps/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/imaps/pom.xml b/protocol/imaps/pom.xml
index 0bf1f6d..1796d34 100644
--- a/protocol/imaps/pom.xml
+++ b/protocol/imaps/pom.xml
@@ -24,29 +24,24 @@
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
- <version>1.3.1b</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-protocol-api</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
@@ -55,7 +50,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.3.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/webapp/components/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/components/pom.xml b/webapp/components/pom.xml
index 25bec12..236551e 100644
--- a/webapp/components/pom.xml
+++ b/webapp/components/pom.xml
@@ -31,49 +31,40 @@ the License.
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-filemgr</artifactId>
- <version>0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-workflow</artifactId>
- <version>0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>pcs-core</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>1.4.16</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>0.9.9-RC1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/webapp/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml
index d6ea986..c6cc6e9 100644
--- a/webapp/fmbrowser/pom.xml
+++ b/webapp/fmbrowser/pom.xml
@@ -41,42 +41,35 @@ the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-webapp-components</artifactId>
- <version>0.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
</dependency>
<!-- JETTY DEPENDENCIES FOR TESTING -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
@@ -84,7 +77,6 @@ the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/webapp/wmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml
index 12aa52f..73abab3 100644
--- a/webapp/wmonitor/pom.xml
+++ b/webapp/wmonitor/pom.xml
@@ -41,18 +41,15 @@ the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-webapp-components</artifactId>
- <version>0.11-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.oodt</groupId>
@@ -63,26 +60,22 @@ the License.
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
</dependency>
<!-- JETTY DEPENDENCIES FOR TESTING -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
@@ -90,7 +83,6 @@ the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/oodt/blob/18ffbae1/xmlps/pom.xml
----------------------------------------------------------------------
diff --git a/xmlps/pom.xml b/xmlps/pom.xml
index 542f19b..190cfad 100644
--- a/xmlps/pom.xml
+++ b/xmlps/pom.xml
@@ -32,65 +32,54 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>2.1</version>
<optional></optional>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
<optional></optional>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.2</version>
<optional></optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
<optional></optional>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-product</artifactId>
- <version>${project.parent.version}</version>
<optional></optional>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-profile</artifactId>
- <version>${project.parent.version}</version>
<optional></optional>
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
[08/15] oodt git commit: OODT-839 add more versions to core pom
Posted by ma...@apache.org.
OODT-839 add more versions to core pom
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705313 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/23f6be76
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/23f6be76
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/23f6be76
Branch: refs/heads/master
Commit: 23f6be761fba3871f9794c23af99ed1c3ac4c4ef
Parents: 18ffbae
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 14:30:18 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 14:30:18 2015 +0000
----------------------------------------------------------------------
core/pom.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/23f6be76/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 27b519d..3b198bf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -37,6 +37,8 @@ the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jena.version>3.0.0</jena.version>
+ <wicket.version>1.4.17</wicket.version>
+ <jetty.version>6.1.25</jetty.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -51,6 +53,12 @@ the License.
<version>10.0.1</version>
</dependency>
<dependency>
+ <groupId>com.icegreen</groupId>
+ <artifactId>greenmail</artifactId>
+ <version>1.3.1b</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.3.1</version>
@@ -133,11 +141,21 @@ the License.
<version>4.12</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.26</version>
</dependency>
<dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.6.2</version>
+ </dependency>
+ <dependency>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.0</version>
@@ -221,6 +239,17 @@ the License.
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
+ <artifactId>cas-product</artifactId>
+ <type>war</type>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-protocol-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-resource</artifactId>
<version>${project.parent.version}</version>
</dependency>
@@ -267,10 +296,20 @@ the License.
</dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
<artifactId>pcs-input</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>pcs-opsui</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.2-FINAL</version>
@@ -324,6 +363,24 @@ the License.
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
<version>2.2-beta1</version>
@@ -341,6 +398,21 @@ the License.
<classifier>asl</classifier>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.5.4</version>
[03/15] oodt git commit: OODT-839 patch to update deps
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/webapp/wmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml
index 1b8e0c7..12aa52f 100644
--- a/webapp/wmonitor/pom.xml
+++ b/webapp/wmonitor/pom.xml
@@ -16,129 +16,129 @@ 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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.oodt</groupId>
- <artifactId>wmonitor</artifactId>
- <packaging>war</packaging>
- <version>0.11-SNAPSHOT</version>
- <name>CAS Workflow Manager Monitor Web App</name>
- <properties>
- <wicket.version>1.4.17</wicket.version>
- <jetty.version>6.1.25</jetty.version>
- <slf4j.version>1.5.8</slf4j.version>
- <log4j.version>1.2.14</log4j.version>
- </properties>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/wmonitor</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-webapp-components</artifactId>
- <version>0.11-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>cas-filemgr</artifactId>
- <groupId>org.apache.oodt</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../../core/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>wmonitor</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>CAS Workflow Manager Monitor Web App</name>
+ <properties>
+ <wicket.version>1.4.17</wicket.version>
+ <jetty.version>6.1.25</jetty.version>
+ <slf4j.version>1.5.8</slf4j.version>
+ <log4j.version>1.2.14</log4j.version>
+ </properties>
+ <dependencies>
- <!-- JUNIT DEPENDENCY FOR TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
+ <!-- JUNIT DEPENDENCY FOR TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-webapp-components</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-filemgr</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
- <!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <filtering>false</filtering>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <optimize>true</optimize>
- <debug>true</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </project>
+ <!-- JETTY DEPENDENCIES FOR TESTING -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- LOGGING DEPENDENCIES - LOG4J -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/webapp/wmonitor</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/webapp/wmonitor</url>
+ </scm>
+</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/workflow/pom.xml
----------------------------------------------------------------------
diff --git a/workflow/pom.xml b/workflow/pom.xml
index c067fb2..58241c5 100644
--- a/workflow/pom.xml
+++ b/workflow/pom.xml
@@ -16,7 +16,7 @@ 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>org.apache.oodt</groupId>
@@ -31,6 +31,114 @@ the License.
provides some out of the box backend implementations of them (including one based
on the javax.sql.DataSource interface). This component provides everything that you need
to execute workflows, and science processing pipelines.</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-cli</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-resource</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.safehaus.jug</groupId>
+ <artifactId>jug</artifactId>
+ <version>2.0.0</version>
+ <classifier>asl</classifier>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -40,16 +148,16 @@ the License.
<forkMode>pertest</forkMode>
<useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/src/test/resources/test.logging.properties</value>
- </property>
- </systemProperties>
- <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/test/resources/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
</configuration>
</plugin>
<plugin>
@@ -68,13 +176,13 @@ the License.
</configuration>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -95,10 +203,10 @@ the License.
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -106,112 +214,4 @@ the License.
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-cli</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-resource</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>xmlrpc</groupId>
- <artifactId>xmlrpc</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.safehaus.jug</groupId>
- <artifactId>jug</artifactId>
- <version>2.0.0</version>
- <classifier>asl</classifier>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/xmlps/pom.xml
----------------------------------------------------------------------
diff --git a/xmlps/pom.xml b/xmlps/pom.xml
index bd373b9..542f19b 100644
--- a/xmlps/pom.xml
+++ b/xmlps/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
- <!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -15,129 +14,125 @@
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>org.apache.oodt</groupId>
- <artifactId>oodt-core</artifactId>
- <version>0.11-SNAPSHOT</version>
- <relativePath>../core/pom.xml</relativePath>
- </parent>
- <artifactId>oodt-xmlps</artifactId>
- <name>XML-configured, DBMS-based Product and Profile Server</name>
- <version>0.11-SNAPSHOT</version>
- <description>
- An XML-configured DBMS-based Product and Profile meant to easily
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+ <artifactId>oodt-xmlps</artifactId>
+ <version>0.11-SNAPSHOT</version>
+ <name>XML-configured, DBMS-based Product and Profile Server</name>
+ <description>An XML-configured DBMS-based Product and Profile meant to easily
sit on top of Web-Grid and other Product and Profile server contexts
- for rapid deployment and integration.
- </description>
- <build>
- <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <targetPath>org/apache/oodt/xmlps</targetPath>
- <directory>${basedir}/src/main/conf</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <targetPath>org/apache/oodt/xmlps/mapping</targetPath>
- <filtering />
- <directory>${basedir}/src/test/resources</directory>
- <includes />
- <excludes />
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <systemProperties>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${basedir}/src/test/resources/logging.properties</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-xmlquery</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>cas-metadata</artifactId>
- <version>${project.parent.version}</version>
- <optional />
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-product</artifactId>
- <version>${project.parent.version}</version>
- <optional />
- </dependency>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-profile</artifactId>
- <version>${project.parent.version}</version>
- <optional />
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <optional />
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <optional />
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- <optional />
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+ for rapid deployment and integration.</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ <optional></optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.1</version>
+ <optional></optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.2</version>
+ <optional></optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-metadata</artifactId>
+ <version>${project.parent.version}</version>
+ <optional></optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-product</artifactId>
+ <version>${project.parent.version}</version>
+ <optional></optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-profile</artifactId>
+ <version>${project.parent.version}</version>
+ <optional></optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-xmlquery</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <targetPath>org/apache/oodt/xmlps</targetPath>
+ <directory>${basedir}/src/main/conf</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <targetPath>org/apache/oodt/xmlps/mapping</targetPath>
+ <filtering></filtering>
+ <directory>${basedir}/src/test/resources</directory>
+ <includes></includes>
+ <excludes></excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <systemProperties>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/test/resources/logging.properties</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/42587f4c/xmlquery/pom.xml
----------------------------------------------------------------------
diff --git a/xmlquery/pom.xml b/xmlquery/pom.xml
index 643f649..4d92234 100644
--- a/xmlquery/pom.xml
+++ b/xmlquery/pom.xml
@@ -24,8 +24,8 @@
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-xmlquery</artifactId>
- <name>Query Expression</name>
<packaging>jar</packaging>
+ <name>Query Expression</name>
<description>This component provides a way to express queries in a generic
manner. Its centerpiece is a class called XMLQuery that uses
boolean postfix expressions to capture the domain, range, and
@@ -34,11 +34,19 @@
query. It's used by many other components as the standard way to
pass a query and its results between servers, clients, nodes, and
other components.</description>
- <scm>
- <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</developerConnection>
- <url>http://svn.apache.org/viewvc/oodt/trunk/xmlquery</url>
- </scm>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
@@ -63,6 +71,11 @@
</plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/trunk/xmlquery</url>
+ </scm>
<profiles>
<profile>
<id>audit</id>
@@ -81,10 +94,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -92,17 +105,4 @@
</build>
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>org.apache.oodt</groupId>
- <artifactId>oodt-commons</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
[02/15] oodt git commit: Merge update trunk to dep update branch
Posted by ma...@apache.org.
Merge update trunk to dep update branch
git-svn-id: https://svn.apache.org/repos/asf/oodt/branches/dependency-update@1705287 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/0daa5db5
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/0daa5db5
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/0daa5db5
Branch: refs/heads/master
Commit: 0daa5db559db085b7345231db9cfac3fc2ecca7a
Parents: 5839183 53e3477
Author: Tom Barber <ma...@apache.org>
Authored: Fri Sep 25 12:55:12 2015 +0000
Committer: Tom Barber <ma...@apache.org>
Committed: Fri Sep 25 12:55:12 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 47 +-
agility/setup.py | 2 +-
app/fmbrowser/pom.xml | 2 +-
app/weditor/pom.xml | 4 +-
.../lib/pear/Core/ApplicationRequest.class.php | 8 +-
catalog/pom.xml | 2 +-
cli/pom.xml | 2 +-
commons/pom.xml | 2 +-
.../oodt/commons/io/DirectorySelectorTest.java | 17 +
.../org/apache/oodt/commons/util/XMLTest.java | 4 +-
commons/src/test/resources/test.xml | 16 +
core/pom.xml | 17 +-
crawler/pom.xml | 2 +-
curator/pom.xml | 225 -
curator/services/pom.xml | 166 +
.../curation/metadata/CuratorConfMetKeys.java | 52 +
.../cas/curation/service/CurationService.java | 154 +
.../curation/service/CurationServiceConfig.java | 212 +
.../cas/curation/service/DirectoryResource.java | 139 +
.../cas/curation/service/IngestionResource.java | 352 ++
.../cas/curation/service/MetadataResource.java | 972 ++++
.../cas/curation/service/PolicyResource.java | 310 ++
.../cas/curation/service/SystemResource.java | 69 +
.../cas/curation/structs/ExtractorConfig.java | 54 +
.../cas/curation/structs/IngestionTask.java | 168 +
.../curation/structs/IngestionTaskStatus.java | 36 +
.../curation/util/CurationXmlStructFactory.java | 114 +
.../oodt/cas/curation/util/DateUtils.java | 59 +
.../curation/util/ExtractorConfigReader.java | 52 +
.../curation/util/ExtractorConfigWriter.java | 51 +
.../src/main/webapp/META-INF/context.xml | 43 +
.../services/src/main/webapp/WEB-INF/web.xml | 52 +
.../apache/oodt/cas/curation/CurationApp.java | 22 -
.../org/apache/oodt/cas/curation/HomePage.css | 645 ---
.../org/apache/oodt/cas/curation/HomePage.html | 149 -
.../org/apache/oodt/cas/curation/HomePage.java | 7 -
.../org/apache/oodt/cas/curation/HomePage.js | 639 ---
.../cas/curation/config/CuratorConfMetKeys.java | 56 -
.../org/apache/oodt/cas/curation/curation.png | Bin 10161 -> 0 bytes
.../oodt/cas/curation/fileTree/application.png | Bin 465 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/code.png | Bin 604 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/css.png | Bin 619 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/db.png | Bin 580 -> 0 bytes
.../oodt/cas/curation/fileTree/directory.png | Bin 538 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/doc.png | Bin 652 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/file.png | Bin 295 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/film.png | Bin 654 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/flash.png | Bin 583 -> 0 bytes
.../oodt/cas/curation/fileTree/folder_open.png | Bin 584 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/html.png | Bin 735 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/java.png | Bin 634 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/linux.png | Bin 669 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/music.png | Bin 386 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/pdf.png | Bin 592 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/php.png | Bin 539 -> 0 bytes
.../oodt/cas/curation/fileTree/picture.png | Bin 607 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/ppt.png | Bin 589 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/psd.png | Bin 857 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/ruby.png | Bin 627 -> 0 bytes
.../oodt/cas/curation/fileTree/script.png | Bin 860 -> 0 bytes
.../oodt/cas/curation/fileTree/spinner.gif | Bin 2531 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/txt.png | Bin 343 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/xls.png | Bin 664 -> 0 bytes
.../apache/oodt/cas/curation/fileTree/zip.png | Bin 387 -> 0 bytes
.../org/apache/oodt/cas/curation/green_dot.png | Bin 195 -> 0 bytes
.../java/org/apache/oodt/cas/curation/help.gif | Bin 1583 -> 0 bytes
.../oodt/cas/curation/icon-new-dataset.png | Bin 2061 -> 0 bytes
.../cas/curation/icon-new-dataset_smaller.png | Bin 1446 -> 0 bytes
.../oodt/cas/curation/icon-new-product.png | Bin 1591 -> 0 bytes
.../cas/curation/icon-new-product_smaller.png | Bin 1345 -> 0 bytes
.../org/apache/oodt/cas/curation/important.gif | Bin 1493 -> 0 bytes
.../java/org/apache/oodt/cas/curation/info.gif | Bin 1488 -> 0 bytes
.../org/apache/oodt/cas/curation/ingestion.png | Bin 6687 -> 0 bytes
.../apache/oodt/cas/curation/jquery-1.3.2.js | 4376 ------------------
.../cas/curation/jquery-ui-1.7.2.full.min.js | 298 --
.../apache/oodt/cas/curation/jquery.alerts.css | 77 -
.../cas/curation/jquery.periodicalupdater.js | 105 -
.../org/apache/oodt/cas/curation/pencil.png | Bin 451 -> 0 bytes
.../org/apache/oodt/cas/curation/red_dot.png | Bin 219 -> 0 bytes
.../cas/curation/service/CurationService.java | 171 -
.../curation/service/CurationServiceConfig.java | 227 -
.../cas/curation/service/DirectoryResource.java | 138 -
.../cas/curation/service/IngestionResource.java | 352 --
.../cas/curation/service/MetadataResource.java | 972 ----
.../cas/curation/service/PolicyResource.java | 310 --
.../cas/curation/service/SystemResource.java | 69 -
.../cas/curation/structs/ExtractorConfig.java | 54 -
.../cas/curation/structs/IngestionTask.java | 168 -
.../curation/structs/IngestionTaskStatus.java | 36 -
.../java/org/apache/oodt/cas/curation/title.gif | Bin 318 -> 0 bytes
.../curation/util/CurationXmlStructFactory.java | 114 -
.../oodt/cas/curation/util/DateUtils.java | 59 -
.../curation/util/ExtractorConfigReader.java | 52 -
.../curation/util/ExtractorConfigWriter.java | 51 -
.../apache/oodt/cas/curation/util/SSOUtils.java | 60 -
curator/src/main/webapp/META-INF/context.xml | 53 -
curator/src/main/webapp/WEB-INF/web.xml | 62 -
curator/src/main/webapp/error.jsp | 22 -
curator/src/main/webapp/home.jsp | 160 -
curator/src/main/webapp/index.jsp | 20 -
curator/src/main/webapp/login.jsp | 69 -
curator/src/main/webapp/logout.jsp | 25 -
curator/src/main/webapp/sso_login.jsp | 34 -
curator/src/main/webapp/tools/logout.jsp | 24 -
curator/src/main/webapp/tools/requireLogin.jsp | 27 -
.../webapp/views/common/cas-curator-footer.jsp | 26 -
.../webapp/views/common/cas-curator-header.jsp | 119 -
.../main/webapp/views/common/login-status.jsp | 32 -
.../site/resources/images/basic_extractor.jpg | Bin 53280 -> 0 bytes
.../src/site/resources/images/basic_filemgr.jpg | Bin 72096 -> 0 bytes
.../src/site/resources/images/basic_ingest.jpg | Bin 48213 -> 0 bytes
.../src/site/resources/images/basic_login.jpg | Bin 26935 -> 0 bytes
.../src/site/resources/images/basic_page.jpg | Bin 26115 -> 0 bytes
.../src/site/resources/images/basic_staging.jpg | Bin 27100 -> 0 bytes
.../src/site/resources/images/cas-curator.jpg | Bin 27536 -> 0 bytes
.../src/site/resources/images/cas-curator.psd | Bin 1003720 -> 0 bytes
.../src/site/resources/media/Bach-SuiteNo2.mp3 | Bin 4781080 -> 0 bytes
curator/src/site/site.xml | 32 -
curator/src/site/xdoc/api/index.xml | 105 -
curator/src/site/xdoc/development/maven.xml | 175 -
curator/src/site/xdoc/user/advanced.xml | 56 -
curator/src/site/xdoc/user/basic.xml | 690 ---
curator/webapp/pom.xml | 170 +
.../apache/oodt/cas/curation/CurationApp.java | 147 +
.../oodt/cas/curation/CurationSession.java | 70 +
.../org/apache/oodt/cas/curation/HomePage.css | 242 +
.../org/apache/oodt/cas/curation/HomePage.html | 195 +
.../org/apache/oodt/cas/curation/HomePage.java | 90 +
.../apache/oodt/cas/curation/HomePage_edrn.html | 219 +
.../oodt/cas/curation/HomePage_wicket.css | 242 +
.../org/apache/oodt/cas/curation/bg-body.gif | Bin 0 -> 827 bytes
.../oodt/cas/curation/blackfade-syncd.jpg | Bin 0 -> 445 bytes
.../oodt/cas/curation/edrn-informatics.css | 421 ++
.../cas/curation/edrn-informatics_wicket.css | 421 ++
.../org/apache/oodt/cas/curation/edrn-logo.png | Bin 0 -> 8484 bytes
.../org/apache/oodt/cas/curation/footer_hhs.gif | Bin 0 -> 1232 bytes
.../org/apache/oodt/cas/curation/footer_nih.gif | Bin 0 -> 819 bytes
.../apache/oodt/cas/curation/footer_usagov.gif | Bin 0 -> 1049 bytes
.../java/org/apache/oodt/cas/curation/l-cdg.gif | Bin 0 -> 491 bytes
.../java/org/apache/oodt/cas/curation/l-dcp.gif | Bin 0 -> 2430 bytes
.../java/org/apache/oodt/cas/curation/l-nci.gif | Bin 0 -> 2309 bytes
.../java/org/apache/oodt/cas/curation/l-nih.gif | Bin 0 -> 778 bytes
.../oodt/cas/curation/login/LoginPage.css | 72 +
.../oodt/cas/curation/login/LoginPage.html | 95 +
.../oodt/cas/curation/login/LoginPage.java | 112 +
.../cas/curation/workbench/WorkbenchPage.html | 24 +
.../cas/curation/workbench/WorkbenchPage.java | 46 +
.../webapp/src/main/webapp/META-INF/context.xml | 60 +
curator/webapp/src/main/webapp/WEB-INF/web.xml | 72 +
.../site/resources/images/basic_extractor.jpg | Bin 0 -> 53280 bytes
.../src/site/resources/images/basic_filemgr.jpg | Bin 0 -> 72096 bytes
.../src/site/resources/images/basic_ingest.jpg | Bin 0 -> 48213 bytes
.../src/site/resources/images/basic_login.jpg | Bin 0 -> 26935 bytes
.../src/site/resources/images/basic_page.jpg | Bin 0 -> 26115 bytes
.../src/site/resources/images/basic_staging.jpg | Bin 0 -> 27100 bytes
.../src/site/resources/images/cas-curator.jpg | Bin 0 -> 27536 bytes
.../src/site/resources/images/cas-curator.psd | Bin 0 -> 1003720 bytes
.../src/site/resources/media/Bach-SuiteNo2.mp3 | Bin 0 -> 4781080 bytes
curator/webapp/src/site/site.xml | 32 +
curator/webapp/src/site/xdoc/api/index.xml | 105 +
.../webapp/src/site/xdoc/development/maven.xml | 175 +
curator/webapp/src/site/xdoc/user/advanced.xml | 56 +
curator/webapp/src/site/xdoc/user/basic.xml | 690 +++
filemgr/pom.xml | 2 +-
.../cli/action/AddProductTypeCliAction.java | 10 +-
.../oodt/cas/filemgr/util/XmlStructFactory.java | 11 +-
filemgr/src/main/resources/cmd-line-options.xml | 25 +
.../cas/filemgr/cli/TestFileManagerCli.java | 3 +-
.../cli/action/TestAddProductTypeCliAction.java | 9 +
.../repository/TestXMLRepositoryManager.java | 4 +-
filemgr/src/test/resources/cmd-line-options.xml | 25 +
grid/pom.xml | 9 +-
.../apache/oodt/grid/ProductQueryServlet.java | 13 +-
metadata/pom.xml | 2 +-
mvn/archetypes/opsui/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/webapp/META-INF/context.xml | 26 +
mvn/archetypes/pom.xml | 2 +-
mvn/archetypes/radix/pom.xml | 2 +-
.../solr/src/main/assembly/assembly.xml | 16 +
.../radix/src/main/resources/bin/radix | 2 +-
mvn/plugins/cas-install/pom.xml | 2 +-
opendapps/pom.xml | 2 +-
.../OpendapProfileElementExtractor.java | 3 +
pcs/core/pom.xml | 2 +-
pcs/input/pom.xml | 2 +-
pcs/opsui/pom.xml | 34 +-
.../curation/workbench/Workbench.js | 639 +++
.../org/apache/oodt/pcs/opsui/BasePage.html | 5 +
.../org/apache/oodt/pcs/opsui/BasePage.java | 8 +-
.../apache/oodt/pcs/opsui/BasePage_classic.html | 7 +
.../oodt/pcs/opsui/BasePage_cleanwhite.html | 5 +
.../org/apache/oodt/pcs/opsui/HomePage.html | 5 +
.../org/apache/oodt/pcs/opsui/HomePage.java | 11 +-
.../org/apache/oodt/pcs/opsui/OpsuiApp.java | 28 +
.../apache/oodt/pcs/opsui/WorkbenchPage.html | 19 +
.../apache/oodt/pcs/opsui/WorkbenchPage.java | 30 +
pcs/opsui/src/main/webapp/META-INF/context.xml | 33 +-
pcs/opsui/src/main/webapp/WEB-INF/web.xml | 34 +-
pcs/services/pom.xml | 2 +-
pge/pom.xml | 2 +-
pom.xml | 6 +-
product/pom.xml | 2 +-
profile/pom.xml | 9 +-
.../oodt/profile/EnumeratedProfileElement.java | 16 +-
.../java/org/apache/oodt/profile/Profile.java | 30 +-
.../org/apache/oodt/profile/ProfileElement.java | 30 +-
.../oodt/profile/RangedProfileElement.java | 4 +-
.../apache/oodt/profile/ResourceAttributes.java | 109 +-
.../oodt/profile/UnspecifiedProfileElement.java | 4 +-
.../java/org/apache/oodt/profile/Utility.java | 32 +-
.../resources/org/apache/oodt/profile/test.xml | 16 +
profile/src/test/resources/test.xml | 16 +
protocol/api/pom.xml | 2 +-
protocol/ftp/pom.xml | 2 +-
protocol/http/pom.xml | 2 +-
protocol/imaps/pom.xml | 2 +-
protocol/sftp/pom.xml | 2 +-
pushpull/pom.xml | 2 +-
resource/pom.xml | 2 +-
resource/src/main/bin/resmgr | 1 +
.../oodt/cas/resource/batchmgr/Batchmgr.java | 7 +
.../cas/resource/batchmgr/XmlRpcBatchMgr.java | 21 +
.../cli/action/GetExecReportCliAction.java | 46 +
.../cli/action/GetNodeReportCliAction.java | 45 +
.../cli/action/GetQueuedJobsCliAction.java | 55 +
.../cas/resource/mux/QueueMuxBatchManager.java | 7 +
.../cas/resource/scheduler/LRUScheduler.java | 9 +-
.../resource/system/XmlRpcResourceManager.java | 90 +
.../system/XmlRpcResourceManagerClient.java | 45 +-
.../resource/util/ResourceNodeComparator.java | 36 +
.../cas/resource/util/XmlRpcStructFactory.java | 26 +
.../src/main/resources/cmd-line-actions.xml | 12 +
.../src/main/resources/cmd-line-options.xml | 66 +-
.../resource/mux/mocks/MockBatchManager.java | 8 +
sso/pom.xml | 2 +-
webapp/components/pom.xml | 23 +-
.../curation/workbench/Workbench.css | 405 ++
.../curation/workbench/Workbench.html | 153 +
.../curation/workbench/Workbench.java | 60 +
.../curation/workbench/Workbench.js | 639 +++
.../curation/workbench/Workbench_wicket.css | 403 ++
.../curation/workbench/application.png | Bin 0 -> 465 bytes
.../webcomponents/curation/workbench/code.png | Bin 0 -> 604 bytes
.../webcomponents/curation/workbench/css.png | Bin 0 -> 619 bytes
.../cas/webcomponents/curation/workbench/db.png | Bin 0 -> 580 bytes
.../curation/workbench/directory.png | Bin 0 -> 538 bytes
.../webcomponents/curation/workbench/doc.png | Bin 0 -> 652 bytes
.../webcomponents/curation/workbench/file.png | Bin 0 -> 295 bytes
.../webcomponents/curation/workbench/film.png | Bin 0 -> 654 bytes
.../webcomponents/curation/workbench/flash.png | Bin 0 -> 583 bytes
.../curation/workbench/folder_open.png | Bin 0 -> 584 bytes
.../webcomponents/curation/workbench/help.gif | Bin 0 -> 1583 bytes
.../webcomponents/curation/workbench/html.png | Bin 0 -> 735 bytes
.../curation/workbench/important.gif | Bin 0 -> 1493 bytes
.../webcomponents/curation/workbench/info.gif | Bin 0 -> 1488 bytes
.../webcomponents/curation/workbench/java.png | Bin 0 -> 634 bytes
.../curation/workbench/jquery-1.3.2.js | 4376 ++++++++++++++++++
.../workbench/jquery-ui-1.7.2.full.min.js | 298 ++
.../curation/workbench/jquery.alerts.css | 77 +
.../curation/workbench/jquery.alerts.js | 315 ++
.../curation/workbench/jquery.alerts_wicket.css | 77 +
.../workbench/jquery.periodicalupdater.js | 105 +
.../webcomponents/curation/workbench/linux.png | Bin 0 -> 669 bytes
.../webcomponents/curation/workbench/music.png | Bin 0 -> 386 bytes
.../webcomponents/curation/workbench/pdf.png | Bin 0 -> 592 bytes
.../webcomponents/curation/workbench/php.png | Bin 0 -> 539 bytes
.../curation/workbench/picture.png | Bin 0 -> 607 bytes
.../webcomponents/curation/workbench/ppt.png | Bin 0 -> 589 bytes
.../webcomponents/curation/workbench/psd.png | Bin 0 -> 857 bytes
.../webcomponents/curation/workbench/ruby.png | Bin 0 -> 627 bytes
.../webcomponents/curation/workbench/script.png | Bin 0 -> 860 bytes
.../curation/workbench/spinner.gif | Bin 0 -> 2531 bytes
.../webcomponents/curation/workbench/title.gif | Bin 0 -> 318 bytes
.../webcomponents/curation/workbench/txt.png | Bin 0 -> 343 bytes
.../webcomponents/curation/workbench/xls.png | Bin 0 -> 664 bytes
.../webcomponents/curation/workbench/zip.png | Bin 0 -> 387 bytes
webapp/fmbrowser/pom.xml | 6 +-
webapp/fmprod/pom.xml | 2 +-
webapp/wmonitor/pom.xml | 6 +-
workflow/pom.xml | 2 +-
workflow/src/main/bin/wmgr | 1 +
xmlps/pom.xml | 4 +-
.../apache/oodt/xmlps/profile/DBMSExecutor.java | 1 +
xmlquery/pom.xml | 2 +-
.../oodt/product/HttpRedirectException.java | 40 +
.../java/org/apache/oodt/xmlquery/XMLQuery.java | 1 +
287 files changed, 15524 insertions(+), 11373 deletions(-)
----------------------------------------------------------------------