Author: wkeil
Date: Tue Jul 29 01:21:49 2014
New Revision: 1614239
URL: http://svn.apache.org/r1614239
Log:
DMAP-35: Refactor Simple DDR
Adjusted builder to data mismatch
Task-Url: https://issues.apache.org/jira/browse/DMAP-35
Added:
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/Builder.java
- copied, changed from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/BlackBerryOSBuilder.java
- copied, changed from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/DefaultOSBuilder.java
- copied, changed from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/MozillaOSModelBuilder.java
- copied, changed from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/OperaOSModelBuilder.java
- copied, changed from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java
Copied:
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/Builder.java
(from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java)
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/Builder.java?p2=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/Builder.java&p1=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java&r1=1612164&r2=1614239&rev=1614239&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/Builder.java
Tue Jul 29 01:21:49 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.devicemap.simpleddr.builder;
+package org.apache.devicemap.simpleapi.oddr.builder;
import org.apache.devicemap.simpleddr.model.BuiltObject;
import org.apache.devicemap.simpleddr.model.UserAgent;
Copied:
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/BlackBerryOSBuilder.java
(from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java)
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/BlackBerryOSBuilder.java?p2=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/BlackBerryOSBuilder.java&p1=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java&r1=1612164&r2=1614239&rev=1614239&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/BlackBerryOSBuilder.java
Tue Jul 29 01:21:49 2014
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.devicemap.simpleddr.builder.os;
+package org.apache.devicemap.simpleapi.oddr.builder.os;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.devicemap.simpleddr.builder.Builder;
+
+import org.apache.devicemap.simpleapi.oddr.builder.Builder;
import org.apache.devicemap.simpleddr.model.BuiltObject;
import org.apache.devicemap.simpleddr.model.UserAgent;
import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
Copied:
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/DefaultOSBuilder.java
(from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java)
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/DefaultOSBuilder.java?p2=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/DefaultOSBuilder.java&p1=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java&r1=1612164&r2=1614239&rev=1614239&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/DefaultOSBuilder.java
Tue Jul 29 01:21:49 2014
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.devicemap.simpleddr.builder.os;
+package org.apache.devicemap.simpleapi.oddr.builder.os;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.devicemap.simpleddr.builder.Builder;
+
+import org.apache.devicemap.simpleapi.oddr.builder.Builder;
import org.apache.devicemap.simpleddr.model.UserAgent;
import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
Copied:
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/MozillaOSModelBuilder.java
(from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java)
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/MozillaOSModelBuilder.java?p2=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/MozillaOSModelBuilder.java&p1=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java&r1=1612164&r2=1614239&rev=1614239&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/MozillaOSModelBuilder.java
Tue Jul 29 01:21:49 2014
@@ -16,23 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.devicemap.simpleddr.builder.os;
+package org.apache.devicemap.simpleapi.oddr.builder.os;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.devicemap.simpleddr.builder.Builder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.AndroidMozillaSubBuilder;
-import org.apache.devicemap.simpleddr.builder.os.mozilla.BadaMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.BlackBerryMozillaSubBuilder;
-import org.apache.devicemap.simpleddr.builder.os.mozilla.BrewMozillaSubBuilder;
-import org.apache.devicemap.simpleddr.builder.os.mozilla.IOSMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.LinuxMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.MacOSXMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.SymbianMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.WebOSMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.WinCEMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.WinPhoneMozillaSubBuilder;
+
+import org.apache.devicemap.simpleapi.oddr.builder.Builder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.AndroidMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.BadaMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.BlackBerryMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.BrewMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.IOSMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.LinuxMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.MacOSXMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.SymbianMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.WebOSMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.WinCEMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.WinPhoneMozillaSubBuilder;
import org.apache.devicemap.simpleddr.model.UserAgent;
import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
Copied:
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/OperaOSModelBuilder.java
(from r1612164,
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java)
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/OperaOSModelBuilder.java?p2=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/OperaOSModelBuilder.java&p1=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java&r1=1612164&r2=1614239&rev=1614239&view=diff
==============================================================================
---
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java
(original)
+++
incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/OperaOSModelBuilder.java
Tue Jul 29 01:21:49 2014
@@ -16,16 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.devicemap.simpleddr.builder.os;
+package org.apache.devicemap.simpleapi.oddr.builder.os;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.devicemap.simpleddr.builder.Builder;
-import org.apache.devicemap.simpleddr.builder.device.WinPhoneDeviceBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.AndroidMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.SymbianMozillaSubBuilder;
-import
org.apache.devicemap.simpleddr.builder.os.mozilla.WinCEMozillaSubBuilder;
+
+import org.apache.devicemap.simpleapi.oddr.builder.Builder;
+import
org.apache.devicemap.simpleapi.oddr.builder.device.WinPhoneDeviceBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.AndroidMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.SymbianMozillaSubBuilder;
+import
org.apache.devicemap.simpleapi.oddr.builder.os.mozilla.WinCEMozillaSubBuilder;
import org.apache.devicemap.simpleddr.model.BuiltObject;
import org.apache.devicemap.simpleddr.model.UserAgent;
import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
