cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r726753 [3/3] - in /cxf/branches/2.1.x-fixes: ./ common/common/src/test/java/org/apache/cxf/helpers/ distribution/src/main/release/samples/configuration_interceptor/ distribution/src/main/release/samples/configuration_interceptor/src/demo/s...
Date Mon, 15 Dec 2008 18:14:50 GMT
Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml Mon Dec 15 10:14:38 2008
@@ -1,72 +1,72 @@
-<?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.
--->
-<!-- START SNIPPET: beans -->
-<!--beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:simple="http://cxf.apache.org/simple"
-  xsi:schemaLocation="
-  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xmlns:security="http://www.springframework.org/schema/security"
-  xsi:schemaLocation="
-http://www.springframework.org/schema/beans 
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop 
-http://www.springframework.org/schema/aop/spring-aop.xsd
-http://www.springframework.org/schema/security 
-http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
-http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
-
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
-  <jaxrs:server id="bookservice"
-		        address="/">
-    <jaxrs:serviceBeans>
-      <ref bean="bookstore"/>
-    </jaxrs:serviceBeans>
-    <jaxrs:providers>
-        <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
-    </jaxrs:providers>		   
-  </jaxrs:server>
-
-  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStore"/>
-
-  <security:global-method-security secured-annotations="enabled"/>
-  
-  <security:http auto-config='true'>
-    <security:http-basic />
-  </security:http>
-  
-  <security:authentication-provider>
-    <security:user-service>
-      <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
-      <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
-    </security:user-service>
-  </security:authentication-provider> 
-</beans>
-<!-- END SNIPPET: beans -->
-
+<?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.
+-->
+<!-- START SNIPPET: beans -->
+<!--beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:simple="http://cxf.apache.org/simple"
+  xsi:schemaLocation="
+  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:security="http://www.springframework.org/schema/security"
+  xsi:schemaLocation="
+http://www.springframework.org/schema/beans 
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop 
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://www.springframework.org/schema/security 
+http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd">
+
+  <import resource="classpath:META-INF/cxf/cxf.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+  <jaxrs:server id="bookservice"
+		        address="/">
+    <jaxrs:serviceBeans>
+      <ref bean="bookstore"/>
+    </jaxrs:serviceBeans>
+    <jaxrs:providers>
+        <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
+    </jaxrs:providers>		   
+  </jaxrs:server>
+
+  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStore"/>
+
+  <security:global-method-security secured-annotations="enabled"/>
+  
+  <security:http auto-config='true'>
+    <security:http-basic />
+  </security:http>
+  
+  <security:authentication-provider>
+    <security:user-service>
+      <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
+      <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
+    </security:user-service>
+  </security:authentication-provider> 
+</beans>
+<!-- END SNIPPET: beans -->
+

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml Mon Dec 15 10:14:38 2008
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
-	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.
--->
-<!-- START SNIPPET: webxml -->
-<web-app>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>WEB-INF/beans.xml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-
-    <filter>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-  
-    <filter-mapping>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-	<servlet>
-		<servlet-name>CXFServlet</servlet-name>
-		<display-name>CXF Servlet</display-name>
-		<servlet-class>
-			org.apache.cxf.transport.servlet.CXFServlet
-		</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>CXFServlet</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+	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.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>WEB-INF/beans.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+    <filter>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+  
+    <filter-mapping>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+	<servlet>
+		<servlet-name>CXFServlet</servlet-name>
+		<display-name>CXF Servlet</display-name>
+		<servlet-class>
+			org.apache.cxf.transport.servlet.CXFServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>CXFServlet</servlet-name>
+		<url-pattern>/*</url-pattern>
+	</servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml Mon Dec 15 10:14:38 2008
@@ -1,73 +1,73 @@
-<?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.
--->
-<!-- START SNIPPET: beans -->
-<!--beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:simple="http://cxf.apache.org/simple"
-  xsi:schemaLocation="
-  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xmlns:security="http://www.springframework.org/schema/security"
-  xsi:schemaLocation="
-http://www.springframework.org/schema/beans 
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop 
-http://www.springframework.org/schema/aop/spring-aop.xsd
-http://www.springframework.org/schema/security 
-http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
-http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
-
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
-  <jaxrs:server id="bookservice"
-		        address="/">
-    <jaxrs:serviceBeans>
-      <ref bean="bookstore"/>
-    </jaxrs:serviceBeans>		   
-    <jaxrs:providers>
-        <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
-    </jaxrs:providers>
-  </jaxrs:server>
-
-  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoInterface"/>
-  <aop:config proxy-target-class="true"/>
-  
-  <security:global-method-security secured-annotations="enabled"/>
-  
-  <security:http auto-config='true'>
-    <security:http-basic />
-  </security:http>
-  
-  <security:authentication-provider>
-    <security:user-service>
-      <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
-      <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
-    </security:user-service>
-  </security:authentication-provider> 
-</beans>
-<!-- END SNIPPET: beans -->
-
+<?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.
+-->
+<!-- START SNIPPET: beans -->
+<!--beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:simple="http://cxf.apache.org/simple"
+  xsi:schemaLocation="
+  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:security="http://www.springframework.org/schema/security"
+  xsi:schemaLocation="
+http://www.springframework.org/schema/beans 
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop 
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://www.springframework.org/schema/security 
+http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd">
+
+  <import resource="classpath:META-INF/cxf/cxf.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+  <jaxrs:server id="bookservice"
+		        address="/">
+    <jaxrs:serviceBeans>
+      <ref bean="bookstore"/>
+    </jaxrs:serviceBeans>		   
+    <jaxrs:providers>
+        <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
+    </jaxrs:providers>
+  </jaxrs:server>
+
+  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoInterface"/>
+  <aop:config proxy-target-class="true"/>
+  
+  <security:global-method-security secured-annotations="enabled"/>
+  
+  <security:http auto-config='true'>
+    <security:http-basic />
+  </security:http>
+  
+  <security:authentication-provider>
+    <security:user-service>
+      <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
+      <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
+    </security:user-service>
+  </security:authentication-provider> 
+</beans>
+<!-- END SNIPPET: beans -->
+

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml Mon Dec 15 10:14:38 2008
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
-	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.
--->
-<!-- START SNIPPET: webxml -->
-<web-app>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>WEB-INF/beans.xml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-
-    <filter>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-  
-    <filter-mapping>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-	<servlet>
-		<servlet-name>CXFServlet</servlet-name>
-		<display-name>CXF Servlet</display-name>
-		<servlet-class>
-			org.apache.cxf.transport.servlet.CXFServlet
-		</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>CXFServlet</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+	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.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>WEB-INF/beans.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+    <filter>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+  
+    <filter-mapping>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+	<servlet>
+		<servlet-name>CXFServlet</servlet-name>
+		<display-name>CXF Servlet</display-name>
+		<servlet-class>
+			org.apache.cxf.transport.servlet.CXFServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>CXFServlet</servlet-name>
+		<url-pattern>/*</url-pattern>
+	</servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml Mon Dec 15 10:14:38 2008
@@ -1,83 +1,83 @@
-<?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.
--->
-<!-- START SNIPPET: beans -->
-<!--beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:simple="http://cxf.apache.org/simple"
-  xsi:schemaLocation="
-  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xmlns:security="http://www.springframework.org/schema/security"
-  xsi:schemaLocation="
-http://www.springframework.org/schema/beans 
-http://www.springframework.org/schema/beans/spring-beans.xsd
-http://www.springframework.org/schema/aop 
-http://www.springframework.org/schema/aop/spring-aop.xsd
-http://www.springframework.org/schema/security 
-http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
-http://cxf.apache.org/jaxrs
-http://cxf.apache.org/schemas/jaxrs.xsd">
-
-  <import resource="classpath:META-INF/cxf/cxf.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
-  <jaxrs:server id="bookservice"
-		        address="/">
-    <jaxrs:serviceBeans>
-      <ref bean="bookstore"/>
-    </jaxrs:serviceBeans>		   
-    <jaxrs:providers>
-        <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
-    </jaxrs:providers>
-  </jaxrs:server>
-
-  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoAnnotations"/>
-  <aop:config proxy-target-class="true"/>
-  
-  <security:global-method-security>
-      <security:protect-pointcut 
-        expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook())" 
-        access="ROLE_ADMIN"/>
-      <security:protect-pointcut 
-        expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long))" 
-        access="ROLE_USER, ROLE_ADMIN"/>
-      <security:protect-pointcut 
-        expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long, String))" 
-        access="ROLE_USER"/>    
-  </security:global-method-security>
-  
-  <security:http auto-config='true'>
-    <security:http-basic />
-  </security:http>
-  
-  <security:authentication-provider>
-    <security:user-service>
-      <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
-      <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
-    </security:user-service>
-  </security:authentication-provider> 
-</beans>
-<!-- END SNIPPET: beans -->
-
+<?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.
+-->
+<!-- START SNIPPET: beans -->
+<!--beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:simple="http://cxf.apache.org/simple"
+  xsi:schemaLocation="
+  http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:security="http://www.springframework.org/schema/security"
+  xsi:schemaLocation="
+http://www.springframework.org/schema/beans 
+http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop 
+http://www.springframework.org/schema/aop/spring-aop.xsd
+http://www.springframework.org/schema/security 
+http://www.springframework.org/schema/security/spring-security-2.0.4.xsd
+http://cxf.apache.org/jaxrs
+http://cxf.apache.org/schemas/jaxrs.xsd">
+
+  <import resource="classpath:META-INF/cxf/cxf.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml" />
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+  <jaxrs:server id="bookservice"
+		        address="/">
+    <jaxrs:serviceBeans>
+      <ref bean="bookstore"/>
+    </jaxrs:serviceBeans>		   
+    <jaxrs:providers>
+        <bean class="org.apache.cxf.systest.jaxrs.security.SecurityExceptionMapper"/>
+    </jaxrs:providers>
+  </jaxrs:server>
+
+  <bean id="bookstore" class="org.apache.cxf.systest.jaxrs.security.SecureBookStoreNoAnnotations"/>
+  <aop:config proxy-target-class="true"/>
+  
+  <security:global-method-security>
+      <security:protect-pointcut 
+        expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook())" 
+        access="ROLE_ADMIN"/>
+      <security:protect-pointcut 
+        expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long))" 
+        access="ROLE_USER, ROLE_ADMIN"/>
+      <security:protect-pointcut 
+        expression="execution(* org.apache.cxf.systest.jaxrs.BookInterface.getThatBook(Long, String))" 
+        access="ROLE_USER"/>    
+  </security:global-method-security>
+  
+  <security:http auto-config='true'>
+    <security:http-basic />
+  </security:http>
+  
+  <security:authentication-provider>
+    <security:user-service>
+      <security:user name="bob" password="bobspassword" authorities="ROLE_USER" />
+      <security:user name="foo" password="bar" authorities="ROLE_USER, ROLE_ADMIN" />
+    </security:user-service>
+  </security:authentication-provider> 
+</beans>
+<!-- END SNIPPET: beans -->
+

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml Mon Dec 15 10:14:38 2008
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
-	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.
--->
-<!-- START SNIPPET: webxml -->
-<web-app>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>WEB-INF/beans.xml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-
-    <filter>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-  
-    <filter-mapping>
-      <filter-name>springSecurityFilterChain</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-	<servlet>
-		<servlet-name>CXFServlet</servlet-name>
-		<display-name>CXF Servlet</display-name>
-		<servlet-class>
-			org.apache.cxf.transport.servlet.CXFServlet
-		</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>CXFServlet</servlet-name>
-		<url-pattern>/*</url-pattern>
-	</servlet-mapping>
-</web-app>
-<!-- END SNIPPET: webxml -->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+	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.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>WEB-INF/beans.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+    <filter>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+  
+    <filter-mapping>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+	<servlet>
+		<servlet-name>CXFServlet</servlet-name>
+		<display-name>CXF Servlet</display-name>
+		<servlet-class>
+			org.apache.cxf.transport.servlet.CXFServlet
+		</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>CXFServlet</servlet-name>
+		<url-pattern>/*</url-pattern>
+	</servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties Mon Dec 15 10:14:38 2008
@@ -1,30 +1,30 @@
-#
-#
-#    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.
-#
-#
-
-# Global logging configuration
-log4j.rootLogger=WARN, stdout
-
-log4j.logger.org.springframework.security=DEBUG, stdout
-
-# Console output...
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
+#
+#
+#    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.
+#
+#
+
+# Global logging configuration
+log4j.rootLogger=WARN, stdout
+
+log4j.logger.org.springframework.security=DEBUG, stdout
+
+# Console output...
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java Mon Dec 15 10:14:38 2008
@@ -1,71 +1,71 @@
-/**
- * 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.
- */
-
-package org.apache.cxf.tools.wsdlto.xmlbeans;
-
-import java.io.File;
-
-import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.tools.common.ProcessorTestBase;
-import org.apache.cxf.tools.wsdlto.WSDLToJava;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class XmlbeansBindingTest extends ProcessorTestBase {
-    
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-        File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
-        classFile.mkdir();
-        System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath()
-                                              + File.separatorChar);
-
-    }
-
-    @After
-    public void tearDown() {
-        //super.tearDown();
-    }
-    
-    @Test
-    public void testEmbeddedSchema() throws Exception {
-        
-        try {
-            String[] args = new String[] {"-classdir",
-                                          output.getCanonicalPath() + "/classes", "-d",
-                                          output.getCanonicalPath(), "-db", "xmlbeans",
-                                          getLocation("/wsdl2java_wsdl/xmlbeanstest.wsdl")};
-            WSDLToJava.main(args);       
-            
-            File file = new File(output, "classes/schemaorg_apache_xmlbeans/system/");
-            file = new File(file.getAbsoluteFile(), file.list()[0]);
-            assertTrue(file.exists());
-            File stringListXSB = new File(file, "stringlisttype428ftype.xsb");          
-            String contents = FileUtils.getStringFromFile(stringListXSB);
-            //assertTrue(contents.indexOf("URI_SHA_1_EA71EF943F0B49ADA611FB92B3BB95A7D57BE89B" 
-            //                            + "/xmlbeanstest.wsdl") != -1);
-            assertTrue(contents.indexOf("/xmlbeanstest.wsdl") != -1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        
-    }
-}
+/**
+ * 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.
+ */
+
+package org.apache.cxf.tools.wsdlto.xmlbeans;
+
+import java.io.File;
+
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.wsdlto.WSDLToJava;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class XmlbeansBindingTest extends ProcessorTestBase {
+    
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
+        classFile.mkdir();
+        System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath()
+                                              + File.separatorChar);
+
+    }
+
+    @After
+    public void tearDown() {
+        //super.tearDown();
+    }
+    
+    @Test
+    public void testEmbeddedSchema() throws Exception {
+        
+        try {
+            String[] args = new String[] {"-classdir",
+                                          output.getCanonicalPath() + "/classes", "-d",
+                                          output.getCanonicalPath(), "-db", "xmlbeans",
+                                          getLocation("/wsdl2java_wsdl/xmlbeanstest.wsdl")};
+            WSDLToJava.main(args);       
+            
+            File file = new File(output, "classes/schemaorg_apache_xmlbeans/system/");
+            file = new File(file.getAbsoluteFile(), file.list()[0]);
+            assertTrue(file.exists());
+            File stringListXSB = new File(file, "stringlisttype428ftype.xsb");          
+            String contents = FileUtils.getStringFromFile(stringListXSB);
+            //assertTrue(contents.indexOf("URI_SHA_1_EA71EF943F0B49ADA611FB92B3BB95A7D57BE89B" 
+            //                            + "/xmlbeanstest.wsdl") != -1);
+            assertTrue(contents.indexOf("/xmlbeanstest.wsdl") != -1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+    }
+}

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl Mon Dec 15 10:14:38 2008
@@ -1,199 +1,199 @@
-<?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.
--->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:tns="http://apache.org/hello_world_soap_http"
-    xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types"
-            xmlns="http://www.w3.org/2001/XMLSchema"
-xmlns:tns="http://apache.org/hello_world_soap_http/types"
-            elementFormDefault="qualified">
-<simpleType name="MyStringType">
-<restriction base="string">
-<maxLength value="30" />
-</restriction>
-</simpleType>
-
-            <element name="sayHi">
-                <complexType/>
-            </element>
-            <element name="sayHiResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="tns:MyStringType"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeOneWay">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="pingMe">
-                <complexType/>
-            </element>
-            <element name="pingMeResponse">
-                <complexType/>
-            </element>
-            <element name="faultDetail">
-                <complexType>
-                    <sequence>
-                        <element name="minor" type="short"/>
-                        <element name="major" type="short"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiRequest">
-        <wsdl:part element="x1:sayHi" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="x1:sayHiResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeOneWayRequest">
-        <wsdl:part element="x1:greetMeOneWay" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeRequest">
-        <wsdl:part name="in" element="x1:pingMe"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeResponse">
-        <wsdl:part name="out" element="x1:pingMeResponse"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeFault">
-        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:portType name="Ping">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
-        </wsdl:operation>
-
-
-    </wsdl:portType>
-    
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        
-        
-        <wsdl:operation name="greetMe">
-            <soap:operation soapAction="greetMe" style="document"/>
-            <wsdl:input name="greetMeRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="greetMeResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <soap:operation soapAction="greetMeOneWay" style="document"/>
-            <wsdl:input name="greetMeOneWayRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-        
-    </wsdl:binding>
-    
-    <wsdl:binding name="Ping_SOAPBinding" type="tns:Ping">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="sayHi" style="document"/>
-            <wsdl:input name="sayHiRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <soap:operation soapAction="pingMe" style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="pingMeFault">
-                <soap:fault name="pingMeFault" use="literal"/>
-            </wsdl:fault>
-        </wsdl:operation>
-
-        
-    </wsdl:binding>
-
-    <wsdl:service name="GreeterSOAPService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="GreeterSoapPort">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort/Greeter"/>
-        </wsdl:port>
-        <wsdl:port binding="tns:Ping_SOAPBinding" name="PingSoapPort">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort/Ping"/>
-        </wsdl:port>
-
-    </wsdl:service>
-
+<?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.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/hello_world_soap_http"
+    xmlns:x1="http://apache.org/hello_world_soap_http/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <wsdl:types>
+        <schema targetNamespace="http://apache.org/hello_world_soap_http/types"
+            xmlns="http://www.w3.org/2001/XMLSchema"
+xmlns:tns="http://apache.org/hello_world_soap_http/types"
+            elementFormDefault="qualified">
+<simpleType name="MyStringType">
+<restriction base="string">
+<maxLength value="30" />
+</restriction>
+</simpleType>
+
+            <element name="sayHi">
+                <complexType/>
+            </element>
+            <element name="sayHiResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="tns:MyStringType"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeOneWay">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="pingMe">
+                <complexType/>
+            </element>
+            <element name="pingMeResponse">
+                <complexType/>
+            </element>
+            <element name="faultDetail">
+                <complexType>
+                    <sequence>
+                        <element name="minor" type="short"/>
+                        <element name="major" type="short"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+    <wsdl:message name="sayHiRequest">
+        <wsdl:part element="x1:sayHi" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+        <wsdl:part element="x1:sayHiResponse" name="out"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part element="x1:greetMe" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part element="x1:greetMeResponse" name="out"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeOneWayRequest">
+        <wsdl:part element="x1:greetMeOneWay" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeRequest">
+        <wsdl:part name="in" element="x1:pingMe"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeResponse">
+        <wsdl:part name="out" element="x1:pingMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeFault">
+        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+    </wsdl:message>
+    
+    <wsdl:portType name="Greeter">
+        
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </wsdl:operation>
+        
+        <wsdl:operation name="greetMeOneWay">
+            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:portType name="Ping">
+        <wsdl:operation name="sayHi">
+            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+        </wsdl:operation>
+
+        <wsdl:operation name="pingMe">
+            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+        </wsdl:operation>
+
+
+    </wsdl:portType>
+    
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        
+        
+        <wsdl:operation name="greetMe">
+            <soap:operation soapAction="greetMe" style="document"/>
+            <wsdl:input name="greetMeRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="greetMeResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        
+        <wsdl:operation name="greetMeOneWay">
+            <soap:operation soapAction="greetMeOneWay" style="document"/>
+            <wsdl:input name="greetMeOneWayRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+        </wsdl:operation>
+        
+    </wsdl:binding>
+    
+    <wsdl:binding name="Ping_SOAPBinding" type="tns:Ping">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <wsdl:operation name="sayHi">
+            <soap:operation soapAction="sayHi" style="document"/>
+            <wsdl:input name="sayHiRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="sayHiResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+
+        <wsdl:operation name="pingMe">
+            <soap:operation soapAction="pingMe" style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="pingMeFault">
+                <soap:fault name="pingMeFault" use="literal"/>
+            </wsdl:fault>
+        </wsdl:operation>
+
+        
+    </wsdl:binding>
+
+    <wsdl:service name="GreeterSOAPService">
+        <wsdl:port binding="tns:Greeter_SOAPBinding" name="GreeterSoapPort">
+            <soap:address location="http://localhost:9000/SoapContext/SoapPort/Greeter"/>
+        </wsdl:port>
+        <wsdl:port binding="tns:Ping_SOAPBinding" name="PingSoapPort">
+            <soap:address location="http://localhost:9000/SoapContext/SoapPort/Ping"/>
+        </wsdl:port>
+
+    </wsdl:service>
+
 </wsdl:definitions> 
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl Mon Dec 15 10:14:38 2008
@@ -1,39 +1,39 @@
-<wsdl:definitions name="Child"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:tns="http://child/"
-  xmlns:xsd="http://child/xsd"
-  targetNamespace="http://child/">
-  <wsdl:types>
-    <xs:schema targetNamespace="http://child/xsd">
-      <xs:element name="Message">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="Message">
-    <wsdl:part name="msg" element="xsd:Message"/>
-  </wsdl:message>
-  <wsdl:portType name="PortType">
-    <wsdl:operation name="Operation">
-      <wsdl:input message="tns:Message"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="Binding" type="tns:PortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Operation">
-      <soap:operation style="document"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Service">
-        <wsdl:port name="Port" binding="tns:Binding">
-            <soap:address location="http://localhost/service" />
-        </wsdl:port>
-  </wsdl:service>
+<wsdl:definitions name="Child"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://child/"
+  xmlns:xsd="http://child/xsd"
+  targetNamespace="http://child/">
+  <wsdl:types>
+    <xs:schema targetNamespace="http://child/xsd">
+      <xs:element name="Message">
+        <xs:complexType>
+          <xs:sequence/>
+        </xs:complexType>
+      </xs:element>
+    </xs:schema>
+  </wsdl:types>
+  <wsdl:message name="Message">
+    <wsdl:part name="msg" element="xsd:Message"/>
+  </wsdl:message>
+  <wsdl:portType name="PortType">
+    <wsdl:operation name="Operation">
+      <wsdl:input message="tns:Message"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="Binding" type="tns:PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Operation">
+      <soap:operation style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Service">
+        <wsdl:port name="Port" binding="tns:Binding">
+            <soap:address location="http://localhost/service" />
+        </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl Mon Dec 15 10:14:38 2008
@@ -1,39 +1,39 @@
-<wsdl:definitions name="Child2"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:tns="http://child2/"
-  xmlns:xsd="http://child2/xsd"
-  targetNamespace="http://child2/">
-  <wsdl:types>
-    <xs:schema targetNamespace="http://child2/xsd">
-      <xs:element name="Child2Message">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="Child2Message">
-    <wsdl:part name="msg" element="xsd:Child2Message"/>
-  </wsdl:message>
-  <wsdl:portType name="Child2PortType">
-    <wsdl:operation name="Child2Operation">
-      <wsdl:input message="tns:Child2Message"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="Child2Binding" type="tns:Child2PortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Child2Operation">
-      <soap:operation style="document"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Child2Service">
-        <wsdl:port name="Child2Port" binding="tns:Child2Binding">
-            <soap:address location="http://localhost/service/child2" />
-        </wsdl:port>
-  </wsdl:service>
+<wsdl:definitions name="Child2"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://child2/"
+  xmlns:xsd="http://child2/xsd"
+  targetNamespace="http://child2/">
+  <wsdl:types>
+    <xs:schema targetNamespace="http://child2/xsd">
+      <xs:element name="Child2Message">
+        <xs:complexType>
+          <xs:sequence/>
+        </xs:complexType>
+      </xs:element>
+    </xs:schema>
+  </wsdl:types>
+  <wsdl:message name="Child2Message">
+    <wsdl:part name="msg" element="xsd:Child2Message"/>
+  </wsdl:message>
+  <wsdl:portType name="Child2PortType">
+    <wsdl:operation name="Child2Operation">
+      <wsdl:input message="tns:Child2Message"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="Child2Binding" type="tns:Child2PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Child2Operation">
+      <soap:operation style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Child2Service">
+        <wsdl:port name="Child2Port" binding="tns:Child2Binding">
+            <soap:address location="http://localhost/service/child2" />
+        </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl Mon Dec 15 10:14:38 2008
@@ -1,4 +1,4 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
-    <wsdl:import namespace="http://child/" location="child.wsdl" />
-    <wsdl:import namespace="http://child2/" location="child2.wsdl" />
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
+    <wsdl:import namespace="http://child/" location="child.wsdl" />
+    <wsdl:import namespace="http://child2/" location="child2.wsdl" />
 </wsdl:definitions>
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl Mon Dec 15 10:14:38 2008
@@ -1,3 +1,3 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
-    <wsdl:import namespace="http://child/" location="child.wsdl" />
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
+    <wsdl:import namespace="http://child/" location="child.wsdl" />
 </wsdl:definitions>
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl Mon Dec 15 10:14:38 2008
@@ -1,39 +1,39 @@
-<wsdl:definitions name="Child"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:tns="http://child/"
-  xmlns:xsd="http://child/xsd"
-  targetNamespace="http://child/">
-  <wsdl:types>
-    <xs:schema targetNamespace="http://child/xsd">
-      <xs:element name="Message">
-        <xs:complexType>
-          <xs:sequence/>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="Message">
-    <wsdl:part name="msg" element="xsd:Message"/>
-  </wsdl:message>
-  <wsdl:portType name="PortType">
-    <wsdl:operation name="Operation">
-      <wsdl:input message="tns:Message"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="Binding" type="tns:PortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Operation">
-      <soap:operation style="document"/>
-      <wsdl:input>
-        <soap:body use="literal"/>
-      </wsdl:input>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Service">
-        <wsdl:port name="Port" binding="tns:Binding">
-            <soap:address location="http://localhost/service" />
-        </wsdl:port>
-  </wsdl:service>
+<wsdl:definitions name="Child"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://child/"
+  xmlns:xsd="http://child/xsd"
+  targetNamespace="http://child/">
+  <wsdl:types>
+    <xs:schema targetNamespace="http://child/xsd">
+      <xs:element name="Message">
+        <xs:complexType>
+          <xs:sequence/>
+        </xs:complexType>
+      </xs:element>
+    </xs:schema>
+  </wsdl:types>
+  <wsdl:message name="Message">
+    <wsdl:part name="msg" element="xsd:Message"/>
+  </wsdl:message>
+  <wsdl:portType name="PortType">
+    <wsdl:operation name="Operation">
+      <wsdl:input message="tns:Message"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="Binding" type="tns:PortType">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="Operation">
+      <soap:operation style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Service">
+        <wsdl:port name="Port" binding="tns:Binding">
+            <soap:address location="http://localhost/service" />
+        </wsdl:port>
+  </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl Mon Dec 15 10:14:38 2008
@@ -1,3 +1,3 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
-    <wsdl:import namespace="http://incorrect-namespace" location="child.wsdl" />
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Parent">
+    <wsdl:import namespace="http://incorrect-namespace" location="child.wsdl" />
 </wsdl:definitions>
\ No newline at end of file

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl (original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl Mon Dec 15 10:14:38 2008
@@ -1,72 +1,72 @@
-<?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.
--->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://cxf.apache.org/xmlbeans/wsdltest" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://cxf.apache.org/xmlbeans/wsdltest"
-    xmlns:x1="http://cxf.apache.org/xmlbeans/wsdltest"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-    <wsdl:types>        
-        <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	        targetNamespace="http://cxf.apache.org/xmlbeans/wsdltest"
-	        xmlns:x1="http://cxf.apache.org/xmlbeans/wsdltest"
-	        elementFormDefault="qualified">
-	
-	        <complexType name="StringListType">
-	                <all>
-	                        <element minOccurs="1" maxOccurs="1" name="myname" type="string" />
-	                        <element minOccurs="1" maxOccurs="1" name="myaddress" type="string" />
-	                </all>
-	        </complexType>
-	
-	        <element name="sayHi2Message" type="x1:StringListType" />
-	
-        </schema> 
-    </wsdl:types>
-
-  <wsdl:message name="sayHiRequest2">
-    <wsdl:part element="x1:sayHi2Message" name="in"/>
-  </wsdl:message> 
-    
-    <wsdl:portType name="GreeterMine">
-        <wsdl:operation name="sayHi2">
-             <wsdl:input message="tns:sayHiRequest2" name="sayHiRequest2"/>
-        </wsdl:operation>
-        
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:GreeterMine">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="sayHi2">
-            <soap:operation soapAction="sayHi2" style="document"/>
-            <wsdl:input name="sayHiRequest2">
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>        
-    </wsdl:binding>
-    <wsdl:service name="SOAPMineService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
-
+<?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.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://cxf.apache.org/xmlbeans/wsdltest" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://cxf.apache.org/xmlbeans/wsdltest"
+    xmlns:x1="http://cxf.apache.org/xmlbeans/wsdltest"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+
+    <wsdl:types>        
+        <schema xmlns="http://www.w3.org/2001/XMLSchema"
+	        targetNamespace="http://cxf.apache.org/xmlbeans/wsdltest"
+	        xmlns:x1="http://cxf.apache.org/xmlbeans/wsdltest"
+	        elementFormDefault="qualified">
+	
+	        <complexType name="StringListType">
+	                <all>
+	                        <element minOccurs="1" maxOccurs="1" name="myname" type="string" />
+	                        <element minOccurs="1" maxOccurs="1" name="myaddress" type="string" />
+	                </all>
+	        </complexType>
+	
+	        <element name="sayHi2Message" type="x1:StringListType" />
+	
+        </schema> 
+    </wsdl:types>
+
+  <wsdl:message name="sayHiRequest2">
+    <wsdl:part element="x1:sayHi2Message" name="in"/>
+  </wsdl:message> 
+    
+    <wsdl:portType name="GreeterMine">
+        <wsdl:operation name="sayHi2">
+             <wsdl:input message="tns:sayHiRequest2" name="sayHiRequest2"/>
+        </wsdl:operation>
+        
+    </wsdl:portType>
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:GreeterMine">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="sayHi2">
+            <soap:operation soapAction="sayHi2" style="document"/>
+            <wsdl:input name="sayHiRequest2">
+                <soap:body use="literal"/>
+            </wsdl:input>
+        </wsdl:operation>        
+    </wsdl:binding>
+    <wsdl:service name="SOAPMineService">
+        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
+

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message