Title: [826] trunk/ws/jaxws/wsnotification: Convert test to ServiceMix 2.x (using 1.x compatibility mode)
- Revision
- 826
- Author
- gnt
- Date
- 2005-11-13 19:40:12 -0500 (Sun, 13 Nov 2005)
Log Message
Convert test to ServiceMix 2.x (using 1.x compatibility mode)
Modified Paths
Property Changed
- trunk/ws/jaxws/wsnotification/
Diff
Property changes: trunk/ws/jaxws/wsnotification
Name: svn:ignore
- target
.settings
bin
rootDir
ActiveMQ
junit*.properties
+ target
.settings
bin
rootDir
ActiveMQ
junit*.properties
.classpath
.project
Modified: trunk/ws/jaxws/wsnotification/project.xml (825 => 826)
--- trunk/ws/jaxws/wsnotification/project.xml 2005-11-13 23:56:45 UTC (rev 825)
+++ trunk/ws/jaxws/wsnotification/project.xml 2005-11-14 00:40:12 UTC (rev 826)
@@ -23,8 +23,70 @@
<dependencies>
+ <!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
<dependency>
<groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>sjsxp</artifactId>
+ <version>${jaxws_rt_version}</version>
+ </dependency>
+
+ <dependency>
+ <id>stax+api</id>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -47,6 +109,11 @@
<eclipse.dependency>true</eclipse.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>org.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -98,63 +165,6 @@
<version>${pom.currentVersion}</version>
</dependency>
- <!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>saaj-api</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>sjsxp</artifactId>
- <version>${jaxws_rt_version}</version>
- </dependency>
-
- <dependency>
- <id>stax+api</id>
- <version>1.0</version>
- </dependency>
-
<!-- for testing -->
<dependency>
<id>jencks+all</id>
Modified: trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/JBINotificationBroker.java (825 => 826)
--- trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/JBINotificationBroker.java 2005-11-13 23:56:45 UTC (rev 825)
+++ trunk/ws/jaxws/wsnotification/src/main/java/org/servicemix/ws/notification/JBINotificationBroker.java 2005-11-14 00:40:12 UTC (rev 826)
@@ -23,6 +23,7 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jms.JMSException;
+import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
@@ -61,19 +62,24 @@
super(factory);
}
+ @WebMethod(exclude=true)
public void init(ComponentContext context) throws JBIException {
this.context = context;
}
+ @WebMethod(exclude=true)
public void shutDown() throws JBIException {
}
+ @WebMethod(exclude=true)
public void start() throws JBIException {
}
+ @WebMethod(exclude=true)
public void stop() throws JBIException {
}
+ @WebMethod(exclude=true)
public ObjectName getExtensionMBeanName() {
return null;
}
Modified: trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java (825 => 826)
--- trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java 2005-11-13 23:56:45 UTC (rev 825)
+++ trunk/ws/jaxws/wsnotification/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java 2005-11-14 00:40:12 UTC (rev 826)
@@ -1,18 +1,18 @@
package org.servicemix.ws.notification;
-import java.util.Iterator;
-import java.util.List;
+import org.servicemix.TestSupport;
+import org.servicemix.jbi.config.spring.XBeanProcessor;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.w3c.dom.Node;
+import org.xbean.spring.context.ClassPathXmlApplicationContext;
-import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
-import javax.xml.transform.TransformerException;
-import org.servicemix.TestSupport;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.w3c.dom.Node;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
public class JbiNotificationTest extends TestSupport {
@@ -22,6 +22,7 @@
String file = "wsn-subscribe-with-envelope.xml";
Object answer = requestServiceWithFileRequest(serviceName, file);
if (answer instanceof Source) {
+ System.err.println(transformer.toString((Source) answer));
answer = transformer.toDOMNode((Source) answer);
}
assertTrue("Should return a DOM Node: " + answer, answer instanceof Node);
@@ -37,7 +38,8 @@
@Override
protected AbstractXmlApplicationContext createBeanFactory() {
- return new ClassPathXmlApplicationContext("org/servicemix/ws/notification/jbi-wsn.xml");
+ List processors = Arrays.asList(new XBeanProcessor());
+ return new ClassPathXmlApplicationContext("org/servicemix/ws/notification/jbi-wsn.xml", processors);
}
protected void assertMessagesReceived(MessageList messageList, int messageCount) throws Exception {
