Author: dkulp
Date: Tue Nov 6 21:23:17 2012
New Revision: 1406340
URL: http://svn.apache.org/viewvc?rev=1406340&view=rev
Log:
ws_rm and ws_policy in m2e
Added:
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml
- copied, changed from r1406336,
cxf/trunk/distribution/src/main/release/samples/ws_policy/addr-external.xml
Removed:
cxf/trunk/distribution/src/main/release/samples/ws_policy/addr-external.xml
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
Modified: cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml?rev=1406340&r1=1406339&r2=1406340&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml Tue Nov
6 21:23:17 2012
@@ -54,6 +54,8 @@
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/wsdl/hello_world_addr_policy.wsdl</wsdl>
+
<frontEnd>jaxws21</frontEnd>
+
<faultSerialVersionUID>1</faultSerialVersionUID>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -63,25 +65,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/main/java/demo/ws_policy/client/client.xml"
todir="${basedir}/target/classes/demo/ws_policy/client" />
- <copy
file="${basedir}/src/main/java/demo/ws_policy/server/server.xml"
todir="${basedir}/target/classes/demo/ws_policy/server" />
- <copy file="${basedir}/addr-external.xml"
todir="${basedir}/target/classes/" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Copied:
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml
(from r1406336,
cxf/trunk/distribution/src/main/release/samples/ws_policy/addr-external.xml)
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml?p2=cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml&p1=cxf/trunk/distribution/src/main/release/samples/ws_policy/addr-external.xml&r1=1406336&r2=1406340&rev=1406340&view=diff
==============================================================================
(empty)
Modified: cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml?rev=1406340&r1=1406339&r2=1406340&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml Tue Nov 6
21:23:17 2012
@@ -53,6 +53,8 @@
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/wsdl/hello_world_rm.wsdl</wsdl>
+
<frontEnd>jaxws21</frontEnd>
+
<faultSerialVersionUID>1</faultSerialVersionUID>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -62,24 +64,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copyxmlfiles</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy
file="${basedir}/src/main/java/demo/ws_rm/client/ws_rm.xml"
todir="${basedir}/target/classes/demo/ws_rm/client" />
- <copy
file="${basedir}/src/main/java/demo/ws_rm/server/ws_rm.xml"
todir="${basedir}/target/classes/demo/ws_rm/server" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java?rev=1406340&r1=1406339&r2=1406340&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
Tue Nov 6 21:23:17 2012
@@ -52,7 +52,7 @@ public final class Client {
File wsdlFile = new File(args[0]);
URL wsdlURL;
if (wsdlFile.exists()) {
- wsdlURL = wsdlFile.toURL();
+ wsdlURL = wsdlFile.toURI().toURL();
} else {
wsdlURL = new URL(args[0]);
}
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java?rev=1406340&r1=1406339&r2=1406340&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
Tue Nov 6 21:23:17 2012
@@ -26,6 +26,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.interceptor.MessageSenderInterceptor;
import org.apache.cxf.io.AbstractWrappedOutputStream;
@@ -71,9 +72,9 @@ public class MessageLossSimulator extend
// discard even-numbered message
InterceptorChain chain = message.getInterceptorChain();
- ListIterator it = chain.getIterator();
+ ListIterator<Interceptor<? extends Message>> it = chain.getIterator();
while (it.hasNext()) {
- PhaseInterceptor pi = (PhaseInterceptor)it.next();
+ PhaseInterceptor<? extends Message> pi = (PhaseInterceptor<?
extends Message>)it.next();
if (MessageSenderInterceptor.class.getName().equals(pi.getId())) {
chain.remove(pi);
LOG.info("Removed MessageSenderInterceptor from interceptor
chain.");
