[jbossws-commits] JBossWS SVN: r9184 - in stack/cxf/trunk/modules: server/src/main/resources/jbossws-cxf.sar/META-INF and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-02-02 04:03:35 -0500 (Mon, 02 Feb 2009)
New Revision: 9184

Modified:
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml
   stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml
   stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml
Log:
sync configs and prop files with CXF 2.1.3 release

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -1,65 +1,174 @@
 <?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
+  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
+  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.
+  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.
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
-  <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/management/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"
+    interface="org.apache.cxf.management.InstrumentationManager"
+  />
+
+  <!-- Copied from CXF-SOURCES/rt/core/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.wsdl11.WSDLManagerImpl"
+    interface="org.apache.cxf.wsdl.WSDLManager"
+  />
+  <extension
+    class="org.apache.cxf.phase.PhaseManagerImpl"
+    interface="org.apache.cxf.phase.PhaseManager"
+  />
+  <extension
+    class="org.apache.cxf.workqueue.WorkQueueManagerImpl"
+    interface="org.apache.cxf.workqueue.WorkQueueManager"
+  />
+  <extension
+    class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"
+    interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"
+  />
+  <extension
+    class="org.apache.cxf.endpoint.ServerRegistryImpl"
+    interface="org.apache.cxf.endpoint.ServerRegistry"
+  />
+  <extension
+    class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"
+    interface="org.apache.cxf.transports.http.QueryHandlerRegistry"
+  /> 
+  <extension
+    class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"
+    interface="org.apache.cxf.endpoint.EndpointResolverRegistry"
+  />
+  <extension
+    class="org.apache.cxf.headers.HeaderManagerImpl"
+    interface="org.apache.cxf.headers.HeaderManager"
+  />
+  <extension
+    class="org.apache.cxf.catalog.OASISCatalogManager"
+    interface="org.apache.cxf.catalog.OASISCatalogManager"
+  />
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.object.ObjectBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
     <namespace>http://cxf.apache.org/binding/object/</namespace>
   </extension>
-  <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.soap.SoapBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
+    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+    <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
     <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
-    <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
-    <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
-    <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
-    <namespace>http://cxf.apache.org/bindings/xformat</namespace>
   </extension>
-  <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+    
+  <extension
+    class="org.apache.cxf.binding.soap.SoapTransportFactory" 
+    interface="org.apache.cxf.transport.DestinationFactory"
+    deferred="true"
+  >
+    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+  </extension>    
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.jbi.JBIBindingFactory"
+    deferred="true"
+  >
+    <namespace>http://cxf.apache.org/bindings/jbi</namespace>
+    <namespace>http://java.sun.com/xml/ns/jbi/binding/service+engine</namespace>
+  </extension>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.corba.CorbaBindingFactory"
+    deferred="true"
+  >
+    <namespace>http://cxf.apache.org/bindings/corba</namespace>
+    <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
+  </extension>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.http.HttpBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
     <namespace>http://apache.org/cxf/binding/http</namespace>
   </extension>
-  <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.xml.XMLBindingFactory"
+    deferred="true"
+  >
     <namespace>http://cxf.apache.org/bindings/xformat</namespace>
-    <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
+    <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>       
   </extension>
-  <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/>
-  <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/>
-  <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/>
-  <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/>
-  <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/>
-  <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/>
-  <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/>
-  <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/>
-  <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/>
-  <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.transport.jms.JMSTransportFactory"
+    deferred="true"
+  >
     <namespace>http://cxf.apache.org/transports/jms</namespace>
     <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
   </extension>
-  <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/>
-  <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
-    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
+    deferred="true"
+  >
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+    <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
     <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+    <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
+    <namespace>http://cxf.apache.org/bindings/xformat</namespace>
   </extension>
-  <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
-    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.transport.jbi.JBITransportFactory"
+    deferred="true"
+  >
+    <namespace>http://cxf.apache.org/transports/jbi</namespace>
+    <namespace>http://cxf.apache.org/transports/jbi/configuration</namespace>
   </extension>
-</extensions>
\ No newline at end of file
+
+  <!-- Copied from CXF-SOURCES/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.jaxrs.JAXRSBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
+    <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
+  </extension>
+
+</extensions>

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -1,32 +1,55 @@
 <?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
