summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4819eb2)
13 files changed:
-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
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
<!-- Embedded broker -->
<amq:broker id="broker" useJmx="false" persistent="false">
<amq:transportConnectors>
<!-- 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>
<!-- <amq:transportConnector uri="xmpp://localhost:61222" /> -->
</amq:transportConnectors>
</amq:broker>
-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
Manifest-Version: 1.0
Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6
.0.16,7.0.0)"
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
Import-Package: org.springframework.security,org.springframework.secur
ity.providers,org.springframework.security.ui,org.springframework.sec
urity.userdetails,org.springframework.security.ui.savedrequest
-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
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
</bean>
<bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
</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
</bean>
</beans>
\ No newline at end of file
-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=
Manifest-Version: 1.0
Fragment-Host: org.springframework.jdbc
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
Import-Package: com.mysql.jdbc;resolution:=optional,net.sourceforge.jt
ds.jdbc;resolution:=optional,org.hsqldb;resolution:=optional
Manifest-Version: 1.0
Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core
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-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
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
Manifest-Version: 1.0
Fragment-Host: org.argeo.dep.osgi.catalina.start
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
/docs/config/ajp.html APR (HTTP/AJP) Connector: /docs/apr.html Define
a non-SSL HTTP/1.1 Connector on port 8080
-->
/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"
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool" port="8080"
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
-->
<!-- 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}" />
-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
Manifest-Version: 1.0
Fragment-Host: org.springframework.osgi.web.extender
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
Import-Package: org.apache.catalina,org.apache.catalina.connector