Update products with new constants

Signed-off-by: Francois Aissaoui <aissaoui@laas.fr>

3 files changed, 7 insertions, 22 deletions

diff --git a/org.eclipse.om2m.site.asn-cse/om2m.product b/org.eclipse.om2m.site.asn-cse/om2m.product
index 5e68fab1..8e2aed7c 100644
--- a/org.eclipse.om2m.site.asn-cse/om2m.product
+++ b/org.eclipse.om2m.site.asn-cse/om2m.product
@@ -48,8 +48,8 @@
       <plugin id="org.eclipse.jetty.server"/>
       <plugin id="org.eclipse.jetty.servlet"/>
       <plugin id="org.eclipse.jetty.util"/>
-      <plugin id="org.eclipse.om2m.binding.http"/>
       <plugin id="org.eclipse.om2m.binding.coap"/>
+      <plugin id="org.eclipse.om2m.binding.http"/>
       <plugin id="org.eclipse.om2m.binding.service"/>
       <plugin id="org.eclipse.om2m.commons"/>
       <plugin id="org.eclipse.om2m.commons.logging" fragment="true"/>
@@ -72,7 +72,6 @@
       <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.http.jetty" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.om2m.binding.http" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.om2m.binding.coap" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.om2m.core" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.om2m.datamapping.jaxb" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.om2m.persistence.eclipselink" autoStart="true" startLevel="2" />
@@ -81,7 +80,7 @@
       <property name="org.apache.commons.logging.Log" value="org.apache.commons.logging.impl.Log4JLogger" />
       <property name="org.eclipse.equinox.http.jetty.http.port" value="8181" />
       <property name="org.eclipse.om2m.adminRequestingEntity" value="admin:admin" />
-      <property name="org.eclipse.om2m.coap.port" value="5685" />
+      <property name="org.eclipse.om2m.coap.port" value="5684" />
       <property name="org.eclipse.om2m.cseAuthentication" value="true" />
       <property name="org.eclipse.om2m.cseBaseAddress" value="127.0.0.1" />
       <property name="org.eclipse.om2m.cseBaseContext" value="/" />
@@ -91,7 +90,7 @@
       <property name="org.eclipse.om2m.cseType" value="ASN" />
       <property name="org.eclipse.om2m.dbDriver" value="org.h2.Driver" />
       <property name="org.eclipse.om2m.dbPassword" value="om2m" />
-      <property name="org.eclipse.om2m.dbReset" value="true" />
+      <property name="org.eclipse.om2m.dbReset" value="false" />
       <property name="org.eclipse.om2m.dbUrl" value="jdbc:h2:./database/asndb" />
       <property name="org.eclipse.om2m.dbUser" value="om2m" />
       <property name="org.eclipse.om2m.globalContext" value="" />
diff --git a/org.eclipse.om2m.site.in-cse/om2m.product b/org.eclipse.om2m.site.in-cse/om2m.product
index 41d86b97..517b1d71 100644
--- a/org.eclipse.om2m.site.in-cse/om2m.product
+++ b/org.eclipse.om2m.site.in-cse/om2m.product
@@ -3,7 +3,6 @@
 
 <product uid="in-cse" version="1.0.0" useFeatures="false" includeLaunchers="false">
 
-
    <configIni use="default">
    </configIni>
 
@@ -18,7 +17,6 @@
 
    <windowImages/>
 
-
    <launcher name="in-cse">
       <solaris/>
       <win useIco="false">
@@ -26,13 +24,11 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux>
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
    </vm>
 
-
    <plugins>
       <plugin id="javax.servlet"/>
       <plugin id="javax.xml"/>
@@ -54,8 +50,8 @@
       <plugin id="org.eclipse.jetty.server"/>
       <plugin id="org.eclipse.jetty.servlet"/>
       <plugin id="org.eclipse.jetty.util"/>
-      <plugin id="org.eclipse.om2m.binding.http"/>
       <plugin id="org.eclipse.om2m.binding.coap"/>
+      <plugin id="org.eclipse.om2m.binding.http"/>
       <plugin id="org.eclipse.om2m.binding.service"/>
       <plugin id="org.eclipse.om2m.commons"/>
       <plugin id="org.eclipse.om2m.commons.logging" fragment="true"/>
@@ -76,8 +72,8 @@
       <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.http.jetty" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.om2m.binding.http" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.om2m.binding.coap" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.om2m.binding.http" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.om2m.core" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.om2m.datamapping.jaxb" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.om2m.persistence.eclipselink" autoStart="true" startLevel="2" />
@@ -95,7 +91,7 @@
       <property name="org.eclipse.om2m.cseType" value="IN-CSE" />
       <property name="org.eclipse.om2m.dbDriver" value="org.h2.Driver" />
       <property name="org.eclipse.om2m.dbPassword" value="om2m" />
-      <property name="org.eclipse.om2m.dbReset" value="true" />
+      <property name="org.eclipse.om2m.dbReset" value="false" />
       <property name="org.eclipse.om2m.dbUrl" value="jdbc:h2:./database/indb" />
       <property name="org.eclipse.om2m.dbUser" value="om2m" />
       <property name="org.eclipse.om2m.globalContext" value="" />
@@ -105,11 +101,4 @@
       <property name="org.eclipse.om2m.webInterfaceContext" value="/webpage" />
    </configurations>
 
-   <preferencesInfo>
-      <targetfile overwrite="false"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
 </product>
diff --git a/org.eclipse.om2m.site.mn-cse/om2m.product b/org.eclipse.om2m.site.mn-cse/om2m.product
index dcbeaede..3b8723b0 100644
--- a/org.eclipse.om2m.site.mn-cse/om2m.product
+++ b/org.eclipse.om2m.site.mn-cse/om2m.product
@@ -15,7 +15,6 @@
       </vmArgsMac>
    </launcherArgs>
 
-
    <launcher>
       <solaris/>
       <win useIco="false">
@@ -42,7 +41,6 @@
       <plugin id="org.eclipse.equinox.launcher"/>
       <plugin id="org.eclipse.jetty.continuation"/>
       <plugin id="org.eclipse.jetty.http"/>
-      <plugin id="org.eclipse.om2m.binding.coap"/>
       <plugin id="org.eclipse.jetty.io"/>
       <plugin id="org.eclipse.jetty.security"/>
       <plugin id="org.eclipse.jetty.server"/>
@@ -71,7 +69,6 @@
       <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.http.jetty" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.om2m.binding.http" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.om2m.binding.coap" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.om2m.core" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.om2m.datamapping.jaxb" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.om2m.persistence.eclipselink" autoStart="true" startLevel="2" />
@@ -90,7 +87,7 @@
       <property name="org.eclipse.om2m.cseType" value="MN" />
       <property name="org.eclipse.om2m.dbDriver" value="org.h2.Driver" />
       <property name="org.eclipse.om2m.dbPassword" value="om2m" />
-      <property name="org.eclipse.om2m.dbReset" value="true" />
+      <property name="org.eclipse.om2m.dbReset" value="false" />
       <property name="org.eclipse.om2m.dbUrl" value="jdbc:h2:./database/mndb" />
       <property name="org.eclipse.om2m.dbUser" value="om2m" />
       <property name="org.eclipse.om2m.globalContext" value="" />