You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/09/07 06:07:40 UTC

svn commit: r279236 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/engine/ core/src/org/apache/axis2/receivers/ security/src/org/apache/axis2/security/handler/ security/src/org/apache/axis2/security/util/ wsdl/src/org/apache/axis...

Author: dims
Date: Tue Sep  6 21:07:26 2005
New Revision: 279236

URL: http://svn.apache.org/viewcvs?rev=279236&view=rev
Log:
- Add support for signature parts
- Add init() injection in generated code as well
- If the init has 2 messagecontext params, inject the in context and out context (both of them)


Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java
    webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/WSHandlerConstantsMapper.java
    webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java?rev=279236&r1=279235&r2=279236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/DependencyManager.java Tue Sep  6 21:07:26 2005
@@ -29,8 +29,9 @@
 public class DependencyManager {
     private final static String MESSAGE_CONTEXT_INJECTION_METHOD = "init";
 
-    public static void configureBusinussLogicProvider(Object obj,
-                                                      MessageContext msgctx)
+    public static void configureBusinessLogicProvider(Object obj,
+                                                      MessageContext msgctx,
+                                                      MessageContext newMsgCtx)
             throws AxisFault {
         try {
             Class classToLoad = obj.getClass();
@@ -41,8 +42,14 @@
                         methods[i].getName()) &&
                         methods[i].getParameterTypes().length == 1 &&
                         methods[i].getParameterTypes()[0] ==
-                        MessageContext.class) {
+                                MessageContext.class) {
                     methods[i].invoke(obj, new Object[]{msgctx});
+                } else if (MESSAGE_CONTEXT_INJECTION_METHOD.equals(
+                        methods[i].getName()) &&
+                        methods[i].getParameterTypes().length == 2 &&
+                        methods[i].getParameterTypes()[0] == MessageContext.class &&
+                        methods[i].getParameterTypes()[1] == MessageContext.class) {
+                    methods[i].invoke(obj, new Object[]{msgctx, newMsgCtx});
                 }
             }
         } catch (SecurityException e) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java?rev=279236&r1=279235&r2=279236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOnlyMessageReceiver.java Tue Sep  6 21:07:26 2005
@@ -75,7 +75,7 @@
 
             // find the WebService method
             Class ImplClass = obj.getClass();
-            DependencyManager.configureBusinussLogicProvider(obj, msgContext);
+            DependencyManager.configureBusinessLogicProvider(obj, msgContext, null);
 
             OperationDescription op = msgContext.getOperationContext()
                     .getAxisOperation();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java?rev=279236&r1=279235&r2=279236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/receivers/RawXMLINOutMessageReceiver.java Tue Sep  6 21:07:26 2005
@@ -71,7 +71,7 @@
             Class ImplClass = obj.getClass();
 
             //Inject the Message Context if it is asked for
-            DependencyManager.configureBusinussLogicProvider(obj, msgContext);
+            DependencyManager.configureBusinessLogicProvider(obj, msgContext, newmsgContext);
 
             OperationDescription opDesc = msgContext.getOperationContext()
                     .getAxisOperation();

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java?rev=279236&r1=279235&r2=279236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/handler/WSSHandlerConstants.java Tue Sep  6 21:07:26 2005
@@ -33,8 +33,9 @@
 		public static final String PW_CALLBACK_CLASS = "OutPasswordCallbackClass";
 		public static final String SIG_PROP_FILE = "OutSignaturePropFile";
 		public static final String SIG_KEY_ID = "OutSignatureKeyIdentifier";
-		
-		//Repetition count
+        public static final String SIGNATURE_PARTS = "OutSignatureParts";
+
+        //Repetition count
 		public static final String SENDER_REPEAT_COUNT = "senderRepeteCount";
 		public static final String REPETITON = "repetition";
 		

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/WSHandlerConstantsMapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/WSHandlerConstantsMapper.java?rev=279236&r1=279235&r2=279236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/WSHandlerConstantsMapper.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/WSHandlerConstantsMapper.java Tue Sep  6 21:07:26 2005
@@ -48,7 +48,8 @@
 		outHandlerConstants.put(WSHandlerConstants.PW_CALLBACK_CLASS, WSSHandlerConstants.Out.PW_CALLBACK_CLASS);
 		outHandlerConstants.put(WSHandlerConstants.SIG_PROP_FILE, WSSHandlerConstants.Out.SIG_PROP_FILE);
 		outHandlerConstants.put(WSHandlerConstants.SIG_KEY_ID, WSSHandlerConstants.Out.SIG_KEY_ID);
-		
+        outHandlerConstants.put(WSHandlerConstants.SIGNATURE_PARTS, WSSHandlerConstants.Out.SIGNATURE_PARTS);
+
 	}
 	
 	/**

Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl?rev=279236&r1=279235&r2=279236&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl Tue Sep  6 21:07:26 2005
@@ -20,6 +20,9 @@
         // get the implementation class for the Web Service
         Object obj = getTheImplementationObject(msgContext);
 
+        //Inject the Message Context if it is asked for
+        org.apache.axis2.engine.DependencyManager.configureBusinessLogicProvider(obj, msgContext, newMsgContext);
+
         <xsl:value-of select="$skeletonname"/> skel = (<xsl:value-of select="$skeletonname"/>)obj;
         //Out Envelop
         org.apache.axis2.soap.SOAPEnvelope envelope = null;