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 [2/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...
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinCEMozillaSubBuilder.java Fri Jan 11 15:59:53 2013
@@ -18,15 +18,15 @@
* 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.Scanner;
import java.util.regex.MatchResult;
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 WinCEMozillaSubBuilder implements Builder {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/builder/os/mozilla/WinPhoneMozillaSubBuilder.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 WinPhoneMozillaSubBuilder implements Builder {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/Cache.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/Cache.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/Cache.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/Cache.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.cache;
+package org.apache.devicemap.simpleddr.cache;
import java.util.Collection;
import java.util.Map;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/CacheImpl.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/CacheImpl.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/CacheImpl.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/cache/CacheImpl.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.cache;
+package org.apache.devicemap.simpleddr.cache;
import java.util.ArrayList;
import java.util.Collection;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/BrowserDatasourceHandler.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/BrowserDatasourceHandler.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/BrowserDatasourceHandler.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/BrowserDatasourceHandler.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.documenthandler;
+package org.apache.devicemap.simpleddr.documenthandler;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
-import org.openddr.simpleapi.oddr.ODDRService;
-import org.openddr.simpleapi.oddr.ODDRVocabularyService;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
-import org.openddr.simpleapi.oddr.vocabulary.VocabularyHolder;
+import org.apache.devicemap.simpleddr.ODDRService;
+import org.apache.devicemap.simpleddr.ODDRVocabularyService;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.vocabulary.VocabularyHolder;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceBuilderHandler.java Fri Jan 11 15:59:53 2013
@@ -18,11 +18,11 @@
* along with Simple APIs. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.openddr.simpleapi.oddr.documenthandler;
+package org.apache.devicemap.simpleddr.documenthandler;
import java.util.ArrayList;
import java.util.List;
-import org.openddr.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/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceDatasourceHandler.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceDatasourceHandler.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceDatasourceHandler.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/DeviceDatasourceHandler.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.documenthandler;
+package org.apache.devicemap.simpleddr.documenthandler;
import java.util.HashMap;
import java.util.Map;
-import org.openddr.simpleapi.oddr.ODDRService;
-import org.openddr.simpleapi.oddr.ODDRVocabularyService;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.vocabulary.VocabularyHolder;
+import org.apache.devicemap.simpleddr.ODDRService;
+import org.apache.devicemap.simpleddr.ODDRVocabularyService;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.vocabulary.VocabularyHolder;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/OperatingSystemDatasourceHandler.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/OperatingSystemDatasourceHandler.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/OperatingSystemDatasourceHandler.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/OperatingSystemDatasourceHandler.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.documenthandler;
+package org.apache.devicemap.simpleddr.documenthandler;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
-import org.openddr.simpleapi.oddr.ODDRService;
-import org.openddr.simpleapi.oddr.ODDRVocabularyService;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
-import org.openddr.simpleapi.oddr.vocabulary.VocabularyHolder;
+import org.apache.devicemap.simpleddr.ODDRService;
+import org.apache.devicemap.simpleddr.ODDRVocabularyService;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.vocabulary.VocabularyHolder;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/VocabularyHandler.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/VocabularyHandler.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/VocabularyHandler.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/documenthandler/VocabularyHandler.java Fri Jan 11 15:59:53 2013
@@ -18,15 +18,15 @@
* along with Simple APIs. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.openddr.simpleapi.oddr.documenthandler;
+package org.apache.devicemap.simpleddr.documenthandler;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.openddr.simpleapi.oddr.model.vocabulary.Vocabulary;
-import org.openddr.simpleapi.oddr.model.vocabulary.VocabularyProperty;
-import org.openddr.simpleapi.oddr.model.vocabulary.VocabularyVariable;
+import org.apache.devicemap.simpleddr.model.vocabulary.Vocabulary;
+import org.apache.devicemap.simpleddr.model.vocabulary.VocabularyProperty;
+import org.apache.devicemap.simpleddr.model.vocabulary.VocabularyVariable;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/BrowserIdentificator.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.identificator;
+package org.apache.devicemap.simpleddr.identificator;
import java.util.Map;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.UserAgentFactory;
-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.UserAgentFactory;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.ddr.simple.Evidence;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/DeviceIdentificator.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.identificator;
+package org.apache.devicemap.simpleddr.identificator;
import java.util.ArrayList;
import java.util.Collections;
@@ -26,10 +26,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.openddr.simpleapi.oddr.builder.device.DeviceBuilder;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.UserAgentFactory;
+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;
import org.w3c.ddr.simple.Evidence;
public class DeviceIdentificator implements Identificator {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/Identificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/Identificator.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/Identificator.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/Identificator.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.identificator;
+package org.apache.devicemap.simpleddr.identificator;
-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;
import org.w3c.ddr.simple.Evidence;
public interface Identificator {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/identificator/OSIdentificator.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.identificator;
+package org.apache.devicemap.simpleddr.identificator;
import java.util.Map;
-import org.openddr.simpleapi.oddr.builder.Builder;
-import org.openddr.simpleapi.oddr.model.UserAgent;
-import org.openddr.simpleapi.oddr.model.UserAgentFactory;
-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.UserAgentFactory;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.ddr.simple.Evidence;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BufferedODDRHTTPEvidence.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BufferedODDRHTTPEvidence.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BufferedODDRHTTPEvidence.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BufferedODDRHTTPEvidence.java Fri Jan 11 15:59:53 2013
@@ -18,11 +18,11 @@
* along with Simple APIs. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.openddr.simpleapi.oddr.model;
+package org.apache.devicemap.simpleddr.model;
-import org.openddr.simpleapi.oddr.model.browser.Browser;
-import org.openddr.simpleapi.oddr.model.device.Device;
-import org.openddr.simpleapi.oddr.model.os.OperatingSystem;
+import org.apache.devicemap.simpleddr.model.browser.Browser;
+import org.apache.devicemap.simpleddr.model.device.Device;
+import org.apache.devicemap.simpleddr.model.os.OperatingSystem;
public class BufferedODDRHTTPEvidence extends ODDRHTTPEvidence {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BuiltObject.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BuiltObject.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BuiltObject.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/BuiltObject.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.model;
+package org.apache.devicemap.simpleddr.model;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRHTTPEvidence.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRHTTPEvidence.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRHTTPEvidence.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRHTTPEvidence.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.model;
+package org.apache.devicemap.simpleddr.model;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyName.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyName.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyName.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyName.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.model;
+package org.apache.devicemap.simpleddr.model;
import org.w3c.ddr.simple.PropertyName;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyRef.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyRef.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyRef.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyRef.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.model;
+package org.apache.devicemap.simpleddr.model;
import org.w3c.ddr.simple.PropertyName;
import org.w3c.ddr.simple.PropertyRef;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValue.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValue.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValue.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValue.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.model;
+package org.apache.devicemap.simpleddr.model;
import org.w3c.ddr.simple.PropertyRef;
import org.w3c.ddr.simple.PropertyValue;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValues.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValues.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValues.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/ODDRPropertyValues.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.model;
+package org.apache.devicemap.simpleddr.model;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgent.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgent.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgent.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgent.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.model;
+package org.apache.devicemap.simpleddr.model;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgentFactory.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgentFactory.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgentFactory.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/UserAgentFactory.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.model;
+package org.apache.devicemap.simpleddr.model;
import java.util.Map;
import org.w3c.ddr.simple.Evidence;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/browser/Browser.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/browser/Browser.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/browser/Browser.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/browser/Browser.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.model.browser;
+package org.apache.devicemap.simpleddr.model.browser;
import java.util.Map;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
+import org.apache.devicemap.simpleddr.model.BuiltObject;
public class Browser extends BuiltObject implements Comparable {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/device/Device.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/device/Device.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/device/Device.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/device/Device.java Fri Jan 11 15:59:53 2013
@@ -18,9 +18,9 @@
* along with Simple APIs. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.openddr.simpleapi.oddr.model.device;
+package org.apache.devicemap.simpleddr.model.device;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
+import org.apache.devicemap.simpleddr.model.BuiltObject;
public class Device extends BuiltObject implements Comparable, Cloneable {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/os/OperatingSystem.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/os/OperatingSystem.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/os/OperatingSystem.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/os/OperatingSystem.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.model.os;
+package org.apache.devicemap.simpleddr.model.os;
import java.util.Map;
-import org.openddr.simpleapi.oddr.model.BuiltObject;
+import org.apache.devicemap.simpleddr.model.BuiltObject;
public class OperatingSystem extends BuiltObject implements Comparable {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/Vocabulary.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/Vocabulary.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/Vocabulary.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/Vocabulary.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.model.vocabulary;
+package org.apache.devicemap.simpleddr.model.vocabulary;
import java.util.Map;
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyProperty.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyProperty.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyProperty.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyProperty.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.model.vocabulary;
+package org.apache.devicemap.simpleddr.model.vocabulary;
public class VocabularyProperty {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyVariable.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyVariable.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyVariable.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/model/vocabulary/VocabularyVariable.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.model.vocabulary;
+package org.apache.devicemap.simpleddr.model.vocabulary;
public class VocabularyVariable {
Modified: incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/vocabulary/VocabularyHolder.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/vocabulary/VocabularyHolder.java?rev=1432114&r1=1432108&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/vocabulary/VocabularyHolder.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/main/java/org/apache/devicemap/simpleddr/vocabulary/VocabularyHolder.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.vocabulary;
+package org.apache.devicemap.simpleddr.vocabulary;
import java.util.Map;
import org.apache.commons.lang.ArrayUtils;
-import org.openddr.simpleapi.oddr.cache.Cache;
-import org.openddr.simpleapi.oddr.cache.CacheImpl;
-import org.openddr.simpleapi.oddr.model.vocabulary.Vocabulary;
-import org.openddr.simpleapi.oddr.model.vocabulary.VocabularyProperty;
+import org.apache.devicemap.simpleddr.cache.Cache;
+import org.apache.devicemap.simpleddr.cache.CacheImpl;
+import org.apache.devicemap.simpleddr.model.vocabulary.Vocabulary;
+import org.apache.devicemap.simpleddr.model.vocabulary.VocabularyProperty;
import org.w3c.ddr.simple.exception.NameException;
public class VocabularyHolder {
Modified: incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties?rev=1432114&r1=1432113&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties Fri Jan 11 15:59:53 2013
@@ -1,5 +1,5 @@
# Properties used to test the openddr module
-oddr.service.class=org.openddr.simpleapi.oddr.ODDRService
+oddr.service.class=org.apache.devicemap.simpleddr.ODDRService
oddr.ua.device.builder.path=${project.build.directory}/test-classes/openddr/TEST_BuilderDataSource.xml
oddr.ua.device.datasource.path=${project.build.directory}/test-classes/openddr/TEST_DeviceDataSource.xml
Modified: incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSource.xml?rev=1432114&r1=1432113&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSource.xml (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSource.xml Fri Jan 11 15:59:53 2013
@@ -31,7 +31,7 @@
</version>
<Builders>
<builder
- class="org.openddr.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/openddr/java/src/test/resources/openddr/TEST_BuilderDataSourcePatch.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSourcePatch.xml?rev=1432114&r1=1432113&r2=1432114&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSourcePatch.xml (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/resources/openddr/TEST_BuilderDataSourcePatch.xml Fri Jan 11 15:59:53 2013
@@ -31,7 +31,7 @@
</version>
<Builders>
<builder
- class="org.openddr.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)