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 d5883256d1942a697895a78b0f66946319fe7baf..80ebb981b9f466dae085994c2586f731b2721f86 100644 (file)
--- 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 53d9846350a335ebbd0dad3de8f68c696b2ea6e6..eae474ba4f01af0b6ffe0865f162107a1f0f1856 100644 (file)
--- 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 d1afbfa548d1a74c6e2d188b93025f403d34d348..56fc24c5b722fa13dc1ace99f0497c9eb29e425f 100644 (file)
--- 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 c904a5dfb08bc3584f7bc85e27323e4ed499134b..8336c33648cc133bb78c71f4992bdb0e1a069f97 100644 (file)
--- 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 1cf7321bdc05da0a88c0f3f5d3ed6877052c99be..7b93b37ac1dd84d4c2fbfec9ad9eb729bd0baaad 100644 (file)
--- 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 76c1c9bae977815491eff383fc229a79cd7bb03d..ca042169befe68d9fd42b64d78c09fbf8dd8f7aa 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="${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 72dd57905be37cf4c086e919a09ec0ae9feb3082..6b9d5ba367522ca7678988188153e6213e0b2c20 100644 (file)
--- 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 61642c05a3117a7fc8a967b02c07f4dc8a2db5c8..46b918e5d627aadd822d99ac58fd0bcc6f7555b2 100644 (file)
--- 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 94f5b36eb3e9c9286b803b9bddbe1f311f02cc8b..5eddd9bc6db56c77e36bb0f4f76e5cee180ee4b9 100644 (file)
--- 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 fcad3f3d51c96c5585a91b970503a9e07a1133d0..3af97decdd3157baaef22d268365edb074fad696 100644 (file)
--- 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 736b2494cf844a18512beed01252450f0792b443..507e0febd7f97ac2163378f94fd3e3b98f2b0a18 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="${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 aa2cc8d2e161de23991f31faac72d66d14fc3b92..d269ece3b0d5bb52f870f4e5bf2cc1b4a0e885ba 100644 (file)
--- 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 5e38caa8398b38ae0715bd56989ab4c286f43321..a92061b37bfc878f0fb3228c119cff36adcad7cf 100644 (file)
--- 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