svn commit: r1071957 - in /cxf/branches/2.3.x-fixes: ./ distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/

[coheigea]

Author: coheigea
Date: Fri Feb 18 10:48:54 2011
New Revision: 1071957

URL: http://svn.apache.org/viewvc?rev=1071957&view=rev
Log:
[CXF-3347] - Merged to 2.3.x-fixes.

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
    
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 18 10:48:54 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558,1070778,1071743
+/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814,1070034,1070430,1070471,1070558,1070778,1071743,1071946

Modified: 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java?rev=1071957&r1=1071956&r2=1071957&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
 Fri Feb 18 10:48:54 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package demos.wssec.common;
+package demo.wssec.common;
 
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;

Modified: 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java?rev=1071957&r1=1071956&r2=1071957&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/demo/wssec/common/ConciseFormatter.java
 Fri Feb 18 10:48:54 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package demos.wssec.common;
+package demo.wssec.common;
 
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;