You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2014/07/07 21:50:35 UTC
svn commit: r1608583 - in
/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap:
./ loader/ loader/resource/ loaders/
Author: rezan
Date: Mon Jul 7 19:50:34 2014
New Revision: 1608583
URL: http://svn.apache.org/r1608583
Log:
refactor
Added:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/Loader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/LoaderFactory.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/ResourceLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/FileLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/JarLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/NoopLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java
- copied, changed from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/UninitializedLoader.java
Removed:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/
Modified:
incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java?rev=1608583&r1=1608582&r2=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/DeviceMapClient.java Mon Jul 7 19:50:34 2014
@@ -19,7 +19,7 @@
package org.apache.devicemap;
import org.apache.devicemap.data.Device;
-import org.apache.devicemap.loaders.LoaderFactory;
+import org.apache.devicemap.loader.LoaderFactory;
import java.io.IOException;
import java.util.ArrayList;
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/Loader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/Loader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/Loader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/Loader.java Mon Jul 7 19:50:34 2014
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loaders;
+package org.apache.devicemap.loader;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/LoaderFactory.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/LoaderFactory.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/LoaderFactory.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/LoaderFactory.java Mon Jul 7 19:50:34 2014
@@ -17,14 +17,14 @@
under the License.
*/
-package org.apache.devicemap.loaders;
+package org.apache.devicemap.loader;
import org.apache.devicemap.DeviceMapClient.LoaderOption;
-import org.apache.devicemap.loaders.types.JarLoader;
-import org.apache.devicemap.loaders.types.FileLoader;
-import org.apache.devicemap.loaders.types.NoopLoader;
-import org.apache.devicemap.loaders.types.URLLoader;
-import org.apache.devicemap.loaders.types.UninitializedLoader;
+import org.apache.devicemap.loader.resource.JarLoader;
+import org.apache.devicemap.loader.resource.FileLoader;
+import org.apache.devicemap.loader.resource.NoopLoader;
+import org.apache.devicemap.loader.resource.URLLoader;
+import org.apache.devicemap.loader.resource.UninitializedLoader;
/**
*
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/ResourceLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/ResourceLoader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/ResourceLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/ResourceLoader.java Mon Jul 7 19:50:34 2014
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loaders;
+package org.apache.devicemap.loader;
import java.io.IOException;
import java.io.InputStream;
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/FileLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/FileLoader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/FileLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/FileLoader.java Mon Jul 7 19:50:34 2014
@@ -16,14 +16,14 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loaders.types;
+package org.apache.devicemap.loader.resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.devicemap.loaders.ResourceLoader;
+import org.apache.devicemap.loader.ResourceLoader;
/**
*
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/JarLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/JarLoader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/JarLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/JarLoader.java Mon Jul 7 19:50:34 2014
@@ -16,13 +16,13 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loaders.types;
+package org.apache.devicemap.loader.resource;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.devicemap.loaders.ResourceLoader;
+import org.apache.devicemap.loader.ResourceLoader;
/**
*
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/NoopLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/NoopLoader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/NoopLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/NoopLoader.java Mon Jul 7 19:50:34 2014
@@ -16,14 +16,14 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loaders.types;
+package org.apache.devicemap.loader.resource;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
import org.apache.devicemap.data.Device;
-import org.apache.devicemap.loaders.Loader;
+import org.apache.devicemap.loader.Loader;
/**
*
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/URLLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/URLLoader.java Mon Jul 7 19:50:34 2014
@@ -1,10 +1,10 @@
-package org.apache.devicemap.loaders.types;
+package org.apache.devicemap.loader.resource;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.apache.devicemap.loaders.ResourceLoader;
+import org.apache.devicemap.loader.ResourceLoader;
/**
*
Copied: incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java (from r1608578, incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/UninitializedLoader.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java?p2=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java&p1=incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/UninitializedLoader.java&r1=1608578&r2=1608583&rev=1608583&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loaders/types/UninitializedLoader.java (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/main/java/org/apache/devicemap/loader/resource/UninitializedLoader.java Mon Jul 7 19:50:34 2014
@@ -16,13 +16,13 @@
specific language governing permissions and limitations
under the License.
*/
-package org.apache.devicemap.loaders.types;
+package org.apache.devicemap.loader.resource;
import java.io.IOException;
import java.util.Map;
import org.apache.devicemap.data.Device;
-import org.apache.devicemap.loaders.Loader;
+import org.apache.devicemap.loader.Loader;
/**
*