servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject git commit: SM-2312 Remove placeholder configuration from the activemq-camel blueprint
Date Wed, 28 May 2014 10:28:52 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.0.x 4c4fdbc68 -> 1bc5bebd3


SM-2312 Remove placeholder configuration from the activemq-camel blueprint


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/1bc5bebd
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/1bc5bebd
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/1bc5bebd

Branch: refs/heads/servicemix-5.0.x
Commit: 1bc5bebd3cb83861a51783aea729173e30e22131
Parents: 4c4fdbc
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Wed May 28 12:28:31 2014 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Wed May 28 12:28:31 2014 +0200

----------------------------------------------------------------------
 .../resources/OSGI-INF/blueprint/activemq-camel.xml   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/1bc5bebd/activemq/activemq-camel/src/main/resources/OSGI-INF/blueprint/activemq-camel.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-camel/src/main/resources/OSGI-INF/blueprint/activemq-camel.xml
b/activemq/activemq-camel/src/main/resources/OSGI-INF/blueprint/activemq-camel.xml
index 9b2c6b1..5d95b6f 100644
--- a/activemq/activemq-camel/src/main/resources/OSGI-INF/blueprint/activemq-camel.xml
+++ b/activemq/activemq-camel/src/main/resources/OSGI-INF/blueprint/activemq-camel.xml
@@ -15,17 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-           xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
-
-    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
-
-    <cm:property-placeholder persistent-id="org.apache.activemq.server-default" update-strategy="reload">
-        <cm:default-properties>
-            <cm:property name="broker-name" value="amq-broker"/>
-        </cm:default-properties>
-    </cm:property-placeholder>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <reference id="pooledConnectionFactory" interface="javax.jms.ConnectionFactory"
                filter="(transacted=false)"/>
@@ -44,4 +34,4 @@
             <entry key="component" value="activemq"/>
         </service-properties>
     </service>
-</blueprint>
\ No newline at end of file
+</blueprint>


Mime
View raw message