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:15 UTC
[05/15] oodt git commit: OODT-839 patch to update deps
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>