Mercurial > hg > release > thermostat-1.6

changeset 1709:0f4eb944e00b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove web.war.backingstorage*snippets from pom files Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-June/013926.html PR2466
author Omair Majid <omajid@redhat.com>
date Tue, 16 Jun 2015 11:52:41 -0400
parents 4cf9650b8bb1
children 763dc2378c4e
files distribution/config/web.auth pom.xml
diffstat 2 files changed, 2 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/web.auth	Tue Jun 23 09:57:32 2015 -0600
+++ b/distribution/config/web.auth	Tue Jun 16 11:52:41 2015 -0400
@@ -4,8 +4,8 @@
 
 # Username to use for connecting to the backing storage
 # implementation
-${web.war.backingstorage.username.snippet}
+# storage.username=username
 
 # Password to use for connecting to the backing storage
 # implementation
-${web.war.backingstorage.password.snippet}
+# storage.password=password
--- a/pom.xml	Tue Jun 23 09:57:32 2015 -0600
+++ b/pom.xml	Tue Jun 16 11:52:41 2015 -0400
@@ -124,14 +124,6 @@
         <agent.dev.password> tester </agent.dev.password>
         <mongodb.dev.username> mongodevuser </mongodb.dev.username>
         <mongodb.dev.password> mongodevpassword </mongodb.dev.password>
-        <!-- used in web.xml of the war artifact -->
-        <web.war.backingstorage.username.snippet>
-storage.username=${mongodb.dev.username}
-        </web.war.backingstorage.username.snippet>
-        <!-- used in web.xml of the war artifact -->
-        <web.war.backingstorage.password.snippet>
-storage.password=${mongodb.dev.password}
-        </web.war.backingstorage.password.snippet>
         <!--
              Used in thermostat-users.properties. We define two users.
              One client user and one agent user.
@@ -293,14 +285,6 @@
          to change to a newer version, unless you abolutely have to. -->
     <javax.servlet.version>2.5</javax.servlet.version>
 
-    <!-- used in web.xml of the war artifact -->
-    <web.war.backingstorage.username.snippet>
-#storage.username=thermostat-mongodb-user
-    </web.war.backingstorage.username.snippet>
-    <!-- used in web.xml of the war artifact -->
-    <web.war.backingstorage.password.snippet>
-#storage.password=supersecrit
-    </web.war.backingstorage.password.snippet>
     <!--
          Used in thermostat-users.properties and
          thermostat-roles.properties respectively. We don't define