+  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
+  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.
+  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.
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
-<properties version="1.0">
-  <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
-  <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
-  <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.apache.cxf.wsdl.http.AddressType</entry>
+<properties>
+
+  <!-- Copied from CXF-SOURCES/rt/ws/addr/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.ws.addressing-1">javax.wsdl.Binding=org.apache.cxf.ws.addressing.wsdl.UsingAddressing</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/corba/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry>
+  <entry key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry>
+  <entry key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry>
+  <entry key="org.apache.cxf.binding.corba-4">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.AddressType</entry>
+  <entry key="org.apache.cxf.binding.corba-5">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.PolicyType</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/cxf/extensions.xml -->
   <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
   <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
   <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/cxf/extensions.xml -->
   <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry>
   <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry>
   <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry>
-</properties>
\ No newline at end of file
+  <entry key="org.apache.cxf.transport.jms-4">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientConfig</entry>
+  <entry key="org.apache.cxf.transport.jms-5">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerConfig</entry>
+  <entry key="org.apache.cxf.transport.jms-6">javax.wsdl.Port=org.apache.cxf.transport.jms.SessionPoolType</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jbi/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.transport.jbi">javax.wsdl.Port=org.apache.cxf.transports.jbi.AddressType</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
+  <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
+  <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.apache.cxf.wsdl.http.AddressType</entry>
+
+</properties>

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -18,6 +18,14 @@
   under the License.
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
 <properties>
-    <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/tools.service.validator.xml -->
+  <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
+
+  <!-- Copied from CXF-SOURCES/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml -->
+  <entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry>
+  <entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry>
+
 </properties>

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers	2009-02-02 09:03:35 UTC (rev 9184)
@@ -18,242 +18,55 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler
+
+#####
+# Commands used to generate this file:
 #
+# cd $CXF_213_SOURCES
+# touch ~/spring.handlers
+# find -type f -name spring.handlers | awk ' { print "echo \\# Copied from "$1" >> ~/spring.handlers && cat "$1" >> ~/spring.handlers"; } ' | /bin/bash -
 #
-#    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.
-#
-#
+#####
+
+# Copied from CXF-SOURCES/rt/ws/rm/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
+
+# Copied from CXF-SOURCES/rt/ws/addr/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
-http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
+#Copied from CXF-SOURCES/rt/ws/policy/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
+http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
+http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
+http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
 
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/core/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler
 http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/bindings/object/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
+
+# Copied from CXF-SOURCES/rt/bindings/coloc/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/transports/http-jetty/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/transports/http/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/frontend/jaxws/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/frontend/simple/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas	2009-02-02 09:03:35 UTC (rev 9184)
@@ -18,276 +18,68 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd
-http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd
-http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd
+
+#####
+# Commands used to generate this file:
 #
+# cd $CXF_213_SOURCES
+# touch ~/spring.schemas
+# find -type f -name spring.schemas | awk ' { print "echo \\# Copied from "$1" >> ~/spring.schemas && cat "$1" >> ~/spring.schemas"; } ' | /bin/bash -
 #
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd
+#####
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd
-http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd
+# Copied from CXF-SOURCES/rt/ws/rm/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd
+http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd
+http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd
-#
-#
-#    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.
-#
-#
-http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd
-http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
-http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
-http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
-http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
-http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
-http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
+# Copied from CXF-SOURCES/rt/ws/addr/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd
 
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/ws/policy/src/main/resources/META-INF/spring.schemas
+http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd
+http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
+http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
+http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
+http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
+
+# Copied from CXF-SOURCES/rt/core/src/main/resources/META-INF/spring.schemas
 http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
-http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd
 
-#
-#
-#    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.
-#
-#
-http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
-
-http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-
+# Copied from CXF-SOURCES/rt/bindings/object/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/bindings/object.xsd=schemas/bindings/object.xsd
 
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/spring.schemas
 http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd
+
+# Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
+http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd
+
+# Copied from CXF-SOURCES/rt/transports/http-jetty/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd
+
+# Copied from CXF-SOURCES/rt/transports/http/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd
+http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd
+
+# Copied from CXF-SOURCES/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/jaxrs.xsd=schemas/jaxrs.xsd
+
+# Copied from CXF-SOURCES/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd
+
+# Copied from CXF-SOURCES/rt/frontend/simple/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd
+
+# Copied from CXF-SOURCES/common/common/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
+
+# Copied from CXF-SOURCES/common/schemas/src/main/resources/META-INF/spring.schemas
+http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
+http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -1,25 +1,37 @@
 <?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
