You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/08/20 11:32:20 UTC
svn commit: r567626 - in /incubator/servicemix/trunk: ./
common/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/
deployables/bindingcomponents/servicemix-cxf-bc/
deployables/serviceengines/servicemix-cxf-se/
Author: gnodet
Date: Mon Aug 20 02:32:19 2007
New Revision: 567626
URL: http://svn.apache.org/viewvc?rev=567626&view=rev
Log:
Move versions informations to the top pom
Modified:
incubator/servicemix/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ConsumerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml
incubator/servicemix/trunk/pom.xml
Modified: incubator/servicemix/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ConsumerEndpoint.java?rev=567626&r1=567625&r2=567626&view=diff
==============================================================================
--- incubator/servicemix/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ConsumerEndpoint.java (original)
+++ incubator/servicemix/trunk/common/servicemix-common/src/main/java/org/apache/servicemix/common/endpoints/ConsumerEndpoint.java Mon Aug 20 02:32:19 2007
@@ -35,6 +35,7 @@
private QName targetInterface;
private QName targetService;
private String targetEndpoint;
+ private QName targetOperation;
private String targetUri;
public ConsumerEndpoint() {
@@ -118,6 +119,20 @@
}
/**
+ * @return the targetOperation
+ */
+ public QName getTargetOperation() {
+ return targetOperation;
+ }
+
+ /**
+ * @param targetOperation the targetOperation to set
+ */
+ public void setTargetOperation(QName targetOperation) {
+ this.targetOperation = targetOperation;
+ }
+
+ /**
* @return the targetUri
*/
public String getTargetUri() {
@@ -137,6 +152,9 @@
}
if (exchange.getInterfaceName() == null && targetInterface != null) {
exchange.setInterfaceName(targetInterface);
+ }
+ if (exchange.getOperation() == null && targetOperation != null) {
+ exchange.setOperation(targetOperation);
}
if (exchange.getService() == null && targetService != null) {
exchange.setService(targetService);
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml?rev=567626&r1=567625&r2=567626&view=diff
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml Mon Aug 20 02:32:19 2007
@@ -34,10 +34,7 @@
<description>A CXF Binding Component</description>
<properties>
- <jetty-version>6.1.3</jetty-version>
- <cxf-version>2.0.1-incubator</cxf-version>
<surefire.fork.mode>pertest</surefire.fork.mode>
- <derby-version>10.2.2.0</derby-version>
</properties>
<dependencies>
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml?rev=567626&r1=567625&r2=567626&view=diff
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-cxf-se/pom.xml Mon Aug 20 02:32:19 2007
@@ -34,7 +34,6 @@
<description>A CXF Service Engine</description>
<properties>
- <cxf-version>2.0.1-incubator</cxf-version>
</properties>
<dependencies>
@@ -42,13 +41,13 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -64,20 +63,20 @@
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
<version>${spring-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- <version>${spring-version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jmx</artifactId>
+ <version>${spring-version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
@@ -100,19 +99,19 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jbi</artifactId>
<version>${cxf-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-jbi</artifactId>
<version>${cxf-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${cxf-version}</version>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=567626&r1=567625&r2=567626&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Aug 20 02:32:19 2007
@@ -214,7 +214,8 @@
<oro-version>2.0.8</oro-version>
<sitemesh-version>2.2.1</sitemesh-version>
<woden-version>1.0.0M6</woden-version>
- <cxf-version>2.1-incubator-SNAPSHOT</cxf-version>
+ <cxf-version>2.0.1-incubator</cxf-version>
+ <derby-version>10.2.2.0</derby-version>
<releases-repo-id>apache.incubating</releases-repo-id>
<releases-repo-name>Apache Incubating Repository</releases-repo-name>
@@ -1123,7 +1124,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.2.1.6</version>
+ <version>${derby-version}</version>
</dependency>
<dependency>
<groupId>drools</groupId>