cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r470331 - in /incubator/cxf/trunk: common/metacode/src/main/resources/schemas/wsdl/ rt/databinding/jaxb/ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/ rt/databinding/jaxb/src/test/resources/schema/ testutils/src/main/resources/wsdl...
Date Thu, 02 Nov 2006 11:21:54 GMT
Author: blin
Date: Thu Nov  2 03:21:49 2006
New Revision: 470331

URL: http://svn.apache.org/viewvc?view=rev&rev=470331
Log:
[cxf-148] copied resource cleanup
1. eliminiate duplicated resources
2. remove Apache license headers from orignial document, unmodified OASIS or w3c document
should not contain Apache license headers.

Removed:
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/schema/wsdl.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305728/ws-addr.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/ws-addr.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/xml.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/ws-addr.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/xml.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/ws-addr.xsd
Modified:
    incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
    incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/wsrm.xsd
    incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/xml.xsd
    incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/schema/jms.xsd
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/ws-addr.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/basic_callback.wsdl
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.wsdl
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/bf-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/r-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rl-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rp-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/bf-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/r-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rl-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rp-2.xsd
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/sg-2.xsd

Modified: incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd (original)
+++ incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd Thu
Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- $Id: ws-addr-wsdl.xsd,v 1.1 2005/03/22 18:15:15 hugo Exp $ -->
 <!--
     W3C XML Schema defined in the Web Services Addressing 1.0 

Modified: incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/wsrm.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/wsrm.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/wsrm.xsd (original)
+++ incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/wsrm.xsd Thu Nov 
2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
  
 Copyright Notice
@@ -193,4 +175,4 @@
       </xs:simpleContent>
     </xs:complexType>
   </xs:element>  
-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/xml.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/xml.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/xml.xsd (original)
+++ incubator/cxf/trunk/common/metacode/src/main/resources/schemas/wsdl/xml.xsd Thu Nov  2
03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0"?>
-<!--
-  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.
--->
 <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xml:lang="en">
 	<xs:annotation>
 		<xs:documentation>This schema defines attributes and an attribute group

Modified: incubator/cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/pom.xml?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/pom.xml Thu Nov  2 03:21:49 2006
@@ -34,6 +34,30 @@
         <topDirectoryLocation>../../..</topDirectoryLocation>
     </properties>
 
