Author: gertv
Date: Thu Jul 3 07:56:05 2008
New Revision: 673699
URL: http://svn.apache.org/viewvc?rev=673699&view=rev
Log:
SM-1440: SMX3 builds fails after relocation/rename of plugins and constants
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/servicemix-itests/src/test/java/org/apache/servicemix/itests/WSNComponentTest.java
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=673699&r1=673698&r2=673699&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Thu Jul 3
07:56:05 2008
@@ -653,7 +653,7 @@
<inherited>true</inherited>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>res-maven-plugin</artifactId>
- <version>${servicemix-version}</version>
+ <version>${res-maven-plugin-version}</version>
<configuration>
<inputDirectory>${basedir}/src/main/release</inputDirectory>
<outputDirectory>${basedir}/target/filtered</outputDirectory>
Modified: servicemix/smx3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=673699&r1=673698&r2=673699&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Thu Jul 3 07:56:05 2008
@@ -72,6 +72,8 @@
<servicemix-cxf-se-version>4.0-SNAPSHOT</servicemix-cxf-se-version>
<servicemix-drools-version>4.0-SNAPSHOT</servicemix-drools-version>
<servicemix-file-version>4.0-SNAPSHOT</servicemix-file-version>
+ <res-maven-plugin-version>4.0-SNAPSHOT</res-maven-plugin-version>
+ <servicemix-build-version>1.0</servicemix-build-version>
<xfire-jsr181-api-version>1.0-M1</xfire-jsr181-api-version>
<xfire-version>1.2.5</xfire-version>
Modified:
servicemix/smx3/trunk/servicemix-itests/src/test/java/org/apache/servicemix/itests/WSNComponentTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/src/test/java/org/apache/servicemix/itests/WSNComponentTest.java?rev=673699&r1=673698&r2=673699&view=diff
==============================================================================
---
servicemix/smx3/trunk/servicemix-itests/src/test/java/org/apache/servicemix/itests/WSNComponentTest.java
(original)
+++
servicemix/smx3/trunk/servicemix-itests/src/test/java/org/apache/servicemix/itests/WSNComponentTest.java
Thu Jul 3 07:56:05 2008
@@ -20,7 +20,6 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
-import javax.xml.ws.EndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import junit.framework.TestCase;
@@ -32,10 +31,10 @@
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.soap.SoapHelper;
+import org.apache.servicemix.soap.interceptors.jbi.JbiConstants;
import org.apache.servicemix.tck.ReceiverComponent;
-import org.apache.servicemix.wsn.client.NotificationBroker;
import org.apache.servicemix.wsn.client.AbstractWSAClient;
+import org.apache.servicemix.wsn.client.NotificationBroker;
import org.apache.servicemix.wsn.component.WSNComponent;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -95,7 +94,7 @@
httpReceiver.setEndpoint("endpoint");
httpReceiver.setRoleAsString("consumer");
httpReceiver.setLocationURI("http://localhost:8192/Receiver/";);
- httpReceiver.setDefaultMep(SoapHelper.IN_ONLY);
+ httpReceiver.setDefaultMep(JbiConstants.IN_ONLY);
httpReceiver.setSoap(true);
httpComponent.setEndpoints(new HttpEndpoint[] { httpWSNBroker,
httpReceiver });
