cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r819955 - in /cxf/trunk/rt/transports/http-osgi: ./ src/main/java/org/apache/servicemix/cxf/transport/http_osgi/ src/test/java/org/apache/servicemix/cxf/transport/http_osgi/
Date Tue, 29 Sep 2009 14:08:07 GMT
Author: dkulp
Date: Tue Sep 29 14:08:06 2009
New Revision: 819955

URL: http://svn.apache.org/viewvc?rev=819955&view=rev
Log:
Copy http-osgi transport from smx to start preparing it to be part of CXF

Added:
    cxf/trunk/rt/transports/http-osgi/   (props changed)
      - copied from r819942, servicemix/smx4/features/trunk/cxf/cxf-transport-osgi/
Modified:
    cxf/trunk/rt/transports/http-osgi/pom.xml
    cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistry.java
    cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
    cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServlet.java
    cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactory.java
    cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/SpringOsgiServlet.java
    cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java
    cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServletTest.java
    cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactoryTest.java

Propchange: cxf/trunk/rt/transports/http-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 29 14:08:06 2009
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+eclipse-classes
+.settings
+.classpath
+.project
+.wtpmodules
+

Modified: cxf/trunk/rt/transports/http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/pom.xml?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/pom.xml (original)
+++ cxf/trunk/rt/transports/http-osgi/pom.xml Tue Sep 29 14:08:06 2009
@@ -1,84 +1,75 @@
+<!--
+  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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <!--
-
-        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.
-    -->
-
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf</groupId>
+    <artifactId>cxf-rt-transports-http-osgi</artifactId>
+    <packaging>bundle</packaging>
+    <version>2.3.0-SNAPSHOT</version>
+    <name>Apache CXF HTTP Transport for OSGi</name>
+    <url>http://cxf.apache.org</url>
 
     <parent>