+  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
+  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.
+  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.
 -->
 <plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org">
-  <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/>
-  <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
+
+  <!-- Copied from CXF-SOURCES/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml -->
+  <databinding
+    name="jaxb"
+    package="org.apache.cxf.tools.wsdlto.databinding.jaxb"
+    profile="JAXBDataBinding"
+  />
+
+  <!-- Copied from CXF-SOURCES/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml -->
+  <frontend
+    name="jaxws"
+    package="org.apache.cxf.tools.wsdlto.frontend.jaxws"
+    profile="JAXWSProfile"
+  >
     <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
     <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
     <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
@@ -33,4 +45,5 @@
       <generator name="ServiceGenerator"/>
     </generators>
   </frontend>
-</plugin>
\ No newline at end of file
+
+</plugin>

Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -7,9 +7,9 @@
   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
@@ -18,9 +18,22 @@
   under the License.
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
 <properties>
-    <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
-    <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
-    <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
-    <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
+  <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
+  <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
+  <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="jms-javax.wsdl.Port">org.apache.cxf.transport.jms.wsdl11.JmsTransportPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jbi/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="jbi-javax.wsdl.Port">org.apache.cxf.transport.jbi.wsdl11.JBITransportPlugin</entry>
+
 </properties>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -1,65 +1,174 @@
 <?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
+  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
+  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.
+  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.
 -->
 <extensions xmlns="http://cxf.apache.org/bus/extension">
-  <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/management/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"
+    interface="org.apache.cxf.management.InstrumentationManager"
+  />
+
+  <!-- Copied from CXF-SOURCES/rt/core/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.wsdl11.WSDLManagerImpl"
+    interface="org.apache.cxf.wsdl.WSDLManager"
+  />
+  <extension
+    class="org.apache.cxf.phase.PhaseManagerImpl"
+    interface="org.apache.cxf.phase.PhaseManager"
+  />
+  <extension
+    class="org.apache.cxf.workqueue.WorkQueueManagerImpl"
+    interface="org.apache.cxf.workqueue.WorkQueueManager"
+  />
+  <extension
+    class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"
+    interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"
+  />
+  <extension
+    class="org.apache.cxf.endpoint.ServerRegistryImpl"
+    interface="org.apache.cxf.endpoint.ServerRegistry"
+  />
+  <extension
+    class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"
+    interface="org.apache.cxf.transports.http.QueryHandlerRegistry"
+  /> 
+  <extension
+    class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"
+    interface="org.apache.cxf.endpoint.EndpointResolverRegistry"
+  />
+  <extension
+    class="org.apache.cxf.headers.HeaderManagerImpl"
+    interface="org.apache.cxf.headers.HeaderManager"
+  />
+  <extension
+    class="org.apache.cxf.catalog.OASISCatalogManager"
+    interface="org.apache.cxf.catalog.OASISCatalogManager"
+  />
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.object.ObjectBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
     <namespace>http://cxf.apache.org/binding/object/</namespace>
   </extension>
-  <extension class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.soap.SoapBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
+    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+    <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
     <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
-    <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
-    <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
-    <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
-    <namespace>http://cxf.apache.org/bindings/xformat</namespace>
   </extension>
-  <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
+    
+  <extension
+    class="org.apache.cxf.binding.soap.SoapTransportFactory" 
+    interface="org.apache.cxf.transport.DestinationFactory"
+    deferred="true"
+  >
+    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+  </extension>    
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.jbi.JBIBindingFactory"
+    deferred="true"
+  >
+    <namespace>http://cxf.apache.org/bindings/jbi</namespace>
+    <namespace>http://java.sun.com/xml/ns/jbi/binding/service+engine</namespace>
+  </extension>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.corba.CorbaBindingFactory"
+    deferred="true"
+  >
+    <namespace>http://cxf.apache.org/bindings/corba</namespace>
+    <namespace>http://schemas.apache.org/yoko/bindings/corba</namespace>
+  </extension>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.http.HttpBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
     <namespace>http://apache.org/cxf/binding/http</namespace>
   </extension>
-  <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.binding.xml.XMLBindingFactory"
+    deferred="true"
+  >
     <namespace>http://cxf.apache.org/bindings/xformat</namespace>
-    <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
+    <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>       
   </extension>
