[jboss-svn-commits] JBL Code SVN: r36983 - in labs/jbossesb/workspace/tcunning/as6/product: samples/quickstarts/conf and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu May 5 06:53:38 EDT 2011


Author: mageshbk at jboss.com
Date: 2011-05-05 06:53:38 -0400 (Thu, 05 May 2011)
New Revision: 36983

Modified:
   labs/jbossesb/workspace/tcunning/as6/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java
   labs/jbossesb/workspace/tcunning/as6/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java
   labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/CXFFactory.java
   labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/ServletControllerExtProviderFactory.java
Log:
Fixed WS QSs failures on AS6 - Magesh

Modified: labs/jbossesb/workspace/tcunning/as6/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java	2011-04-29 20:06:17 UTC (rev 36982)
+++ labs/jbossesb/workspace/tcunning/as6/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java	2011-05-05 10:53:38 UTC (rev 36983)
@@ -105,7 +105,7 @@
             try
             {
                 // Try Native impl first
-                loader.loadClass("org.jboss.ws.extensions.addressing.soap.SOAPAddressingBuilderImpl");
+                loader.loadClass("org.jboss.ws.core.server.ServerHandlerDelgate");
                 WSIMPL = WSIMPL_NATIVE;
             }
             catch (Throwable t1)

Modified: labs/jbossesb/workspace/tcunning/as6/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/samples/quickstarts/conf/base-build.xml	2011-04-29 20:06:17 UTC (rev 36982)
+++ labs/jbossesb/workspace/tcunning/as6/product/samples/quickstarts/conf/base-build.xml	2011-05-05 10:53:38 UTC (rev 36983)
@@ -243,6 +243,8 @@
             <pathelement location="${org.jboss.esb.server.home}/lib/dom4j.jar"/>
             <pathelement location="${org.jboss.esb.server.common.lib}/antlr.jar"/>
             <pathelement location="${org.jboss.esb.server.common.lib}/jbosssx.jar"/>
+            <!-- AS6 has it in lib -->
+            <pathelement location="${org.jboss.esb.server.home}/lib/jbosssx.jar"/>
             
             <!-- smooks.esb jars -->
             <fileset dir="${org.jboss.esb.server.deploy.dir}/smooks.esb" includes="*.jar"/>

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java	2011-04-29 20:06:17 UTC (rev 36982)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorHttpServletRequest.java	2011-05-05 10:53:38 UTC (rev 36983)
@@ -131,29 +131,21 @@
         // TODO link this is with security
         return false ;
     }
-
-    /*
-     * The following methods are not supported by this adapter.
-     */
-
-    public StringBuffer getRequestURL()
-    {
-        throw new UnsupportedOperationException("Not yet supported") ;
-    }
     
     public String getAuthType()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public Cookie[] getCookies()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
-    public long getDateHeader(String arg0)
+    public long getDateHeader(String name)
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        String s = this.getHeader(name);
+        return s != null ? Long.valueOf(s) : 0;
     }
 
     public Enumeration getHeaders(final String name)
@@ -169,54 +161,64 @@
         }
     }
 
-    public int getIntHeader(String arg0)
+    public int getIntHeader(String name)
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        String s = this.getHeader(name);
+        return s != null ? Integer.valueOf(s) : 0;
     }
 
+    /*
+     * The following methods are not supported by this adapter.
+     */
+
+    public StringBuffer getRequestURL()
+    {
+        return null;
+    }
+
     public String getPathTranslated()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public String getRemoteUser()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public String getRequestedSessionId()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public String getServletPath()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public HttpSession getSession()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public boolean isRequestedSessionIdFromCookie()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return false;
     }
 
     public boolean isRequestedSessionIdFromURL()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return false;
     }
 
     public boolean isRequestedSessionIdFromUrl()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return false;
     }
 
     public boolean isRequestedSessionIdValid()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return false;
     }
 
     public Enumeration getAttributeNames()
@@ -231,12 +233,12 @@
 
     public int getContentLength()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return 0;
     }
 
     public Locale getLocale()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public Enumeration getLocales()
@@ -261,7 +263,7 @@
 
     public String getProtocol()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public BufferedReader getReader() throws IOException
@@ -276,12 +278,12 @@
 
     public String getRemoteAddr()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public String getRemoteHost()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public RequestDispatcher getRequestDispatcher(String arg0)
@@ -291,17 +293,17 @@
 
     public String getScheme()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public String getServerName()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public int getServerPort()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return 0;
     }
 
     public boolean isSecure()
@@ -333,21 +335,21 @@
 
     public String getLocalAddr()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public String getLocalName()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return null;
     }
 
     public int getLocalPort()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return 0;
     }
 
     public int getRemotePort()
     {
-        throw new UnsupportedOperationException("Not yet supported") ;
+        return 0;
     }
 }

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/CXFFactory.java
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/CXFFactory.java	2011-04-29 20:06:17 UTC (rev 36982)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/CXFFactory.java	2011-05-05 10:53:38 UTC (rev 36983)
@@ -265,7 +265,7 @@
     {
         public Bus getBus(final Endpoint endpoint)
         {
-            final BusHolder busHolder = endpoint.getAttachment(BusHolder.class) ;
+            final BusHolder busHolder = endpoint.getService().getDeployment().getAttachment(BusHolder.class) ;
             return busHolder.getBus() ;
         }
     }

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/ServletControllerExtProviderFactory.java
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/ServletControllerExtProviderFactory.java	2011-04-29 20:06:17 UTC (rev 36982)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/cxf/ServletControllerExtProviderFactory.java	2011-05-05 10:53:38 UTC (rev 36983)
@@ -83,7 +83,7 @@
         
         BusHolderImpl(final Endpoint endpoint, final ServletContext context)
         {
-            final BusHolder busHolder = endpoint.getAttachment(BusHolder.class) ;
+            final BusHolder busHolder = endpoint.getService().getDeployment().getAttachment(BusHolder.class) ;
             final Bus bus = busHolder.getBus() ;
 
             final ServletTransportFactory servletTransportFactory = new SOAPProcessorServletTransportFactory(bus, getTransport(bus)) ;



More information about the jboss-svn-commits mailing list