camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1021987 - in /camel/trunk/examples/camel-example-cxf-proxy: ./ src/main/java/org/apache/camel/example/cxf/proxy/ src/main/resources/ src/main/resources/META-INF/spring/ src/main/webapp/ src/test/java/org/apache/camel/example/reportincident/
Date Wed, 13 Oct 2010 03:40:46 GMT
Author: ningjiang
Date: Wed Oct 13 03:40:45 2010
New Revision: 1021987

URL: http://svn.apache.org/viewvc?rev=1021987&view=rev
Log:
CAMEL-3221 removed the webapp directory safely

Added:
    camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/
    camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
  (props changed)
      - copied unchanged from r1021971, camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/camel-config.xml
Removed:
    camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/camel-config.xml
    camel/trunk/examples/camel-example-cxf-proxy/src/main/webapp/
Modified:
    camel/trunk/examples/camel-example-cxf-proxy/pom.xml
    camel/trunk/examples/camel-example-cxf-proxy/src/main/java/org/apache/camel/example/cxf/proxy/MyMain.java
    camel/trunk/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java

Modified: camel/trunk/examples/camel-example-cxf-proxy/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/pom.xml?rev=1021987&r1=1021986&r2=1021987&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-proxy/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf-proxy/pom.xml Wed Oct 13 03:40:45 2010
@@ -29,7 +29,23 @@
     <artifactId>camel-example-cxf-proxy</artifactId>
     <name>Camel :: Example :: CXF Proxy</name>
     <description>An example which uses Camel to proxy a web service</description>
-    <packaging>war</packaging>
+    <packaging>bundle</packaging>
+    
+    <properties>
+		<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>
+		<!-- to avoid us import bunch of cxf package -->
+		<camel.osgi.dynamic>
+			*
+     </camel.osgi.dynamic>
+	</properties>
 
     <dependencies>
         <dependency>
@@ -137,9 +153,6 @@
 				<groupId>org.apache.camel</groupId>
 				<artifactId>camel-maven-plugin</artifactId>
 				<version>${project.version}</version>
-				<configuration>
-				   <applicationContextUri>camel-config.xml</applicationContextUri>
-				</configuration>
 			</plugin>
 			
         </plugins>

Modified: camel/trunk/examples/camel-example-cxf-proxy/src/main/java/org/apache/camel/example/cxf/proxy/MyMain.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/src/main/java/org/apache/camel/example/cxf/proxy/MyMain.java?rev=1021987&r1=1021986&r2=1021987&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-proxy/src/main/java/org/apache/camel/example/cxf/proxy/MyMain.java
(original)
+++ camel/trunk/examples/camel-example-cxf-proxy/src/main/java/org/apache/camel/example/cxf/proxy/MyMain.java
Wed Oct 13 03:40:45 2010
@@ -32,7 +32,7 @@ public final class MyMain {
 
     public static void main(String[] args) throws Exception {
         Main main = new Main();
-        main.setApplicationContextUri("camel-config.xml");
+        main.setApplicationContextUri("META-INF/spring/camel-config.xml");
         main.start();
     }
 }

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

Propchange: camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
------------------------------------------------------------------------------
    svn:executable = *

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

Propchange: camel/trunk/examples/camel-example-cxf-proxy/src/main/resources/META-INF/spring/camel-config.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

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

Modified: camel/trunk/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java?rev=1021987&r1=1021986&r2=1021987&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
(original)
+++ camel/trunk/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java
Wed Oct 13 03:40:45 2010
@@ -34,7 +34,7 @@ public class ReportIncidentRoutesTest {
 
     protected void startCamel() throws Exception {
         main = new Main();
-        main.setApplicationContextUri("camel-config.xml");
+        main.setApplicationContextUri("META-INF/spring/camel-config.xml");
         main.start();
     }
     



Mime
View raw message