Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 65423 invoked from network); 28 Jan 2009 17:18:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Jan 2009 17:18:32 -0000 Received: (qmail 98350 invoked by uid 500); 28 Jan 2009 17:18:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98290 invoked by uid 500); 28 Jan 2009 17:18:22 -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 98242 invoked by uid 99); 28 Jan 2009 17:18:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jan 2009 09:18:22 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 28 Jan 2009 17:18:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E50F823889F3; Wed, 28 Jan 2009 17:17:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r738549 - in /cxf/trunk: common/common/src/test/java/org/apache/cxf/helpers/ distribution/src/main/release/samples/configuration_interceptor/ distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/ distributi... Date: Wed, 28 Jan 2009 17:17:45 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090128171745.E50F823889F3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Jan 28 17:17:43 2009 New Revision: 738549 URL: http://svn.apache.org/viewvc?rev=738549&view=rev Log: Make sure svn properties are properly set on everything Modified: cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java (props changed) cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml (props changed) cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml (props changed) cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/build.xml (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/client/Client.java (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/server/HelloWorld.java (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/server/HelloWorldImpl.java (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/server/Server.java (props changed) cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/wsdl/cxf-servlet.xml (props changed) cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml (props changed) cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml (props changed) cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml (props changed) cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (props changed) cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/add_customer.xml (props changed) cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/update_customer.xml (props changed) cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java (contents, props changed) cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java (contents, props changed) cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java (props changed) cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java (props changed) cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml (props changed) cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml (props changed) cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl (props changed) cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfoComparator.java (props changed) cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java (props changed) cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java (props changed) cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java (props changed) cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java (props changed) cxf/trunk/rt/ws/security/src/test/resources/DoubleIt.wsdl (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java (props changed) cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java (props changed) cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml (props changed) cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml (props changed) cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml (props changed) cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml (props changed) cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml (props changed) cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml (props changed) cxf/trunk/systests/src/test/resources/log4j.properties (props changed) cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl (props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl (contents, props changed) cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl (props changed) Propchange: cxf/trunk/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/build.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/client/Client.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/server/HelloWorld.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/server/HelloWorldImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/demo/hw/server/Server.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/java_first_jaxws_factory_bean/wsdl/cxf-servlet.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/add_customer.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/update_customer.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java?rev=738549&r1=738548&r2=738549&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java Wed Jan 28 17:17:43 2009 @@ -1,112 +1,112 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.interceptor; - - -import java.io.OutputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; - -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.io.CacheAndWriteOutputStream; -import org.apache.cxf.io.CachedOutputStream; -import org.apache.cxf.io.CachedOutputStreamCallback; -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.AbstractPhaseInterceptor; -import org.apache.cxf.phase.Phase; - - -/** - * - */ -public class PrettyLoggingOutInterceptor extends AbstractPhaseInterceptor { - - private static final Logger LOG = LogUtils.getL7dLogger(PrettyLoggingOutInterceptor.class); - private PrintWriter writer; - - - public PrettyLoggingOutInterceptor(PrintWriter w) { - super(Phase.PRE_STREAM); - addBefore(StaxOutInterceptor.class.getName()); - writer = w; - } - - public void handleMessage(Message message) throws Fault { - final OutputStream os = message.getContent(OutputStream.class); - if (os == null) { - return; - } - if (!LOG.isLoggable(Level.ALL)) { - return; - } - -// Write the output while caching it for the log message - final CacheAndWriteOutputStream newOut = new CacheAndWriteOutputStream(os); - message.setContent(OutputStream.class, newOut); - newOut.registerCallback(new LoggingCallback()); - } - - public class LoggingCallback implements CachedOutputStreamCallback { - - public void onFlush(CachedOutputStream cos) { - - } - - public void onClose(CachedOutputStream cos) { - - try { - TransformerFactory tfactory = TransformerFactory.newInstance(); - try { - tfactory.setAttribute("indent-number", "2"); - } catch (Exception ex) { - //ignore - } - Transformer serializer; - serializer = tfactory.newTransformer(); - //Setup indenting to "pretty print" - serializer.setOutputProperty(OutputKeys.INDENT, "yes"); - serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); - - if (writer != null) { - serializer.transform(new StreamSource(cos.getInputStream()), - new StreamResult(writer)); - - writer.close(); - } else if (LOG.isLoggable(Level.INFO)) { - StringWriter swriter = new StringWriter(); - serializer.transform(new StreamSource(cos.getInputStream()), - new StreamResult(swriter)); - LOG.info(swriter.toString()); - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - } +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.interceptor; + + +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.io.CacheAndWriteOutputStream; +import org.apache.cxf.io.CachedOutputStream; +import org.apache.cxf.io.CachedOutputStreamCallback; +import org.apache.cxf.message.Message; +import org.apache.cxf.phase.AbstractPhaseInterceptor; +import org.apache.cxf.phase.Phase; + + +/** + * + */ +public class PrettyLoggingOutInterceptor extends AbstractPhaseInterceptor { + + private static final Logger LOG = LogUtils.getL7dLogger(PrettyLoggingOutInterceptor.class); + private PrintWriter writer; + + + public PrettyLoggingOutInterceptor(PrintWriter w) { + super(Phase.PRE_STREAM); + addBefore(StaxOutInterceptor.class.getName()); + writer = w; + } + + public void handleMessage(Message message) throws Fault { + final OutputStream os = message.getContent(OutputStream.class); + if (os == null) { + return; + } + if (!LOG.isLoggable(Level.ALL)) { + return; + } + +// Write the output while caching it for the log message + final CacheAndWriteOutputStream newOut = new CacheAndWriteOutputStream(os); + message.setContent(OutputStream.class, newOut); + newOut.registerCallback(new LoggingCallback()); + } + + public class LoggingCallback implements CachedOutputStreamCallback { + + public void onFlush(CachedOutputStream cos) { + + } + + public void onClose(CachedOutputStream cos) { + + try { + TransformerFactory tfactory = TransformerFactory.newInstance(); + try { + tfactory.setAttribute("indent-number", "2"); + } catch (Exception ex) { + //ignore + } + Transformer serializer; + serializer = tfactory.newTransformer(); + //Setup indenting to "pretty print" + serializer.setOutputProperty(OutputKeys.INDENT, "yes"); + serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); + + if (writer != null) { + serializer.transform(new StreamSource(cos.getInputStream()), + new StreamResult(writer)); + + writer.close(); + } else if (LOG.isLoggable(Level.INFO)) { + StringWriter swriter = new StringWriter(); + serializer.transform(new StreamSource(cos.getInputStream()), + new StreamResult(swriter)); + LOG.info(swriter.toString()); + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + } } \ No newline at end of file Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptor.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java?rev=738549&r1=738548&r2=738549&view=diff ============================================================================== --- cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java (original) +++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java Wed Jan 28 17:17:43 2009 @@ -1,51 +1,51 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.interceptor; - -import java.io.ByteArrayOutputStream; -import java.io.PrintWriter; - -import org.apache.cxf.io.CachedOutputStream; - -import org.junit.Assert; -import org.junit.Test; - -public class PrettyLoggingOutInterceptorTest extends Assert { - - @Test - public void testFormatting() throws Exception { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PrintWriter pw = new PrintWriter(baos); - - PrettyLoggingOutInterceptor p = new PrettyLoggingOutInterceptor(pw); - PrettyLoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(); - CachedOutputStream cos = new CachedOutputStream(); - - String s = " " - + ""; - cos.getOut().write(s.getBytes()); - l.onClose(cos); - String str = baos.toString(); - //format has changed - assertFalse(str.matches(s)); - assertTrue(str.contains("")); - - } -} +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.cxf.interceptor; + +import java.io.ByteArrayOutputStream; +import java.io.PrintWriter; + +import org.apache.cxf.io.CachedOutputStream; + +import org.junit.Assert; +import org.junit.Test; + +public class PrettyLoggingOutInterceptorTest extends Assert { + + @Test + public void testFormatting() throws Exception { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintWriter pw = new PrintWriter(baos); + + PrettyLoggingOutInterceptor p = new PrettyLoggingOutInterceptor(pw); + PrettyLoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(); + CachedOutputStream cos = new CachedOutputStream(); + + String s = " " + + ""; + cos.getOut().write(s.getBytes()); + l.onClose(cos); + String str = baos.toString(); + //format has changed + assertFalse(str.matches(s)); + assertTrue(str.contains("")); + + } +} Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/PrettyLoggingOutInterceptorTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfoComparator.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/ws/security/src/test/resources/DoubleIt.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/systests/src/test/resources/log4j.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl?rev=738549&r1=738548&r2=738549&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl (original) +++ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl Wed Jan 28 17:17:43 2009 @@ -1,75 +1,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1969/report_incident.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml Propchange: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date