Author: ningjiang
Date: Mon Jun 27 14:23:37 2011
New Revision: 1140172
URL: http://svn.apache.org/viewvc?rev=1140172&view=rev
Log:
CAMEL-4142 revert the patch as we created camel-example-cxf-blueprint
Removed:
camel/trunk/examples/camel-example-cxf-osgi/src/profiles/blueprint/OSGI-INF/blueprint/camel-context.xml
camel/trunk/examples/camel-example-cxf-osgi/src/profiles/spring/META-INF/spring/camel-context.xml
Modified:
camel/trunk/examples/camel-example-cxf-osgi/README.txt
camel/trunk/examples/camel-example-cxf-osgi/pom.xml
Modified: camel/trunk/examples/camel-example-cxf-osgi/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/README.txt?rev=1140172&r1=1140171&r2=1140172&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/README.txt (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/README.txt Mon Jun 27 14:23:37
2011
@@ -13,8 +13,6 @@ the same port.
You will need to compile this example first:
mvn install
-If you want to test the bundle with blueprint configuration, you need to build
the example with
- mvn clean install -Pblueprint
Remarks:
- During the compilation phase, a unit test will be performed, this unit test
simulates the
@@ -34,7 +32,7 @@ To run the example on Apache ServiceMix
2) Add features required
features:addUrl mvn:org.apache.camel.karaf/apache-camel/2.8.0/xml/features
- features:install http
+ features:install war
features:install camel-spring
features:install camel-jaxb
features:install camel-cxf
Modified: camel/trunk/examples/camel-example-cxf-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/pom.xml?rev=1140172&r1=1140171&r2=1140172&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-osgi/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-osgi/pom.xml Mon Jun 27 14:23:37 2011
@@ -136,35 +136,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>spring</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <resources>
- <resource>
-
<directory>${basedir}/src/profiles/spring</directory>
- </resource>
- <resource>
-
<directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- </build>
- </profile>
- <profile>
- <id>blueprint</id>
- <build>
- <resources>
- <resource>
-
<directory>${basedir}/src/profiles/blueprint</directory>
- </resource>
- <resource>
-
<directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- </build>
- </profile>
- </profiles>
</project>
