Author: ningjiang Date: Fri Jul 13 13:28:41 2012 New Revision: 1361209 URL: http://svn.apache.org/viewvc?rev=1361209&view=rev Log: Merged revisions 1361198 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1361198 | ningjiang | 2012-07-13 21:14:55 +0800 (Fri, 13 Jul 2012) | 9 lines Merged revisions 1361117 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1361117 | ningjiang | 2012-07-13 17:11:29 +0800 (Fri, 13 Jul 2012) | 1 line CAMEL-5441 Removed the import package of META-INF.cxf ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/examples/camel-example-cxf-osgi/pom.xml camel/branches/camel-2.9.x/examples/camel-example-cxf-proxy/pom.xml camel/branches/camel-2.9.x/examples/camel-example-cxf/pom.xml Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1361117 Merged /camel/branches/camel-2.10.x:r1361198 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/examples/camel-example-cxf-osgi/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-cxf-osgi/pom.xml?rev=1361209&r1=1361208&r2=1361209&view=diff ============================================================================== --- camel/branches/camel-2.9.x/examples/camel-example-cxf-osgi/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-cxf-osgi/pom.xml Fri Jul 13 13:28:41 2012 @@ -115,8 +115,6 @@ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> <Export-Package>org.apache.camel.example.reportincident*</Export-Package> <Import-Package> - META-INF.cxf, - META-INF.cxf.osgi, org.apache.cxf, org.apache.cxf.binding, org.apache.cxf.binding.corba, Modified: camel/branches/camel-2.9.x/examples/camel-example-cxf-proxy/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-cxf-proxy/pom.xml?rev=1361209&r1=1361208&r2=1361209&view=diff ============================================================================== --- camel/branches/camel-2.9.x/examples/camel-example-cxf-proxy/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-cxf-proxy/pom.xml Fri Jul 13 13:28:41 2012 @@ -35,9 +35,6 @@ <camel.osgi.export.pkg> org.apache.camel.example.* </camel.osgi.export.pkg> - <camel.osgi.import.additional> - META-INF.cxf - </camel.osgi.import.additional> <camel.osgi.private.pkg> org.apache.camel.example.reportincident </camel.osgi.private.pkg> Modified: camel/branches/camel-2.9.x/examples/camel-example-cxf/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-cxf/pom.xml?rev=1361209&r1=1361208&r2=1361209&view=diff ============================================================================== --- camel/branches/camel-2.9.x/examples/camel-example-cxf/pom.xml (original) +++ camel/branches/camel-2.9.x/examples/camel-example-cxf/pom.xml Fri Jul 13 13:28:41 2012 @@ -37,7 +37,6 @@ org.apache.camel.example.* </camel.osgi.export.pkg> <camel.osgi.import.additional> - META-INF.cxf, org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool </camel.osgi.import.additional> <camel.osgi.private.pkg>
