Author: dkulp
Date: Wed Jun 11 12:52:46 2008
New Revision: 666807
URL: http://svn.apache.org/viewvc?rev=666807&view=rev
Log:
Merged revisions 666774 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r666774 | dkulp | 2008-06-11 14:29:57 -0400 (Wed, 11 Jun 2008) | 2 lines
Move build time only catalog.cat files out of src/main/resources so they
don't end up packaged in the jars
........
Added:
cxf/branches/2.0.x-fixes/api/src/main/build-resources/
- copied from r666774, cxf/trunk/api/src/main/build-resources/
cxf/branches/2.0.x-fixes/api/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/api/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
- copied unchanged from r666774,
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/build-resources/
- copied from r666774, cxf/trunk/rt/bindings/jbi/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/build-resources/
- copied from r666774, cxf/trunk/rt/bindings/xml/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/bindings/xml/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/build-resources/
- copied from r666774,
cxf/trunk/rt/transports/http-jetty/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/transports/http-jetty/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/build-resources/
- copied from r666774,
cxf/trunk/rt/transports/http/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/transports/http/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/build-resources/
- copied from r666774,
cxf/trunk/rt/transports/jbi/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/build-resources/
- copied from r666774,
cxf/trunk/rt/transports/jms/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/transports/jms/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/build-resources/
- copied from r666774, cxf/trunk/rt/ws/policy/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/ws/policy/src/main/build-resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/build-resources/
- copied from r666774, cxf/trunk/rt/ws/rm/src/main/build-resources/
cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/build-resources/catalog.cat
- copied unchanged from r666774,
cxf/trunk/rt/ws/rm/src/main/build-resources/catalog.cat
Removed:
cxf/branches/2.0.x-fixes/api/src/main/resources/
cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/ws/policy/src/main/resources/schemas/catalog.cat
cxf/branches/2.0.x-fixes/rt/ws/rm/src/main/resources/catalog.cat
cxf/branches/2.0.x-fixes/rt/ws/security/src/main/resources/schemas/catalog.cat
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/api/pom.xml
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml
cxf/branches/2.0.x-fixes/rt/bindings/xml/pom.xml
cxf/branches/2.0.x-fixes/rt/transports/http-jetty/pom.xml
cxf/branches/2.0.x-fixes/rt/transports/http/pom.xml
cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml
cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml
cxf/branches/2.0.x-fixes/rt/ws/policy/pom.xml
cxf/branches/2.0.x-fixes/rt/ws/rm/pom.xml
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/api/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/api/pom.xml Wed Jun 11 12:52:46 2008
@@ -133,7 +133,7 @@
<xsdOption>
<xsd>${basedir}/target/schemas/schemas/wsdl/http.xsd</xsd>
<bindingFile>${basedir}/target/schemas/schemas/wsdl/wsdl.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<dependencies>
<dependency>${basedir}/target/schemas/schemas/wsdl/wsdl.xsd</dependency>
</dependencies>
@@ -143,10 +143,6 @@
<packagename>org.apache.cxf.ws.addressing</packagename>
</xsdOption>
<xsdOption>
-
<xsd>${basedir}/target/schemas/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
-
<packagename>org.apache.cxf.ws.addressing.wsdl</packagename>
- </xsdOption>
- <xsdOption>
<xsd>${basedir}/target/schemas/schemas/wsdl/addressing.xsd</xsd>
<bindingFile>${basedir}/target/schemas/schemas/wsdl/addressing.xjb</bindingFile>
</xsdOption>
@@ -154,6 +150,10 @@
<xsd>${basedir}/target/schemas/schemas/configuration/security.xsd</xsd>
<bindingFile>${basedir}/target/schemas/schemas/configuration/security.xjb</bindingFile>
</xsdOption>
+ <xsdOption>
+
<xsd>${basedir}/target/schemas/schemas/wsdl/ws-addr-wsdl.xsd</xsd>
+
<bindingFile>${basedir}/target/schemas/schemas/wsdl/ws-addr-wsdl.xjb</bindingFile>
+ </xsdOption>
</xsdOptions>
</configuration>
<goals>
@@ -170,7 +170,7 @@
<xsdOption>
<xsd>${basedir}/src/test/resources/schemas/wsdl/test-conf.xsd</xsd>
<bindingFile>${basedir}/src/test/resources/schemas/wsdl/test-conf.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified:
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
(original)
+++
cxf/branches/2.0.x-fixes/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
Wed Jun 11 12:52:46 2008
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- $Id: ws-addr-wsdl.xsd,v 1.1 2005/03/22 18:15:15 hugo Exp $ -->
+<?xml version="1.0" encoding="utf-8"?>
<!--
W3C XML Schema defined in the Web Services Addressing 1.0
- WSDL Binding specification
Modified:
cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
(original)
+++
cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Wed Jun 11 12:52:46 2008
@@ -158,7 +158,7 @@
while (it.hasNext()) {
list.add(it.next().toString());
}
- }
+ }
list.add("-quiet");
list.add("-d");
list.add(outputDir);
Modified: cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/jbi/pom.xml Wed Jun 11 12:52:46 2008
@@ -95,7 +95,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/jbi.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified: cxf/branches/2.0.x-fixes/rt/bindings/xml/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/xml/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/xml/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/xml/pom.xml Wed Jun 11 12:52:46 2008
@@ -90,7 +90,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/xml-binding.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified: cxf/branches/2.0.x-fixes/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http-jetty/pom.xml Wed Jun 11
12:52:46 2008
@@ -107,7 +107,7 @@
<xsdOptions>
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/configuration/http-jetty.xsd</xsd>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/configuration/security</deleteDir>
Modified: cxf/branches/2.0.x-fixes/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/http/pom.xml Wed Jun 11 12:52:46 2008
@@ -86,7 +86,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/http-conf.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/http-conf.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified: cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jbi/pom.xml Wed Jun 11 12:52:46 2008
@@ -83,7 +83,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/jbi.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/jbi.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml Wed Jun 11 12:52:46 2008
@@ -110,7 +110,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/jms.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/jms.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/wsdl</deleteDir>
</deleteDirs>
Modified: cxf/branches/2.0.x-fixes/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/policy/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/policy/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/policy/pom.xml Wed Jun 11 12:52:46 2008
@@ -103,7 +103,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/ws-policy-200409.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/ws-policy-200409.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/oasis_open</deleteDir>
<deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir>
@@ -112,7 +112,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/ws-policy-200607.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/ws-policy-200607.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/oasis_open</deleteDir>
<deleteDir>${basedir}/target/generated/src/main/java/org/w3</deleteDir>
Modified: cxf/branches/2.0.x-fixes/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/rm/pom.xml?rev=666807&r1=666806&r2=666807&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/rm/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/rm/pom.xml Wed Jun 11 12:52:46 2008
@@ -139,7 +139,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/wsrm.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/wsrm.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<deleteDirs>
<deleteDir>${basedir}/target/generated/src/main/java/org/apache/cxf/ws/addressing</deleteDir>
</deleteDirs>
@@ -147,7 +147,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/configuration/wsrm-manager-types.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/configuration/wsrm-policy.xjb</bindingFile>
-
<catalog>${basedir}/src/main/resources/catalog.cat</catalog>
+
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<extension>true</extension>
<extensionArgs>
<extensionArg>-Xdv</extensionArg>
