Return-Path: 
 <cxf-commits-return-3375-apmail-incubator-cxf-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org
Received: (qmail 3811 invoked from network); 23 Oct 2007 18:14:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Oct 2007 18:14:48 -0000
Received: (qmail 70955 invoked by uid 500); 23 Oct 2007 18:14:35 -0000
Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org
Received: (qmail 70824 invoked by uid 500); 23 Oct 2007 18:14:35 -0000
Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:cxf-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cxf-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cxf-commits@incubator.apache.org>
List-Id: <cxf-commits.incubator.apache.org>
Reply-To: cxf-dev@incubator.apache.org
Delivered-To: mailing list cxf-commits@incubator.apache.org
Received: (qmail 70815 invoked by uid 99); 23 Oct 2007 18:14:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2007 11:14:35 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Oct 2007 18:14:39 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 124411A9832; Tue, 23 Oct 2007 11:13:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r587583 - in /incubator/cxf/branches/2.0.x-fixes: ./
 distribution/src/main/release/samples/integration/jca/inbound/etc/
 integration/jca/src/main/java/org/apache/cxf/jca/core/logging/
Date: Tue, 23 Oct 2007 18:13:48 -0000
To: cxf-commits@incubator.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071023181349.124411A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Tue Oct 23 11:13:48 2007
New Revision: 587583

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

........
  r587582 | dkulp | 2007-10-23 14:12:20 -0400 (Tue, 23 Oct 2007) | 2 lines
  
  [CXF-1130] Weblogic stuff from Jeff added.
........

Added:
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ra.xml
      - copied unchanged from r587582, incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ra.xml
Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ejb-jar.xml
    incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ejb-jar.xml?rev=587583&r1=587582&r2=587583&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ejb-jar.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/etc/weblogic-ejb-jar.xml Tue Oct 23 11:13:48 2007
@@ -18,11 +18,11 @@
   under the License.
 -->
 
-<jboss-ejb-jar>
+<weblogic-ejb-jar xmlns="http://www.bea.com/ns/weblogic/90">
 
-   <jboss-enterprise-bean>
+   <weblogic-enterprise-bean>
       <ejb-name>GreeterBean</ejb-name>
       <jndi-name>GreeterBean</jndi-name>
-   </jboss-enterprise-bean>
+   </weblogic-enterprise-bean>
 
-</jboss-ejb-jar>
+</weblogic-ejb-jar>

Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java?rev=587583&r1=587582&r2=587583&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java Tue Oct 23 11:13:48 2007
@@ -34,7 +34,7 @@
     public static final String WRITER_HANDLER = "WriterHandler";
     private static String rootLoggerName = "org.apache.cxf";
     private static boolean initComplete;
-    private static Level currentLogLevel = Level.WARNING;;
+    private static Level currentLogLevel = Level.WARNING;
 
     private LoggerHelper() {
         //do nothing here
@@ -57,8 +57,7 @@
                 final WriterHandler handler = new WriterHandler(writer);
                 cxfLogger.addHandler(handler);
             }
-            // log just to the print writer
-            disableConsoleLogging();
+
         }
     }