+    <build>
+        <testResources>
+	    <testResource>
+	        <directory>src/test/resources</directory>
+		<includes>
+		    <include>**</include>
+		</includes>
+	    </testResource>
+	    <testResource>
+	        <directory>src/test/java/org/apache/cxf/jaxb/resources</directory>
+		<targetPath>org/apache/cxf/jaxb/resources</targetPath>
+		<includes>
+		    <include>**/*</include>
+		</includes>
+	    </testResource>
+	    <testResource>
+	        <directory>../../../common/metacode/src/main/resources/</directory>
+		<includes>
+		    <include>schemas/wsdl/wsdl.xsd</include>
+		</includes>
+            </testResource>
+	</testResources>
+    </build> 
+
     <dependencies>
 
         <dependency>

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
(original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
Thu Nov  2 03:21:49 2006
@@ -45,7 +45,7 @@
 
     private static final Logger LOG = Logger.getLogger(JAXBDataBindingTest.class.getName());
     private static final String WSDL_PATH = "/wsdl/hello_world.wsdl";
-    private static final String SCHEMA1 = "/schema/wsdl.xsd";
+    private static final String SCHEMA1 = "/schemas/wsdl/wsdl.xsd";
     private static final String SCHEMA2 = "/schema/jms.xsd";
     private Definition def;
     private Service service;

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/schema/jms.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/schema/jms.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/schema/jms.xsd (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/test/resources/schema/jms.xsd Thu Nov  2 03:21:49
2006
@@ -18,7 +18,7 @@
   under the License.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jms="http://cxf.apache.org/transports/jms"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
targetNamespace="http://cxf.apache.org/transports/jms" elementFormDefault="qualified" jaxb:version="2.0">
-    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="wsdl.xsd"/>
+    <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="../schemas/wsdl/wsdl.xsd"/>
     <xs:simpleType name="DestinationStyleType">
         <xs:restriction base="xs:string">
             <xs:enumeration value="queue"/>

Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/ws-addr.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/ws-addr.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/ws-addr.xsd (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/ws-addr.xsd Thu Nov  2 03:21:49
2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"-->
 <!--
 W3C XML Schema defined in the Web Services Addressing 1.0 specification

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/basic_callback.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/basic_callback.wsdl?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/basic_callback.wsdl
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/basic_callback.wsdl
Thu Nov  2 03:21:49 2006
@@ -37,7 +37,7 @@
 		jaxb:version="2.0"
 		elementFormDefault="qualified">
 
-	    <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
+	    <xsd:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="../schemas/wsdl/ws-addr.xsd"/>
 	    <element name="callback_message" type="xsd:string"/>
 	    <element name="RegisterCallback" type="references:EndpointReferenceType"/>
 	    <element name="returnType" type="xsd:string"/>

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305728/hello_world.wsdl
Thu Nov  2 03:21:49 2006
@@ -33,7 +33,7 @@
             elementFormDefault="qualified">
 
             <import namespace="http://www.w3.org/2005/08/addressing" 
-                    schemaLocation="ws-addr.xsd"/>
+                    schemaLocation="../../schemas/wsdl/ws-addr.xsd"/>
 
             <element name="sayHi" type="wsa:EndpointReferenceType"/>
             <element name="sayHiResponse">

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.wsdl?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.wsdl
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.wsdl
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 	Copyright (C) OASIS Open (2004). All Rights Reserved.
 	
@@ -56,7 +38,7 @@
 				schemaLocation="./Printer.xsd" />
 			<xsd:import
 				namespace="http://www.w3.org/2006/02/addressing/wsdl"
-				schemaLocation="./ws-addr.xsd" />
+				schemaLocation="../../schemas/wsdl/ws-addr.xsd" />
 		</xsd:schema>
 	</wsdl:types>
 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/Printer.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 	Copyright (C) OASIS Open (2004). All Rights Reserved.
 	 
@@ -39,7 +21,7 @@
 	<xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2" 
 	   schemaLocation="./bf-2.xsd" />
 	<xsd:import namespace="http://www.w3.org/2005/08/addressing" 
-	   schemaLocation="./ws-addr.xsd" />
+	   schemaLocation="../../schemas/wsdl/ws-addr.xsd" />
 	<xsd:import namespace="http://docs.oasis-open.org/wsrf/rl-2" 
 	   schemaLocation="./rl-2.xsd" />	
 	<xsd:import namespace="http://docs.oasis-open.org/wsrf/rp-2" 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/bf-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/bf-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/bf-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/bf-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementers or users of this specification,
can be obtained from the OASIS Executive Director. 
 
@@ -41,10 +23,10 @@
   targetNamespace="http://docs.oasis-open.org/wsrf/bf-2">
 
   <xsd:import namespace="http://www.w3.org/2005/08/addressing" 
-              schemaLocation="ws-addr.xsd" />
+              schemaLocation="../../schemas/wsdl/ws-addr.xsd" />
               
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace" 
-              schemaLocation="xml.xsd">
+              schemaLocation="../../schemas/wsdl/xml.xsd">
     <xsd:annotation>
       <xsd:documentation>
         Get access to the xml: attribute groups for xml:lang as declared on 'schema'

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/r-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/r-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/r-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/r-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rl-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rl-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rl-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rl-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
   

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rp-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rp-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rp-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bug305770/rp-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/bf-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/bf-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/bf-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/bf-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementers or users of this specification,
can be obtained from the OASIS Executive Director. 
 
@@ -41,10 +23,10 @@
   targetNamespace="http://docs.oasis-open.org/wsrf/bf-2">
 
   <xsd:import namespace="http://www.w3.org/2005/08/addressing" 
-              schemaLocation="ws-addr.xsd" />
+              schemaLocation="../../../../schemas/wsdl/ws-addr.xsd" />
               
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace" 
-              schemaLocation="xml.xsd">
+              schemaLocation="../../../../schemas/wsdl/xml.xsd">
     <xsd:annotation>
       <xsd:documentation>
         Get access to the xml: attribute groups for xml:lang as declared on 'schema'

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/r-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/r-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/r-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/r-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rl-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rl-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rl-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rl-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
   

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rp-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rp-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rp-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/rp-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/sg-2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/sg-2.xsd?view=diff&rev=470331&r1=470330&r2=470331
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/sg-2.xsd
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/bughanging/schemas/wsdl/sg-2.xsd
Thu Nov  2 03:21:49 2006
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <!-- 
 OASIS takes no position regarding the validity or scope of any intellectual property or other
rights that might be claimed to pertain to the implementation or use of the technology described
in this document or the extent to which any license under such rights might or might not be
available; neither does it represent that it has made any effort to identify any such rights.
Information on OASIS's procedures with respect to rights in OASIS specifications can be found
at the OASIS website. Copies of claims of rights made available for publication and any assurances
of licenses to be made available, or the result of an attempt made to obtain a general license
or permission for the use of such proprietary rights by implementors or users of this specification,
can be obtained from the OASIS Executive Director.
 
@@ -45,7 +27,7 @@
   <!-- ======================== Imports ============================ -->
 
   <xsd:import namespace="http://www.w3.org/2005/08/addressing" 
-              schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd" /> 
+              schemaLocation="../../schemas/wsdl/ws-addr.xsd" /> 
   <xsd:import namespace="http://docs.oasis-open.org/wsrf/bf-2"
               schemaLocation="bf-2.xsd" />
               



Mime
View raw message