Fix JDBC Parameter var name (#476)

* Rename JDBC_URL_OPTS to JDBC_URL_PARAMS

diff --git a/build.properties b/build.properties
index ecce3d18a42106bdaa220ae9144922b7f922837e..087912083fc47f2a0db7fab4756b449e2b450cb1 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -198,11 +198,11 @@ db.jdbc.default.datasource=jdbc/default
 #db.jdbc.urloptions.encoded=ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&foo=true
 
 #
-# Use the JDBC_URL_OPTS env var to set the urloptions for the jdbc connection string
+# Use the JDBC_URL_PARAMS env var to set the urloptions for the jdbc connection string
 # The db.jdbc.urloptions.encoded needs to be created in each ant target which uses it by calling the
 # urlencode scriptdef. We can still reference it below as it will be added at runtime.
 #
-db.jdbc.urloptions=${env.JDBC_URL_OPTS}
+db.jdbc.urloptions=${env.JDBC_URL_PARAMS}
 
 #
 # JDBC urls that CollectionSpace needs to talk to the "admin" database, Nuxeo databases, and the "cspace" database (i.e., the AuthN/AuthZ database)

diff --git a/build.xml b/build.xml
index 3cd4c4f947060fda8dcfc2d106e03c72cb1dc788..d026cd9117dac2852f8df4710c5044b02d2e5b91 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,7 @@
   <scriptdef name="urlencode" language="javascript">
     <attribute name="property"/>
     <![CDATA[
-                       var value = self.project.getProperty(attributes.get("property"));
+      var value = self.project.getProperty(attributes.get("property"));
       var encoded = encodeURIComponent(value);
       self.project.setProperty(attributes.get("property") + ".encoded", encoded)
     ]]>