You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ds...@apache.org on 2006/09/15 06:29:31 UTC
svn commit: r446513 - in /webservices/axis2/trunk/java/modules:
jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
kernel/src/org/apache/axis2/context/AbstractContext.java
Author: dsosnoski
Date: Thu Sep 14 21:29:28 2006
New Revision: 446513
URL: http://svn.apache.org/viewvc?view=rev&rev=446513
Log:
Move COPY_PROPERTIES constant from org.apache.axis2.client.Options to AbstractContext
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java?view=diff&rev=446513&r1=446512&r2=446513
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java Thu Sep 14 21:29:28 2006
@@ -34,6 +34,7 @@
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.AbstractContext;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.jaxws.AxisCallback;
@@ -142,7 +143,8 @@
// For now, just take all of the properties that were in the
// JAX-WS MessageContext, and set them on the Axis2 MessageContext.
- axisRequestMsgCtx.setProperty(Options.COPY_PROPERTIES, Boolean.TRUE);
+ axisRequestMsgCtx.setProperty(AbstractContext.COPY_PROPERTIES,
+ Boolean.TRUE);
axisRequestMsgCtx.setProperties(requestMsgCtx.getProperties());
if (log.isDebugEnabled()) {
log.debug("Properties: " + axisRequestMsgCtx.getProperties().toString());
@@ -265,7 +267,8 @@
// For now, just take all of the properties that were in the
// JAX-WS MessageContext, and set them on the Axis2 MessageContext.
- axisRequestMsgCtx.setProperty(Options.COPY_PROPERTIES, Boolean.TRUE);
+ axisRequestMsgCtx.setProperty(AbstractContext.COPY_PROPERTIES,
+ Boolean.TRUE);
axisRequestMsgCtx.setProperties(requestMsgCtx.getProperties());
if (log.isDebugEnabled()) {
log.debug("Properties: " + axisRequestMsgCtx.getProperties().toString());
@@ -402,7 +405,8 @@
// For now, just take all of the properties that were in the
// JAX-WS MessageContext, and set them on the Axis2 MessageContext.
- axisRequestMsgCtx.setProperty(Options.COPY_PROPERTIES, Boolean.TRUE);
+ axisRequestMsgCtx.setProperty(AbstractContext.COPY_PROPERTIES,
+ Boolean.TRUE);
axisRequestMsgCtx.setProperties(requestMsgCtx.getProperties());
if (log.isDebugEnabled()) {
log.debug("Properties: " + axisRequestMsgCtx.getProperties().toString());
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?view=diff&rev=446513&r1=446512&r2=446513
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java Thu Sep 14 21:29:28 2006
@@ -17,8 +17,6 @@
package org.apache.axis2.context;
-import org.apache.axis2.client.Options;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -29,6 +27,11 @@
*/
public abstract class AbstractContext {
+ /**
+ * Property used to indicate copying of properties is needed by context.
+ */
+ public static final String COPY_PROPERTIES = "CopyProperties";
+
protected long lastTouchedTime;
protected transient AbstractContext parent;
@@ -78,17 +81,16 @@
/**
* This will set the properties to the context. But in setting that one may need to "copy" all
* the properties from the source properties to the target properties. To enable this we introduced
- * a property (org.apache.axis2.client.Options#COPY_PROPERTIES) so that if set to true, this code
+ * a property ({@link #COPY_PROPERTIES}) so that if set to true, this code
* will copy the whole thing, without just referencing to the source.
*
* @param properties
- * @see org.apache.axis2.client.Options#COPY_PROPERTIES
*/
public void setProperties(Map properties) {
if (properties == null) {
this.properties = null;
} else {
- Boolean copyProperties = ((Boolean) properties.get(Options.COPY_PROPERTIES));
+ Boolean copyProperties = ((Boolean) properties.get(COPY_PROPERTIES));
if ((copyProperties != null) && copyProperties.booleanValue()) {
Iterator iterator = properties.keySet().iterator();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org