Author: davsclaus
Date: Wed Feb 29 13:59:43 2012
New Revision: 1295111
URL: http://svn.apache.org/viewvc?rev=1295111&view=rev
Log:
CAMEL-5030. Support for smpp tunnelling through http proxy
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 13:59:43 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1295111&r1=1295110&r2=1295111&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml
Wed Feb 29 13:59:43 2012
@@ -602,6 +602,7 @@
<feature name='camel-smpp' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsmpp/${jsmpp-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle>mvn:org.apache.camel/camel-smpp/${project.version}</bundle>
</feature>
<feature name='camel-snmp' version='${project.version}' resolver='(obr)'
start-level='50'>
