From ebda9eac10e84a98224e0aa93fbe7269ac146892 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Sep 2009 10:34:13 +0000
Subject: [PATCH] Rename references, bundle symbolic names

git-svn-id: https://svn.argeo.org/commons/trunk@2896 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.server.hsqldb/META-INF/spring/hsqldb.xml    | 6 +++---
 server/modules/org.argeo.server.hsqldb/hsqldb.properties  | 6 +++---
 .../org.argeo.server.mysql/META-INF/spring/mysql.xml      | 6 +++---
 server/modules/org.argeo.server.mysql/mysql.properties    | 6 +++---
 server/modules/org.argeo.server.tomcat/conf/server.xml    | 8 ++++----
 server/modules/org.argeo.server.tomcat/tomcat.properties  | 6 +++---
 6 files changed, 19 insertions(+), 19 deletions(-)

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 ca042169b..bab73dfcc 100644
--- 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 6b9d5ba36..9053e4eac 100644
--- 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 51003f5cd..0a1205924 100644
--- 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 11a0d5544..bb5cee8eb 100644
--- 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 507e0febd..fda25a39a 100644
--- 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 d269ece3b..f79b2dec4 100644
--- 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
-- 
2.30.2