Author: gmazza
Date: Mon Nov 26 16:58:26 2012
New Revision: 1413721
URL: http://svn.apache.org/viewvc?rev=1413721&view=rev
Log:
Removed antrun plugin from ws_policy example (ported over changes from CXF 2.7
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/addr-external.xml
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml?rev=1413721&r1=1413720&r2=1413721&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
Mon Nov 26 16:58:26 2012
@@ -34,6 +34,18 @@
<cxf.version>${project.version}</cxf.version>
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/package.html</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -54,6 +66,8 @@
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/wsdl/hello_world_addr_policy.wsdl</wsdl>
+ <frontEnd>jaxws21</frontEnd>
+
<faultSerialVersionUID>1</faultSerialVersionUID>
</wsdlOption>
</wsdlOptions>
</configuration>
@@ -63,25 +77,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>
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml?rev=1413721&view=auto
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml
(added)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/addr-external.xml
Mon Nov 26 16:58:26 2012
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<attachments xmlns:wsp="http://www.w3.org/ns/ws-policy";
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
+ <wsp:PolicyAttachment>
+ <wsp:AppliesTo>
+ <wsa:EndpointReference>
+
<wsa:Address>http://localhost:9000/SoapContext/SoapPort</wsa:Address>
+ </wsa:EndpointReference>
+ </wsp:AppliesTo>
+ <wsp:Policy>
+ <wsam:Addressing
xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata";>
+ <wsp:Policy/>
+ </wsam:Addressing>
+ </wsp:Policy>
+ </wsp:PolicyAttachment>
+</attachments>
