cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r448475 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/io/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/core/src/main/java/org/apache/cxf/binding/attachment/ rt/core/src/main/java/org/apache/cxf/tr...
Date Thu, 21 Sep 2006 06:55:51 GMT
Author: ffang
Date: Wed Sep 20 23:55:48 2006
New Revision: 448475

URL: http://svn.apache.org/viewvc?view=rev&rev=448475
Log:
1. create org.apache.cxf.io package in api
2. move AbstractCachedOutputStream and AbstractWrappedOutputStream into org.apache.cxf.io
package, so that these classes can be shared with transport and frontend modules, or potentially
other modules in the future

Added:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java
  (with props)
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
  (with props)
Removed:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractCachedOutputStream.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/AbstractCachedOutputStream.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/AbstractWrappedOutputStream.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractWrappedOutputStream.java
Modified:
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AttachmentOutInterceptor.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStream.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
    incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java
    incubator/cxf/trunk/rt/transports/jms/.checkstyle
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
    incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
    incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java

Added: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java?view=auto&rev=448475
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java
(added)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java
Wed Sep 20 23:55:48 2006
@@ -0,0 +1,214 @@
+/**
+ * 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.io;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+
+public abstract class AbstractCachedOutputStream extends OutputStream {
+
+    protected OutputStream currentStream;
+
+    private long threshold = 8 * 1024;
+
+    private int totalLength;
+
+    private boolean inmem;
+
+    private File tempFile;
+
+    private File outputDir;
+
+    public AbstractCachedOutputStream(PipedInputStream stream) throws IOException {
+        currentStream = new PipedOutputStream(stream);
+        inmem = true;
+    }
+
+    public AbstractCachedOutputStream() {
+        currentStream = new ByteArrayOutputStream();
+        inmem = true;
+    }
+
+    /**
+     * Perform any actions required on stream flush (freeze headers, reset
+     * output stream ... etc.)
+     */
+    protected abstract void doFlush() throws IOException;
+
+    public void flush() throws IOException {
+        currentStream.flush();
+        doFlush();
+    }
+
+    /**
+     * Perform any actions required on stream closure (handle response etc.)
+     */
+    protected abstract void doClose() throws IOException;
+
+    public void close() throws IOException {
+        currentStream.close();
+        doClose();
+    }
+
+    public boolean equals(Object obj) {
+        return currentStream.equals(obj);
+    }
+
+    /**
+     * Replace the original stream with the new one, when with Attachment, needs
+     * to replace the xml writer stream with the stream used by
+     * AttachmentSerializer Or Copy the cached output stream to the "real"
+     * output stream, i.e. onto the wire.
+     * 
+     * @param realOS the real output stream
+     * @throws IOException
+     */
+    public void resetOut(OutputStream out, boolean copyOldContent) throws IOException {
+        if (inmem) {
+            ByteArrayOutputStream byteOut = (ByteArrayOutputStream)currentStream;
+            if (copyOldContent && byteOut.size() > 0) {
+                byteOut.writeTo(out);
+            }
+        } else {
+            // read the file
+            currentStream.close();
+            FileInputStream fin = new FileInputStream(tempFile);
+            if (copyOldContent) {
+                byte[] buffer = new byte[4096];
+                int len = 0;
+                int pos = 0;
+                while (true) {
+                    len = fin.read(buffer, 0, 4096);
+                    if (len != -1) {
+                        out.write(buffer, 0, len);
+                        pos += len;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+        currentStream = out;
+    }
+
+    /**
+     * @return the underlying output stream
+     */
+    public OutputStream getOut() {
+        return currentStream;
+    }
+
+    public int hashCode() {
+        return currentStream.hashCode();
+    }
+
+    public String toString() {
+        return currentStream.toString();
+    }
+
+    protected abstract void onWrite() throws IOException;
+
+    public void write(byte[] b, int off, int len) throws IOException {
+        onWrite();
+        this.totalLength += len;
+        if (inmem && totalLength > threshold) {
+            createFileOutputStream();
+        }
+        currentStream.write(b, off, len);
+    }
+
+    public void write(byte[] b) throws IOException {
+        onWrite();
+        this.totalLength += b.length;
+        if (inmem && totalLength > threshold) {
+            createFileOutputStream();
+        }
+        currentStream.write(b);
+    }
+
+    public void write(int b) throws IOException {
+        onWrite();
+        this.totalLength++;
+        if (inmem && totalLength > threshold) {
+            createFileOutputStream();
+        }
+        currentStream.write(b);
+    }
+
+    private void createFileOutputStream() throws IOException {
+        byte[] bytes = ((ByteArrayOutputStream)currentStream).toByteArray();
+        if (outputDir == null) {
+            tempFile = File.createTempFile("att", "tmp");
+        } else {
+            tempFile = File.createTempFile("att", "tmp", outputDir);
+        }
+        currentStream = new BufferedOutputStream(new FileOutputStream(tempFile));
+        currentStream.write(bytes);
+        inmem = false;
+    }
+
+    public File getTempFile() {
+        return tempFile;
+    }
+
+    public InputStream getInputStream() throws IOException {
+        if (inmem) {
+            if (currentStream instanceof ByteArrayOutputStream) {
+                return new ByteArrayInputStream(((ByteArrayOutputStream)currentStream).toByteArray());
+            } else if (currentStream instanceof PipedOutputStream) {
+                return new PipedInputStream((PipedOutputStream)currentStream);
+            } else {
+                return null;
+            }
+        } else {
+            try {
+                return new FileInputStream(tempFile);
+            } catch (FileNotFoundException e) {
+                throw new IOException("Cached file was deleted, " + e.toString());
+            }
+        }
+    }
+
+    public void dispose() {
+        if (!inmem) {
+            tempFile.delete();
+        }
+    }
+
+    public void setOutputDir(File outputDir) throws IOException {
+        this.outputDir = outputDir;
+        createFileOutputStream();
+    }
+
+    public void setThreshold(long threshold) {
+        this.threshold = threshold;
+    }
+
+}

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractCachedOutputStream.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java?view=auto&rev=448475
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
(added)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
Wed Sep 20 23:55:48 2006
@@ -0,0 +1,43 @@
+/**
+ * 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.io;
+
+import org.apache.cxf.message.Message;
+
+public abstract class AbstractWrappedOutputStream extends AbstractCachedOutputStream {
+
+    protected Message outMessage;
+    private boolean flushed;
+    
+    protected AbstractWrappedOutputStream(Message m) {
+        super();
+        outMessage = m;
+    }
+
+    /**
+     * @return true if already flushed
+     */
+    protected boolean alreadyFlushed() {
+        boolean ret = flushed;
+        flushed = true;
+        return ret;
+    }
+
+}

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AttachmentOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AttachmentOutInterceptor.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AttachmentOutInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AttachmentOutInterceptor.java
Wed Sep 20 23:55:48 2006
@@ -30,10 +30,11 @@
 import org.apache.cxf.common.i18n.BundleUtils;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.io.AbstractCachedOutputStream;
 import org.apache.cxf.jaxb.attachment.AttachmentSerializer;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.phase.Phase;
-import org.apache.cxf.transport.AbstractCachedOutputStream;
+
 
 public class AttachmentOutInterceptor extends AbstractSoapInterceptor {
 

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/binding/attachment/CachedOutputStream.java
Wed Sep 20 23:55:48 2006
@@ -22,7 +22,9 @@
 import java.io.IOException;
 import java.io.PipedInputStream;
 
-import org.apache.cxf.transport.AbstractCachedOutputStream;
+import org.apache.cxf.io.AbstractCachedOutputStream;
+
+
 
 public class CachedOutputStream extends AbstractCachedOutputStream {
 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStream.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStream.java
(original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStream.java
Wed Sep 20 23:55:48 2006
@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 
+import org.apache.cxf.io.AbstractCachedOutputStream;
+
 public class CachedOutputStream extends AbstractCachedOutputStream {
     CachedOutputStream() {
         super();

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Wed Sep 20 23:55:48 2006
@@ -28,6 +28,7 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
+import javax.xml.validation.Schema;
 import javax.xml.ws.Binding;
 import javax.xml.ws.Provider;
 import javax.xml.ws.WebServiceException;
@@ -38,6 +39,8 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.endpoint.EndpointException;
 import org.apache.cxf.endpoint.ServerImpl;
+import org.apache.cxf.jaxb.JAXBDataReaderFactory;
+import org.apache.cxf.jaxb.JAXBDataWriterFactory;
 import org.apache.cxf.jaxws.context.WebContextResourceResolver;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
 import org.apache.cxf.jaxws.support.JaxwsEndpointImpl;
@@ -47,6 +50,7 @@
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.ChainInitiationObserver;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.wsdl.EndpointReferenceUtils;
 
 public class EndpointImpl extends javax.xml.ws.Endpoint {
  
@@ -81,6 +85,10 @@
         QName endpointName = implInfo.getEndpointName();
         EndpointInfo ei = service.getServiceInfo().getEndpoint(endpointName);
         
+        // revisit: should get enableSchemaValidation from configuration
+        if (false) {
+            addSchemaValidation();
+        }
 
         if (implInfo.isWebServiceProvider()) {
             service.setInvoker(new ProviderInvoker((Provider<?>)i));
@@ -95,6 +103,18 @@
         }
         
         doInit = true;
+    }
+
+    private void addSchemaValidation() {
+        Schema schema = EndpointReferenceUtils.getSchema(service.getServiceInfo());
+        
+        if (service.getDataReaderFactory() instanceof JAXBDataReaderFactory) {
+            ((JAXBDataReaderFactory)service.getDataReaderFactory()).setSchema(schema);
+        }
+        
+        if (service.getDataWriterFactory() instanceof JAXBDataWriterFactory) {
+            ((JAXBDataWriterFactory)service.getDataWriterFactory()).setSchema(schema);
+        }
     }
 
     private synchronized void init() {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
Wed Sep 20 23:55:48 2006
@@ -49,6 +49,7 @@
 import org.apache.cxf.common.util.Base64Exception;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.io.AbstractWrappedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Wed Sep 20 23:55:48 2006
@@ -43,6 +43,7 @@
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.configuration.security.SSLClientPolicy;
 import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.io.AbstractWrappedOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
Wed Sep 20 23:55:48 2006
@@ -37,6 +37,7 @@
 import javax.wsdl.xml.WSDLWriter;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.io.AbstractWrappedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;

Modified: incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/JettyHTTPDestinationTest.java
Wed Sep 20 23:55:48 2006
@@ -36,10 +36,10 @@
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
 import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.io.AbstractCachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.AbstractCachedOutputStream;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.MessageObserver;

Modified: incubator/cxf/trunk/rt/transports/jms/.checkstyle
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/.checkstyle?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/.checkstyle (original)
+++ incubator/cxf/trunk/rt/transports/jms/.checkstyle Wed Sep 20 23:55:48 2006
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="false">
-    <fileset name="all" enabled="true" check-config-name="CXF Checks" local="false">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?><fileset-config file-format-version="1.1.0"
simple-config="false">
+<fileset name="all" enabled="true" check-config-name="CXF Checks" type="external" description=""><file-match-pattern
match-pattern="^src[/\\]." include-pattern="true"/>
+</fileset>
+</fileset-config>
\ No newline at end of file

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
(original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Wed Sep 20 23:55:48 2006
@@ -42,11 +42,12 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.ConfigurationProvider;
+import org.apache.cxf.io.AbstractCachedOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.AbstractCachedOutputStream;
+
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;

Modified: incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
(original)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Wed Sep 20 23:55:48 2006
@@ -49,10 +49,10 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.ConfigurationProvider;
+import org.apache.cxf.io.AbstractCachedOutputStream;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.AbstractCachedOutputStream;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.Destination;
@@ -569,8 +569,6 @@
         protected void onWrite() throws IOException {
             // Do nothing here        
         }
-
-      
 
     }
 

Modified: incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java?view=diff&rev=448475&r1=448474&r2=448475
==============================================================================
--- incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java
(original)
+++ incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java
Wed Sep 20 23:55:48 2006
@@ -25,10 +25,10 @@
 import java.io.PipedInputStream;
 
 import org.apache.cxf.binding.attachment.CachedOutputStream;
+import org.apache.cxf.io.AbstractCachedOutputStream;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.transport.AbstractCachedOutputStream;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;



Mime
View raw message