Author: wkeil Date: Tue Jul 29 20:12:41 2014 New Revision: 1614475 URL: http://svn.apache.org/r1614475 Log: DMAP-35: Refactor Simple DDR
Task-Url: https://issues.apache.org/jira/browse/DMAP-35 Removed: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleapi/ Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSource.xml incubator/devicemap/trunk/devicemap/java/simpleddr/src/test/resources/openddr-test-data/TEST_BuilderDataSourcePatch.xml Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/pom.xml Tue Jul 29 20:12:41 2014 @@ -17,7 +17,7 @@ <artifactId>devicemap-java</artifactId> <version>1.0.1-SNAPSHOT</version> </parent> - <version>1.0.0-RC2</version> + <version>1.0.0</version> <description>Apache DeviceMap Simple DDR Java module</description> <artifactId>devicemap-simpleddr</artifactId> <packaging>jar</packaging> 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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -18,10 +18,6 @@ */ 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; @@ -45,6 +41,10 @@ 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/builder/browser/AndroidMobileBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.builder.Builder; import org.apache.devicemap.simpleddr.model.UserAgent; import org.apache.devicemap.simpleddr.model.browser.Browser; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.builder.Builder; import org.apache.devicemap.simpleddr.model.UserAgent; import org.apache.devicemap.simpleddr.model.browser.Browser; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.browser; +package org.apache.devicemap.simpleddr.builder.browser; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.ArrayList; import java.util.Collections; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.List; import java.util.Map; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.builder.Builder; import org.apache.devicemap.simpleddr.model.device.Device; public interface DeviceBuilder extends Builder { Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.Iterator; import java.util.LinkedHashMap; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.ArrayList; import java.util.Collections; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.Iterator; import java.util.LinkedHashMap; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.ArrayList; import java.util.Collections; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.ArrayList; import java.util.Collections; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.device; +package org.apache.devicemap.simpleddr.builder.device; import java.util.ArrayList; import java.util.Collections; Modified: incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/BadaMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/BlackBerryMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/BrewMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/IOSMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/LinuxMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.builder.Builder; import org.apache.devicemap.simpleddr.model.BuiltObject; 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/builder/os/mozilla/MacOSXMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.builder.Builder; import org.apache.devicemap.simpleddr.model.BuiltObject; 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/builder/os/mozilla/SymbianMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/WebOSMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/WinCEMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&view=diff ============================================================================== --- incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java (original) +++ incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.Scanner; import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/builder/os/mozilla/WinPhoneMozillaSubBuilder.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/simpleddr/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java?rev=1614475&r1=1614474&r2=1614475&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/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java Tue Jul 29 20:12:41 2014 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.devicemap.simpleapi.oddr.builder.os.mozilla; +package org.apache.devicemap.simpleddr.builder.os.mozilla; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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/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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -21,7 +21,7 @@ package org.apache.devicemap.simpleddr.d import java.util.ArrayList; import java.util.List; -import org.apache.devicemap.simpleapi.oddr.builder.device.DeviceBuilder; +import org.apache.devicemap.simpleddr.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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -20,7 +20,7 @@ package org.apache.devicemap.simpleddr.i import java.util.Map; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.devicemap.simpleapi.oddr.builder.device.DeviceBuilder; +import org.apache.devicemap.simpleddr.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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -20,7 +20,7 @@ package org.apache.devicemap.simpleddr.i import java.util.Map; -import org.apache.devicemap.simpleapi.oddr.builder.Builder; +import org.apache.devicemap.simpleddr.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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -31,7 +31,7 @@ </version> <Builders> <builder - class="org.apache.devicemap.simpleapi.oddr.builder.device.AndroidDeviceBuilder"> + class="org.apache.devicemap.simpleddr.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=1614475&r1=1614474&r2=1614475&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 20:12:41 2014 @@ -31,7 +31,7 @@ </version> <Builders> <builder - class="org.apache.devicemap.simpleapi.oddr.builder.device.SimpleDeviceBuilder"> + class="org.apache.devicemap.simpleddr.builder.device.SimpleDeviceBuilder"> <device id="desktopDevice"> <list> <value>Mozilla/5.0; (X11; Linux x86_64; rv:8.0)
