Merge pull request #12 from metacosm/2.1.x

Fixed problem with non-working tests.

consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java

@@ -132,9 +132,9 @@ private <T> T customizePort(Class<T> expectedServiceInterface, Object service, S
       List<Handler> handlerChain = binding.getHandlerChain();
       if (handlerChain != null)
       {
-    	 //We need to make sure the WSS handlers are added before the REQUEST_HEADER_CLIENT_HANDLER otherwise the session information is lost
-    	 addWSSHandlers(handlerChain);
-    	  
+         //We need to make sure the WSS handlers are added before the REQUEST_HEADER_CLIENT_HANDLER otherwise the session information is lost
+         addWSSHandlers(handlerChain);
+
          // if we already have a handler chain, just add the request hearder handler if it's not already in there
          if (!handlerChain.contains(REQUEST_HEADER_CLIENT_HANDLER))
          {
@@ -145,10 +145,10 @@ private <T> T customizePort(Class<T> expectedServiceInterface, Object service, S
       {
          // otherwise, create a handler chain and add our handler to it
          handlerChain = new ArrayList<Handler>(1);
-         
+
          //We need to make sure the WSS handlers are added before the REQUEST_HEADER_CLIENT_HANDLER otherwise the session information is lost
          addWSSHandlers(handlerChain);
-         
+
          handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
       }
       binding.setHandlerChain(handlerChain);
@@ -385,7 +385,7 @@ else if (wsrp1 != null)
             }
             catch (Exception e)
             {
-               log.debug("PortletManagement port was not available for WSDL at: " + wsdlDefinitionURL, e);
+               log.debug("PortletManagement port was not available for WSDL at " + wsdlDefinitionURL, e);
                portletManagementURL = null;
             }
 
@@ -396,7 +396,7 @@ else if (wsrp1 != null)
             }
             catch (Exception e)
             {
-               log.debug("Registration port was not available for WSDL at: " + wsdlDefinitionURL, e);
+               log.debug("Registration port was not available for WSDL at " + wsdlDefinitionURL, e);
                registrationURL = null;
             }
 
@@ -416,7 +416,7 @@ else if (wsrp1 != null)
       }
       catch (Exception e)
       {
-         log.info("Couldn't access WSDL information at" + wsdlDefinitionURL + ". Service won't be available", e);
+         log.info("Couldn't access WSDL information at " + wsdlDefinitionURL + ". Service won't be available", e);
          setAvailable(false);
          setFailed(true);
          throw e;

consumer/src/test/resources/wsdl/both-services.wsdl

@@ -10,9 +10,9 @@
 
    <!-- Original from http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=WSDL&WsrpVersion=All -->
    <import namespace="urn:oasis:names:tc:wsrp:v2:bind"
-           location="http://docs.oasis-open.org/wsrp/v2/wsrp-2.0-bindings.wsdl"/>
+           location="wsrp-2.0-bindings.wsdl"/>
    <import namespace="urn:oasis:names:tc:wsrp:v1:bind"
-           location="http://www.oasis-open.org/committees/wsrp/specifications/version1/wsrp_v1_bindings.wsdl"/>
+           location="wsrp_v1_bindings.wsdl"/>
 
    <wsdl:service name="WSRP_v1_Service">
       <wsdl:port binding="v1bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPBaseService">

consumer/src/test/resources/wsdl/simplev1.wsdl

@@ -3,8 +3,7 @@
                   xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
                   targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl">
    <!-- Original from http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=WSDL&WsrpVersion=One -->
-   <import namespace="urn:oasis:names:tc:wsrp:v1:bind"
-           location="http://www.oasis-open.org/committees/wsrp/specifications/version1/wsrp_v1_bindings.wsdl"/>
+   <import namespace="urn:oasis:names:tc:wsrp:v1:bind" location="wsrp_v1_bindings.wsdl"/>
    <wsdl:service name="WSRPService">
       <wsdl:port binding="bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPBaseService">
          <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx"/>

consumer/src/test/resources/wsdl/wsrp-1.0-services.wsdl

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, a division of Red Hat
+  ~ Copyright 2010, Red Hat Middleware, LLC, and individual
+  ~ contributors as indicated by the @authors tag. See the
+  ~ copyright.txt in the distribution for a full listing of
+  ~ individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
+                  xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
+
+                  xmlns="http://schemas.xmlsoap.org/wsdl/"
+
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+
+   <import namespace="urn:oasis:names:tc:wsrp:v1:bind"
+           location="wsrp_v1_bindings.wsdl"/>
+
+   <wsdl:service name="WSRPService">
+      <wsdl:port binding="bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPMarkupService">
+         <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+      </wsdl:port>
+      <wsdl:port binding="bind:WSRP_v1_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService">
+         <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+      </wsdl:port>
+      <wsdl:port binding="bind:WSRP_v1_Registration_Binding_SOAP" name="WSRPRegistrationService">
+         <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+      </wsdl:port>
+      <wsdl:port binding="bind:WSRP_v1_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService">
+         <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+      </wsdl:port>
+   </wsdl:service>
+</wsdl:definitions>