-  <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/>
-  <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/>
-  <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/>
-  <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/>
-  <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/>
-  <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/>
-  <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/>
-  <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/>
-  <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/>
-  <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.transport.jms.JMSTransportFactory"
+    deferred="true"
+  >
     <namespace>http://cxf.apache.org/transports/jms</namespace>
     <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
   </extension>
-  <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/>
-  <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
-    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory"
+    deferred="true"
+  >
+    <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+    <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
     <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+    <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+    <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
+    <namespace>http://cxf.apache.org/bindings/xformat</namespace>
   </extension>
-  <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
-    <namespace>http://schemas.xmlsoap.org/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
-    <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.transport.jbi.JBITransportFactory"
+    deferred="true"
+  >
+    <namespace>http://cxf.apache.org/transports/jbi</namespace>
+    <namespace>http://cxf.apache.org/transports/jbi/configuration</namespace>
   </extension>
+
+  <!-- Copied from CXF-SOURCES/rt/frontend/jaxrs/src/main/resources/META-INF/cxf/bus-extensions.xml -->
+  <extension
+    class="org.apache.cxf.jaxrs.JAXRSBindingFactory" 
+    interface="org.apache.cxf.binding.BindingFactory"
+    deferred="true"
+  >
+    <namespace>http://apache.org/cxf/binding/jaxrs</namespace>
+  </extension>
+
 </extensions>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -7,27 +7,49 @@
   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.
--->
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties version="1.0">
-  <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
-  <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
-  <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry>
-  <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
-  <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
-  <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
-  <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry>
-  <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry>
-  <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry>
-</properties>
-
+-->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
+<properties>
+
+  <!-- Copied from CXF-SOURCES/rt/ws/addr/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.ws.addressing-1">javax.wsdl.Binding=org.apache.cxf.ws.addressing.wsdl.UsingAddressing</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/corba/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.binding.corba-1">javax.wsdl.Binding=org.apache.cxf.binding.corba.wsdl.BindingType</entry>
+  <entry key="org.apache.cxf.binding.corba-2">javax.wsdl.BindingOperation=org.apache.cxf.binding.corba.wsdl.OperationType</entry>
+  <entry key="org.apache.cxf.binding.corba-3">javax.wsdl.Definition=org.apache.cxf.binding.corba.wsdl.TypeMappingType</entry>
+  <entry key="org.apache.cxf.binding.corba-4">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.AddressType</entry>
+  <entry key="org.apache.cxf.binding.corba-5">javax.wsdl.Port=org.apache.cxf.binding.corba.wsdl.PolicyType</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
+  <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
+  <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry>
+  <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry>
+  <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry>
+  <entry key="org.apache.cxf.transport.jms-4">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientConfig</entry>
+  <entry key="org.apache.cxf.transport.jms-5">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerConfig</entry>
+  <entry key="org.apache.cxf.transport.jms-6">javax.wsdl.Port=org.apache.cxf.transport.jms.SessionPoolType</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jbi/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.transport.jbi">javax.wsdl.Port=org.apache.cxf.transports.jbi.AddressType</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml -->
+  <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
+  <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
+  <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.apache.cxf.wsdl.http.AddressType</entry>
+
+</properties>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -18,6 +18,14 @@
   under the License.
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
 <properties>
-    <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/tools.service.validator.xml -->
+  <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry>
+
+  <!-- Copied from CXF-SOURCES/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools.service.validator.xml -->
+  <entry key="UniqueBodyValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator</entry>
+  <entry key="WrapperStyleNameCollisionValidator">org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.WrapperStyleNameCollisionValidator</entry>
+
 </properties>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers	2009-02-02 09:03:35 UTC (rev 9184)
@@ -18,242 +18,55 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler
+
+#####
+# Commands used to generate this file:
 #
+# cd $CXF_213_SOURCES
+# touch ~/spring.handlers
+# find -type f -name spring.handlers | awk ' { print "echo \\# Copied from "$1" >> ~/spring.handlers && cat "$1" >> ~/spring.handlers"; } ' | /bin/bash -
 #
-#    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.
-#
-#
+#####
+
+# Copied from CXF-SOURCES/rt/ws/rm/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
+
+# Copied from CXF-SOURCES/rt/ws/addr/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
-http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
-http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
+#Copied from CXF-SOURCES/rt/ws/policy/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler
+http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
+http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
+http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler
 
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/core/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler
 http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/bindings/object/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler
