Merge pull request #1 from trohovsky/update-to-6.2

Update examples to Red Hat JBoss Fuse 6.2.0 version (build 123)

Author: fbolton

README.txt README.md

@@ -1,35 +1,40 @@
-These demos have been built and tested using Red Hat JBoss Fuse 6.1.0 GA build 379
+These demos have been built and tested using Red Hat JBoss Fuse 6.2.0 build 123
 
 Prerequisites
 -------------
-You must have Apache Maven installed and you must configure your settings.xml file
-to use the following repository (both as a repository and as a plug-in repository):
-
-https://repo.fusesource.com/nexus/content/groups/public/
+Before building and running this example you need:
 
+* Maven 3.0.4 or higher
+* JDK 1.6
+* JBoss Fuse 6.2.0
 
 Building the examples
 ---------------------
 The examples are built using Apache Maven. To build all of the examples (and install the
-corresponding artifacts in your local Maven repository) enter the following commands from
+corresponding artifacts in your local Maven repository) enter the following command from
 the top-level directory of the examples:
 
-    $ cd parent
-    $ mvn install
-    $ cd ..
     $ mvn install
 
+Configuring additional users
+----------------------------
+Edit the `$FUSE_HOME/etc/users.properties` and add a user called `admin`:
+
+    admin=admin,admin
+
+This will enable connecting to the embedded message broker.
+
 
 Installing the customer-ws-osgi-bundle
 --------------------------------------
-The 'customer-ws-osgi-bundle' deploys a simple web service listening on ServiceMix's
+The `customer-ws-osgi-bundle` deploys a simple web service listening on ServiceMix's
 HTTP port (by default, this is port 8181). To install and start the bundle, just do 
 
     karaf@root> install -s mvn:com.fusesource.byexample.cxf-webinars/customer-ws-osgi-bundle
 