-	    <groupId>org.apache.servicemix.cxf</groupId>
-	    <artifactId>cxf</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-parent</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+        <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.servicemix.cxf</groupId>
-    <artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
-    <packaging>bundle</packaging>
-    <version>4.1.0-SNAPSHOT</version>
-    <name>Apache ServiceMix CXF Transport for OSGi</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>${felix.compendium.version}</version>
+            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-bundle</artifactId>
-            <version>${cxf.version}</version>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>${geronimo.wsmetadata.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>${geronimo.annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>${geronimo.servlet.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
-            <version>${servicemix.specs.version}</version>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
-            <version>${easymock.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -89,15 +80,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             javax.xml.rpc*;resolution:=optional,
-                            javax.xml.soap,
+                            javax.xml.soap;resolution:=optional,
                             com.ctc.wstx.stax;resolution:=optional,
-                            org.apache.axis.soap;resolution:=optional,
-                            org.apache.axis2.saaj;resolution:=optional,
                             com.sun.xml.messaging.saaj.soap.ver1_1;resolution:=optional,
                             com.sun.xml.messaging.saaj.client.p2p;resolution:=optional,
                             com.sun.xml.messaging.saaj.soap;resolution:=optional,
@@ -114,41 +104,6 @@
                     </instructions>
                 </configuration>
             </plugin>
-            <!-- generate dependencies versions -->
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>depends-maven-plugin</artifactId>
-                <version>${depends.maven.plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-depends-file</id>
-                        <goals>
-                            <goal>generate-depends-file</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                    <systemProperties>
-                        <property>
-                            <name>javax.xml.parsers.DocumentBuilderFactory</name>
-                            <value>com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>javax.xml.datatype.DatatypeFactory</name>
-                            <value>com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl</value>
-                        </property>
-                        <property>
-                            <name>javax.xml.parsers.SAXParserFactory</name>
-                            <value>com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl</value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

Modified: cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistry.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistry.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistry.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistry.java
Tue Sep 29 14:08:06 2009
@@ -26,14 +26,15 @@
 
 public class OsgiDestinationRegistry implements OsgiDestinationRegistryIntf {
 
-    private ConcurrentMap<String, OsgiDestination> destinations = new ConcurrentHashMap<String,
OsgiDestination>();
+    private ConcurrentMap<String, OsgiDestination> destinations 
+        = new ConcurrentHashMap<String, OsgiDestination>();
 
     public OsgiDestinationRegistry() {
     }
 
     public void addDestination(String path, OsgiDestination destination) {
         String p = getTrimmedPath(path);
-        destinations.putIfAbsent(path, destination);
+        destinations.putIfAbsent(p, destination);
     }
 
     public void removeDestination(String path) {

Modified: cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationRegistryIntf.java
Tue Sep 29 14:08:06 2009
@@ -22,15 +22,13 @@
 import java.util.Set;
 
 public interface OsgiDestinationRegistryIntf {
-	public void addDestination(String path, OsgiDestination destination);
+    void addDestination(String path, OsgiDestination destination);
 
-    public void removeDestination(String path);
+    void removeDestination(String path);
 
-    public OsgiDestination getDestinationForPath(String path);
+    OsgiDestination getDestinationForPath(String path);
     
-    public Collection<OsgiDestination> getDestinations();
+    Collection<OsgiDestination> getDestinations();
 
-    public Set<String> getDestinationsPaths();
-
-   
+    Set<String> getDestinationsPaths();
 }

Modified: cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServlet.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServlet.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServlet.java
Tue Sep 29 14:08:06 2009
@@ -19,13 +19,13 @@
 package org.apache.servicemix.cxf.transport.http_osgi;
 
 import java.io.IOException;
-import java.io.OutputStream;
 import java.io.InputStream;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.Set;
-import java.util.Collection;
+import java.io.OutputStream;
 import java.security.Principal;
+import java.util.Collection;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -36,16 +36,16 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.helpers.HttpHeaderHelper;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.security.SecurityContext;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.HTTPSession;
 import org.apache.cxf.transport.https.SSLUtils;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.transports.http.QueryHandler;
+import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.wsdl.http.AddressType;
 
 public class OsgiServlet extends HttpServlet {
@@ -77,12 +77,14 @@
     }
 
     @Override
-    protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws
ServletException, IOException {
+    protected void doDelete(HttpServletRequest request, HttpServletResponse response)
+        throws ServletException, IOException {
         invoke(request, response);
     }
 
     @Override
-    protected void doPut(HttpServletRequest request, HttpServletResponse response) throws
ServletException, IOException {
+    protected void doPut(HttpServletRequest request, HttpServletResponse response) 
+        throws ServletException, IOException {
         invoke(request, response);
     }
 
@@ -238,7 +240,9 @@
         res.getWriter().write("<html><body>No service was found.</body></html>");
     }
 
-    public void invokeDestination(final HttpServletRequest request, HttpServletResponse response,
OsgiDestination d) throws ServletException {
+    public void invokeDestination(final HttpServletRequest request, 
+                                  HttpServletResponse response, 
+                                  OsgiDestination d) throws ServletException {
         if (LOG.isLoggable(Level.FINE)) {
             LOG.fine("Service http request on thread: " + Thread.currentThread());
         }
@@ -296,10 +300,10 @@
     }
 
     protected MessageImpl createInMessage() {
-       return new MessageImpl();
+        return new MessageImpl();
     }
 
     protected ExchangeImpl createExchange() {
-       return new ExchangeImpl();
+        return new ExchangeImpl();
     }
 }

Modified: cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactory.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactory.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactory.java
Tue Sep 29 14:08:06 2009
@@ -27,8 +27,7 @@
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.transport.http.AbstractHTTPTransportFactory;
 
-public class OsgiTransportFactory extends AbstractHTTPTransportFactory
-    implements DestinationFactory {
+public class OsgiTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory
{
 
     private OsgiDestinationRegistryIntf registry;
 
@@ -56,7 +55,8 @@
 
     public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
         if (URI.create(endpointInfo.getAddress()).isAbsolute()) {
-            throw new IllegalStateException("Endpoint address should be a relative URI wrt
to the servlet address (use '/xxx' for example)");
+            throw new IllegalStateException("Endpoint address should be a relative URI "
+                                             + "wrt to the servlet address (use '/xxx' for
example)");
         }
         OsgiDestination d = registry.getDestinationForPath(endpointInfo.getAddress());
         if (d == null) {

Modified: cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/SpringOsgiServlet.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/SpringOsgiServlet.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/SpringOsgiServlet.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/servicemix/cxf/transport/http_osgi/SpringOsgiServlet.java
Tue Sep 29 14:08:06 2009
@@ -18,12 +18,12 @@
  */
 package org.apache.servicemix.cxf.transport.http_osgi;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
 
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 public class SpringOsgiServlet extends OsgiServlet implements ApplicationContextAware {
 

Modified: cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiDestinationTest.java
Tue Sep 29 14:08:06 2009
@@ -26,10 +26,9 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.MessageObserver;
 
-import static org.easymock.classextension.EasyMock.*;
 import org.easymock.classextension.IMocksControl;
 
 import org.junit.After;
@@ -37,6 +36,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.classextension.EasyMock.*;
 
 public class OsgiDestinationTest extends Assert {
 

Modified: cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServletTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServletTest.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServletTest.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiServletTest.java
Tue Sep 29 14:08:06 2009
@@ -22,6 +22,7 @@
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Set;
 import java.util.TreeSet;
 
 import javax.servlet.ServletConfig;
@@ -41,12 +42,11 @@
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.HTTPSession;
-import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.transports.http.QueryHandler;
+import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.apache.cxf.wsdl.http.AddressType;
 
-import static org.easymock.classextension.EasyMock.*;
 import org.easymock.classextension.IMocksControl;
 
 import org.junit.After;
@@ -54,13 +54,14 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.classextension.EasyMock.*;
 
 public class OsgiServletTest extends Assert {
 
     private static final String ADDRESS = "http://bar/snafu";
     private static final String ROOT = "http://localhost:8080/";
     private static final QName QNAME = new QName(ADDRESS, "foobar");
-    private static final String PATH ="/SoapContext/SoapPort";
+    private static final String PATH = "/SoapContext/SoapPort";
     private static final String URI = "/cxf" + PATH;
     private static final String SERVICES = "/cxf/services";
     private static final String QUERY = "wsdl";
@@ -87,7 +88,7 @@
     private AddressType extensor;
     private ExchangeImpl exchange;
     private EndpointInfo endpoint;
-    private TreeSet<String> paths;
+    private Set<String> paths;
 
     @Before
     public void setUp() {
@@ -232,7 +233,7 @@
             expect(registry.getDestinationsPaths()).andReturn(paths).anyTimes();
         } else if (destinationCount >= 0) {
             expect(registry.getDestinationsPaths()).andReturn(paths);
-            ArrayList<OsgiDestination> destinations =
+            List<OsgiDestination> destinations =
                 new ArrayList<OsgiDestination>();
             for (int i = 0; i < destinationCount; i++) {
                 destinations.add(destination);
@@ -299,7 +300,7 @@
             control.createMock(QueryHandlerRegistry.class);
         expect(bus.getExtension(QueryHandlerRegistry.class)).andReturn(qrh).anyTimes();
         QueryHandler qh = control.createMock(QueryHandler.class);
-        ArrayList<QueryHandler> handlers = new ArrayList<QueryHandler>();
+        List<QueryHandler> handlers = new ArrayList<QueryHandler>();
         handlers.add(qh);
         expect(qrh.getHandlers()).andReturn(handlers);
         String base = ROOT + URI + "?" + QUERY;
@@ -309,7 +310,7 @@
         expect(qh.getResponseContentType(eq(base), eq(PATH))).andReturn(XML);
         ServletOutputStream sos = control.createMock(ServletOutputStream.class);
         expect(response.getOutputStream()).andReturn(sos);
-        qh.writeResponse(eq(base), eq(PATH), same(endpoint), (same(sos))); 
+        qh.writeResponse(eq(base), eq(PATH), same(endpoint), same(sos)); 
         expectLastCall();
         sos.flush();
         expectLastCall();

Modified: cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactoryTest.java?rev=819955&r1=819942&r2=819955&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactoryTest.java
(original)
+++ cxf/trunk/rt/transports/http-osgi/src/test/java/org/apache/servicemix/cxf/transport/http_osgi/OsgiTransportFactoryTest.java
Tue Sep 29 14:08:06 2009
@@ -27,7 +27,6 @@
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.DestinationFactoryManager;
 
-import static org.easymock.classextension.EasyMock.*;
 import org.easymock.classextension.IMocksControl;
 
 import org.junit.After;
@@ -35,6 +34,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.easymock.classextension.EasyMock.*;
+
 
 public class OsgiTransportFactoryTest extends Assert {
 



Mime
View raw message