cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1040387 - in /cxf/trunk: distribution/ distribution/src/main/release/samples/groovy_spring_support/ distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/ distribution/src/main/release/samples/js_browser_clien...
Date Tue, 30 Nov 2010 02:34:26 GMT
Author: dkulp
Date: Tue Nov 30 02:34:25 2010
New Revision: 1040387

URL: http://svn.apache.org/viewvc?rev=1040387&view=rev
Log:
[CXF-3099] Fix the samples that were not updated to Jetty 7
Update versions of groovy and ruby that are used in the samples

Modified:
    cxf/trunk/distribution/pom.xml
    cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml
    cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
    cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/build.xml
    cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/servlet/Server.java
    cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/negativefilters.properties

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Tue Nov 30 02:34:25 2010
@@ -386,6 +386,30 @@
                                     <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
+                                    <groupId>org.eclipse.jetty</groupId>
+                                    <artifactId>jetty-webapp</artifactId>
+                                    <version>${cxf.jetty.version}</version>
+                                    <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.jetty</groupId>
+                                    <artifactId>jetty-servlet</artifactId>
+                                    <version>${cxf.jetty.version}</version>
+                                    <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.jetty</groupId>
+                                    <artifactId>jetty-security</artifactId>
+                                    <version>${cxf.jetty.version}</version>
+                                    <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.eclipse.jetty</groupId>
+                                    <artifactId>jetty-xml</artifactId>
+                                    <version>${cxf.jetty.version}</version>
+                                    <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
                                     <groupId>junit</groupId>
                                     <artifactId>junit</artifactId>
                                     <version>4.4</version>

Modified: cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/build.xml Tue Nov
30 02:34:25 2010
@@ -21,19 +21,18 @@
 
     <property name="maven.repo" value="http://repo1.maven.org/maven2"/>
     <property name="spring.version" value="2.0.6"/>
-    <property name="groovy.version" value="1.0"/>
+    <property name="groovy.version" value="1.7.5"/>
     
     <property name="spring-aop.jar" value="spring-aop-${spring.version}.jar"/>
     <property name="spring-support.jar" value="spring-support-${spring.version}.jar"/>
     <property name="spring-repo" value="${maven.repo}/org/springframework"/>
 
-    <property name="groovy-core.jar" value="groovy-${groovy.version}.jar" />
+    <property name="groovy.jar" value="groovy-${groovy.version}.jar" />
     <property name="antlr.jar" value="antlr-2.7.6.jar" />
-    <property name="asm.jar" value="asm-2.2.3.jar" />
-    <property name="groovy-repo" value="${maven.repo}/groovy/groovy/1.0"/>
+    <property name="groovy-repo" value="${maven.repo}/org/codehaus/groovy/groovy/${groovy.version}"/>
 
     <property name="thirdparty.classpath" 
-	      value="../../lib/${spring-aop.jar}${path.separator}../../lib/${spring-support.jar}${path.separator}lib/${groovy-core.jar}${path.separator}lib/${antlr.jar}${path.separator}lib/${asm.jar}"/>
+	      value="../../lib/${spring-aop.jar}${path.separator}../../lib/${spring-support.jar}${path.separator}lib/${groovy.jar}${path.separator}lib/${antlr.jar}"/>
 
     <import file="../common_build.xml"/>
 
@@ -42,9 +41,8 @@
 	<get src="${spring-repo}/spring-support/${spring.version}/${spring-support.jar}" dest="${cxf.home}/lib/${spring-support.jar}"
usetimestamp="true"/>
 
 	<mkdir dir="lib"/>
-	<get src="${groovy-repo}/${groovy-core.jar}" dest="lib/${groovy-core.jar}" usetimestamp="true"/>
+	<get src="${groovy-repo}/${groovy.jar}" dest="lib/${groovy.jar}" usetimestamp="true"/>
 	<get src="${maven.repo}/antlr/antlr/2.7.6/${antlr.jar}" dest="lib/${antlr.jar}" usetimestamp="true"/>
-	<get src="${maven.repo}/asm/asm/2.2.3/${asm.jar}" dest="lib/${asm.jar}" usetimestamp="true"/>
     </target>
 
     <target name="client" description="run demo client" depends="build">

