Author: ningjiang
Date: Fri Dec 9 12:38:44 2011
New Revision: 1212375
URL: http://svn.apache.org/viewvc?rev=1212375&view=rev
Log:
Merged revisions 1212275 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1212275 | ningjiang | 2011-12-09 16:22:45 +0800 (Fri, 09 Dec 2011) | 1 line
Aligned the Bundle-SymbolicName of camel-example-cxf-osgi and
camel-example-cxf-blueprint with other sample bundles
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/pom.xml
camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 9 12:38:44 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414,1211773,1211811
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830,1211363,1211414,1211773,1211811,1212275
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/pom.xml?rev=1212375&r1=1212374&r2=1212375&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/pom.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-blueprint/pom.xml Fri
Dec 9 12:38:44 2011
@@ -102,7 +102,7 @@
<configuration>
<manifestLocation>target/META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.camel.example.reportincident*</Export-Package>
<Import-Package>
*
Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/pom.xml?rev=1212375&r1=1212374&r2=1212375&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/pom.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/pom.xml Fri Dec
9 12:38:44 2011
@@ -112,7 +112,7 @@
<configuration>
<manifestLocation>target/META-INF</manifestLocation>
<instructions>
-
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.camel.example.reportincident*</Export-Package>
<Import-Package>
META-INF.cxf,