Author: dkulp
Date: Tue May 29 16:51:42 2012
New Revision: 1343842
URL: http://svn.apache.org/viewvc?rev=1343842&view=rev
Log:
Merged revisions 1343075 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1343075 | sergeyb | 2012-05-27 14:13:04 -0400 (Sun, 27 May 2012) | 1 line
Including OAuth10 client/server demos in the build
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml?rev=1343842&r1=1343841&r2=1343842&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml
(original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/pom.xml Tue
May 29 16:51:42 2012
@@ -94,9 +94,8 @@
<module>corba/bank_ws_addressing</module>
<module>corba/hello_world</module>
- <!--module>jax_rs/minimal_osgi</module>
<module>oauth/server</module>
- <module>oauth/client</module-->
+ <module>oauth/client</module>
<!--
these are a bit fragile as they need to go off to external sites to
get stuff like
