Rename references, bundle symbolic names

git-svn-id: https://svn.argeo.org/commons/trunk@2896 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
index ca042169befe68d9fd42b64d78c09fbf8dd8f7aa..bab73dfcc8f3a2aef8144b6baa7383efa90b559a 100644 (file)
--- a/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml
@@ -33,9 +33,9 @@
        </bean>
 
        <bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
-               <property name="database" value="${jdbc.url}" />
-               <property name="user" value="${jdbc.username}" />
-               <property name="password" value="${jdbc.password}" />
+               <property name="database" value="${argeo.server.jdbc.url}" />
+               <property name="user" value="${argeo.server.jdbc.username}" />
+               <property name="password" value="${argeo.server.jdbc.password}" />
 
        </bean>
 </beans>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.hsqldb/hsqldb.properties b/server/modules/org.argeo.server.hsqldb/hsqldb.properties
index 6b9d5ba367522ca7678988188153e6213e0b2c20..9053e4eacc4ac482c02a31438767793f7790c9a0 100644 (file)
--- a/server/modules/org.argeo.server.hsqldb/hsqldb.properties
+++ b/server/modules/org.argeo.server.hsqldb/hsqldb.properties
@@ -1,3 +1,3 @@
-jdbc.url=jdbc:hsqldb:mem:test
-jdbc.username=sa
-jdbc.password=
+argeo.server.jdbc.url=jdbc:hsqldb:mem:test
+argeo.server.jdbc.username=sa
+argeo.server.jdbc.password=

diff --git a/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml b/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml
index 51003f5cd09a2693e37208c44efc93790344783c..0a12059247fe2a61da8801b63dc7f82f8723e648 100644 (file)
--- a/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml
+++ b/server/modules/org.argeo.server.mysql/META-INF/spring/mysql.xml
@@ -45,9 +45,9 @@
        <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
                destroy-method="close">
                <property name="driverClassName" value="com.mysql.jdbc.Driver" />
-               <property name="url" value="${jdbc.url}" />
-               <property name="username" value="${jdbc.username}" />
-               <property name="password" value="${jdbc.password}" />
+               <property name="url" value="${argeo.server.jdbc.url}" />
+               <property name="username" value="${argeo.server.jdbc.username}" />
+               <property name="password" value="${argeo.server.jdbc.password}" />
                <property name="testOnBorrow" value="true" />
                <property name="validationQuery" value="SELECT 1" />
                <property name="maxActive" value="10" />

diff --git a/server/modules/org.argeo.server.mysql/mysql.properties b/server/modules/org.argeo.server.mysql/mysql.properties
index 11a0d554441dec7aeb06668bf133458158f028c2..bb5cee8eb74c1fb29a96c5371cc96c73b8840608 100644 (file)
--- a/server/modules/org.argeo.server.mysql/mysql.properties
+++ b/server/modules/org.argeo.server.mysql/mysql.properties
@@ -1,3 +1,3 @@
-jdbc.url=jdbc:mysql://localhost/slc
-jdbc.username=root
-jdbc.password=
+argeo.server.jdbc.url=jdbc:mysql://localhost/argeo
+argeo.server.jdbc.username=root
+argeo.server.jdbc.password=

diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 507e0febd7f97ac2163378f94fd3e3b98f2b0a18..fda25a39a321f807a737567eba343fcd348b058a 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/conf/server.xml
+++ b/server/modules/org.argeo.server.tomcat/conf/server.xml
@@ -62,8 +62,8 @@
                        /docs/config/ajp.html APR (HTTP/AJP) Connector: /docs/apr.html Define
                        a non-SSL HTTP/1.1 Connector on port 8080
                -->
-               <Connector port="${server.port.http}" protocol="HTTP/1.1"
-                       connectionTimeout="20000" redirectPort="${server.port.https}" />
+               <Connector port="${argeo.server.port.http}" protocol="HTTP/1.1"
+                       connectionTimeout="20000" redirectPort="${argeo.server.port.https}" />
                <!-- A "Connector" using the shared thread pool-->
                <!--
                        <Connector executor="tomcatThreadPool" port="8080"
@@ -81,8 +81,8 @@
                -->
 
                <!-- Define an AJP 1.3 Connector on port 8009 -->
-               <Connector port="${server.port.ajp}" protocol="AJP/1.3"
-                       redirectPort="${server.port.https}" />
+               <Connector port="${argeo.server.port.ajp}" protocol="AJP/1.3"
+                       redirectPort="${argeo.server.port.https}" />
 
 
                <!--

diff --git a/server/modules/org.argeo.server.tomcat/tomcat.properties b/server/modules/org.argeo.server.tomcat/tomcat.properties
index d269ece3b0d5bb52f870f4e5bf2cc1b4a0e885ba..f79b2dec43ae68cdb3442c53fd6b431d10d56002 100644 (file)
--- a/server/modules/org.argeo.server.tomcat/tomcat.properties
+++ b/server/modules/org.argeo.server.tomcat/tomcat.properties
@@ -1,3 +1,3 @@
-server.port.http=7070
-server.port.https=7443
-server.port.ajp=7009
+argeo.server.port.http=7070
+argeo.server.port.https=7443
+argeo.server.port.ajp=7009