Modified: cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/groovy_spring_support/src/demo/spring/servlet/Server.java
Tue Nov 30 02:34:25 2010
@@ -18,12 +18,12 @@
  */
 package demo.spring.servlet;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 public class Server {
 
@@ -37,7 +37,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.mortbay.jetty.Server server = new org.mortbay.jetty.Server();
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(9002);

Modified: cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/js_browser_client_java_first/cxf.xml Tue
Nov 30 02:34:25 2010
@@ -34,14 +34,14 @@ http://cxf.apache.org/transports/http-je
 		<httpj:engine port="9000">
 			<httpj:handlers>
 				<bean
-					class="org.mortbay.jetty.handler.ContextHandler">
+					class="org.eclipse.jetty.server.handler.ContextHandler">
 					<property name="contextPath" value="/" />
 					<property name="handler">
 						<bean
-							class="org.mortbay.jetty.handler.ResourceHandler">
+							class="org.eclipse.jetty.server.handler.ResourceHandler">
 							<property name="baseResource">
 								<bean
-									class="org.mortbay.resource.FileResource">
+									class="org.eclipse.jetty.util.resource.FileResource">
 									<constructor-arg
 										value="file:staticContent" />
 								</bean>
@@ -49,7 +49,7 @@ http://cxf.apache.org/transports/http-je
 						</bean>
 					</property>
 				</bean>
-				<bean class="org.mortbay.jetty.handler.DefaultHandler" />
+				<bean class="org.eclipse.jetty.server.handler.DefaultHandler" />
 			</httpj:handlers>
 		</httpj:engine>
 	</httpj:engine-factory>

Modified: cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/js_browser_client_simple/cxf.xml Tue Nov
30 02:34:25 2010
@@ -34,19 +34,19 @@ http://cxf.apache.org/transports/http-je
  <!-- The server runs on port 9000 -->
  <httpj:engine port="9000">
   <httpj:handlers>
-    <bean class="org.mortbay.jetty.handler.ContextHandler">
+    <bean class="org.eclipse.jetty.server.handler.ContextHandler">
      <property name="contextPath" value="/" />
      <property name="handler">
-      <bean class="org.mortbay.jetty.handler.ResourceHandler">
+      <bean class="org.eclipse.jetty.server.handler.ResourceHandler">
        <property name="baseResource">
-        <bean class="org.mortbay.resource.FileResource">
+        <bean class="org.eclipse.jetty.util.resource.FileResource">
          <constructor-arg value="file:staticContent" />
         </bean>
         </property>
       </bean>
      </property>
     </bean>
-    <bean class="org.mortbay.jetty.handler.DefaultHandler"/>
+    <bean class="org.eclipse.jetty.server.handler.DefaultHandler"/>
   </httpj:handlers>
  </httpj:engine>
 </httpj:engine-factory>

Modified: cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/build.xml?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/build.xml Tue Nov
30 02:34:25 2010
@@ -20,26 +20,19 @@
 <project name="Spring HTTP Servlet demo" default="build" basedir=".">
 
     <property name="maven.repo" value="http://repo1.maven.org/maven2"/>
-    <property name="spring.version" value="2.0.6"/>
-    
-    <property name="spring-aop.jar" value="spring-aop-${spring.version}.jar"/>
-    <property name="spring-support.jar" value="spring-support-${spring.version}.jar"/>
-    <property name="spring-repo" value="${maven.repo}/org/springframework"/>
 
-    <property name="jruby.jar" value="jruby-0.9.8.jar"/>
+    <property name="jruby.jar" value="jruby-1.5.5.jar"/>
     <property name="cglib.jar" value="cglib-nodep-2.1_3.jar"/>
 
     <property name="thirdparty.classpath" 
-	      value="../../lib/${spring-aop.jar}${path.separator}../../lib/${spring-support.jar}${path.separator}lib/${jruby.jar}${path.separator}lib/${cglib.jar}"/>
+	      value="${path.separator}lib/${jruby.jar}${path.separator}lib/${cglib.jar}"/>
 
     <import file="../common_build.xml"/>
 
     <target name="get.dep" description="Get the thirdpaty jars">
-	<get src="${spring-repo}/spring-aop/${spring.version}/${spring-aop.jar}" dest="${cxf.home}/lib/${spring-aop.jar}"
usetimestamp="true"/>
-	<get src="${spring-repo}/spring-support/${spring.version}/${spring-support.jar}" dest="${cxf.home}/lib/${spring-support.jar}"
usetimestamp="true"/>
 
 	<mkdir dir="lib"/>
-	<get src="${maven.repo}/jruby/jruby/0.9.8/${jruby.jar}" dest="lib/${jruby.jar}" usetimestamp="true"/>
+	<get src="${maven.repo}/org/jruby/jruby/1.5.5/${jruby.jar}" dest="lib/${jruby.jar}" usetimestamp="true"/>
 	<get src="${maven.repo}/cglib/cglib-nodep/2.1_3/${cglib.jar}" dest="lib/${cglib.jar}"
usetimestamp="true"/>
     </target>
 

Modified: cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/servlet/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/servlet/Server.java?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/servlet/Server.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ruby_spring_support/src/demo/spring/servlet/Server.java
Tue Nov 30 02:34:25 2010
@@ -18,12 +18,12 @@
  */
 package demo.spring.servlet;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 public class Server {
 
@@ -37,7 +37,7 @@ public class Server {
          * as a convenience so you do not need to configure your servlet
          * container to see CXF in action!
          */
-        org.mortbay.jetty.Server server = new org.mortbay.jetty.Server();
+        org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(9002);

Modified: cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/negativefilters.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/negativefilters.properties?rev=1040387&r1=1040386&r2=1040387&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/negativefilters.properties
(original)
+++ cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/negativefilters.properties
Tue Nov 30 02:34:25 2010
@@ -37,6 +37,7 @@ org.apache.commons.collections.*
 org.apache.velocity*
 org.apache.webdav.lib*
 org.mortbay.*
+org.eclipse.jetty.*
 org.springframework.*
 org.apache.ws.commons.*
 org.apache.cxf.jca.dummy.Dummy



Mime
View raw message