-#
-#
-#    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.
-#
-#
+
+# Copied from CXF-SOURCES/rt/bindings/coloc/src/main/resources/META-INF/spring.handlers
 http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/transports/http-jetty/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/transports/http/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/frontend/jaxrs/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/frontend/jaxws/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler
+
+# Copied from CXF-SOURCES/rt/frontend/simple/src/main/resources/META-INF/spring.handlers
+http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas	2009-02-02 09:03:35 UTC (rev 9184)
@@ -18,276 +18,68 @@
 #    under the License.
 #
 #
-http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd
-http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd
-http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd
+
+#####
+# Commands used to generate this file:
 #
+# cd $CXF_213_SOURCES
+# touch ~/spring.schemas
+# find -type f -name spring.schemas | awk ' { print "echo \\# Copied from "$1" >> ~/spring.schemas && cat "$1" >> ~/spring.schemas"; } ' | /bin/bash -
 #
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd
+#####
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd
-http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd
+# Copied from CXF-SOURCES/rt/ws/rm/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd
+http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd
+http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd
 
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd
-#
-#
-#    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.
-#
-#
-http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd
-http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
-http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
-http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
-http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
-http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
-http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
+# Copied from CXF-SOURCES/rt/ws/addr/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd
 
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/ws/policy/src/main/resources/META-INF/spring.schemas
+http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd
+http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd
+http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
+http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd
+http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd
+http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd
+
+# Copied from CXF-SOURCES/rt/core/src/main/resources/META-INF/spring.schemas
 http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd
-#
-#
-#    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.
-#
-#
-http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
-http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd
 
-#
-#
-#    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.
-#
-#
-http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
-http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
-http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
-
-http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd
-
+# Copied from CXF-SOURCES/rt/bindings/object/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/bindings/object.xsd=schemas/bindings/object.xsd
 
-#
-#
-#    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.
-#
-#
+# Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/spring.schemas
 http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd
+
+# Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd
+http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd
+
+# Copied from CXF-SOURCES/rt/transports/http-jetty/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd
+
+# Copied from CXF-SOURCES/rt/transports/http/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd
+http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd
+
+# Copied from CXF-SOURCES/rt/frontend/jaxrs/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/jaxrs.xsd=schemas/jaxrs.xsd
+
+# Copied from CXF-SOURCES/rt/frontend/jaxws/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd
+
+# Copied from CXF-SOURCES/rt/frontend/simple/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd
+
+# Copied from CXF-SOURCES/common/common/src/main/resources/META-INF/spring.schemas
+http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd
+
+# Copied from CXF-SOURCES/common/schemas/src/main/resources/META-INF/spring.schemas
+http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/2003-02-11.xsd=schemas/wsdl/wsdl.xsd
+http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd
+http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd
+http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -1,25 +1,37 @@
 <?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
+  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
+  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.
+  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.
 -->
 <plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org">
-  <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/>
-  <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
+
+  <!-- Copied from CXF-SOURCES/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml -->
+  <databinding
+    name="jaxb"
+    package="org.apache.cxf.tools.wsdlto.databinding.jaxb"
+    profile="JAXBDataBinding"
+  />
+
+  <!-- Copied from CXF-SOURCES/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml -->
+  <frontend
+    name="jaxws"
+    package="org.apache.cxf.tools.wsdlto.frontend.jaxws"
+    profile="JAXWSProfile"
+  >
     <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/>
     <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
     <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
@@ -33,4 +45,5 @@
       <generator name="ServiceGenerator"/>
     </generators>
   </frontend>
+
 </plugin>

Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml	2009-02-01 05:01:49 UTC (rev 9183)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml	2009-02-02 09:03:35 UTC (rev 9184)
@@ -7,9 +7,9 @@
   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
@@ -18,9 +18,22 @@
   under the License.
 -->
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+
 <properties>
-    <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
-    <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
-    <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
-    <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/soap/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="soap-javax.wsdl.Port">org.apache.cxf.binding.soap.wsdl11.SoapAddressPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/bindings/xml/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry>
+  <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry>
+  <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
+  <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jms/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="jms-javax.wsdl.Port">org.apache.cxf.transport.jms.wsdl11.JmsTransportPlugin</entry>
+
+  <!-- Copied from CXF-SOURCES/rt/transports/jbi/src/main/resources/META-INF/wsdl.plugin.xml -->
+  <entry key="jbi-javax.wsdl.Port">org.apache.cxf.transport.jbi.wsdl11.JBITransportPlugin</entry>
+
 </properties>