Author: ngallardo
Date: Mon Apr 16 06:49:41 2007
New Revision: 529247

URL: http://svn.apache.org/viewvc?view=rev&rev=529247
Log:
AXIS2-2532

Update the factories to create a LogicalMessageContext.

Modified:
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
    
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java?view=diff&rev=529247&r1=529246&r2=529247
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
 Mon Apr 16 06:49:41 2007
@@ -19,11 +19,12 @@
 package org.apache.axis2.jaxws.context.factory;
 
 import org.apache.axis2.jaxws.context.WebServiceContextImpl;
+import org.apache.axis2.jaxws.core.MessageContext;
+import org.apache.axis2.jaxws.handler.LogicalMessageContext;
 import org.apache.axis2.jaxws.handler.ProtectedMessageContext;
 import org.apache.axis2.jaxws.handler.SoapMessageContext;
 
 import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
 
 public class MessageContextFactory {
 
@@ -36,12 +37,32 @@
         return new WebServiceContextImpl();
     }
 
-    public static MessageContext createSoapMessageContext(
+    /**
+     * Creates a SOAPMessageContext based on the input core MessageContext.  
+     *       
+     * @param jaxwsMessageContext
+     * @return
+     */
+    public static SoapMessageContext createSoapMessageContext(
             org.apache.axis2.jaxws.core.MessageContext jaxwsMessageContext) {
         return new SoapMessageContext(jaxwsMessageContext);
     }
+    
+    /**
+     * Creates a LogicalMessageContext based on the input core MessageContext.
+     * 
+     * @param mc
+     * @return
+     */
+    public static LogicalMessageContext 
createLogicalMessageContext(MessageContext mc) {
+        return new LogicalMessageContext(mc);
+    }
 
-    public static MessageContext createProtectedMessageContext(
+    /*
+     * This method is deprecated as we will be removing the 
ProtectedMessageContext
+     */
+    @Deprecated
+    public static javax.xml.ws.handler.MessageContext 
createProtectedMessageContext(
             org.apache.axis2.jaxws.core.MessageContext jaxwsMessageContext) {
         return new ProtectedMessageContext(jaxwsMessageContext);
     }

Modified: 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java?view=diff&rev=529247&r1=529246&r2=529247
==============================================================================
--- 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/util/MessageContextUtils.java
 Mon Apr 16 06:49:41 2007
@@ -1,18 +1,20 @@
 /*
- * Copyright 2006 The Apache Software Foundation.
- * Copyright 2006 International Business Machines Corp.
- *
- * Licensed 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
- *
+ * 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.
+ * 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.
  */
 package org.apache.axis2.jaxws.core.util;
 
@@ -77,9 +79,8 @@
             return jaxwsFaultMC;
         }
         catch (AxisFault e) {
-
+            throw ExceptionFactory.makeWebServiceException(e);
         }
-        return null;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to