Improve configuration

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

diff --git a/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml
index 324146ff9bce068ec21cf2400fd2a4b164b8de28..c0ce5e0765b9e99a94d68a4746777c9948323726 100644 (file)
--- a/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml
@@ -7,7 +7,6 @@
        <bean
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
                <property name="locations">
                        <value>osgibundle:agent.properties</value>
                </property>

diff --git a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
index 57ad1970fa3af2070b2fb9e190599c03bbefb7cc..ef5f43ceb3471d9bf600ff7238d737140387a580 100644 (file)
--- a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
+++ b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
@@ -6,7 +6,6 @@
        <bean
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
                <property name="locations">
                        <value>osgibundle:activemq.properties</value>
                </property>

diff --git a/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml b/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml
index 4cb24daf20879e75298813cabe76d36e4491a616..e67283c5ff14cc1a2d57e42ad30056f4f770dafb 100644 (file)
--- a/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml
+++ b/modules/server/org.argeo.slc.server.agentproxy/META-INF/spring/agentProxy.xml
@@ -9,10 +9,8 @@
        <bean
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
                <property name="locations">
-                       <value>osgibundle:agentproxy.properties
-                       </value>
+                       <value>osgibundle:agentproxy.properties</value>
                </property>
        </bean>
 

diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
index f569dd1061a054c2756048589d382e826e5a2fa0..1d4f4f4eccc1f81ef24408f08951baf48439f105 100644 (file)
--- a/modules/server/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Import-Package: javax.jms,
  org.argeo.slc.jms,
  org.argeo.slc.msg.event,
  org.argeo.slc.services,
+ org.springframework.beans.factory.config;specification-version="2.5.6.SEC01",
  org.springframework.jms.core,
  org.springframework.jms.listener,
  org.springframework.jms.listener.adapter,

diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
index bd412575e67324ae9d1eae60154a147427477730..cd4f23d1fa9342a678e200d92da364df095f3531 100644 (file)
--- a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
+++ b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
@@ -6,8 +6,15 @@
 
        <import resource="classpath:org/argeo/slc/activemq/destinations.xml" />
 
-       <!-- Attachments -->
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+               <property name="locations">
+                       <value>osgibundle:jms.properties</value>
+               </property>
+       </bean>
 
+       <!-- Attachments -->
        <bean id="attachmentStorage.jmsContainer.add" parent="listenerContainer">
                <property name="destination" ref="slcJms.destination.attachment.add" />
                <property name="messageListener">
@@ -27,8 +34,9 @@
                        -->
                        <bean class="org.apache.activemq.ActiveMQConnectionFactory">
                                <property name="brokerURL">
-                                       <value>vm://localhost</value>
-                               </property>
+                                       <value>${slc.server.jms.url}</value>
+                                       <!--<value>vm://localhost</value>
+                               --></property>
                        </bean>
                </property>
                <property name="eventsDestination" ref="slcJms.destination.events" />

diff --git a/modules/server/org.argeo.slc.server.jms/jms.properties b/modules/server/org.argeo.slc.server.jms/jms.properties
new file mode 100644 (file)
index 0000000..8244f4b
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jms/jms.properties
@@ -0,0 +1,2 @@
+# TODO: duplicated with activemq bundle!
+slc.server.jms.url=tcp://localhost:61616

diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml
index 6ef3613e83e8d0c2ae85d77e31df446cfda46795..bba3b481371f39710018621efb1d81ce662a9580 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml
@@ -1,20 +1,16 @@
-<!--
 
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+       <!--
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
+               Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org> Licensed under
+               the Apache License, Version 2.0 (the "License"); you may not use this
+               file except in compliance with the License. You may obtain a copy of
+               the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+               required by applicable law or agreed to in writing, software
+               distributed under the License is distributed on an "AS IS" BASIS,
+               WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+               implied. See the License for the specific language governing
+               permissions and limitations under the License.
+       -->
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -60,11 +56,11 @@
                        value="classpath:/org/argeo/slc/core/test/tree/basicReport.xslt" />
                <property name="marshaller" ref="slcDefault.castor.marshaller" />
                <property name="logXml" value="false" />
-               <property name="outputDir" value="${slc.workDir}/results/html" />
+               <property name="outputDir" value="${user.dir}/results/html" />
        </bean>
 
        <bean name="slcDefault.castor.fileSlcExecutionNotifier" class="org.argeo.slc.xml.process.FileSlcExecutionNotifier">
-               <property name="basePath" value="${slc.workDir}/process" />
+               <property name="basePath" value="${user.dir}/process" />
                <property name="marshaller" ref="slcDefault.castor.marshaller" />
        </bean>