Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 28373 invoked from network); 18 Feb 2011 10:49:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2011 10:49:22 -0000 Received: (qmail 9868 invoked by uid 500); 18 Feb 2011 10:49:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9752 invoked by uid 500); 18 Feb 2011 10:49:19 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 9742 invoked by uid 99); 18 Feb 2011 10:49:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 10:49:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 10:49:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3C4E923889D7; Fri, 18 Feb 2011 10:48:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Fri, 18 Feb 2011 10:48:55 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110218104855.3C4E923889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;