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 2017/10/14 05:35:58 UTC
[01/13] oodt git commit: OODT-933 marked code that uses XMLRPC
Repository: oodt
Updated Branches:
refs/heads/development 444a5a997 -> 5794ec3bc
OODT-933 marked code that uses XMLRPC
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/853071a1
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/853071a1
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/853071a1
Branch: refs/heads/development
Commit: 853071a136c820c55c3f28c2b4f6e9934c0b4a0f
Parents: e55f2cd
Author: Radu Manole <ma...@gmail.com>
Authored: Fri Sep 30 18:40:45 2016 +0300
Committer: Radu Manole <ma...@gmail.com>
Committed: Fri Sep 30 18:40:45 2016 +0300
----------------------------------------------------------------------
.../server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java | 2 ++
.../channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java | 2 ++
.../server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java | 3 ++-
.../channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java | 3 ++-
commons/src/main/java/org/apache/oodt/commons/ExecServer.java | 2 ++
commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java | 2 ++
.../main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java | 3 ++-
.../org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java | 3 ++-
.../org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java | 2 ++
.../apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java | 2 ++
.../apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java | 4 ++++
.../cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java | 2 +-
.../cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java | 1 +
.../org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java | 1 +
.../java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java | 1 +
.../apache/oodt/cas/resource/system/XmlRpcResourceManager.java | 3 ++-
.../oodt/cas/resource/system/XmlRpcResourceManagerClient.java | 3 ++-
.../apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java | 3 ++-
.../apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java | 2 ++
.../oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java | 3 ++-
.../cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java | 4 ++++
21 files changed, 42 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
index 51b27b4..9477707 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClient.java
@@ -48,11 +48,13 @@ import java.util.Vector;
/**
* @author bfoster
* @version $Revision$
+ * @deprecated replaced by avro-rpc
*
* <p>
* A Communication Channel Client over XML-RPC
* <p>
*/
+@Deprecated
public class XmlRpcCommunicationChannelClient extends AbstractCommunicationChannelClient {
public static final int INT = 60;
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java
index fb01ac0..774e4fa 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelClientFactory.java
@@ -33,11 +33,13 @@ import org.springframework.beans.factory.annotation.Required;
/**
* @author bfoster
* @version $Revision$
+ * @deprecated replaced by avro-rpc
*
* <p>
* A Factory for creating XmlRpcCommunicationChannelServer
* <p>
*/
+@Deprecated
public class XmlRpcCommunicationChannelClientFactory implements
CommunicationChannelClientFactory {
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
index 5540d44..dd1f2c5 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServer.java
@@ -42,11 +42,12 @@ import java.util.Set;
/**
* @author bfoster
* @version $Revision$
- *
+ * @deprecated replaced by avro-rpc
* <p>
* A Communication Channel Server over XML-RPC
* <p>
*/
+@Deprecated
public class XmlRpcCommunicationChannelServer extends
AbstractCommunicationChannelServer {
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java
----------------------------------------------------------------------
diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java
index 565d4d3..6e02807 100644
--- a/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java
+++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/server/channel/xmlrpc/XmlRpcCommunicationChannelServerFactory.java
@@ -33,11 +33,12 @@ import org.springframework.beans.factory.annotation.Required;
/**
* @author bfoster
* @version $Revision$
- *
+ * @deprecated replaced by avro-rpc
* <p>
* A Factory for creating XmlRpcCommunicationChannelServer
* <p>
*/
+@Deprecated
public class XmlRpcCommunicationChannelServerFactory implements
CommunicationChannelServerFactory {
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
index 5adb83c..19e195c 100644
--- a/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
+++ b/commons/src/main/java/org/apache/oodt/commons/ExecServer.java
@@ -55,7 +55,9 @@ import javax.naming.NamingException;
* This is an executable class that starts a JPL EDA server.
*
* @author Kelly
+ * @deprecated soon be replaced by avro-rpc
*/
+@Deprecated
public class ExecServer {
public static final int MILLIS = 15000;
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java b/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
index 8b0551f..d200d76 100644
--- a/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
+++ b/commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java
@@ -40,7 +40,9 @@ import java.util.Map;
* This class provides several XML-RPC utilities.
*
* @author Kelly
+ * @deprecated soon be replaced by avro-rpc
*/
+@Deprecated
public class XMLRPC {
/** Build an XML-RPC method call.
*
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
index f993303..b62c96b 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java
@@ -31,13 +31,14 @@ import java.util.logging.Logger;
/**
* @author mattmann
* @version $Revision$
- *
+ * @deprecated soon be replaced by avro-rpc
* <p>
* A daemon utility class for {@link ProductCrawler}s that allows a regular
* ProductCrawler to be run as a daemon, and statistics about crawling to be
* kept. The daemon is an XML-RPC accessible web service.
* </p>.
*/
+@Deprecated
public class CrawlDaemon {
public static final double DOUBLE = 1000.0;
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
----------------------------------------------------------------------
diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
index 9485b29..6b0fde7 100644
--- a/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
+++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java
@@ -34,11 +34,12 @@ import java.util.Vector;
/**
* @author mattmann
* @version $Revision$
- *
+ * @deprecated soon be replaced by avro-rpc
* <p>
* A Controller class for the Crawl Daemons
* </p>.
*/
+@Deprecated
public class CrawlDaemonController {
/* our xml rpc client */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
index beba420..c047c0f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
@@ -79,9 +79,11 @@ import java.util.logging.Logger;
* @author mattmann
* @author bfoster
* @version $Revision$
+ * @deprecated replaced by avro-rpc
* <p/>
* <p> An XML RPC-based File manager. </p>
*/
+@Deprecated
public class XmlRpcFileManager {
/* the port to run the XML RPC web server on, default is 1999 */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
index db64716..d925d2a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
@@ -66,9 +66,11 @@ import java.util.logging.Logger;
* @author mattmann (Chris Mattmann)
* @author bfoster (Brian Foster)
* @version $Revision$
+ * @deprecated replaced by avro-rpc
* <p/>
* <p> The XML RPC based file manager client. </p>
*/
+@Deprecated
public class XmlRpcFileManagerClient implements FileManagerClient {
/* our xml rpc client */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java
index 52cd12f..b002e2a 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java
@@ -42,6 +42,10 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
+/**
+ * @deprecated replaced by avro-rpc
+ */
+@Deprecated
public class XmlRpcFileManagerServer implements FileManagerServer {
/* the port to run the XML RPC web server on, default is 1999 */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java
index 6f74235..80f65c4 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java
@@ -23,7 +23,7 @@ import org.apache.oodt.cas.filemgr.system.FileManagerClient;
import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import java.net.URL;
-
+@Deprecated
public class XmlRpcFileManagerClientFactory implements FileManagerClientFactory {
private URL url;
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java
index bb2511b..4d7eb30 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java
@@ -23,6 +23,7 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerServer;
/**
* Created by radu on 7/11/15.
*/
+@Deprecated
public class XmlRpcFileManagerServerFactory implements FileManagerServerFactory {
private int port;
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
index 6094320..cb65cb0 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java
@@ -54,6 +54,7 @@ import java.util.concurrent.ConcurrentHashMap;
* <p> A factory class for creating File Manager structures suitable for transfer over the XML-RPC pipe, and
* for reading objects from the XML-RPC pipe into File Manager structs. </p>
*/
+@Deprecated
public final class XmlRpcStructFactory {
private XmlRpcStructFactory() throws InstantiationException {
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
index 15ed172..671a17c 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java
@@ -58,6 +58,7 @@ import javax.xml.parsers.ParserConfigurationException;
* </p>
*
*/
+@Deprecated
public final class XmlStructFactory {
/* our log stream */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
index 87f6bea..7897faa 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
@@ -51,12 +51,13 @@ import java.util.logging.Logger;
/**
* @author woollard
* @version $Revision$
- *
+ * @deprecated soon be replaced by avro-rpc
* <p>
* An XML RPC-based Resource manager.
* </p>
*
*/
+@Deprecated
public class XmlRpcResourceManager {
/* our log stream */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
index c700e61..90911c5 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManagerClient.java
@@ -48,12 +48,13 @@ import java.util.logging.Logger;
/**
* @author mattmann
* @version $Revision$
- *
+ * @deprecated soon be replaced by avro-rpc
* <p>
* The XML RPC based resource manager client.
* </p>
*
*/
+@Deprecated
public class XmlRpcResourceManagerClient {
public static final int VAL = 20;
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
----------------------------------------------------------------------
diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
index c0898fa..ca7191a 100644
--- a/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
+++ b/resource/src/main/java/org/apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java
@@ -41,12 +41,13 @@ import java.util.logging.Logger;
/**
* @author woollard
* @version $Revision$
- *
+ * @deprecated soon be replaced by avro-rpc
* <p>
* An XML RPC-based Batch Submission System.
* </p>
*
*/
+@Deprecated
public class XmlRpcBatchStub {
/* the port to run the XML RPC web server on, default is 2000 */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
index db30098..85099e6 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
@@ -56,7 +56,9 @@ import static org.apache.oodt.cas.workflow.util.GenericWorkflowObjectFactory.get
*
* @author mattmann (Chris Mattmann)
* @author bfoster (Brian Foster)
+ * @deprecated replaced by avro-rpc
*/
+@Deprecated
public class XmlRpcWorkflowManager implements WorkflowManager {
private static final Logger LOG = Logger.getLogger(XmlRpcWorkflowManager.class.getName());
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
index 53c70e4..ebb24be 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
@@ -45,12 +45,13 @@ import java.util.logging.Logger;
/**
* @author mattmann
* @version $Revision$
- *
+ * @deprecated replaced by avro-rpc
* <p>
* The XML RPC based workflow manager client.
* </p>
*
*/
+@Deprecated
public class XmlRpcWorkflowManagerClient implements WorkflowManagerClient {
/* our xml rpc client */
http://git-wip-us.apache.org/repos/asf/oodt/blob/853071a1/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java
index 6d5e74b..7c1f0d1 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java
@@ -24,6 +24,10 @@ import org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient;
import java.net.URL;
+/**
+ * @deprecated replaced by avro-rpc
+ */
+@Deprecated
public class XmlRpcWorkflowManagerFactory implements WorkflowManagerFactory {
private int port;
[08/13] oodt git commit: OODT-959 update tika to 1.16
Posted by ma...@apache.org.
OODT-959 update tika to 1.16
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ebaae1f3
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ebaae1f3
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ebaae1f3
Branch: refs/heads/development
Commit: ebaae1f3306073dcaab83163a3930d611482bf06
Parents: bc2aa24
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:27:23 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:27:23 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +-
core/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/ebaae1f3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5d147d3..5058970 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,7 @@ Release 1.3 - In Progress
* OODT-957 Add CVE reporting plugin to maven build chain
* OODT-958 Update commons-collections
-
+* OODT-959 Update tika to 1.16
Release 1.2 - 08/14/2017
http://git-wip-us.apache.org/repos/asf/oodt/blob/ebaae1f3/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c54a0f5..4e55cf1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -421,12 +421,12 @@ the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.10</version>
+ <version>1.16</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.7</version>
+ <version>1.16</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
[06/13] oodt git commit: OODT-958 update commons collections
Posted by ma...@apache.org.
OODT-958 update commons collections
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/2c465c5d
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/2c465c5d
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/2c465c5d
Branch: refs/heads/development
Commit: 2c465c5d93d97cf1ab8b401484b9d755539347c1
Parents: 8491fb1
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:03:28 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:03:28 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/2c465c5d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6a248e7..5d147d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,7 +3,7 @@ Apache OODT Change Log
Release 1.3 - In Progress
* OODT-957 Add CVE reporting plugin to maven build chain
-
+* OODT-958 Update commons-collections
Release 1.2 - 08/14/2017
[07/13] oodt git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/oodt
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/oodt
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/bc2aa246
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/bc2aa246
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/bc2aa246
Branch: refs/heads/development
Commit: bc2aa2469fc4c2632679571c2aa01ce80948f50b
Parents: 2c465c5 871803a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:03:43 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:03:43 2017 +0100
----------------------------------------------------------------------
README.md | 2 +-
config/pom.xml | 140 ++++++++++
config/src/main/assembly/assembly.xml | 97 +++++++
.../java/org/apache/oodt/config/Component.java | 51 ++++
.../oodt/config/ConfigurationManager.java | 66 +++++
.../config/ConfigurationManagerFactory.java | 86 ++++++
.../java/org/apache/oodt/config/Constants.java | 97 +++++++
.../DistributedConfigurationManager.java | 230 ++++++++++++++++
.../DistributedConfigurationPublisher.java | 273 +++++++++++++++++++
.../oodt/config/distributed/ZNodePaths.java | 102 +++++++
.../oodt/config/distributed/cli/CLIAction.java | 126 +++++++++
.../config/distributed/cli/ConfigPublisher.java | 37 +++
.../config/distributed/utils/ConfigUtils.java | 75 +++++
.../config/distributed/utils/CuratorUtils.java | 193 +++++++++++++
.../StandaloneConfigurationManager.java | 67 +++++
.../AbstractDistributedConfigurationTest.java | 51 ++++
config/src/main/resources/cmd-line-actions.xml | 38 +++
config/src/main/resources/cmd-line-options.xml | 85 ++++++
config/src/main/resources/config-publisher.xml | 80 ++++++
config/src/main/resources/log4j.xml | 53 ++++
config/src/main/scripts/conf-publisher | 40 +++
.../DistributedConfigurationManagerTest.java | 140 ++++++++++
.../DistributedConfigurationPublisherTest.java | 128 +++++++++
.../oodt/config/distributed/TestServer.java | 45 +++
config/src/test/resources/config-publisher.xml | 76 ++++++
core/pom.xml | 30 ++
filemgr/pom.xml | 13 +-
filemgr/src/main/assembly/assembly.xml | 49 ++--
filemgr/src/main/bin/filemgr | 28 +-
.../cas/filemgr/system/XmlRpcFileManager.java | 41 +--
filemgr/src/main/resources/log4j.xml | 40 +++
.../TestDistributedXmlRpcFileManager.java | 230 ++++++++++++++++
.../distributed/config/config-publisher.xml | 45 +++
.../distributed/config/filemgr.properties | 157 +++++++++++
filemgr/src/test/resources/filemgr.properties | 155 -----------
pom.xml | 1 +
resource/pom.xml | 8 +
.../resource/system/XmlRpcResourceManager.java | 48 ++--
.../system/TestXmlRpcResourceManager.java | 19 +-
.../TestDistributedXmlRpcResourceManager.java | 83 ++++++
.../config/distributed/config-publisher.xml | 40 +++
.../config/distributed/resource.properties | 75 +++++
workflow/pom.xml | 8 +
.../workflow/system/XmlRpcWorkflowManager.java | 34 ++-
.../TestAsynchronousLocalEngineRunner.java | 3 +-
.../TestDistributedXmlRpcWorkflowManager.java | 136 +++++++++
.../config/distributed/config-publisher.xml | 56 ++++
.../config/distributed/workflow.properties | 87 ++++++
48 files changed, 3518 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/bc2aa246/core/pom.xml
----------------------------------------------------------------------
[02/13] oodt git commit: OODT-957 add maven dependency check plugin
for potential CVE detection
Posted by ma...@apache.org.
OODT-957 add maven dependency check plugin for potential CVE detection
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/87910318
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/87910318
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/87910318
Branch: refs/heads/development
Commit: 87910318d72575ff2495bf47afde6e8e4d29f614
Parents: 7443a7c
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 08:50:51 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 08:50:51 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/87910318/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index bd13609..c01ef9f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -569,6 +569,17 @@ mm
</configuration>
</plugin>
<plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
[12/13] oodt git commit: Roll POMs forward to 1.9-dev;
last release in the 1.x series that includes both XML-RPC *and*
AvroRPC.
Posted by ma...@apache.org.
Roll POMs forward to 1.9-dev; last release in the 1.x series that includes both XML-RPC *and* AvroRPC.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d26d33cd
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d26d33cd
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d26d33cd
Branch: refs/heads/development
Commit: d26d33cd9e4293c16adb6fd4a250529be7ce3d3f
Parents: 13dc9b8
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Fri Oct 13 08:51:16 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Fri Oct 13 08:51:16 2017 -0700
----------------------------------------------------------------------
cli/pom.xml | 2 +-
commons/pom.xml | 2 +-
config/pom.xml | 4 ++--
crawler/pom.xml | 2 +-
curator/services/pom.xml | 2 +-
curator/sso/pom.xml | 2 +-
curator/webapp/pom.xml | 2 +-
filemgr/pom.xml | 2 +-
metadata/pom.xml | 2 +-
mvn/archetypes/opsui/pom.xml | 2 +-
mvn/archetypes/pom.xml | 2 +-
mvn/archetypes/radix/pom.xml | 2 +-
mvn/plugins/cas-install/pom.xml | 2 +-
pcs/core/pom.xml | 2 +-
pcs/input/pom.xml | 2 +-
pcs/opsui/pom.xml | 2 +-
pcs/services/pom.xml | 2 +-
pge/pom.xml | 2 +-
pom.xml | 2 +-
resource/pom.xml | 2 +-
webapp/components/pom.xml | 2 +-
webapp/fmbrowser/pom.xml | 3 +--
webapp/fmprod/pom.xml | 2 +-
webapp/wmonitor/pom.xml | 3 +--
webapp/wmservices/pom.xml | 2 +-
workflow/pom.xml | 2 +-
26 files changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index 8404cb2..053c324 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-cli</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 9085b26..d5108a2 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-commons</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/config/pom.xml
----------------------------------------------------------------------
diff --git a/config/pom.xml b/config/pom.xml
index e34ff44..15f8f3e 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>oodt-core</artifactId>
<groupId>org.apache.oodt</groupId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -137,4 +137,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/crawler/pom.xml
----------------------------------------------------------------------
diff --git a/crawler/pom.xml b/crawler/pom.xml
index 7dd760f..535d457 100644
--- a/crawler/pom.xml
+++ b/crawler/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-crawler</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/curator/services/pom.xml
----------------------------------------------------------------------
diff --git a/curator/services/pom.xml b/curator/services/pom.xml
index ba080a8..3882f3a 100644
--- a/curator/services/pom.xml
+++ b/curator/services/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>curator-services</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/curator/sso/pom.xml
----------------------------------------------------------------------
diff --git a/curator/sso/pom.xml b/curator/sso/pom.xml
index 2fb29ef..145ce53 100644
--- a/curator/sso/pom.xml
+++ b/curator/sso/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>curator-sso</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/curator/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/curator/webapp/pom.xml b/curator/webapp/pom.xml
index 204512e..c368671 100644
--- a/curator/webapp/pom.xml
+++ b/curator/webapp/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-curator</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/filemgr/pom.xml
----------------------------------------------------------------------
diff --git a/filemgr/pom.xml b/filemgr/pom.xml
index 1f6229a..9d3c424 100644
--- a/filemgr/pom.xml
+++ b/filemgr/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-filemgr</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/metadata/pom.xml
----------------------------------------------------------------------
diff --git a/metadata/pom.xml b/metadata/pom.xml
index ce658b6..5a1d186 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-metadata</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/mvn/archetypes/opsui/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/archetypes/opsui/pom.xml b/mvn/archetypes/opsui/pom.xml
index 0765756..d1f0023 100644
--- a/mvn/archetypes/opsui/pom.xml
+++ b/mvn/archetypes/opsui/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../../core</relativePath>
</parent>
<artifactId>opsui-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/mvn/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/archetypes/pom.xml b/mvn/archetypes/pom.xml
index 183cdb3..6062bef 100644
--- a/mvn/archetypes/pom.xml
+++ b/mvn/archetypes/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/mvn/archetypes/radix/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/archetypes/radix/pom.xml b/mvn/archetypes/radix/pom.xml
index a255304..8808fc0 100644
--- a/mvn/archetypes/radix/pom.xml
+++ b/mvn/archetypes/radix/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../../core</relativePath>
</parent>
<artifactId>radix-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/mvn/plugins/cas-install/pom.xml
----------------------------------------------------------------------
diff --git a/mvn/plugins/cas-install/pom.xml b/mvn/plugins/cas-install/pom.xml
index 40f9db9..673a75d 100644
--- a/mvn/plugins/cas-install/pom.xml
+++ b/mvn/plugins/cas-install/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<artifactId>maven-cas-install-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/pcs/core/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/core/pom.xml b/pcs/core/pom.xml
index 751b2ca..a167866 100644
--- a/pcs/core/pom.xml
+++ b/pcs/core/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-core</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/pcs/input/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/input/pom.xml b/pcs/input/pom.xml
index f019cda..e837313 100644
--- a/pcs/input/pom.xml
+++ b/pcs/input/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-input</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/pcs/opsui/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml
index 58dc8cb..0b80826 100755
--- a/pcs/opsui/pom.xml
+++ b/pcs/opsui/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-opsui</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/pcs/services/pom.xml
----------------------------------------------------------------------
diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml
index 6be72b7..50289f7 100644
--- a/pcs/services/pom.xml
+++ b/pcs/services/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>pcs-services</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/pge/pom.xml
----------------------------------------------------------------------
diff --git a/pge/pom.xml b/pge/pom.xml
index 72a33d9..449adbc 100644
--- a/pge/pom.xml
+++ b/pge/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-pge</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 08e6c5c..184644b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>core/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/resource/pom.xml
----------------------------------------------------------------------
diff --git a/resource/pom.xml b/resource/pom.xml
index f0edcbc..07f4884 100644
--- a/resource/pom.xml
+++ b/resource/pom.xml
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-resource</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/webapp/components/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/components/pom.xml b/webapp/components/pom.xml
index 559ae66..29dbbbb 100644
--- a/webapp/components/pom.xml
+++ b/webapp/components/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>oodt-webapp-components</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/webapp/fmbrowser/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmbrowser/pom.xml b/webapp/fmbrowser/pom.xml
index 927e0ed..06ed48c 100644
--- a/webapp/fmbrowser/pom.xml
+++ b/webapp/fmbrowser/pom.xml
@@ -21,11 +21,10 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>fmbrowser</artifactId>
- <version>1.3-SNAPSHOT</version>
<packaging>war</packaging>
<name>CAS File Manager Browser Web App</name>
<properties>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/webapp/fmprod/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/fmprod/pom.xml b/webapp/fmprod/pom.xml
index 7c9c0f9..c817559 100644
--- a/webapp/fmprod/pom.xml
+++ b/webapp/fmprod/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-product</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/webapp/wmonitor/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/wmonitor/pom.xml b/webapp/wmonitor/pom.xml
index e8f6703..1bd0ab2 100644
--- a/webapp/wmonitor/pom.xml
+++ b/webapp/wmonitor/pom.xml
@@ -21,11 +21,10 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>wmonitor</artifactId>
- <version>1.3-SNAPSHOT</version>
<packaging>war</packaging>
<name>CAS Workflow Manager Monitor Web App</name>
<properties>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/webapp/wmservices/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/wmservices/pom.xml b/webapp/wmservices/pom.xml
index f19b641..099ffee 100644
--- a/webapp/wmservices/pom.xml
+++ b/webapp/wmservices/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>workflow-services</artifactId>
http://git-wip-us.apache.org/repos/asf/oodt/blob/d26d33cd/workflow/pom.xml
----------------------------------------------------------------------
diff --git a/workflow/pom.xml b/workflow/pom.xml
index 03062aa..ea0d6b2 100644
--- a/workflow/pom.xml
+++ b/workflow/pom.xml
@@ -21,7 +21,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath>../core/pom.xml</relativePath>
</parent>
<artifactId>cas-workflow</artifactId>
[10/13] oodt git commit: - use Tika 1.13 - 1.16 isn't compat with the
commons-compress we are referencing
Posted by ma...@apache.org.
- use Tika 1.13 - 1.16 isn't compat with the commons-compress we are
referencing
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/8a3d5194
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/8a3d5194
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/8a3d5194
Branch: refs/heads/development
Commit: 8a3d5194424d8327e8b3ffc4a2d45f18b56e3371
Parents: c7b8c98
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Thu Oct 12 10:42:04 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Thu Oct 12 10:42:04 2017 -0700
----------------------------------------------------------------------
core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/8a3d5194/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8c9a41f..63d2d1d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -444,12 +444,12 @@ the License.
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.16</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
- <version>1.16</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
[13/13] oodt git commit: Merge OODT-933: Deprecate all XMLRPC code.
Posted by ma...@apache.org.
Merge OODT-933: Deprecate all XMLRPC code.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/5794ec3b
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/5794ec3b
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/5794ec3b
Branch: refs/heads/development
Commit: 5794ec3bc8474c846be4ff1af3082c252956cac1
Parents: d26d33c 853071a
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Fri Oct 13 22:35:41 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Fri Oct 13 22:35:41 2017 -0700
----------------------------------------------------------------------
commons/src/main/java/org/apache/oodt/commons/ExecServer.java | 2 ++
commons/src/main/java/org/apache/oodt/commons/util/XMLRPC.java | 2 ++
.../main/java/org/apache/oodt/cas/crawl/daemon/CrawlDaemon.java | 3 ++-
.../org/apache/oodt/cas/crawl/daemon/CrawlDaemonController.java | 3 ++-
.../org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java | 2 ++
.../apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java | 2 ++
.../apache/oodt/cas/filemgr/system/XmlRpcFileManagerServer.java | 4 ++++
.../cas/filemgr/system/rpc/XmlRpcFileManagerClientFactory.java | 2 +-
.../cas/filemgr/system/rpc/XmlRpcFileManagerServerFactory.java | 1 +
.../org/apache/oodt/cas/filemgr/util/XmlRpcStructFactory.java | 1 +
.../java/org/apache/oodt/cas/filemgr/util/XmlStructFactory.java | 1 +
.../apache/oodt/cas/resource/system/XmlRpcResourceManager.java | 3 ++-
.../oodt/cas/resource/system/XmlRpcResourceManagerClient.java | 3 ++-
.../apache/oodt/cas/resource/system/extern/XmlRpcBatchStub.java | 3 ++-
.../apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java | 2 ++
.../oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java | 3 ++-
.../cas/workflow/system/rpc/XmlRpcWorkflowManagerFactory.java | 4 ++++
17 files changed, 34 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/5794ec3b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/5794ec3b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManagerClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/5794ec3b/resource/src/main/java/org/apache/oodt/cas/resource/system/XmlRpcResourceManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/5794ec3b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/5794ec3b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java
----------------------------------------------------------------------
[05/13] oodt git commit: update commons-collections to resolve CVE
report
Posted by ma...@apache.org.
update commons-collections to resolve CVE report
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/8491fb1b
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/8491fb1b
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/8491fb1b
Branch: refs/heads/development
Commit: 8491fb1b16d77a5ec60210eda0845de0b81569d7
Parents: ed7036f
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:02:38 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:02:38 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/8491fb1b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 8ad58c7..165905b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,7 +110,7 @@ the License.
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
[04/13] oodt git commit: OODT-957 add maven dependency check plugin
for potential CVE detection
Posted by ma...@apache.org.
OODT-957 add maven dependency check plugin for potential CVE detection
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ed7036f1
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ed7036f1
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ed7036f1
Branch: refs/heads/development
Commit: ed7036f1ac30ea04fb02cffab581f6b1f84698eb
Parents: d07f91a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 09:02:12 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 09:02:12 2017 +0100
----------------------------------------------------------------------
core/pom.xml | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/ed7036f1/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c01ef9f..8ad58c7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -569,17 +569,6 @@ mm
</configuration>
</plugin>
<plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -994,5 +983,26 @@ mm
</plugins>
</build>
</profile>
+ <profile>
+ <id>cve-check</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
[09/13] oodt git commit: Fix merge conflicts.
Posted by ma...@apache.org.
Fix merge conflicts.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c7b8c989
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c7b8c989
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c7b8c989
Branch: refs/heads/development
Commit: c7b8c9896c6def11370077333bf577a3397582ae
Parents: 444a5a9 ebaae1f
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Thu Oct 12 10:36:49 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Thu Oct 12 10:36:49 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 8 ++++++++
core/pom.xml | 25 +++++++++++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7b8c989/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5abaf3a,5058970..4e50f80
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,11 +1,14 @@@
Apache OODT Change Log
======================
+
++=======
+ Release 1.3 - In Progress
+
++* OODT-964, OODT-963 Fix issues merging Distributed ZK Config module into Avro-RPC branch (imesha,mattmann)
+ * OODT-957 Add CVE reporting plugin to maven build chain
+ * OODT-958 Update commons-collections
+ * OODT-959 Update tika to 1.16
+
Release 1.2 - 08/14/2017
* OODT-955 Fix numhits error in Lucene Catalog
http://git-wip-us.apache.org/repos/asf/oodt/blob/c7b8c989/core/pom.xml
----------------------------------------------------------------------
[03/13] oodt git commit: OODT-957 add maven dependency check plugin
for potential CVE detection
Posted by ma...@apache.org.
OODT-957 add maven dependency check plugin for potential CVE detection
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d07f91ad
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d07f91ad
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d07f91ad
Branch: refs/heads/development
Commit: d07f91ad496a7e6fab580ab2793521d3142775c4
Parents: 8791031
Author: Tom Barber <to...@analytical-labs.com>
Authored: Tue Sep 12 08:51:29 2017 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Tue Sep 12 08:51:29 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d07f91ad/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a688c31..6a248e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,11 @@
Apache OODT Change Log
======================
+Release 1.3 - In Progress
+
+* OODT-957 Add CVE reporting plugin to maven build chain
+
+
+
Release 1.2 - 08/14/2017
* OODT-955 Fix numhits error in Lucene Catalog
[11/13] oodt git commit: - roll master: forward to 1.9-dev
Posted by ma...@apache.org.
- roll master: forward to 1.9-dev
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/13dc9b84
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/13dc9b84
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/13dc9b84
Branch: refs/heads/development
Commit: 13dc9b8494ce99b8c1ed3f07561eeb0c21f64838
Parents: 8a3d519
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Thu Oct 12 22:35:47 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Thu Oct 12 22:35:47 2017 -0700
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/13dc9b84/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 63d2d1d..a21c37c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -25,7 +25,7 @@ the License.
</parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OODT Core</name>
<properties>