-You will now find that the server is listening on 'http://localhost:8181/cxf/Customer' 
-- you can verify this quickly by pointing your browser at 'http://localhost:8181/cxf/Customer?wsdl'.
-You can test the service by using a tool such as SoapUI from http://www.soapui.org. 
+You will now find that the server is listening on `http://localhost:8181/cxf/Customer` 
+- you can verify this quickly by pointing your browser at `http://localhost:8181/cxf/Customer?wsdl`.
+You can test the service by using a tool such as [SoapUI](http://www.soapui.org)
 
 Alternatively, you can install a bundle that creates a CXF client to this web 
 service. 
@@ -48,7 +53,7 @@ Installing the camel-cxf routes
 To install the camel-cxf demos into JBoss Fuse, you need to install the relevant OSGi bundle
 and any prerequisite features.
 
-Note: You must stop the 'customer-ws-osgi-bundle', if you have alread installed and started it,
+Note: You must stop the `customer-ws-osgi-bundle`, if you have alread installed and started it,
 otherwise you will get a port conflict when a camel-cxf demo is started.
 
 For example, to install the camel-cxf POJO route, do 
@@ -58,14 +63,11 @@ For example, to install the camel-cxf POJO route, do
 
 To install the camel-cxf Payload route, do 
 
-    karaf@root> features:install camel-cxf
-    karaf@root> features:install camel-velocity
+    karaf@root> features:install camel-cxf camel-velocity
     karaf@root> install -s mvn:com.fusesource.byexample.cxf-webinars/customer-ws-camel-cxf-payload
 
 Finally, to install the camel-cxf Provider route, do 
 
-    karaf@root> features:install camel-cxf
-    karaf@root> features:install camel-velocity
+    karaf@root> features:install camel-cxf camel-velocity
     karaf@root> install -s mvn:com.fusesource.byexample.cxf-webinars/customer-ws-camel-cxf-provider
 
-

customer-ws-camel-cxf-payload/pom.xml

@@ -21,6 +21,7 @@
     <groupId>com.fusesource.byexample.cxf-webinars</groupId>
     <artifactId>cxf-webinars</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>com.fusesource.byexample.cxf-webinars</groupId>
@@ -68,17 +69,13 @@
          <instructions>
             <Import-Package>
               org.apache.camel.component.velocity,
-              META-INF.cxf,
-              META-INF.cxf.osgi,
               javax.jws,
               javax.wsdl,
               javax.xml.bind,
               javax.xml.bind.annotation,
               javax.xml.namespace,
               javax.xml.ws,
               org.w3c.dom,
-              <!-- Workaround to access DOM XPathFactory -->
-              org.apache.xpath.jaxp,
               *
             </Import-Package>
             <DynamicImport-Package>

customer-ws-camel-cxf-payload/src/main/resources/META-INF/spring/customer-ws.xml

@@ -28,9 +28,7 @@
     http://camel.apache.org/schema/spring
         http://camel.apache.org/schema/spring/camel-spring.xsd
 ">
-    
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    
+
     <!-- When you use the address="/Customer", the CXF endpoint is installed
        into the container's default Jetty container and automatically gets the URL:
        http://localhost:8181/cxf/Customer
@@ -88,8 +86,10 @@
 
     <bean id="lookupCustomer" class="com.fusesource.customerwscamelcxfpayload.LookupCustomer"/>
 
-    <!--bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
+    <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
         <property name="brokerURL" value="tcp://localhost:61616"/>
-    </bean-->
+        <property name="userName" value="admin"/>
+        <property name="password" value="admin"/>
+    </bean>
 
 </beans>

customer-ws-camel-cxf-pojo/pom.xml

@@ -20,6 +20,7 @@
     <groupId>com.fusesource.byexample.cxf-webinars</groupId>
     <artifactId>cxf-webinars</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>com.fusesource.byexample.cxf-webinars</groupId>
@@ -76,8 +77,6 @@
         <configuration>
          <instructions>
             <Import-Package>
-              META-INF.cxf,
-              META-INF.cxf.osgi,
               *
             </Import-Package>
             <DynamicImport-Package>

customer-ws-camel-cxf-pojo/src/main/resources/META-INF/spring/customer-ws.xml

@@ -28,9 +28,6 @@
         http://camel.apache.org/schema/spring/camel-spring.xsd
 ">
 
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-    <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml"/>
-  
     <!-- When you use the address="/Customer", the CXF endpoint is installed
        into the container's default Jetty container and automatically gets the URL:
        http://localhost:8181/cxf/Customer

customer-ws-camel-cxf-provider/pom.xml

@@ -21,6 +21,7 @@
     <groupId>com.fusesource.byexample.cxf-webinars</groupId>
     <artifactId>cxf-webinars</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>com.fusesource.byexample.cxf-webinars</groupId>
@@ -68,17 +69,13 @@
          <instructions>
             <Import-Package>
               org.apache.camel.component.velocity,
-              META-INF.cxf,
-              META-INF.cxf.osgi,
               javax.jws,
               javax.wsdl,
               javax.xml.bind,
               javax.xml.bind.annotation,
               javax.xml.namespace,
               javax.xml.ws,
               org.w3c.dom,
-              <!-- Workaround to access DOM XPathFactory -->
-              org.apache.xpath.jaxp,
               *
             </Import-Package>
             <DynamicImport-Package>

customer-ws-camel-cxf-provider/src/main/resources/META-INF/spring/customer-ws.xml

@@ -28,10 +28,7 @@
     http://camel.apache.org/schema/spring
         http://camel.apache.org/schema/spring/camel-spring.xsd
 ">
-    
-    
-    <import resource="classpath:META-INF/cxf/cxf.xml" />
-  
+
     <!-- When you use the address="/Customer", the CXF endpoint is installed
        into the container's default Jetty container and automatically gets the URL:
        http://localhost:8181/cxf/Customer
@@ -93,6 +90,8 @@
 
     <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
         <property name="brokerURL" value="tcp://localhost:61616"/>
+        <property name="userName" value="admin"/>
+        <property name="password" value="admin"/>
     </bean>
 
 </beans>

customer-ws-client/pom.xml

@@ -21,6 +21,7 @@
     <groupId>com.fusesource.byexample.cxf-webinars</groupId>
     <artifactId>cxf-webinars</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>com.fusesource.byexample.cxf-webinars</groupId>
@@ -73,7 +74,6 @@
               !com.fusesource.demo.wsdl.customerservice
             </Export-Package>
             <Import-Package>
-              META-INF.cxf,
               *
             </Import-Package>
             <DynamicImport-Package>

customer-ws-client/src/main/resources/META-INF/spring/customer-client.xml

@@ -23,8 +23,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-    
   <!-- address="http://localhost:8181/cxf/Customer" -->
   <!-- address="http://localhost:9191/Customer" -->
   <jaxws:client

customer-ws-osgi-bundle/pom.xml

@@ -21,6 +21,7 @@
     <groupId>com.fusesource.byexample.cxf-webinars</groupId>
     <artifactId>cxf-webinars</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <groupId>com.fusesource.byexample.cxf-webinars</groupId>
@@ -78,8 +79,6 @@
               !com.fusesource.demo.wsdl.customerservice
             </Export-Package>
             <Import-Package>
-              META-INF.cxf,
-              META-INF.cxf.osgi,
               *
             </Import-Package>
             <DynamicImport-Package>

customer-ws-osgi-bundle/src/main/resources/META-INF/spring/customer-ws.xml

@@ -23,10 +23,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
-<!--
-  -->
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-    
   <!-- When you use the address="/Customer", the CXF endpoint is installed
        into the container's default Jetty container and automatically gets the URL:
        http://localhost:8181/cxf/Customer

parent/pom.xml

@@ -24,7 +24,8 @@
   <parent>
     <groupId>org.jboss.fuse.bom</groupId>
     <artifactId>jboss-fuse-parent</artifactId>
-    <version>6.1.0.redhat-379</version>
+    <version>6.2.0.redhat-123</version>
+    <relativePath></relativePath>
   </parent>
 
   <groupId>com.fusesource.byexample.cxf-webinars</groupId>
@@ -45,7 +46,7 @@
         <maven.compiler.source>1.6</maven.compiler.source>
 
         <!-- the version of the JBoss Fuse BOM, defining all the dependency versions -->
-        <jboss.fuse.bom.version>6.1.0.redhat-379</jboss.fuse.bom.version>
+        <jboss.fuse.bom.version>6.2.0.redhat-123</jboss.fuse.bom.version>
     </properties>
 
     <licenses>

pom.xml

@@ -41,6 +41,7 @@
     </organization>
 
     <modules>
+        <module>parent</module>
         <module>customer-ws-osgi-bundle</module>
         <module>customer-ws-client</module>
         <module>customer-ws-camel-cxf-pojo</module>