[jboss-svn-commits] JBL Code SVN: r38417 - in labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product: rosetta/src/org/jboss/soa/esb/listeners/message and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2013-09-19 22:39:42 -0400 (Thu, 19 Sep 2013)
New Revision: 38417

Modified:
   labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/ivy.xml
   labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/samples/quickstarts/webservice_consumer1/war/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/HelloWorldWS.java
Log:
Merge over changes from JBESB-3919.


Modified: labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/ivy.xml
===================================================================
--- labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/ivy.xml	2013-09-20 02:28:06 UTC (rev 38416)
+++ labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/ivy.xml	2013-09-20 02:39:42 UTC (rev 38417)
@@ -24,7 +24,7 @@
         <dependency org="commons-lang" name="commons-lang" rev="2.4"/>
         <!-- dependency org="commons-net" name="commons-net" rev="2.0.0-652071"/ -->
         <!-- dependency org="org.apache.commons" name="not-yet-commons-ssl" rev="0.3.7"/ -->
-        <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4">
+        <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.8">
         	<exclude org="xpp3" module="xpp3_min"/>
         </dependency>
         <dependency org="com.h2database" name="h2" rev="1.2.124"/>

Modified: labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2013-09-20 02:28:06 UTC (rev 38416)
+++ labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2013-09-20 02:39:42 UTC (rev 38417)
@@ -1017,11 +1017,12 @@
     private AuthenticationRequest getAutenticationRequest(final Message message) throws SecurityServiceException
     {
         final byte[] encryptedAuthRequest = (byte[]) message.getContext().getContext(SecurityService.AUTH_REQUEST);
+
+        // store the encrypted auth request. Will be re-attached to outgoing messages.
+        AuthenticationRequestImpl.setEncryptedAuthRequest(encryptedAuthRequest);
+        
         if (encryptedAuthRequest != null)
         {
-    		// store the encrypted auth request. Will be re-attached to outgoing messages.
-            AuthenticationRequestImpl.setEncryptedAuthRequest(encryptedAuthRequest);
-
             return (AuthenticationRequest) PublicCryptoUtil.INSTANCE.decrypt(encryptedAuthRequest);
         }
         return null;

Modified: labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/samples/quickstarts/webservice_consumer1/war/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/HelloWorldWS.java
===================================================================
--- labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/samples/quickstarts/webservice_consumer1/war/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/HelloWorldWS.java	2013-09-20 02:28:06 UTC (rev 38416)
+++ labs/jbossesb/tags/GSS-5.3.1-ONEOFF-1003/product/samples/quickstarts/webservice_consumer1/war/src/org/jboss/soa/esb/samples/quickstart/webservice_consumer1/HelloWorldWS.java	2013-09-20 02:39:42 UTC (rev 38417)
@@ -28,7 +28,7 @@
 @WebService(name = "HelloWorld", targetNamespace = "http://webservice_consumer1/helloworld")
 public class HelloWorldWS
 {
-   @WebMethod
+   @WebMethod(action = "sayHello")
    public String sayHello(@WebParam(name = "toWhom")
    String toWhom)
    {