camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r661592 - in /activemq/camel/trunk: ./ components/camel-cxf/ examples/camel-example-cxf/ examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/ examples/camel-example-jms-file/ examples/camel-example-loan-broker/ tooling/mav...
Date Fri, 30 May 2008 08:36:21 GMT
Author: ningjiang
Date: Fri May 30 01:36:21 2008
New Revision: 661592

URL: http://svn.apache.org/viewvc?rev=661592&view=rev
Log:
CAMEL-561 Replaced apache-activemq module with activemq-core in examples

Modified:
    activemq/camel/trunk/components/camel-cxf/pom.xml
    activemq/camel/trunk/examples/camel-example-cxf/pom.xml
    activemq/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java
    activemq/camel/trunk/examples/camel-example-jms-file/pom.xml
    activemq/camel/trunk/examples/camel-example-loan-broker/pom.xml
    activemq/camel/trunk/pom.xml
    activemq/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml

Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Fri May 30 01:36:21 2008
@@ -7,9 +7,9 @@
   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.
@@ -53,13 +53,13 @@
 
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>      
+      <artifactId>camel-spring</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
-      <type>test-jar</type>      
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
       <artifactId>commons-io</artifactId>
       <version>${commons-io-version}</version>
     </dependency>
-    
+
 
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http-jetty</artifactId>
-      <version>${cxf-version}</version>      
+      <version>${cxf-version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -138,7 +138,7 @@
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
-      <version>2.0.1</version>
+      <version>${jaxb-version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.xml</groupId>
@@ -157,7 +157,7 @@
     <dependency>
       <groupId>javax.xml</groupId>
       <artifactId>jaxb-api</artifactId>
-      <version>2.0</version>
+      <version>${jaxb-api-version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.xml</groupId>
@@ -172,33 +172,41 @@
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>      
+      <artifactId>jetty</artifactId>
       <scope>test</scope>
     </dependency>
 
+    <!--dependency>
+    	<groupId>org.codehaus.woodstox</groupId>
+    	<artifactId>wstx-asl</artifactId>
+    	<version>3.2.4</version>
+    	<exclusions>
+    		<exclusion>
+    			<groupId>stax</groupId>
+    			<artifactId>stax-api</artifactId>
+    		</exclusion>
+    	</exclusions>
+    </dependency-->
+
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-core</artifactId>
-       <version>${spring-version}</version>
     </dependency>
 
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-beans</artifactId>
-       <version>${spring-version}</version>       
      </dependency>
-    
+
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-context</artifactId>
-       <version>${spring-version}</version>       
      </dependency>
 
 
     <dependency>
        <groupId>org.springframework</groupId>
        <artifactId>spring-web</artifactId>
-       <version>${spring-version}</version>
        <scope>test</scope>
      </dependency>
 
@@ -233,9 +241,9 @@
           <systemProperties>
                <property>
                     <name>java.util.logging.config.file</name>
-                    <value>${basedir}/target/test-classes/logging.properties</value>
                        
+                    <value>${basedir}/target/test-classes/logging.properties</value>
                </property>
-          </systemProperties>             
+          </systemProperties>
         </configuration>
       </plugin>
 
@@ -253,14 +261,14 @@
               <artifacts>
                 <artifact>
                   <file>./src/main/resources/schema/cxfEndpoint.xsd</file>
-                  <type>xsd</type>                  
+                  <type>xsd</type>
                 </artifact>
               </artifacts>
             </configuration>
           </execution>
         </executions>
       </plugin>
-    </plugins>  
+    </plugins>
   </build>
 
   <profiles>

Modified: activemq/camel/trunk/examples/camel-example-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-cxf/pom.xml?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-cxf/pom.xml Fri May 30 01:36:21 2008
@@ -7,9 +7,9 @@
   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.
@@ -50,7 +50,6 @@
       <version>${cxf-version}</version>
     </dependency>
 
-
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-jms</artifactId>
@@ -59,48 +58,13 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apache-activemq</artifactId>
+      <artifactId>activemq-core</artifactId>
     </dependency>
 
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
-      <version>2.8.1</version>      
-    </dependency>
-
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>2.0.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.xml</groupId>
-          <artifactId>jsr173</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.jws</groupId>
-          <artifactId>jsr181-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.xml</groupId>
-          <artifactId>jsr173</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.activation</groupId>
-          <artifactId>activation</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>2.8.1</version>
     </dependency>
 
   </dependencies>

Modified: activemq/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java
(original)
+++ activemq/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Server.java
Fri May 30 01:36:21 2008
@@ -25,21 +25,21 @@
         System.out.println("Starting Server");
         Object implementor = new GreeterImpl();
         String address = "http://cxf.apache.org/transports/jms";
-        endpoint = Endpoint.publish(address, implementor);        
-        
+        endpoint = Endpoint.publish(address, implementor);
+
     }
-    
+
     public void stop() {
         if (endpoint != null) {
             endpoint.stop();
-        }    
+        }
     }
-    
+
 
     public static void main(String args[]) throws Exception {
         Server server = new Server();
         System.out.println("Server ready...");
-
+        server.start();
         Thread.sleep(5 * 60 * 1000);
         System.out.println("Server exiting");
         server.stop();

Modified: activemq/camel/trunk/examples/camel-example-jms-file/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-jms-file/pom.xml?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-jms-file/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-jms-file/pom.xml Fri May 30 01:36:21 2008
@@ -7,9 +7,9 @@
   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.
@@ -46,7 +46,7 @@
 
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apache-activemq</artifactId>
+      <artifactId>activemq-core</artifactId>
     </dependency>
 
     <dependency>

Modified: activemq/camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-loan-broker/pom.xml Fri May 30 01:36:21 2008
@@ -50,8 +50,9 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>apache-activemq</artifactId>
-    </dependency>
+      <artifactId>activemq-core</artifactId>
+    </dependency>
+
   </dependencies>
   <profiles>
     <profile>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri May 30 01:36:21 2008
@@ -667,6 +667,31 @@
         <artifactId>spring-test</artifactId>
         <version>${spring-version}</version>
       </dependency>
+      
+      <dependency>
+       <groupId>org.springframework</groupId>
+       <artifactId>spring-core</artifactId>
+       <version>${spring-version}</version>
+    </dependency>
+
+    <dependency>
+       <groupId>org.springframework</groupId>
+       <artifactId>spring-beans</artifactId>
+       <version>${spring-version}</version>
+     </dependency>
+
+    <dependency>
+       <groupId>org.springframework</groupId>
+       <artifactId>spring-context</artifactId>
+       <version>${spring-version}</version>
+     </dependency>
+
+
+    <dependency>
+       <groupId>org.springframework</groupId>
+       <artifactId>spring-web</artifactId>
+       <version>${spring-version}</version>       
+    </dependency>
 
       <dependency>
         <groupId>javax.annotation</groupId>

Modified: activemq/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=661592&r1=661591&r2=661592&view=diff
==============================================================================
--- activemq/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ activemq/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Fri May 30 01:36:21 2008
@@ -5,9 +5,9 @@
     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.



Mime
View raw message