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 gd...@apache.org on 2007/05/07 20:39:32 UTC
svn commit: r535950 - in /webservices/axis2/trunk/java/modules:
kernel/src/org/apache/axis2/context/ kernel/src/org/apache/axis2/util/
scripting/src/org/apache/axis2/scripting/
Author: gdaniels
Date: Mon May 7 11:39:30 2007
New Revision: 535950
URL: http://svn.apache.org/viewvc?view=rev&rev=535950
Log:
Rejigger MetaDataEntry a little to make more sense (better names), and a variety of other small bits of cleanup.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java
webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=535950&r1=535949&r2=535950
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Mon May 7 11:39:30 2007
@@ -1333,17 +1333,21 @@
}
/**
- * @param reference
+ * Add a RelatesTo
+ *
+ * @param reference RelatesTo describing how we relate to another message
*/
public void addRelatesTo(RelatesTo reference) {
options.addRelatesTo(reference);
}
/**
- * @param referance
+ * Set ReplyTo destination
+ *
+ * @param reference the ReplyTo EPR
*/
- public void setReplyTo(EndpointReference referance) {
- options.setReplyTo(referance);
+ public void setReplyTo(EndpointReference reference) {
+ options.setReplyTo(reference);
}
/**
@@ -1721,10 +1725,10 @@
* @return TRUE if the key exists, FALSE otherwise
*/
public boolean containsSelfManagedDataKey(Class clazz, Object key) {
- if (selfManagedDataMap != null) {
- return selfManagedDataMap.containsKey(generateSelfManagedDataKey(clazz, key));
+ if (selfManagedDataMap == null) {
+ return false;
}
- return false;
+ return selfManagedDataMap.containsKey(generateSelfManagedDataKey(clazz, key));
}
/**
@@ -2855,7 +2859,7 @@
// TransportInDescription transportIn
if (transportIn != null) {
- metaTransportIn = new MetaDataEntry(null, transportIn.getName().toString());
+ metaTransportIn = new MetaDataEntry(null, transportIn.getName());
} else {
metaTransportIn = null;
}
@@ -2863,7 +2867,7 @@
// TransportOutDescription transportOut
if (transportOut != null) {
- metaTransportOut = new MetaDataEntry(null, transportOut.getName().toString());
+ metaTransportOut = new MetaDataEntry(transportOut.getName(), null);
} else {
metaTransportOut = null;
}
@@ -3168,7 +3172,6 @@
// get the class name, then add it to the list
String tmpClassNameStr;
String tmpQNameAsStr;
- String tmpHasList = "no list";
if (mdObj != null) {
tmpClassNameStr = mdObj.getClassName();
@@ -3182,11 +3185,9 @@
tmpQNameAsStr = mdObj.getQNameAsString();
- if (!mdObj.isListEmpty()) {
- tmpHasList = "has list";
- }
-
if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {
+ String tmpHasList = mdObj.isListEmpty() ? "no children" : "has children";
+
log.trace(logCorrelationIDString +
":readExternal(): meta data class [" + tmpClassNameStr +
"] qname [" + tmpQNameAsStr + "] index [" + count + "] [" +
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java?view=diff&rev=535950&r1=535949&r2=535950
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java Mon May 7 11:39:30 2007
@@ -127,9 +127,9 @@
* There is no need to store service context inside serviceGroup
* context as well.
*
- * @param service
+ * @param service the AxisService for which to get a context
* @return Returns ServiceContext.
- * @throws AxisFault
+ * @throws AxisFault if something goes wrong
*/
public ServiceContext getServiceContext(AxisService service) throws AxisFault {
AxisService axisService = axisServiceGroup.getService(service.getName());
@@ -226,6 +226,7 @@
* of service contexts for this service group
* context.
*
+ * @param axisSrv the AxisService whose context we're looking for
* @return The ServiceContext associated with the AxisService
* or null, if none can be found
*/
@@ -450,6 +451,8 @@
* we have a configurationContext. This method checks to see
* if additional work needs to be done in order to complete
* the object reconstitution.
+ *
+ * @param cc the active ConfigurationContext
*/
public void activate(ConfigurationContext cc) {
// see if there's any work to do
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java?view=diff&rev=535950&r1=535949&r2=535950
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MetaDataEntry.java Mon May 7 11:39:30 2007
@@ -45,7 +45,7 @@
// list of MetaDataEntry objects that are owned by the
// original object referred to by this MetaDataEntry
- private ArrayList list = null;
+ private ArrayList children = null;
// marker to indicate end-of-list
public static String END_OF_LIST = "LAST_ENTRY";
@@ -58,28 +58,36 @@
/**
* Constructor
+ * @param className name of the object class
+ * @param qnameAsString an expanded version of the QName of this object
*/
- public MetaDataEntry(String c, String n) {
- className = c;
- qnameAsString = n;
+ public MetaDataEntry(String className, String qnameAsString) {
+ this.className = className;
+ this.qnameAsString = qnameAsString;
}
/**
* Constructor
- */
- public MetaDataEntry(String c, String n, String e) {
- className = c;
- qnameAsString = n;
- extraName = e;
+ * @param className name of the object class
+ * @param qnameAsString an expanded version of the QName of this object
+ * @param extraName an additional name associated withe the object
+ */
+ public MetaDataEntry(String className, String qnameAsString, String extraName) {
+ this.className = className;
+ this.qnameAsString = qnameAsString;
+ this.extraName = extraName;
}
/**
* Constructor
- */
- public MetaDataEntry(String c, String n, ArrayList l) {
- className = c;
- qnameAsString = n;
- list = l;
+ * @param className name of the object class
+ * @param qnameAsString an expanded version of the QName of this object
+ * @param children an ArrayList containing MetaDataEntries for owned objects
+ */
+ public MetaDataEntry(String className, String qnameAsString, ArrayList children) {
+ this.className = className;
+ this.qnameAsString = qnameAsString;
+ this.children = children;
}
@@ -174,7 +182,7 @@
/**
* Set the additional name associated with the object
*
- * @param c the extra name string
+ * @param e the extra name string
*/
public void setExtraName(String e) {
extraName = e;
@@ -187,11 +195,7 @@
* @return false for a non-empty list, true for an empty list
*/
public boolean isListEmpty() {
- if (list == null) {
- return true;
- }
-
- return list.isEmpty();
+ return children == null || children.isEmpty();
}
@@ -200,8 +204,8 @@
*
* @return the array list
*/
- public ArrayList getList() {
- return list;
+ public ArrayList getChildren() {
+ return children;
}
@@ -210,8 +214,8 @@
*
* @param L the ArrayList of MetaDataEntry objects
*/
- public void setList(ArrayList L) {
- list = L;
+ public void setChildren(ArrayList L) {
+ children = L;
}
/**
@@ -220,17 +224,17 @@
* @param e the MetaDataEntry object to add to the list
*/
public void addToList(MetaDataEntry e) {
- if (list == null) {
- list = new ArrayList();
+ if (children == null) {
+ children = new ArrayList();
}
- list.add(e);
+ children.add(e);
}
/**
* Remove the list
*/
public void removeList() {
- list = null;
+ children = null;
}
@@ -265,7 +269,7 @@
ObjectStateUtils.writeString(out, className, "MetaDataEntry.className");
ObjectStateUtils.writeString(out, qnameAsString, "MetaDataEntry.qnameAsString");
ObjectStateUtils.writeString(out, extraName, "MetaDataEntry.extraName");
- ObjectStateUtils.writeArrayList(out, list, "MetaDataEntry.list");
+ ObjectStateUtils.writeArrayList(out, children, "MetaDataEntry.list");
}
@@ -306,7 +310,7 @@
className = ObjectStateUtils.readString(in, "MetaDataEntry.className");
qnameAsString = ObjectStateUtils.readString(in, "MetaDataEntry.qnameAsString");
extraName = ObjectStateUtils.readString(in, "MetaDataEntry.extraName");
- list = ObjectStateUtils.readArrayList(in, "MetaDataEntry.list");
+ children = ObjectStateUtils.readArrayList(in, "MetaDataEntry.list");
}
Modified: webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java?view=diff&rev=535950&r1=535949&r2=535950
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java Mon May 7 11:39:30 2007
@@ -22,7 +22,6 @@
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.RepositoryListener;
-import org.apache.axis2.deployment.repository.util.WSInfo;
/**
* An Axis2 RepositoryListener subclass for dealing with script services
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org