You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by wk...@apache.org on 2014/07/29 03:25:45 UTC
svn commit: r1614240 [2/2] - in
/incubator/devicemap/trunk/devicemap/java/simpleddr/src:
main/java/org/apache/devicemap/simpleapi/oddr/builder/browser/
main/java/org/apache/devicemap/simpleapi/oddr/builder/device/
main/java/org/apache/devicemap/simplea...
Copied: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java (from r1612164, incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java?p2=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java&p1=incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java&r1=1612164&r2=1614240&rev=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/oddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java Tue Jul 29 01:25:44 2014
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.devicemap.simpleddr.builder.os.mozilla;
+package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla;
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.UserAgent;
import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java Tue Jul 29 01:25:44 2014
@@ -18,6 +18,10 @@
*/
package org.apache.devicemap.simpleddr;
+import org.apache.devicemap.simpleapi.oddr.builder.Builder;
+import org.apache.devicemap.simpleapi.oddr.builder.browser.DefaultBrowserBuilder;
+import org.apache.devicemap.simpleapi.oddr.builder.device.DeviceBuilder;
+import org.apache.devicemap.simpleapi.oddr.builder.os.DefaultOSBuilder;
import org.apache.devicemap.simpleddr.model.ODDRPropertyValue;
import java.io.File;
@@ -41,10 +45,6 @@ import org.apache.commons.jexl2.Expressi
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.JexlEngine;
import org.apache.commons.jexl2.MapContext;
-import org.apache.devicemap.simpleddr.builder.Builder;
-import org.apache.devicemap.simpleddr.builder.browser.DefaultBrowserBuilder;
-import org.apache.devicemap.simpleddr.builder.device.DeviceBuilder;
-import org.apache.devicemap.simpleddr.builder.os.DefaultOSBuilder;
import org.apache.devicemap.simpleddr.documenthandler.BrowserDatasourceHandler;
import org.apache.devicemap.simpleddr.documenthandler.DeviceBuilderHandler;
import org.apache.devicemap.simpleddr.documenthandler.DeviceDatasourceHandler;
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java Tue Jul 29 01:25:44 2014
@@ -20,7 +20,8 @@ package org.apache.devicemap.simpleddr.d
import java.util.ArrayList;
import java.util.List;
-import org.apache.devicemap.simpleddr.builder.device.DeviceBuilder;
+
+import org.apache.devicemap.simpleapi.oddr.builder.device.DeviceBuilder;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java Tue Jul 29 01:25:44 2014
@@ -19,7 +19,8 @@
package org.apache.devicemap.simpleddr.identificator;
import java.util.Map;
-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.UserAgentFactory;
import org.apache.devicemap.simpleddr.model.browser.Browser;
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java Tue Jul 29 01:25:44 2014
@@ -24,7 +24,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.devicemap.simpleddr.builder.device.DeviceBuilder;
+
+import org.apache.devicemap.simpleapi.oddr.builder.device.DeviceBuilder;
import org.apache.devicemap.simpleddr.model.device.Device;
import org.apache.devicemap.simpleddr.model.UserAgent;
import org.apache.devicemap.simpleddr.model.UserAgentFactory;
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java Tue Jul 29 01:25:44 2014
@@ -19,7 +19,8 @@
package org.apache.devicemap.simpleddr.identificator;
import java.util.Map;
-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.UserAgentFactory;
import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSource.xml?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSource.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSource.xml Tue Jul 29 01:25:44 2014
@@ -31,7 +31,7 @@
</version>
<Builders>
<builder
- class="org.apache.devicemap.simpleddr.builder.device.AndroidDeviceBuilder">
+ class="org.apache.devicemap.simpleapi.oddr.builder.device.AndroidDeviceBuilder">
<device id="Nexus One">
<list>
<value>Nexus One</value>
Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSourcePatch.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSourcePatch.xml?rev=1614240&r1=1614239&r2=1614240&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSourcePatch.xml (original)
+++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSourcePatch.xml Tue Jul 29 01:25:44 2014
@@ -31,7 +31,7 @@
</version>
<Builders>
<builder
- class="org.apache.devicemap.simpleddr.builder.device.SimpleDeviceBuilder">
+ class="org.apache.devicemap.simpleapi.oddr.builder.device.SimpleDeviceBuilder">
<device id="desktopDevice">
<list>
<value>Mozilla/5.0; (X11; Linux x86_64; rv:8.0)