You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by bd...@apache.org on 2013/01/11 16:59:55 UTC

svn commit: r1432114 [1/2] - in /incubator/devicemap/trunk/openddr/java/src: main/java/org/apache/ main/java/org/apache/devicemap/ main/java/org/apache/devicemap/simpleddr/ main/java/org/apache/devicemap/simpleddr/builder/ main/java/org/apache/devicema...

Author: bdelacretaz
Date: Fri Jan 11 15:59:53 2013
New Revision: 1432114

URL: http://svn.apache.org/viewvc?rev=1432114&view=rev
Log:
DMAP-14 - change to org.apache.devicemap package names

Added:
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java
      - copied, changed from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRService.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRVocabularyService.java
      - copied, changed from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRVocabularyService.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/
      - copied from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/builder/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/
      - copied from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/cache/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/
      - copied from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/documenthandler/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/
      - copied from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/identificator/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/
      - copied from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/model/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/vocabulary/
      - copied from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/vocabulary/
Removed:
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRService.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRVocabularyService.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/builder/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/cache/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/documenthandler/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/identificator/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/model/
    incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/vocabulary/
Modified:
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/Cache.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/CacheImpl.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/BrowserDatasourceHandler.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceDatasourceHandler.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/OperatingSystemDatasourceHandler.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/VocabularyHandler.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/Identificator.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BufferedODDRHTTPEvidence.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BuiltObject.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRHTTPEvidence.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyName.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyRef.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValue.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValues.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgent.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgentFactory.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/browser/Browser.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/device/Device.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/os/OperatingSystem.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/Vocabulary.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyProperty.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyVariable.java
    incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/vocabulary/VocabularyHolder.java
    incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties
    incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSource.xml
    incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSourcePatch.xml

