Author: dkulp
Date: Wed Jun 11 11:29:57 2008
New Revision: 666774
URL: http://svn.apache.org/viewvc?rev=666774&view=rev
Log:
Move build time only catalog.cat files out of src/main/resources so they don't
end up packaged in the jars
Added:
cxf/trunk/api/src/main/build-resources/
- copied from r666723, cxf/trunk/api/src/main/resources/
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
(with props)
cxf/trunk/rt/bindings/corba/src/main/build-resources/
cxf/trunk/rt/bindings/corba/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/bindings/corba/src/main/resources/catalog.cat
cxf/trunk/rt/bindings/jbi/src/main/build-resources/
cxf/trunk/rt/bindings/jbi/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat
cxf/trunk/rt/bindings/xml/src/main/build-resources/
cxf/trunk/rt/bindings/xml/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat
cxf/trunk/rt/transports/http-jetty/src/main/build-resources/
cxf/trunk/rt/transports/http-jetty/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/transports/http-jetty/src/main/resources/catalog.cat
cxf/trunk/rt/transports/http/src/main/build-resources/
cxf/trunk/rt/transports/http/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
cxf/trunk/rt/transports/jbi/src/main/build-resources/
cxf/trunk/rt/transports/jbi/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/transports/jbi/src/main/resources/catalog.cat
cxf/trunk/rt/transports/jms/src/main/build-resources/
cxf/trunk/rt/transports/jms/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat
cxf/trunk/rt/ws/addr/src/main/build-resources/
cxf/trunk/rt/ws/addr/src/main/build-resources/catalog.cat
- copied unchanged from r666723,
cxf/trunk/rt/ws/addr/src/main/resources/catalog.cat
cxf/trunk/rt/ws/policy/src/main/build-resources/
cxf/trunk/rt/ws/policy/src/main/build-resources/catalog.cat
- copied, changed from r666723,
cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat
cxf/trunk/rt/ws/rm/src/main/build-resources/
cxf/trunk/rt/ws/rm/src/main/build-resources/catalog.cat
- copied, changed from r666723,
cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat
Removed:
cxf/trunk/api/src/main/resources/
cxf/trunk/rt/bindings/corba/src/main/resources/catalog.cat
cxf/trunk/rt/bindings/jbi/src/main/resources/catalog.cat
cxf/trunk/rt/bindings/xml/src/main/resources/catalog.cat
cxf/trunk/rt/transports/http-jetty/src/main/resources/catalog.cat
cxf/trunk/rt/transports/http/src/main/resources/catalog.cat
cxf/trunk/rt/transports/jbi/src/main/resources/catalog.cat
cxf/trunk/rt/transports/jms/src/main/resources/catalog.cat
cxf/trunk/rt/ws/addr/src/main/resources/catalog.cat
cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat
cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat
cxf/trunk/rt/ws/security/src/main/resources/schemas/catalog.cat
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
cxf/trunk/rt/bindings/corba/pom.xml
cxf/trunk/rt/bindings/jbi/pom.xml
cxf/trunk/rt/bindings/xml/pom.xml
cxf/trunk/rt/transports/http-jetty/pom.xml
cxf/trunk/rt/transports/http/pom.xml
cxf/trunk/rt/transports/jbi/pom.xml
cxf/trunk/rt/transports/jms/pom.xml
cxf/trunk/rt/ws/addr/pom.xml
cxf/trunk/rt/ws/policy/pom.xml
cxf/trunk/rt/ws/rm/pom.xml
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Wed Jun 11 11:29:57 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>
Added: cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb?rev=666774&view=auto
==============================================================================
--- cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
(added)
+++ cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
Wed Jun 11 11:29:57 2008
@@ -0,0 +1,30 @@
+<?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.
+-->
+<jaxb:bindings version="1.0"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
+ jaxb:extensionBindingPrefixes="xjc">
+ <jaxb:bindings schemaLocation="ws-addr-wsdl.xsd" node="/xs:schema">
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.apache.cxf.ws.addressing.wsdl"/>
+ </jaxb:schemaBindings>
+ </jaxb:bindings>
+</jaxb:bindings>
Propchange:
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
(original)
+++ cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
Wed Jun 11 11:29:57 2008
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN"
"http://www.w3.org/2001/XMLSchema.dtd";>
<!--
W3C XML Schema defined in the Web Services Addressing 1.0
- WSDL Binding specification
Modified:
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
---
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
(original)
+++
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Wed Jun 11 11:29:57 2008
@@ -158,7 +158,7 @@
while (it.hasNext()) {
list.add(it.next().toString());
}
- }
+ }
list.add("-quiet");
list.add("-d");
list.add(outputDir);
Modified: cxf/trunk/rt/bindings/corba/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/pom.xml (original)
+++ cxf/trunk/rt/bindings/corba/pom.xml Wed Jun 11 11:29:57 2008
@@ -89,7 +89,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/wsdl/corba-binding.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/wsdl/corba-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/trunk/rt/bindings/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ cxf/trunk/rt/bindings/jbi/pom.xml Wed Jun 11 11:29:57 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/trunk/rt/bindings/xml/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/xml/pom.xml (original)
+++ cxf/trunk/rt/bindings/xml/pom.xml Wed Jun 11 11:29:57 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/trunk/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Wed Jun 11 11:29:57 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/trunk/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Wed Jun 11 11:29:57 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/trunk/rt/transports/jbi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ cxf/trunk/rt/transports/jbi/pom.xml Wed Jun 11 11:29:57 2008
@@ -88,7 +88,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/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Wed Jun 11 11:29:57 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/trunk/rt/ws/addr/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/pom.xml (original)
+++ cxf/trunk/rt/ws/addr/pom.xml Wed Jun 11 11:29:57 2008
@@ -102,7 +102,7 @@
<xsdOption>
<xsd>${basedir}/src/main/resources/schemas/ws-addr-wsdl.xsd</xsd>
<bindingFile>${basedir}/src/main/resources/schemas/ws-addr-wsdl.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/trunk/rt/ws/policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/pom.xml (original)
+++ cxf/trunk/rt/ws/policy/pom.xml Wed Jun 11 11:29:57 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>
Copied: cxf/trunk/rt/ws/policy/src/main/build-resources/catalog.cat (from
r666723, cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/build-resources/catalog.cat?p2=cxf/trunk/rt/ws/policy/src/main/build-resources/catalog.cat&p1=cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat&r1=666723&r2=666774&rev=666774&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/resources/schemas/catalog.cat (original)
+++ cxf/trunk/rt/ws/policy/src/main/build-resources/catalog.cat Wed Jun 11
11:29:57 2008
@@ -18,8 +18,8 @@
under the License.
--
-SYSTEM
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
"oasis-200401-wss-wssecurity-secext-1.0.xsd"
-SYSTEM
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
"oasis-200401-wss-wssecurity-utility-1.0.xsd"
-SYSTEM "http://www.w3.org/2001/xml.xsd"; "xml.xsd"
-SYSTEM "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd";
"xmldsig-core-schema.xsd"
-PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "XMLSchema.dtd"
+SYSTEM
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
"../../../src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+SYSTEM
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
"../../../src/main/resources/schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+SYSTEM "http://www.w3.org/2001/xml.xsd";
"../../../src/main/resources/schemas/xml.xsd"
+SYSTEM "http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd";
"../../../src/main/resources/schemas/xmldsig-core-schema.xsd"
+PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
"../../../src/main/resources/schemas/XMLSchema.dtd"
Modified: cxf/trunk/rt/ws/rm/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=666774&r1=666773&r2=666774&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/pom.xml (original)
+++ cxf/trunk/rt/ws/rm/pom.xml Wed Jun 11 11:29:57 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>
Copied: cxf/trunk/rt/ws/rm/src/main/build-resources/catalog.cat (from r666723,
cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/build-resources/catalog.cat?p2=cxf/trunk/rt/ws/rm/src/main/build-resources/catalog.cat&p1=cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat&r1=666723&r2=666774&rev=666774&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/resources/catalog.cat (original)
+++ cxf/trunk/rt/ws/rm/src/main/build-resources/catalog.cat Wed Jun 11 11:29:57
2008
@@ -21,4 +21,4 @@
SYSTEM "http://schemas.xmlsoap.org/ws/2004/08/addressing";
"../../../../../../common/schemas/src/main/resources/schemas/wsdl/addressing.xsd"
-SYSTEM "http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd";
"schemas/configuration/wsrm-policy.xsd"
+SYSTEM "http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd";
"../resources/schemas/configuration/wsrm-policy.xsd"
