Author: sergeyb
Date: Tue Mar 13 17:09:49 2012
New Revision: 1300240
URL: http://svn.apache.org/viewvc?rev=1300240&view=rev
Log:
Merged revisions 1236902 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1236902 | sergeyb | 2012-01-27 21:49:40 +0000 (Fri, 27 Jan 2012) | 1 line
Moving the cors code to the new rs/security/cors module
........
Added:
cxf/branches/2.5.x-fixes/rt/rs/security/cors/
- copied from r1236902, cxf/trunk/rt/rs/security/cors/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/pom.xml
- copied, changed from r1236902, cxf/trunk/rt/rs/security/cors/pom.xml
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/
- copied from r1236902, cxf/trunk/rt/rs/security/cors/src/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/
- copied from r1236902, cxf/trunk/rt/rs/security/cors/src/main/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/
- copied from r1236902, cxf/trunk/rt/rs/security/cors/src/main/java/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/
- copied from r1236902, cxf/trunk/rt/rs/security/cors/src/main/java/org/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/
- copied from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/
- copied from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/
- copied from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/
- copied from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/
- copied from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java
- copied unchanged from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CorsHeaderConstants.java
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java
- copied unchanged from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharing.java
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
- copied unchanged from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
cxf/branches/2.5.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/package.html
- copied unchanged from r1236902,
cxf/trunk/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/package.html
Removed:
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/rs/security/cors/
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/pom.xml
cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 13 17:09:49 2012
@@ -1 +1 @@
-/cxf/trunk:1297296,1298601-1298624,1298830,1299635,1299682,1299707
+/cxf/trunk:1236902,1297296,1298601-1298624,1298830,1299635,1299682,1299707
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/pom.xml?rev=1300240&r1=1300239&r2=1300240&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/pom.xml Tue Mar 13 17:09:49 2012
@@ -56,6 +56,7 @@
<module>ws/mex</module>
<module>rs/security/xml</module>
<module>rs/security/oauth-parent</module>
+ <module>rs/security/cors</module>
<module>management</module>
<module>management-web</module>
<module>javascript</module>
Copied: cxf/branches/2.5.x-fixes/rt/rs/security/cors/pom.xml (from r1236902,
cxf/trunk/rt/rs/security/cors/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/cors/pom.xml?p2=cxf/branches/2.5.x-fixes/rt/rs/security/cors/pom.xml&p1=cxf/trunk/rt/rs/security/cors/pom.xml&r1=1236902&r2=1300240&rev=1300240&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/cors/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/cors/pom.xml Tue Mar 13 17:09:49
2012
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<packaging>jar</packaging>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.5.3-SNAPSHOT</version>
<name>Apache CXF RS Cross-Origin Resource Sharing</name>
<description>Apache CXF RS XML Security</description>
<url>http://cxf.apache.org</url>
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml?rev=1300240&r1=1300239&r2=1300240&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/pom.xml Tue Mar 13 17:09:49 2012
@@ -187,6 +187,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
