cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1079488 - in /cxf/trunk/distribution/src/main/release/samples: groovy_spring_support/webapp/WEB-INF/ java_first_spring_support/webapp/WEB-INF/ jax_rs/spring_security/webapp/WEB-INF/ ruby_spring_support/webapp/WEB-INF/ ws_rm/wsdl/
Date Tue, 08 Mar 2011 19:07:44 GMT
Author: dkulp
Date: Tue Mar  8 19:07:44 2011
New Revision: 1079488

URL: http://svn.apache.org/viewvc?rev=1079488&view=rev
Log:
Update samples to not import the deprecated imports

Modified:
    cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
    cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml
    cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/beans.xml
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/beans-ruby.xml
    cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/cxf-servlet.xml

Modified: cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml?rev=1079488&r1=1079487&r2=1079488&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/webapp/WEB-INF/beans-groovy.xml
Tue Mar  8 19:07:44 2011
@@ -28,7 +28,6 @@ http://www.springframework.org/schema/la
 http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
 
 	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
 	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
 <lang:groovy id="helloworld" script-source="classpath:demo/spring/HelloWorld.groovy" scope="prototype">

Modified: cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml?rev=1079488&r1=1079487&r2=1079488&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/java_first_spring_support/webapp/WEB-INF/beans.xml
Tue Mar  8 19:07:44 2011
@@ -26,7 +26,6 @@ http://www.springframework.org/schema/be
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
 	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
 	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
 	<jaxws:endpoint 

Modified: cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/beans.xml?rev=1079488&r1=1079487&r2=1079488&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/beans.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/webapp/WEB-INF/beans.xml
Tue Mar  8 19:07:44 2011
@@ -33,7 +33,6 @@ 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="/">

Modified: cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/beans-ruby.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/beans-ruby.xml?rev=1079488&r1=1079487&r2=1079488&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/beans-ruby.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/webapp/WEB-INF/beans-ruby.xml
Tue Mar  8 19:07:44 2011
@@ -1,45 +1,45 @@
 <?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.
+  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"
-	xmlns:lang="http://www.springframework.org/schema/lang"
-	xsi:schemaLocation="
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:simple="http://cxf.apache.org/simple"
+  xmlns:lang="http://www.springframework.org/schema/lang"
+  xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
 http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd">
 
-	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+    <import resource="classpath:META-INF/cxf/cxf.xml" />
+    <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
-<lang:jruby id="helloworldImpl" script-source="classpath:demo/spring/HelloWorldImpl.rb"
script-interfaces="demo.spring.HelloWorld" scope="prototype">
-</lang:jruby>
+    <lang:jruby id="helloworldImpl" script-source="classpath:demo/spring/HelloWorldImpl.rb"
script-interfaces="demo.spring.HelloWorld" scope="prototype">
+    </lang:jruby>
 
-  <simple:server id="pojoservice"  serviceClass="demo.spring.HelloWorld"  address="/HelloWorld">
+    <simple:server id="pojoservice"  serviceClass="demo.spring.HelloWorld"  address="/HelloWorld">
 
-  	<simple:serviceBean>
-  		<ref bean="helloworldImpl" />
-  	</simple:serviceBean>
-  </simple:server>
+        <simple:serviceBean>
+            <ref bean="helloworldImpl" />
+        </simple:serviceBean>
+    </simple:server>
   
+
 </beans>
 <!-- END SNIPPET: beans -->

Modified: cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/cxf-servlet.xml?rev=1079488&r1=1079487&r2=1079488&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/cxf-servlet.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/cxf-servlet.xml Tue Mar  8
19:07:44 2011
@@ -33,13 +33,6 @@
           http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
           http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
-    <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-jaxws.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-policy.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-addr.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-extension-rm.xml" />
-    <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
-
 	<jaxws:endpoint id="helloWorldRM"
 	                implementor="demo.ws_rm.server.GreeterImpl"
                         wsdlLocation="WEB-INF/wsdl/hello_world_rm.wsdl"



Mime
View raw message