Copied: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java (from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRService.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java?p2=incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java&p1=incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRService.java&r1=1432108&r2=1432114&rev=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRService.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRService.java Fri Jan 11 15:59:53 2013
@@ -18,10 +18,10 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr;
+package org.apache.devicemap.simpleddr;
 
-import org.openddr.simpleapi.oddr.model.ODDRPropertyValue;
-import org.openddr.simpleapi.oddr.model.ODDRPropertyRef;
+import org.apache.devicemap.simpleddr.model.ODDRPropertyValue;
+import org.apache.devicemap.simpleddr.model.ODDRPropertyRef;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -41,29 +41,29 @@ 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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.builder.browser.DefaultBrowserBuilder;
-import org.openddr.simpleapi.oddr.builder.device.DeviceBuilder;
-import org.openddr.simpleapi.oddr.builder.os.DefaultOSBuilder;
-import org.openddr.simpleapi.oddr.documenthandler.BrowserDatasourceHandler;
-import org.openddr.simpleapi.oddr.documenthandler.DeviceBuilderHandler;
-import org.openddr.simpleapi.oddr.documenthandler.DeviceDatasourceHandler;
-import org.openddr.simpleapi.oddr.documenthandler.OperatingSystemDatasourceHandler;
-import org.openddr.simpleapi.oddr.identificator.BrowserIdentificator;
-import org.openddr.simpleapi.oddr.identificator.DeviceIdentificator;
-import org.openddr.simpleapi.oddr.identificator.OSIdentificator;
-import org.openddr.simpleapi.oddr.model.BufferedODDRHTTPEvidence;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.ODDRHTTPEvidence;
-import org.openddr.simpleapi.oddr.model.ODDRPropertyName;
-import org.openddr.simpleapi.oddr.model.ODDRPropertyValues;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.UserAgentFactory;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
-import org.openddr.simpleapi.oddr.model.vocabulary.Vocabulary;
-import org.openddr.simpleapi.oddr.model.vocabulary.VocabularyProperty;
-import org.openddr.simpleapi.oddr.vocabulary.VocabularyHolder;
+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;
+import org.apache.devicemap.simpleddr.documenthandler.OperatingSystemDatasourceHandler;
+import org.apache.devicemap.simpleddr.identificator.BrowserIdentificator;
+import org.apache.devicemap.simpleddr.identificator.DeviceIdentificator;
+import org.apache.devicemap.simpleddr.identificator.OSIdentificator;
+import org.apache.devicemap.simpleddr.model.BufferedODDRHTTPEvidence;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.ODDRHTTPEvidence;
+import org.apache.devicemap.simpleddr.model.ODDRPropertyName;
+import org.apache.devicemap.simpleddr.model.ODDRPropertyValues;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.UserAgentFactory;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.model.vocabulary.Vocabulary;
+import org.apache.devicemap.simpleddr.model.vocabulary.VocabularyProperty;
+import org.apache.devicemap.simpleddr.vocabulary.VocabularyHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.ddr.simple.Evidence;

Copied: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRVocabularyService.java (from r1432108, incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRVocabularyService.java)
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRVocabularyService.java?p2=incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRVocabularyService.java&p1=incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRVocabularyService.java&r1=1432108&r2=1432114&rev=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/openddr/simpleapi/oddr/ODDRVocabularyService.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/ODDRVocabularyService.java Fri Jan 11 15:59:53 2013
@@ -18,7 +18,7 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr;
+package org.apache.devicemap.simpleddr;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -32,9 +32,9 @@ import java.util.logging.Logger;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-import org.openddr.simpleapi.oddr.documenthandler.VocabularyHandler;
-import org.openddr.simpleapi.oddr.model.vocabulary.Vocabulary;
-import org.openddr.simpleapi.oddr.vocabulary.VocabularyHolder;
+import org.apache.devicemap.simpleddr.documenthandler.VocabularyHandler;
+import org.apache.devicemap.simpleddr.model.vocabulary.Vocabulary;
+import org.apache.devicemap.simpleddr.vocabulary.VocabularyHolder;
 import org.w3c.ddr.simple.exception.InitializationException;
 import org.xml.sax.SAXException;
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/Builder.java Fri Jan 11 15:59:53 2013
@@ -18,10 +18,10 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder;
+package org.apache.devicemap.simpleddr.builder;
 
-import org.openddr.simpleapi.oddr.model.BuiltObject;
-import org.openddr.simpleapi.oddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.BuiltObject;
+import org.apache.devicemap.simpleddr.model.UserAgent;
 
 public interface Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/AndroidMobileBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class AndroidMobileBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/BlackBerryBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class BlackBerryBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class ChromeBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ChromeMobileBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class ChromeMobileBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DefaultBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class DefaultBrowserBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/DolfinBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class DolfinBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FennecBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class FennecBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/FirefoxBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class FirefoxBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/HintedResolutionBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public abstract class HintedResolutionBrowserBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/IEMobileBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class IEMobileBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/InternetExplorerBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class InternetExplorerBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/JasmineBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class JasmineBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/KonquerorBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class KonquerorBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/LayoutEngineBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public abstract class LayoutEngineBrowserBuilder extends HintedResolutionBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NetFrontBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class NetFrontBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/NokiaBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class NokiaBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/ObigoBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class ObigoBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OpenWaveBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class OpenWaveBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class OperaBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/OperaMiniBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class OperaMiniBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/PolarisBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class PolarisBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SEMCBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class SEMCBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class SafariBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SafariMobileBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class SafariMobileBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/SilkBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class SilkBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/UPBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class UPBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/browser/WebOsBrowserBuilder.java Fri Jan 11 15:59:53 2013
@@ -1,9 +1,9 @@
-package org.openddr.simpleapi.oddr.builder.browser;
+package org.apache.devicemap.simpleddr.builder.browser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
 
 public class WebOsBrowserBuilder extends LayoutEngineBrowserBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/AndroidDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,7 +18,7 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.UserAgent;
 
 public class AndroidDeviceBuilder extends OrderedTokenDeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/DeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,12 +18,12 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.List;
 import java.util.Map;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.device.Device;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.device.Device;
 
 public interface DeviceBuilder extends Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/IOSDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.UserAgent;
 
 public class IOSDeviceBuilder implements DeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/OrderedTokenDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.openddr.simpleapi.oddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.device.Device;
 
 public abstract class OrderedTokenDeviceBuilder implements DeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SimpleDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,16 +18,16 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.BuiltObject;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.device.Device;
 
 public class SimpleDeviceBuilder implements DeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/SymbianDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,7 +18,7 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.UserAgent;
 
 public class SymbianDeviceBuilder extends OrderedTokenDeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/TwoStepDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,7 +18,7 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.UserAgent;
 
 public class TwoStepDeviceBuilder extends OrderedTokenDeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/device/WinPhoneDeviceBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,7 +18,7 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.device;
+package org.apache.devicemap.simpleddr.builder.device;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.UserAgent;
 
 public class WinPhoneDeviceBuilder extends OrderedTokenDeviceBuilder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/BlackBerryOSBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.os;
+package org.apache.devicemap.simpleddr.builder.os;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+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;
 
 public class BlackBerryOSBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/DefaultOSBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.os;
+package org.apache.devicemap.simpleddr.builder.os;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class DefaultOSBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/MozillaOSModelBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,25 +18,25 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.os;
+package org.apache.devicemap.simpleddr.builder.os;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.AndroidMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.BadaMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.BlackBerryMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.BrewMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.IOSMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.LinuxMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.MacOSXMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.SymbianMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.WebOSMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.WinCEMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.WinPhoneMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+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.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class MozillaOSModelBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/OperaOSModelBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,19 +18,19 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.simpleapi.oddr.builder.os;
+package org.apache.devicemap.simpleddr.builder.os;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.builder.device.WinPhoneDeviceBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.AndroidMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.SymbianMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.builder.os.mozilla.WinCEMozillaSubBuilder;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+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.simpleddr.model.BuiltObject;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class OperaOSModelBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/AndroidMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class AndroidMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BadaMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class BadaMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BlackBerryMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class BlackBerryMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/BrewMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class BrewMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/IOSMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class IOSMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/LinuxMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+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;
 
 public class LinuxMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/MacOSXMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,14 +18,14 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+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;
 
 public class MacOSXMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/SymbianMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class SymbianMozillaSubBuilder implements Builder {
 

Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WebOSMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,13 +18,13 @@
  * along with Simple APIs.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package org.openddr.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.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.builder.Builder;
+import org.apache.devicemap.simpleddr.model.UserAgent;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
 
 public class WebOSMozillaSubBuilder implements Builder {