cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1209094 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/jax_rs/spring_security/ distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/ distribution/src/main/release/samples/ja...
Date Thu, 01 Dec 2011 14:09:11 GMT
Author: gmazza
Date: Thu Dec  1 14:09:10 2011
New Revision: 1209094

URL: http://svn.apache.org/viewvc?rev=1209094&view=rev
Log:
Merged revisions 1209091 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1209091 | gmazza | 2011-12-01 09:04:55 -0500 (Thu, 01 Dec 2011) | 1 line
  
  Better Mavenized the spring_security sample.
........

Added:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/resources/
      - copied from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/resources/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/resources/add_customer.xml
      - copied unchanged from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/resources/add_customer.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/resources/update_customer.xml
      - copied unchanged from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/resources/update_customer.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/
      - copied from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/
      - copied from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
      - copied unchanged from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r1209091, cxf/trunk/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/web.xml
Removed:
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/log4j.properties
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/add_customer.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/update_customer.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/webapp/
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
    cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml?rev=1209094&r1=1209093&r2=1209094&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
Thu Dec  1 14:09:10 2011
@@ -20,10 +20,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
-    <name>JAX-RS Spring Security Demo</name>
-    <description>JAX-RS Spring Security Demo</description>
     <artifactId>jax_rs_spring_security</artifactId>
     <version>2.4.5-SNAPSHOT</version>
+    <name>JAX-RS Spring Security Demo</name>
+    <description>JAX-RS Spring Security Demo</description>
+    <packaging>war</packaging>
 
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
@@ -36,33 +37,7 @@
         <aspectj.version>1.5.4</aspectj.version>
     </properties>
     <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copyxmlfiles</id>
-                        <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/src/main/java/demo/jaxrs/client/add_customer.xml"
todir="${basedir}/target/classes/demo/jaxrs/client" />
-	    	               <copy file="${basedir}/src/main/java/demo/jaxrs/client/update_customer.xml"
todir="${basedir}/target/classes/demo/jaxrs/client" />
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-	    	</executions>
-            </plugin>
-        </plugins>
+        <finalName>JAXRSSpringSecurity</finalName>
     </build>   
     <profiles>
         <profile>

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java?rev=1209094&r1=1209093&r2=1209094&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
Thu Dec  1 14:09:10 2011
@@ -83,7 +83,7 @@ public final class Client {
         PostMethod post = new PostMethod("http://localhost:9002/customerservice/customers");
         setMethodHeaders(post, name, password);
         RequestEntity entity = new InputStreamRequestEntity(
-            this.getClass().getResourceAsStream("add_customer.xml"));
+            this.getClass().getClassLoader().getResourceAsStream("add_customer.xml"));
         post.setRequestEntity(entity);
         
         handleHttpMethod(post);
@@ -96,7 +96,7 @@ public final class Client {
         PutMethod put = new PutMethod("http://localhost:9002/customerservice/customers/123");
         setMethodHeaders(put, name, password);
         RequestEntity entity = new InputStreamRequestEntity(
-            this.getClass().getResourceAsStream("update_customer.xml"));
+            this.getClass().getClassLoader().getResourceAsStream("update_customer.xml"));
         put.setRequestEntity(entity);
         
         handleHttpMethod(put);

Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java?rev=1209094&r1=1209093&r2=1209094&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
(original)
+++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
Thu Dec  1 14:09:10 2011
@@ -46,7 +46,7 @@ public class Server {
         WebAppContext webappcontext = new WebAppContext();
         webappcontext.setContextPath("/");
 
-        webappcontext.setWar("webapp");
+        webappcontext.setWar("target/JAXRSSpringSecurity.war");
 
         HandlerCollection handlers = new HandlerCollection();
         handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()});



Mime
View raw message