Author: [log in to unmask]
Date: Mon Aug 31 12:34:47 2015
New Revision: 3468
Log:
Move datacat client to separate module from record-util.
Added:
java/trunk/datacat-client/
java/trunk/datacat-client/pom.xml
java/trunk/datacat-client/src/
java/trunk/datacat-client/src/main/
java/trunk/datacat-client/src/main/java/
java/trunk/datacat-client/src/main/java/org/
java/trunk/datacat-client/src/main/java/org/hps/
java/trunk/datacat-client/src/main/java/org/hps/datacat/
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClient.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClientImpl.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatConstants.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatConstants.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatFactory.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatFactory.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/Dataset.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/Dataset.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetDataType.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetDataType.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetFileFormat.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetFileFormat.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetImpl.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetImpl.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetLocation.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocation.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetLocationImpl.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocationImpl.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetMetadata.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetSite.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetSite.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetUtilities.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetUtilities.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/HttpUtilities.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/HttpUtilities.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/JSONUtilities.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/JSONUtilities.java
java/trunk/datacat-client/src/main/java/org/hps/datacat/client/ScanStatus.java
- copied, changed from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/ScanStatus.java
Removed:
java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClient.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClientImpl.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatacatConstants.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatacatFactory.java
java/trunk/record-util/src/main/java/org/hps/datacat/Dataset.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetDataType.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetFileFormat.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetImpl.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocation.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocationImpl.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetMetadata.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetSite.java
java/trunk/record-util/src/main/java/org/hps/datacat/DatasetUtilities.java
java/trunk/record-util/src/main/java/org/hps/datacat/HttpUtilities.java
java/trunk/record-util/src/main/java/org/hps/datacat/JSONUtilities.java
java/trunk/record-util/src/main/java/org/hps/datacat/ScanStatus.java
Modified:
java/trunk/parent/pom.xml
java/trunk/pom.xml
java/trunk/record-util/pom.xml
Added: java/trunk/datacat-client/pom.xml
=============================================================================
--- java/trunk/datacat-client/pom.xml (added)
+++ java/trunk/datacat-client/pom.xml Mon Aug 31 12:34:47 2015
@@ -0,0 +1,35 @@
+<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>hps-datacat-client</artifactId>
+ <name>datacat-client</name>
+ <description>SRS datacat HTTP client</description>
+ <parent>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-parent</artifactId>
+ <relativePath>../parent/pom.xml</relativePath>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+ <scm>
+ <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/datacat-client/</url>
+ <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/datacat-client/</connection>
+ <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/datacat-client/</developerConnection>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20140107</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+</project>
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClient.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClient.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClient.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.util.List;
import java.util.Map;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClientImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatacatClientImpl.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatClientImpl.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.io.File;
import java.io.UnsupportedEncodingException;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatConstants.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatConstants.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatacatConstants.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatConstants.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
* Constants for the HPS datacat.
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatFactory.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatacatFactory.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatacatFactory.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatacatFactory.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
* Factory class for providing user access to interfaces with protected implementation classes.
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/Dataset.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/Dataset.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/Dataset.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/Dataset.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.util.Date;
import java.util.List;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetDataType.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetDataType.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetDataType.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetDataType.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
*
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetFileFormat.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetFileFormat.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetFileFormat.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetFileFormat.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
*
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetImpl.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetImpl.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetImpl.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetLocation.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocation.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocation.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetLocation.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
*
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetLocationImpl.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocationImpl.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetLocationImpl.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetLocationImpl.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import org.json.JSONObject;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetMetadata.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetMetadata.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetMetadata.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetSite.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetSite.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetSite.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetSite.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
/**
*
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetUtilities.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/DatasetUtilities.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/DatasetUtilities.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/DatasetUtilities.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.util.ArrayList;
import java.util.List;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/HttpUtilities.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/HttpUtilities.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/HttpUtilities.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/HttpUtilities.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/JSONUtilities.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/JSONUtilities.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/JSONUtilities.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/JSONUtilities.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
import java.util.Map;
Copied: java/trunk/datacat-client/src/main/java/org/hps/datacat/client/ScanStatus.java (from r3455, java/trunk/record-util/src/main/java/org/hps/datacat/ScanStatus.java)
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/datacat/ScanStatus.java (original)
+++ java/trunk/datacat-client/src/main/java/org/hps/datacat/client/ScanStatus.java Mon Aug 31 12:34:47 2015
@@ -1,4 +1,4 @@
-package org.hps.datacat;
+package org.hps.datacat.client;
public enum ScanStatus {
Modified: java/trunk/parent/pom.xml
=============================================================================
--- java/trunk/parent/pom.xml (original)
+++ java/trunk/parent/pom.xml Mon Aug 31 12:34:47 2015
@@ -234,6 +234,11 @@
<artifactId>hps-crawler</artifactId>
<version>3.4.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.hps</groupId>
+ <artifactId>hps-datacat-client</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </dependency>
<!-- Next are external dependencies used in multiple modules. -->
<dependency>
<groupId>org.jlab.coda</groupId>
Modified: java/trunk/pom.xml
=============================================================================
--- java/trunk/pom.xml (original)
+++ java/trunk/pom.xml Mon Aug 31 12:34:47 2015
@@ -129,6 +129,7 @@
<module>analysis</module>
<module>conditions</module>
<module>crawler</module>
+ <module>datacat-client</module>
<module>detector-data</module>
<module>detector-model</module>
<module>distribution</module>
Modified: java/trunk/record-util/pom.xml
=============================================================================
--- java/trunk/record-util/pom.xml (original)
+++ java/trunk/record-util/pom.xml Mon Aug 31 12:34:47 2015
@@ -26,15 +26,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/**</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
@@ -50,20 +41,5 @@
<groupId>org.hps</groupId>
<artifactId>hps-conditions</artifactId>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20140107</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.4.1</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
</dependencies>
</project>
