You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/23 20:13:48 UTC
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/
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();
+
}
}