cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1241973 - in /cxf/branches/2.5.x-fixes: ./ rt/rs/security/oauth-parent/ rt/rs/security/oauth-parent/oauth-test/ systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/
Date Wed, 08 Feb 2012 16:56:11 GMT
Author: sergeyb
Date: Wed Feb  8 16:56:10 2012
New Revision: 1241973

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

........
  r1236720 | sergeyb | 2012-01-27 15:40:22 +0000 (Fri, 27 Jan 2012) | 1 line
  
  Removing redundant oauth-test module
........

Added:
    cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
      - copied unchanged from r1236720, cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/MemoryOAuthDataProvider.java
    cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java
      - copied unchanged from r1236720, cxf/trunk/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/OAuthTestUtils.java
Removed:
    cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/
Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/pom.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  8 16:56:10 2012
@@ -1 +1 @@
-/cxf/trunk:1241934
+/cxf/trunk:1236720,1241934

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/rs/security/oauth-parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/pom.xml?rev=1241973&r1=1241972&r2=1241973&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/pom.xml Wed Feb  8 16:56:10 2012
@@ -40,7 +40,6 @@
 
     <modules>
         <module>oauth</module>
-        <module>oauth-test</module> 
     </modules>
 
 </project>



Mime
View raw message