You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/10/24 09:17:50 UTC
[1/2] camel git commit: CAMEL-9231: Fixed spring ws example. Thanks
to Timo Bruckner for the patch.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 487252ae7 -> fe9b4d5eb
refs/heads/master b9195d468 -> 7c9c4fce9
CAMEL-9231: Fixed spring ws example. Thanks to Timo Bruckner for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c9c4fce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c9c4fce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c9c4fce
Branch: refs/heads/master
Commit: 7c9c4fce946288b219aa8abaf44e7c2162d2ea39
Parents: b9195d4
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 24 09:18:29 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 24 09:18:29 2015 +0200
----------------------------------------------------------------------
examples/camel-example-spring-ws/pom.xml | 155 ++++++++++---------
.../main/webapp/WEB-INF/spring-ws-servlet.xml | 5 +-
parent/pom.xml | 1 +
3 files changed, 83 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7c9c4fce/examples/camel-example-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 3394bb8..2d23416 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -17,86 +17,91 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>examples</artifactId>
- <version>2.17-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-spring-ws</artifactId>
- <packaging>war</packaging>
- <name>Camel :: Example :: Spring :: Web Services</name>
- <description>An example showing how to work with Camel and Spring Web Services</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-ws</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
-
- <!-- for running inside a servlet container -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring-version}</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>examples</artifactId>
+ <version>2.17-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-spring-ws</artifactId>
+ <packaging>war</packaging>
+ <name>Camel :: Example :: Spring :: Web Services</name>
+ <description>An example showing how to work with Camel and Spring Web Services</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-ws</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+
+ <!-- for running inside a servlet container -->
+ <dependency>
+ <groupId>org.springframework.ws</groupId>
+ <artifactId>spring-ws-core</artifactId>
+ <version>${spring-ws-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j-version}</version>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!-- for testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <!-- Allows the routes to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
-
- <!-- so we can run mvn jetty:run -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-plugin-version}</version>
- <configuration>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8080</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <!-- Allows the routes to be run via 'mvn camel:run' -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+
+ <!-- so we can run mvn jetty:run -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty-plugin-version}</version>
+ <configuration>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/7c9c4fce/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index 64a8f9a1..b65127a 100644
--- a/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -33,8 +33,8 @@
<bean id="endpointMapping" class="org.apache.camel.component.spring.ws.bean.CamelEndpointMapping">
<property name="interceptors">
<list>
- <ref local="validatingInterceptor"/>
- <ref local="loggingInterceptor"/>
+ <ref bean="validatingInterceptor"/>
+ <ref bean="loggingInterceptor"/>
</list>
</property>
</bean>
@@ -59,5 +59,4 @@
<property name="portTypeName" value="increment"/>
<property name="locationUri" value="http://localhost:8080/increment"/>
</bean>
-
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/7c9c4fce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3985807..677ab81 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -523,6 +523,7 @@
<woodstox-version>4.4.1</woodstox-version>
<ws-commons-util-bundle-version>1.0.2_2</ws-commons-util-bundle-version>
<wsdl4j-bundle-version>1.6.2_6</wsdl4j-bundle-version>
+ <wsdl4j-version>1.6.2</wsdl4j-version>
<xalan-bundle-version>2.7.2_2</xalan-bundle-version>
<xalan-version>2.7.2</xalan-version>
<xbean-spring-version>3.18</xbean-spring-version>
[2/2] camel git commit: CAMEL-9231: Fixed spring ws example. Thanks
to Timo Bruckner for the patch.
Posted by da...@apache.org.
CAMEL-9231: Fixed spring ws example. Thanks to Timo Bruckner for the patch.
Conflicts:
examples/camel-example-spring-ws/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe9b4d5e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe9b4d5e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe9b4d5e
Branch: refs/heads/camel-2.16.x
Commit: fe9b4d5eb2afb0a882a1afc2929b8b20bea54acf
Parents: 487252a
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 24 09:18:29 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 24 09:20:29 2015 +0200
----------------------------------------------------------------------
examples/camel-example-spring-ws/pom.xml | 155 ++++++++++---------
.../main/webapp/WEB-INF/spring-ws-servlet.xml | 5 +-
parent/pom.xml | 1 +
3 files changed, 83 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fe9b4d5e/examples/camel-example-spring-ws/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index a86a37b..2597d38 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -17,86 +17,91 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>examples</artifactId>
- <version>2.16.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-spring-ws</artifactId>
- <packaging>war</packaging>
- <name>Camel :: Example :: Spring :: Web Services</name>
- <description>An example showing how to work with Camel and Spring Web Services</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-ws</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
-
- <!-- for running inside a servlet container -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring-version}</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>examples</artifactId>
+ <version>2.16.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-example-spring-ws</artifactId>
+ <packaging>war</packaging>
+ <name>Camel :: Example :: Spring :: Web Services</name>
+ <description>An example showing how to work with Camel and Spring Web Services</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-ws</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+
+ <!-- for running inside a servlet container -->
+ <dependency>
+ <groupId>org.springframework.ws</groupId>
+ <artifactId>spring-ws-core</artifactId>
+ <version>${spring-ws-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j-version}</version>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!-- for testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
-
- <!-- Allows the routes to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
-
- <!-- so we can run mvn jetty:run -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty-plugin-version}</version>
- <configuration>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8080</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <!-- Allows the routes to be run via 'mvn camel:run' -->
+ <plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+
+ <!-- so we can run mvn jetty:run -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty-plugin-version}</version>
+ <configuration>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/fe9b4d5e/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml b/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
index 64a8f9a1..b65127a 100644
--- a/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
+++ b/examples/camel-example-spring-ws/src/main/webapp/WEB-INF/spring-ws-servlet.xml
@@ -33,8 +33,8 @@
<bean id="endpointMapping" class="org.apache.camel.component.spring.ws.bean.CamelEndpointMapping">
<property name="interceptors">
<list>
- <ref local="validatingInterceptor"/>
- <ref local="loggingInterceptor"/>
+ <ref bean="validatingInterceptor"/>
+ <ref bean="loggingInterceptor"/>
</list>
</property>
</bean>
@@ -59,5 +59,4 @@
<property name="portTypeName" value="increment"/>
<property name="locationUri" value="http://localhost:8080/increment"/>
</bean>
-
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/fe9b4d5e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 58a7d47..3630d94 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -517,6 +517,7 @@
<woodstox-version>4.4.1</woodstox-version>
<ws-commons-util-bundle-version>1.0.2_2</ws-commons-util-bundle-version>
<wsdl4j-bundle-version>1.6.2_6</wsdl4j-bundle-version>
+ <wsdl4j-version>1.6.2</wsdl4j-version>
<xalan-bundle-version>2.7.2_2</xalan-bundle-version>
<xalan-version>2.7.2</xalan-version>
<xbean-spring-version>3.18</xbean-spring-version>