Author: gmazza
Date: Mon Nov 19 15:04:46 2012
New Revision: 1411230
URL: http://svn.apache.org/viewvc?rev=1411230&view=rev
Log:
Removed Maven antrun plugin from restful_dispatch sample (makes it easier to
load via m2e)
Added:
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerAllResp.xml
- copied unchanged from r1411168,
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/CustomerAllResp.xml
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerJohnReq.xml
- copied unchanged from r1411168,
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/CustomerJohnReq.xml
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerJohnResp.xml
- copied unchanged from r1411168,
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/CustomerJohnResp.xml
Removed:
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/CustomerJohnReq.xml
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/CustomerAllResp.xml
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/CustomerJohnResp.xml
Modified:
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
Modified:
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml?rev=1411230&r1=1411229&r2=1411230&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/restful_dispatch/pom.xml
Mon Nov 19 15:04:46 2012
@@ -42,25 +42,6 @@
<target>1.6</target>
</configuration>
</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/restful/client/CustomerJohnReq.xml"
todir="${basedir}/target/classes/demo/restful/client" />
- <copy
file="${basedir}/src/main/java/demo/restful/server/CustomerJohnResp.xml"
todir="${basedir}/target/classes/demo/restful/server" />
- <copy
file="${basedir}/src/main/java/demo/restful/server/CustomerAllResp.xml"
todir="${basedir}/target/classes/demo/restful/server" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
Modified:
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java?rev=1411230&r1=1411229&r2=1411230&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
Mon Nov 19 15:04:46 2012
@@ -83,7 +83,7 @@ public final class Client {
Map<String, Object> requestContext = dispatcher.getRequestContext();
Client client = new Client();
- InputStream is =
client.getClass().getResourceAsStream("CustomerJohnReq.xml");
+ InputStream is =
client.getClass().getResourceAsStream("/CustomerJohnReq.xml");
Document doc = XMLUtils.parse(is);
DOMSource reqMsg = new DOMSource(doc);
Modified:
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java?rev=1411230&r1=1411229&r2=1411230&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
(original)
+++
cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
Mon Nov 19 15:04:46 2012
@@ -74,16 +74,16 @@ public class RestSourcePayloadProvider i
}
private DOMSource getAllCustomers() {
- return createDOMSource("CustomerAllResp.xml");
+ return createDOMSource("/CustomerAllResp.xml");
}
private DOMSource getCustomer(String customerID) {
- return createDOMSource("CustomerJohnResp.xml");
+ return createDOMSource("/CustomerJohnResp.xml");
}
private DOMSource updateCustomer(DOMSource request) {
// TBD: returned update customer info
- return createDOMSource("CustomerJohnResp.xml");
+ return createDOMSource("/CustomerJohnResp.xml");
}
private DOMSource createDOMSource(String fileName) {
