Dan, thanks for backporting this commit ! On 9/18/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > > Author: dkulp > Date: Tue Sep 18 13:10:24 2007 > New Revision: 577037 > > URL: http://svn.apache.org/viewvc?rev=577037&view=rev > Log: > Update release_notes > > Merged revisions 577017-577021 via svnmerge from > https://svn.apache.org/repos/asf/incubator/cxf/trunk > > ........ > r577017 | dkulp | 2007-09-18 15:02:48 -0400 (Tue, 18 Sep 2007) | 2 lines > > [CXF-985] check for jdk 1.6 as well > ........ > r577021 | gnodet | 2007-09-18 15:28:06 -0400 (Tue, 18 Sep 2007) | 1 line > > CXF-1033: Allow other logging framework to be used instead of > java.util.logging > ........ > > Added: > incubator/cxf/tags/cxf-2.0.2-incubator/common/common/src/main/java > /org/apache/cxf/common/logging/AbstractDelegatingLogger.java > - copied unchanged from r577021, incubator/cxf/trunk/common > /common/src/main/java/org/apache/cxf/common/logging > /AbstractDelegatingLogger.java > incubator/cxf/tags/cxf-2.0.2-incubator/common/common/src/main/java > /org/apache/cxf/common/logging/Log4jLogger.java > - copied unchanged from r577021, incubator/cxf/trunk/common > /common/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java > Modified: > incubator/cxf/tags/cxf-2.0.2-incubator/ (props changed) > incubator/cxf/tags/cxf-2.0.2-incubator/common/common/pom.xml > incubator/cxf/tags/cxf-2.0.2-incubator/common/common/src/main/java > /org/apache/cxf/common/logging/LogUtils.java > incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release > /release_notes.txt > incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release > /samples/common_build.xml > > Propchange: incubator/cxf/tags/cxf-2.0.2-incubator/ > ------------------------------------------------------------ > ------------------ > --- svnmerge-integrated (original) > +++ svnmerge-integrated Tue Sep 18 13:10:24 2007 > @@ -1 +1 @@ > -/incubator/cxf/trunk:1-573640,573667-574161,574163-574834 > ,574836-575221,575223-575253,575255-576516,576536-576598 > ,576672,576674-576710,576712-576775,576777-576788,576790 > -576791,576793-576831,576833-577003 > +/incubator/cxf/trunk:1-573640,573667-574161,574163-574834 > ,574836-575221,575223-575253,575255-576516,576536-576598 > ,576672,576674-576710,576712-576775,576777-576788,576790 > -576791,576793-576831,576833-577003,577017-577021 > > Modified: incubator/cxf/tags/cxf-2.0.2-incubator/common/common/pom.xml > URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2 > -incubator/common/common/pom.xml?rev=577037&r1=577036&r2=577037&view=diff > ============================================================ > ================== > --- incubator/cxf/tags/cxf-2.0.2-incubator/common/common/pom.xml > (original) > +++ incubator/cxf/tags/cxf-2.0.2-incubator/common/common/pom.xml Tue Sep > 18 13:10:24 2007 > @@ -113,6 +113,13 @@ > </dependency> > > <dependency> > + <groupId>log4j</groupId> > + <artifactId>log4j</artifactId> > + <version>1.2.14</version> > + <optional>true</optional> > + </dependency> > + > + <dependency> > <groupId>org.codehaus.woodstox</groupId> > <artifactId>wstx-asl</artifactId> > <scope>test</scope> > > Modified: incubator/cxf/tags/cxf-2.0.2-incubator > /common/common/src/main/java/org/apache/cxf/common/logging/LogUtils.java > URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2 > -incubator/common/common/src/main/java/org/apache/cxf > /common/logging/LogUtils.java?rev=577037&r1=577036&r2=577037&view=diff > ============================================================ > ================== > --- incubator/cxf/tags/cxf-2.0.2-incubator/common/common/src/main/java > /org/apache/cxf/common/logging/LogUtils.java (original) > +++ incubator/cxf/tags/cxf-2.0.2-incubator/common/common/src/main/java > /org/apache/cxf/common/logging/LogUtils.java Tue Sep 18 13:10:24 2007 > @@ -19,6 +19,7 @@ > > package org.apache.cxf.common.logging; > > +import java.lang.reflect.Constructor; > import java.text.MessageFormat; > import java.util.MissingResourceException; > import java.util.ResourceBundle; > @@ -35,6 +36,8 @@ > public final class LogUtils { > > private static final Object[] NO_PARAMETERS = new Object[0]; > + > + private static Class<?> loggerClass; > > /** > * Prevents instantiation. > @@ -43,17 +46,20 @@ > } > > /** > + * Enable users to use their own logger implementation. > + */ > + public static void setLoggerClass(Class<?> cls) { > + loggerClass = cls; > + } > + > + /** > * Get a Logger with the associated default resource bundle for the > class. > * > * @param cls the Class to contain the Logger > * @return an appropriate Logger > */ > public static Logger getL7dLogger(Class<?> cls) { > - try { > - return Logger.getLogger(cls.getName(), > BundleUtils.getBundleName(cls)); > - } catch (MissingResourceException rex) { > - return Logger.getLogger(cls.getName()); > - } > + return createLogger(cls, null); > } > > /** > @@ -64,7 +70,38 @@ > * @return an appropriate Logger > */ > public static Logger getL7dLogger(Class<?> cls, String name) { > - return Logger.getLogger(cls.getName(), BundleUtils.getBundleName(cls, > name)); > + return createLogger(cls, name); > + } > + > + /** > + * Create a logger > + */ > + protected static Logger createLogger(Class<?> cls, String name) { > + if (loggerClass != null) { > + try { > + Constructor cns = loggerClass.getConstructor(String.class, > String.class); > + if (name == null) { > + try { > + return (Logger) cns.newInstance(cls.getName(), > BundleUtils.getBundleName(cls)); > + } catch (MissingResourceException rex) { > + return (Logger) cns.newInstance(cls.getName(), > null); > + } > + } else { > + return (Logger) cns.newInstance(cls.getName(), > BundleUtils.getBundleName(cls, name)); > + } > + } catch (Exception e) { > + throw new RuntimeException(e); > + } > + } > + if (name == null) { > + try { > + return Logger.getLogger(cls.getName(), > BundleUtils.getBundleName(cls)); > + } catch (MissingResourceException rex) { > + return Logger.getLogger(cls.getName(), null); > + } > + } else { > + return Logger.getLogger(cls.getName(), > BundleUtils.getBundleName(cls, name)); > + } > } > > /** > > Modified: incubator/cxf/tags/cxf-2.0.2-incubator > /distribution/src/main/release/release_notes.txt > URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2 > -incubator/distribution/src/main/release/release_notes > .txt?rev=577037&r1=577036&r2=577037&view=diff > ============================================================ > ================== > --- > incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/release_notes.txt > (original) > +++ > incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/release_notes.txt > Tue Sep 18 13:10:24 2007 > @@ -83,13 +83,8 @@ > Apache CXF 2.0.2 (incubating) release: > > > - > Release Notes - CXF - Version 2.0.2 > > -** Sub-task > - * [CXF-901] - Update "WAR" building for full war > - * [CXF-902] - Add java_first_pojo sample > - > ** Bug > * [CXF-687] - SOAP over HTTP messages have two Content-Type headers > and SOAP action as a separate header > * [CXF-849] - SSLUtils logs too much at INFO level > @@ -98,6 +93,7 @@ > * [CXF-874] - Problems with service beans that use AOP > * [CXF-882] - @Features and @XXInterceptors doesn't work for client > proxies > * [CXF-886] - XSD2WSDL Tool seems to be unable to access remote > xsdurls > + * [CXF-896] - Aegis binding with @WebFault causes AegisDatabinding to > throw UnsupportedOperationException > * [CXF-897] - Default JAXB Data Binding does not unmarshal parameters > correctly for a POJO service > * [CXF-898] - Invalid links in Service Listing at root of CXF servlet > if the context path does not end in '/' > * [CXF-900] - Generated exception classes don't have serialVersionID > @@ -130,12 +126,16 @@ > * [CXF-959] - Incorrect namespace configuration when generating wsdl > from Aegis databinding > * [CXF-960] - JAX-WS client interfaces that inherit from other > interfaces don't map all the operations > * [CXF-961] - In tomcat, AuthorizationPolicy object is not found in > Message > + * [CXF-962] - Aegis mappings not reflecting in wsdl method parameters > * [CXF-966] - SESSION_MAINTAIN_PROPERTY doesn't track cookies other > than JSESSIONID > * [CXF-967] - WSDL2Java tool doesnt generate code for empty > Input/Output (RPC/Literal) > + * [CXF-970] - CXF doesnt handle the Doc/Literal (Bare) with Null > parameter. > * [CXF-971] - DefinitionParsers don't ignore namespace attributes > * [CXF-974] - Jaxws and simple front ends do not support set > serviceName and endpointName from spring configuration > * [CXF-975] - WS-Policy distribution sample uses outdated cxf policy > namespaces > * [CXF-978] - WSDL2Java generated code will miss the parameter for > wsdl operation has "parameterOrder" attribute. > + * [CXF-993] - CXF doesn't always honor the use of optional soap > headers > + * [CXF-1001] - WSDL2Java header problem when using -exsh parameter > > ** Improvement > * [CXF-232] - Unify dispatch/providers with JAX-WS > @@ -148,32 +148,22 @@ > * [CXF-887] - messages.properties improvements in > org.apache.cxf.jbi.se > * [CXF-888] - Control directory for on-disk attachments > * [CXF-899] - Missing getFaultInfo() fallback patch - use @WebFault > bean as faultInfo if getFaultInfo() is not present > + * [CXF-901] - Update "WAR" building for full war > + * [CXF-902] - Add java_first_pojo sample > * [CXF-928] - wsdl2java should not overwrite existing files > * [CXF-930] - XercesImpl.jar needs to be added to CXF_HOME/lib > directory > * [CXF-931] - UNnecessary library dependency > * [CXF-965] - add groovy and ruby script samples > * [CXF-972] - Define a tns prefix > + * [CXF-1002] - Message Part is not named correctly (always called > "fault") - this breaks XFire backward compatibility - Patch attached > + * [CXF-1025] - Streamline aegis configuration > > ** New Feature > * [CXF-861] - WS-Reliable Messaging Feature > - > + * [CXF-984] - Allow user control of namespace prefixes in Aegis > > ** Task > * [CXF-771] - Upgrade to Neethi 2.0.2 > - > - > - > - > - > - > - > - > - > - > - > - > - > - > > > > > Modified: incubator/cxf/tags/cxf-2.0.2-incubator > /distribution/src/main/release/samples/common_build.xml > URL: http://svn.apache.org/viewvc/incubator/cxf/tags/cxf-2.0.2 > -incubator/distribution/src/main/release/samples/common > _build.xml?rev=577037&r1=577036&r2=577037&view=diff > ============================================================ > ================== > --- > incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/common_build.xml > (original) > +++ > incubator/cxf/tags/cxf-2.0.2-incubator/distribution/src/main/release/samples/common_build.xml > Tue Sep 18 13:10:24 2007 > @@ -58,10 +58,13 @@ > </path> > > <condition property="is.java.version.15"> > - <equals arg1="${ant.java.version}" arg2="1.5"/> > + <or> > + <equals arg1="${ant.java.version}" arg2="1.5"/> > + <equals arg1="${ant.java.version}" arg2="1.6"/> > + </or> > </condition> > > - <fail message="Apache CXF requires Java version 1.5. You are > currently using Java version ${ant.java.version}." > + <fail message="Apache CXF requires Java version 1.5 or higher. You > are currently using Java version ${ant.java.version}." > unless="is.java.version.15"/> > > > > >
-- Cheers, Guillaume Nodet ------------------------ Blog: http://gnodet.blogspot.com/
