svn commit: r1432105 - in /incubator/devicemap/trunk/openddr/java/src/test: java/org/apache/devicemap/openddr/test/ServiceSetup.java resources/config/openddr.properties

[bd...@apache.org]

Author: bdelacretaz
Date: Fri Jan 11 15:48:37 2013
New Revision: 1432105

URL: http://svn.apache.org/viewvc?rev=1432105&view=rev
Log:
DMAP-15 - move oddr.service.class to properties

Modified:
    incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/openddr/test/ServiceSetup.java
    incubator/devicemap/trunk/openddr/java/src/test/resources/config/openddr.properties

Modified: incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/openddr/test/ServiceSetup.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/openddr/test/ServiceSetup.java?rev=1432105&r1=1432104&r2=1432105&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/openddr/test/ServiceSetup.java (original)
+++ incubator/devicemap/trunk/openddr/java/src/test/java/org/apache/devicemap/openddr/test/ServiceSetup.java Fri Jan 11 15:48:37 2013
@@ -30,7 +30,6 @@ import org.w3c.ddr.simple.ServiceFactory
  *  for tests. 
  */
 public class ServiceSetup {
-    private static String SERVICE_CLASS = "org.openddr.simpleapi.oddr.ODDRService";
     private static String CFG_RESOURCE_PATH = "config/openddr.properties";
     public static final Service S;
     
@@ -45,7 +44,8 @@ public class ServiceSetup {
                 cfg.close();
             }
             final String vocabIRI = props.getProperty("oddr.vocabulary.device");
-            S = ServiceFactory.newService(SERVICE_CLASS, vocabIRI, props);
+            final String serviceClass = props.getProperty("oddr.service.class");
+            S = ServiceFactory.newService(serviceClass, vocabIRI, props);
         } catch(Exception e) {
             throw new RuntimeException("Failed to initialize Service", e);
         }

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=1432105&r1=1432104&r2=1432105&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:48:37 2013
@@ -1,12 +1,18 @@
 # Properties used to test the openddr module
+oddr.service.class=org.openddr.simpleapi.oddr.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
 oddr.ua.device.builder.patch.paths=${project.build.directory}/test-classes/openddr/TEST_BuilderDataSourcePatch.xml
 oddr.ua.device.datasource.patch.paths=${project.build.directory}/test-classes/openddr/TEST_DeviceDataSourcePatch.xml
+
 oddr.ua.browser.datasource.path=${project.build.directory}/test-classes/openddr/TEST_BrowserDataSource.xml
+
 oddr.ua.operatingSystem.datasource.path=${project.build.directory}/test-classes/openddr/TEST_OperatingSystemDataSource.xml
+
 ddr.vocabulary.core.path=${project.build.directory}/test-classes/openddr/TEST_coreVocabulary.xml
 oddr.vocabulary.path=${project.build.directory}/test-classes/openddr/TEST_oddrVocabulary.xml
 oddr.limited.vocabulary.path=${project.build.directory}/test-classes/openddr/TEST_oddrLimitedVocabulary.xml
 oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary
+
 oddr.threshold=70
\ No newline at end of file