Author: sergeyb
Date: Fri Jan 27 17:17:43 2012
New Revision: 1236769
URL: http://svn.apache.org/viewvc?rev=1236769&view=rev
Log:
Moving the cors code to rs/security/cors subpackage before moving it to the new
module
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java
- copied, changed from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CorsHeaderConstants.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java
- copied, changed from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharing.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
- copied, changed from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/package.html
- copied unchanged from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/package.html
Removed:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/ConfigServer.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
Copied:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java
(from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CorsHeaderConstants.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java?p2=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java&p1=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CorsHeaderConstants.java&r1=1236688&r2=1236769&rev=1236769&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CorsHeaderConstants.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java
Fri Jan 27 17:17:43 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxrs.cors;
+package org.apache.cxf.rs.security.cors;
/**
* Headers used to implement http://www.w3.org/TR/cors/.
Copied:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java
(from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharing.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java?p2=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java&p1=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharing.java&r1=1236688&r2=1236769&rev=1236769&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharing.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java
Fri Jan 27 17:17:43 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxrs.cors;
+package org.apache.cxf.rs.security.cors;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
Copied:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
(from r1236688,
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java?p2=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java&p1=cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java&r1=1236688&r2=1236769&rev=1236769&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
Fri Jan 27 17:17:43 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.jaxrs.cors;
+package org.apache.cxf.rs.security.cors;
import java.lang.reflect.Method;
import java.util.ArrayList;
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java?rev=1236769&r1=1236768&r2=1236769&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/AnnotatedCorsServer.java
Fri Jan 27 17:17:43 2012
@@ -32,8 +32,8 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.cors.CorsHeaderConstants;
-import org.apache.cxf.jaxrs.cors.CrossOriginResourceSharing;
+import org.apache.cxf.rs.security.cors.CorsHeaderConstants;
+import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
/**
* Service bean with no class-level annotation for cross-script control.
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/ConfigServer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/ConfigServer.java?rev=1236769&r1=1236768&r2=1236769&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/ConfigServer.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/ConfigServer.java
Fri Jan 27 17:17:43 2012
@@ -27,7 +27,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import org.apache.cxf.jaxrs.cors.CrossOriginResourceSharingFilter;
+import org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter;
/**
*
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java?rev=1236769&r1=1236768&r2=1236769&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
Fri Jan 27 17:17:43 2012
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.jaxrs.cors.CorsHeaderConstants;
+import org.apache.cxf.rs.security.cors.CorsHeaderConstants;
import org.apache.cxf.systest.jaxrs.AbstractSpringServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.http.Header;
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java?rev=1236769&r1=1236768&r2=1236769&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
Fri Jan 27 17:17:43 2012
@@ -28,7 +28,7 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.cors.CrossOriginResourceSharing;
+import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
/**
* Service bean with no class-level annotation for cross-script control.
Modified:
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml?rev=1236769&r1=1236768&r2=1236769&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
(original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
Fri Jan 27 17:17:43 2012
@@ -21,7 +21,7 @@ http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd";>
<import resource="classpath:/META-INF/cxf/cxf.xml" />
- <bean id="cors-filter"
class="org.apache.cxf.jaxrs.cors.CrossOriginResourceSharingFilter">
+ <bean id="cors-filter"
class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter">
<property name="allowAllOrigins" value="true" />
</bean>
