You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/03/19 09:56:16 UTC

svn commit: r925143 - in /camel/trunk/examples/camel-example-cxf-async: ./ src/main/java/org/apache/camel/example/client/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/spring/

Author: ningjiang
Date: Fri Mar 19 08:56:16 2010
New Revision: 925143

URL: http://svn.apache.org/viewvc?rev=925143&view=rev
Log:
CAMEL-2541 Added feature.xml for camel-example-cxf-async

Added:
    camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/camel-client.xml   (props changed)
      - copied unchanged from r925056, camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/spring/camel-client.xml
    camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml   (with props)
Removed:
    camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/spring/camel-client.xml
Modified:
    camel/trunk/examples/camel-example-cxf-async/pom.xml
    camel/trunk/examples/camel-example-cxf-async/src/main/java/org/apache/camel/example/client/CamelClient.java

Modified: camel/trunk/examples/camel-example-cxf-async/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-async/pom.xml?rev=925143&r1=925142&r2=925143&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-async/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-async/pom.xml Fri Mar 19 08:56:16 2010
@@ -111,7 +111,47 @@
         </profile>
     </profiles>
     <build>
-        <plugins>
+	   	<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-artifacts</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>target/classes/features.xml</file>
+									<type>xml</type>
+									<classifier>features</classifier>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
             <plugin>
               <groupId>org.apache.cxf</groupId>

Modified: camel/trunk/examples/camel-example-cxf-async/src/main/java/org/apache/camel/example/client/CamelClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-async/src/main/java/org/apache/camel/example/client/CamelClient.java?rev=925143&r1=925142&r2=925143&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-async/src/main/java/org/apache/camel/example/client/CamelClient.java (original)
+++ camel/trunk/examples/camel-example-cxf-async/src/main/java/org/apache/camel/example/client/CamelClient.java Fri Mar 19 08:56:16 2010
@@ -38,7 +38,7 @@ public final class CamelClient {
     public static void main(final String[] args) throws Exception {
         System.out.println("Notice this client requires that the CamelServer is already running!");
 
-        ApplicationContext context = new ClassPathXmlApplicationContext("META-INF/spring/camel-client.xml");
+        ApplicationContext context = new ClassPathXmlApplicationContext("META-INF/camel-client.xml");
 
         // get the camel template for Spring template style sending of messages (= producer)
         final ProducerTemplate producer = (ProducerTemplate) context.getBean("camelTemplate");

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/camel-client.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/camel-client.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/camel-client.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/META-INF/camel-client.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml?rev=925143&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml (added)
+++ camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml Fri Mar 19 08:56:16 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<features>
+    <repository>mvn:org.apache.camel.karaf/apache-camel/${pom.version}/xml/features</repository>
+    
+    <feature name='camel-example-cxf-async' version='${pom.version}'>
+        <feature version="${pom.version}">camel</feature>
+        <feature version="${pom.version}">camel-cxf</feature>
+        <bundle>mvn:org.apache.camel/camel-example-async/${pom.version}</bundle>
+    </feature>
+
+</features>
\ No newline at end of file

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-cxf-async/src/main/resources/features.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml