From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Sep 2009 10:22:00 +0000 (+0000)
Subject: Rename references, bundle symbolic names
X-Git-Tag: argeo-commons-2.1.30~1843
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=e93a2022d143fbb0ff91af11ad1b7206966a3d3e;p=lgpl%2Fargeo-commons.git

Rename references, bundle symbolic names

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

diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
index d5883256d..80ebb981b 100644
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.activemq.broker
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.activemq.broker
 Import-Package: jabber.client;resolution:=optional,jabber.iq._private;
  resolution:=optional,jabber.iq.auth;resolution:=optional,jabber.iq.ro
  ster;resolution:=optional,org.jabber.etherx.streams;resolution:=optio
diff --git a/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml b/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
index 53d984635..eae474ba4 100644
--- a/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
+++ b/server/modules/org.argeo.server.activemq.broker/META-INF/spring/activemq-broker.xml
@@ -17,7 +17,7 @@
 	<!-- Embedded broker -->
 	<amq:broker id="broker" useJmx="false" persistent="false">
 		<amq:transportConnectors>
-			<amq:transportConnector uri="${slc.server.jms.url}" />
+			<amq:transportConnector uri="${argeo.server.jms.url}" />
 			<!-- <amq:transportConnector uri="xmpp://localhost:61222" /> -->
 		</amq:transportConnectors>
 	</amq:broker>
diff --git a/server/modules/org.argeo.server.activemq.broker/activemq.properties b/server/modules/org.argeo.server.activemq.broker/activemq.properties
index d1afbfa54..56fc24c5b 100644
--- a/server/modules/org.argeo.server.activemq.broker/activemq.properties
+++ b/server/modules/org.argeo.server.activemq.broker/activemq.properties
@@ -1 +1 @@
-slc.server.jms.url=tcp://localhost:61616
\ No newline at end of file
+argeo.server.jms.url=tcp://localhost:61616
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
index c904a5dfb..8336c3364 100644
--- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6
  .0.16,7.0.0)"
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.catalina
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.catalina
 Import-Package: org.springframework.security,org.springframework.secur
  ity.providers,org.springframework.security.ui,org.springframework.sec
  urity.userdetails,org.springframework.security.ui.savedrequest
diff --git a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
index 1cf7321bd..7b93b37ac 100644
--- a/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.hsqldb/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.hsqldb
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.hsqldb
 Import-Package: org.argeo.slc.hibernate,org.hibernate,org.springframew
  ork.orm.hibernate3,org.argeo.slc.runtime,org.argeo.slc.process,org.ar
  geo.slc.test,org.argeo.slc.core.attachment,org.argeo.slc.core.test.tr
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 76c1c9bae..ca042169b 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="${slc.server.hsqldb.url}" />
-		<property name="user" value="sa" />
-		<property name="password" value="" />
+		<property name="database" value="${jdbc.url}" />
+		<property name="user" value="${jdbc.username}" />
+		<property name="password" value="${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 72dd57905..6b9d5ba36 100644
--- a/server/modules/org.argeo.server.hsqldb/hsqldb.properties
+++ b/server/modules/org.argeo.server.hsqldb/hsqldb.properties
@@ -1 +1,3 @@
-slc.server.hsqldb.url=jdbc:hsqldb:mem:test
\ No newline at end of file
+jdbc.url=jdbc:hsqldb:mem:test
+jdbc.username=sa
+jdbc.password=
diff --git a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
index 61642c05a..46b918e5d 100644
--- a/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.jdbc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Fragment-Host: org.springframework.jdbc
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.jdbc
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.jdbc
 Import-Package: com.mysql.jdbc;resolution:=optional,net.sourceforge.jt
  ds.jdbc;resolution:=optional,org.hsqldb;resolution:=optional
diff --git a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
index 94f5b36eb..5eddd9bc6 100644
--- a/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.mysql/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core
-Bundle-Version: 0.12.1.SNAPSHOT
+Bundle-Version: 0.1.1.SNAPSHOT
 Bundle-Name: Argeo SLC MySQL
-Bundle-SymbolicName: org.argeo.slc.server.mysql
+Bundle-SymbolicName: org.argeo.server.mysql
 Import-Package: com.mysql.jdbc,net.sf.ehcache.hibernate,org.hibernate,
  org.springframework.cache.ehcache,org.springframework.jdbc.datasource
  ,org.springframework.orm.hibernate3,org.apache.commons.dbcp,org.sprin
diff --git a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
index fcad3f3d5..3af97decd 100644
--- a/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.tomcat/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Fragment-Host: org.argeo.dep.osgi.catalina.start
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.tomcat
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.tomcat
diff --git a/server/modules/org.argeo.server.tomcat/conf/server.xml b/server/modules/org.argeo.server.tomcat/conf/server.xml
index 736b2494c..507e0febd 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="${slc.server.port.http}" protocol="HTTP/1.1"
-			connectionTimeout="20000" redirectPort="${slc.server.port.https}" />
+		<Connector port="${server.port.http}" protocol="HTTP/1.1"
+			connectionTimeout="20000" redirectPort="${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="${slc.server.port.ajp}" protocol="AJP/1.3"
-			redirectPort="${slc.server.port.https}" />
+		<Connector port="${server.port.ajp}" protocol="AJP/1.3"
+			redirectPort="${server.port.https}" />
 
 
 		<!--
diff --git a/server/modules/org.argeo.server.tomcat/tomcat.properties b/server/modules/org.argeo.server.tomcat/tomcat.properties
index aa2cc8d2e..d269ece3b 100644
--- a/server/modules/org.argeo.server.tomcat/tomcat.properties
+++ b/server/modules/org.argeo.server.tomcat/tomcat.properties
@@ -1,3 +1,3 @@
-slc.server.port.http=7070
-slc.server.port.https=7443
-slc.server.port.ajp=7009
+server.port.http=7070
+server.port.https=7443
+server.port.ajp=7009
diff --git a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
index 5e38caa83..a92061b37 100644
--- a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Fragment-Host: org.springframework.osgi.web.extender
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.server.webextender
+Bundle-Version: 0.1.1.SNAPSHOT
+Bundle-SymbolicName: org.argeo.server.webextender
 Import-Package: org.apache.catalina,org.apache.catalina.connector