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 di...@apache.org on 2007/02/25 21:14:45 UTC
svn commit: r511588 [2/8] - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: ./
addressing/ addressing/wsdl/ builder/ client/ context/ dataretrieval/
dataretrieval/client/ deployment/ deployment/resolver/ deployment/util/
descripti...
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java Sun Feb 25 12:14:38 2007
@@ -26,8 +26,8 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.util.ObjectStateUtils;
import org.apache.axis2.util.MetaDataEntry;
+import org.apache.axis2.util.ObjectStateUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -95,12 +95,15 @@
private transient ConfigurationContext configContext;
- /** Should we cache the last OperationContext? */
+ /**
+ * Should we cache the last OperationContext?
+ */
private boolean cachingOperationContext;
- /** A cache for the last OperationContext */
+ /**
+ * A cache for the last OperationContext
+ */
private transient OperationContext lastOperationContext;
-
//----------------------------------------------------------------
// MetaData for data to be restored in activate after readExternal
//----------------------------------------------------------------
@@ -249,21 +252,18 @@
/**
* Returns a name associated with this ServiceContext.
- * <P>
+ * <p/>
* Note: this name is from the corresponding
* AxisService object.
*
* @return The name string, or null if no name can be found
*/
- public String getName()
- {
- if (axisService != null)
- {
+ public String getName() {
+ if (axisService != null) {
return axisService.getName();
}
- if (metaAxisService != null)
- {
+ if (metaAxisService != null) {
return metaAxisService.getName();
}
@@ -277,15 +277,12 @@
*
* @return The name string, or null if no name can be found
*/
- public String getGroupName()
- {
- if (serviceGroupContext != null)
- {
+ public String getGroupName() {
+ if (serviceGroupContext != null) {
return serviceGroupContext.getId();
}
- if (metaParent != null)
- {
+ if (metaParent != null) {
return metaParent.getId();
}
@@ -300,7 +297,7 @@
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
* Also, objects that represent "static" data are
* not saved, except for enough information to be
@@ -308,11 +305,9 @@
* context is re-constituted.
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
//---------------------------------------------------------
// in order to handle future changes to the message
// context definition, be sure to maintain the
@@ -338,26 +333,22 @@
// so that the writing to the output stream continues
// even if one of the objects can't be serialized
- try
- {
+ try {
// EndpointReference targetEPR
ObjectStateUtils.writeObject(out, targetEPR, "ServiceContext.targetEPR");
}
- catch (Exception e1)
- {
+ catch (Exception e1) {
// note that the utility class will provide the trace for the
// exception so we won't have to
// so just consume the exception for now
}
- try
- {
+ try {
// EndpointReference myEPR
ObjectStateUtils.writeObject(out, myEPR, "ServiceContext.myEPR");
}
- catch (Exception e2)
- {
+ catch (Exception e2) {
// note that the utility class will provide the trace for the
// exception so we won't have to
// so just consume the exception for now
@@ -371,8 +362,7 @@
HashMap tmpHashMap = null;
- if ((tmpMap != null) && (!tmpMap.isEmpty()))
- {
+ if ((tmpMap != null) && (!tmpMap.isEmpty())) {
tmpHashMap = new HashMap(tmpMap);
}
@@ -386,12 +376,9 @@
String axisServMarker = "ServiceContext.metaAxisService";
ObjectStateUtils.writeString(out, axisServMarker, axisServMarker);
- if (axisService == null)
- {
+ if (axisService == null) {
out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
- }
- else
- {
+ } else {
out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
metaAxisService = new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
ObjectStateUtils.writeObject(out, metaAxisService, "ServiceContext.metaAxisService");
@@ -412,18 +399,16 @@
/**
* Restore the contents of the object that was previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written. Some data will need to be validated when
* resurrected.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// set the flag to indicate that the message context is being
// reconstituted and will need to have certain object references
// to be reconciled with the current engine setup
@@ -445,14 +430,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -486,8 +469,7 @@
HashMap tmpHashMap = ObjectStateUtils.readHashMap(in,"ServiceContext.properties");
properties = new HashMap();
- if (tmpHashMap != null)
- {
+ if (tmpHashMap != null) {
setProperties(tmpHashMap);
}
@@ -502,12 +484,9 @@
boolean metaAxisServiceIsActive = in.readBoolean();
- if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT)
- {
+ if (metaAxisServiceIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
metaAxisService = (MetaDataEntry) ObjectStateUtils.readObject(in, "ServiceContext.metaAxisService");
- }
- else
- {
+ } else {
metaAxisService = null;
}
@@ -546,11 +525,9 @@
*
* @param cc The configuration context object representing the active configuration
*/
- public void activate(ConfigurationContext cc)
- {
+ public void activate(ConfigurationContext cc) {
// see if there's any work to do
- if (!needsToBeReconciled)
- {
+ if (!needsToBeReconciled) {
// return quick
return;
}
@@ -564,8 +541,7 @@
// We previously saved metaAxisService; restore it
axisService = null;
- if (metaAxisService != null)
- {
+ if (metaAxisService != null) {
axisService = ObjectStateUtils.findService(axisConfig, metaAxisService.getClassName(), metaAxisService.getQNameAsString());
}
@@ -573,8 +549,7 @@
// the parent ServiceGroupContext object was saved
// either use the restored object or sync up with
// an existing ServiceGroupContext object
- if (metaParent != null)
- {
+ if (metaParent != null) {
// find out if a copy of the ServiceGroupContext object exists on this
// engine where this ServiceContext is being restored/activated
// if so, use that object instead of the restored object
@@ -586,17 +561,14 @@
ServiceGroupContext sgc = cc.getServiceGroupContext(groupName);
- if (existingSGC == null)
- {
+ if (existingSGC == null) {
// could not find an existing ServiceGroupContext
// use the restored object
metaParent.activate(cc);
// set parent
this.setParent(metaParent);
- }
- else
- {
+ } else {
// switch over to the existing object
this.setParent(existingSGC);
@@ -611,9 +583,7 @@
metaParent.putContextProperties(existingSGC);
}
- }
- else
- {
+ } else {
// set parent to null
this.setParent(metaParent);
}
@@ -621,8 +591,7 @@
// this is another pointer to our parent object
serviceGroupContext = (ServiceGroupContext) this.getParent();
- if (serviceGroupContext != null)
- {
+ if (serviceGroupContext != null) {
// add the service context to the table
serviceGroupContext.addServiceContext(this);
}
@@ -634,8 +603,7 @@
needsToBeReconciled = false;
// make sure this restored object is in the parent's list
- if (metaParent != null)
- {
+ if (metaParent != null) {
// make sure this restored object is in the parent's list
metaParent.addServiceContext(this);
}
@@ -650,31 +618,24 @@
* @param doParentProperties Indicates whether to go up the context hierachy
* copy the properties at each level
*/
- public void putContextProperties(ServiceContext context, boolean doParentProperties)
- {
- if (context != null)
- {
+ public void putContextProperties(ServiceContext context, boolean doParentProperties) {
+ if (context != null) {
// get the current properties on this context object
Map props = getProperties();
// copy them to the specified context object
context.mergeProperties(props);
- if (doParentProperties)
- {
+ if (doParentProperties) {
ServiceGroupContext mySGC = null;
- if (serviceGroupContext != null)
- {
+ if (serviceGroupContext != null) {
mySGC = serviceGroupContext;
- }
- else if (metaParent != null)
- {
+ } else if (metaParent != null) {
mySGC = metaParent;
}
- if (mySGC != null)
- {
+ if (mySGC != null) {
ServiceGroupContext sgc = context.getServiceGroupContext();
mySGC.putContextProperties(sgc);
}
@@ -687,62 +648,48 @@
* Compares key parts of the state from the current instance of
* this class with the specified instance to see if they are
* equivalent.
- * <P>
+ * <p/>
* This differs from the java.lang.Object.equals() method in
* that the equals() method generally looks at both the
* object identity (location in memory) and the object state
* (data).
- * <P>
+ * <p/>
*
+ * @param ctx
* @return TRUE if this object is equivalent with the specified object
* that is, key fields match
* FALSE, otherwise
- * @param ctx
*/
- public boolean isEquivalent(ServiceContext ctx)
- {
+ public boolean isEquivalent(ServiceContext ctx) {
// NOTE: the input object is expected to exist (ie, be non-null)
- if (!this.axisService.equals(ctx.getAxisService()))
- {
+ if (!this.axisService.equals(ctx.getAxisService())) {
return false;
}
EndpointReference targetEPR2 = ctx.getTargetEPR();
- if ( (this.targetEPR != null) && (targetEPR2 != null) )
- {
- if (!this.targetEPR.isEquivalent(targetEPR2))
- {
+ if ((this.targetEPR != null) && (targetEPR2 != null)) {
+ if (!this.targetEPR.isEquivalent(targetEPR2)) {
return false;
}
- }
- else if ((this.targetEPR == null) && (targetEPR2 == null))
- {
+ } else if ((this.targetEPR == null) && (targetEPR2 == null)) {
// keep going
- }
- else
- {
+ } else {
// one of the objects is null
return false;
}
EndpointReference myEPR2 = ctx.getMyEPR();
- if ( (this.myEPR != null) && (myEPR2 != null) )
- {
- if (!this.myEPR.isEquivalent(myEPR2))
- {
+ if ((this.myEPR != null) && (myEPR2 != null)) {
+ if (!this.myEPR.isEquivalent(myEPR2)) {
return false;
}
- }
- else if ((this.myEPR == null) && (myEPR2 == null))
- {
+ } else if ((this.myEPR == null) && (myEPR2 == null)) {
// keep going
- }
- else
- {
+ } else {
// one of the objects is null
return false;
}
@@ -762,8 +709,7 @@
* for this object instance. It is suitable for matching related log
* entries.
*/
- public String getLogCorrelationIDString()
- {
+ public String getLogCorrelationIDString() {
return logCorrelationIDString;
}
@@ -774,8 +720,7 @@
*
* @param methodname The method where the warning occurs
*/
- private void checkActivateWarning(String methodname)
- {
+ private void checkActivateWarning(String methodname) {
if (needsToBeReconciled) {
log.warn(logCorrelationIDString+":"+methodname+"(): ****WARNING**** "+myClassName+".activate(configurationContext) needs to be invoked.");
}
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=511588&r1=511587&r2=511588
==============================================================================
--- 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 Sun Feb 25 12:14:38 2007
@@ -23,8 +23,8 @@
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.util.ObjectStateUtils;
import org.apache.axis2.util.MetaDataEntry;
+import org.apache.axis2.util.ObjectStateUtils;
import org.apache.axis2.util.UUIDGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -177,22 +177,18 @@
*
* @param srvctx The ServiceContext object to add
*/
- public void addServiceContext(ServiceContext srvctx)
- {
- if (srvctx == null)
- {
+ public void addServiceContext(ServiceContext srvctx) {
+ if (srvctx == null) {
return;
}
AxisService axisService = srvctx.getAxisService();
- if (axisService == null)
- {
+ if (axisService == null) {
return;
}
- if (serviceContextMap == null)
- {
+ if (serviceContextMap == null) {
serviceContextMap = new HashMap();
}
@@ -208,14 +204,11 @@
* context.
*
* @param name The name associated with the ServiceContext
- *
* @return The ServiceContext associated with the name,
* or null, if none can be found
*/
- public ServiceContext findServiceContext(String name)
- {
- if (serviceContextMap == null)
- {
+ public ServiceContext findServiceContext(String name) {
+ if (serviceContextMap == null) {
return null;
}
@@ -230,19 +223,15 @@
* of service contexts for this service group
* context.
*
- *
* @return The ServiceContext associated with the AxisService
* or null, if none can be found
*/
- public ServiceContext findServiceContext(AxisService axisSrv)
- {
- if (axisSrv == null)
- {
+ public ServiceContext findServiceContext(AxisService axisSrv) {
+ if (axisSrv == null) {
return null;
}
- if (serviceContextMap == null)
- {
+ if (serviceContextMap == null) {
return null;
}
@@ -256,8 +245,7 @@
* @param context The ServiceGroupContext object to hold the merged properties
*/
public void putContextProperties(ServiceGroupContext context) {
- if (context != null)
- {
+ if (context != null) {
// get the current properties on this context object
Map props = getProperties();
@@ -275,7 +263,7 @@
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
* Also, objects that represent "static" data are
* not saved, except for enough information to be
@@ -283,11 +271,9 @@
* context is re-constituted.
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
//---------------------------------------------------------
@@ -307,8 +293,7 @@
out.writeLong(getLastTouchedTime());
- if (id == null)
- {
+ if (id == null) {
// generate an ID to use when this object is restored
id = UUIDGenerator.getUUID();
}
@@ -322,8 +307,7 @@
HashMap tmpHashMap = null;
- if ((tmpMap != null) && (!tmpMap.isEmpty()))
- {
+ if ((tmpMap != null) && (!tmpMap.isEmpty())) {
tmpHashMap = new HashMap(tmpMap);
}
@@ -337,12 +321,9 @@
String axisServGrpMarker = "ServiceGroupContext.axisServiceGroup";
ObjectStateUtils.writeString(out, axisServGrpMarker, axisServGrpMarker);
- if (axisServiceGroup == null)
- {
+ if (axisServiceGroup == null) {
out.writeBoolean(ObjectStateUtils.EMPTY_OBJECT);
- }
- else
- {
+ } else {
out.writeBoolean(ObjectStateUtils.ACTIVE_OBJECT);
metaAxisServiceGroup = new MetaDataEntry(axisServiceGroup.getClass().getName(), axisServiceGroup.getServiceGroupName());
ObjectStateUtils.writeObject(out, metaAxisServiceGroup, "ServiceGroupContext.metaAxisServiceGroup");
@@ -364,26 +345,23 @@
/**
* Restore the contents of the object that was previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written. Some data will need to be validated when
* resurrected.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// set the flag to indicate that the message context is being
// reconstituted and will need to have certain object references
// to be reconciled with the current engine setup
needsToBeReconciled = true;
// trace point
- if (log.isTraceEnabled())
- {
+ if (log.isTraceEnabled()) {
log.trace(myClassName+":readExternal(): BEGIN bytes available in stream ["+in.available()+"] ");
}
@@ -394,14 +372,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -423,8 +399,7 @@
HashMap tmpHashMap = ObjectStateUtils.readHashMap(in,"ServiceGroupContext.properties");
properties = new HashMap();
- if (tmpHashMap != null)
- {
+ if (tmpHashMap != null) {
setProperties(tmpHashMap);
}
@@ -439,12 +414,9 @@
boolean metaAxisServiceGrpIsActive = in.readBoolean();
- if (metaAxisServiceGrpIsActive == ObjectStateUtils.ACTIVE_OBJECT)
- {
+ if (metaAxisServiceGrpIsActive == ObjectStateUtils.ACTIVE_OBJECT) {
metaAxisServiceGroup = (MetaDataEntry) ObjectStateUtils.readObject(in, "ServiceGroupContext.metaAxisServiceGroup");
- }
- else
- {
+ } else {
metaAxisServiceGroup = null;
}
@@ -481,11 +453,9 @@
* if additional work needs to be done in order to complete
* the object reconstitution.
*/
- public void activate(ConfigurationContext cc)
- {
+ public void activate(ConfigurationContext cc) {
// see if there's any work to do
- if (!needsToBeReconciled)
- {
+ if (!needsToBeReconciled) {
// return quick
return;
}
@@ -496,9 +466,7 @@
// We previously saved metaAxisServiceGroup; restore it
if (metaAxisServiceGroup != null) {
axisServiceGroup = ObjectStateUtils.findServiceGroup(axisConfig, metaAxisServiceGroup.getClassName(), metaAxisServiceGroup.getQNameAsString());
- }
- else
- {
+ } else {
axisServiceGroup = null;
}
@@ -520,43 +488,35 @@
* Compares key parts of the state from the current instance of
* this class with the specified instance to see if they are
* equivalent.
- * <P>
+ * <p/>
* This differs from the java.lang.Object.equals() method in
* that the equals() method generally looks at both the
* object identity (location in memory) and the object state
* (data).
- * <P>
+ * <p/>
*
* @param ctx The object to compare with
* @return TRUE if this object is equivalent with the specified object
* that is, key fields match
* FALSE, otherwise
*/
- public boolean isEquivalent(ServiceGroupContext ctx)
- {
+ public boolean isEquivalent(ServiceGroupContext ctx) {
// NOTE: the input object is expected to exist (ie, be non-null)
- if (!this.axisServiceGroup.equals(ctx.getDescription()))
- {
+ if (!this.axisServiceGroup.equals(ctx.getDescription())) {
return false;
}
String ctxid = ctx.getId();
- if ((this.id != null) && (ctxid != null))
- {
- if (!this.id.equals(ctxid))
- {
+ if ((this.id != null) && (ctxid != null)) {
+ if (!this.id.equals(ctxid)) {
return false;
}
- }
- else if ((this.id == null) && (ctxid == null))
- {
+ } else if ((this.id == null) && (ctxid == null)) {
// keep going
- }
- else
- {
+ } else {
// mismatch
return false;
}
@@ -576,8 +536,7 @@
*
* @param methodname The method where the warning occurs
*/
- private void checkActivateWarning(String methodname)
- {
+ private void checkActivateWarning(String methodname) {
if (needsToBeReconciled) {
log.warn(myClassName+":"+methodname+"(): ****WARNING**** "+myClassName+".activate(configurationContext) needs to be invoked.");
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/SessionContext.java Sun Feb 25 12:14:38 2007
@@ -172,15 +172,13 @@
/**
* Save the contents of this object.
- * <p>
+ * <p/>
* NOTE: Transient fields and static fields are not saved.
*
* @param out The stream to write the object contents to
- *
- * @exception IOException
+ * @throws IOException
*/
- public void writeExternal(ObjectOutput out) throws IOException
- {
+ public void writeExternal(ObjectOutput out) throws IOException {
// write out contents of this object
// NOTES: For each item, where appropriate,
@@ -218,8 +216,7 @@
HashMap tmpHashMap = null;
- if ((tmpMap != null) && (!tmpMap.isEmpty()))
- {
+ if ((tmpMap != null) && (!tmpMap.isEmpty())) {
tmpHashMap = new HashMap(tmpMap);
}
@@ -241,21 +238,18 @@
/**
* Restore the contents of the MessageContext that was
* previously saved.
- * <p>
+ * <p/>
* NOTE: The field data must read back in the same order and type
* as it was written. Some data will need to be validated when
* resurrected.
*
* @param in The stream to read the object contents from
- *
- * @exception IOException
- * @exception ClassNotFoundException
+ * @throws IOException
+ * @throws ClassNotFoundException
*/
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
// trace point
- if (log.isTraceEnabled())
- {
+ if (log.isTraceEnabled()) {
log.trace(myClassName+":readExternal(): BEGIN bytes available in stream ["+in.available()+"] ");
}
@@ -266,14 +260,12 @@
int revID = in.readInt();
// make sure the object data is in a version we can handle
- if (suid != serialVersionUID)
- {
+ if (suid != serialVersionUID) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_SUID);
}
// make sure the object data is in a revision level we can handle
- if (revID != REVISION_1)
- {
+ if (revID != REVISION_1) {
throw new ClassNotFoundException(ObjectStateUtils.UNSUPPORTED_REVID);
}
@@ -296,8 +288,7 @@
HashMap tmpHashMap = ObjectStateUtils.readHashMap(in,"SessionContext.properties");
properties = new HashMap();
- if (tmpHashMap != null)
- {
+ if (tmpHashMap != null) {
setProperties(tmpHashMap);
}
@@ -309,12 +300,9 @@
// parent
Object tmpParent = ObjectStateUtils.readObject(in, "SessionContext.parent");
- if (tmpParent != null)
- {
+ if (tmpParent != null) {
parent = (AbstractContext) tmpParent;
- }
- else
- {
+ } else {
parent = null;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocator.java Sun Feb 25 12:14:38 2007
@@ -23,7 +23,6 @@
* storing metadata or different types of data to retrieve may code their version of
* Data Locator(s)by implementing the AxisDataLocator interface. Axis 2 support
* Data Locator plugin by configuring in Axis2.xml or services.xml. </p>
- *
*/
public interface AxisDataLocator {
@@ -32,12 +31,10 @@
/**
* Retrieves and returns data based on the specified request.
*
- * @param request
- * The {@link DataRetrievalRequest} allow to specify parameters
+ * @param request The {@link DataRetrievalRequest} allow to specify parameters
* about the request, and additional information to process the
* request.
- * @param msgContext
- * The {@link MessageContext} from the original request.
+ * @param msgContext The {@link MessageContext} from the original request.
* @return {@link Data}[] for the request.
* @throws DataRetrievalException
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/AxisDataLocatorImpl.java Sun Feb 25 12:14:38 2007
@@ -15,19 +15,19 @@
*/
package org.apache.axis2.dataretrieval;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
/**
* The Default Axis2 Data Locator implementation
- *
*/
public class AxisDataLocatorImpl implements AxisDataLocator {
@@ -41,8 +41,8 @@
/**
* Constructor
- * @throws DataRetrievalException
*
+ * @throws DataRetrievalException
*/
public AxisDataLocatorImpl(AxisService in_axisService) throws DataRetrievalException{
super();
@@ -50,7 +50,6 @@
}
/**
- *
* Retrieves and returns data based on the specified request.
*/
public Data[] getData(DataRetrievalRequest request,
@@ -62,10 +61,10 @@
ArrayList dataList = new ArrayList();
if (identifier != null){
key = key + identifier;
- if (dataMap.get(key) != null)
+ if (dataMap.get(key) != null) {
dataList.add(dataMap.get(key));
}
- else {
+ } else {
dataList = getDataList(dialect);
}
@@ -123,8 +122,9 @@
saveKey = data.getDialect();
String identifier = data.getIdentifier();
- if (identifier != null)
+ if (identifier != null) {
saveKey = saveKey + identifier;
+ }
dataMap.put(saveKey, data);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/BaseAxisDataLocator.java Sun Feb 25 12:14:38 2007
@@ -15,17 +15,16 @@
*/
package org.apache.axis2.dataretrieval;
-import java.util.ArrayList;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.dataretrieval.OutputForm;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.ArrayList;
+
/**
* BaseAxisDataLocator implements common code and serves as a base class
* for the supported default Axis2 dialect data locators.
- *
*/
public abstract class BaseAxisDataLocator {
@@ -38,7 +37,7 @@
* The default Axis2 Data locator getData API
* Checks data information configured in ServiceData.xml for the supported
* output forms: inline, url, EndpointReference.
- *
+ * <p/>
* Note: Subclass that has its implementation of outInlineForm, outputLocationForm,
* and outputReferenceForm logic must implement the getData API.
*/
@@ -59,23 +58,21 @@
if (outputform == OutputForm.INLINE_FORM) {
output = outputInlineForm(msgContext, dataList);
- }
- else if (outputform == OutputForm.LOCATION_FORM) {
+ } else if (outputform == OutputForm.LOCATION_FORM) {
output = outputLocationForm(dataList);
- }
- else if (outputform == OutputForm.REFERENCE_FORM) {
+ } else if (outputform == OutputForm.REFERENCE_FORM) {
output = outputReferenceForm(msgContext, dataList);
- }
- else {
+ } else {
output = outputInlineForm(msgContext, dataList);
}
- if (output == null)
+ if (output == null) {
log.info("Null data return! Data Locator does not know how to handle request for dialect= " + (String) request.getDialect()
+ " in the form of " + outputFormString);
+ }
log.trace("Default Base DataLocator getData ends");
@@ -95,8 +92,9 @@
for (int i = 0; i < size; i++) {
metaElement = serviceData[i].getFileContent(msgContext
.getAxisService().getClassLoader());
- if (metaElement != null)
+ if (metaElement != null) {
result.add(new Data(metaElement, serviceData[i].getIdentifier()));
+ }
}
@@ -115,10 +113,11 @@
for (int i = 0; i < serviceData.length; i++) {
String urlValue = serviceData[i].getURL();
- if (urlValue != null)
+ if (urlValue != null) {
result.add(new Data(urlValue, serviceData[i].getIdentifier()));
}
}
+ }
return (Data[]) result.toArray(new Data[0]);
}
@@ -130,9 +129,10 @@
for (int i = 0; i < serviceData.length; i++) {
epr = serviceData[i].getEndpointReference();
- if (epr != null)
+ if (epr != null) {
result.add(new Data((epr), serviceData[i].getIdentifier()));
}
+ }
}
return (Data[]) result.toArray(new Data[0]);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DRConstants.java Sun Feb 25 12:14:38 2007
@@ -33,9 +33,7 @@
}
/**
- *
* Defines contants references in WS-Mex specification
- *
*/
public interface SPEC {
@@ -74,9 +72,7 @@
String GLOBAL_LEVEL = "GlobalLevel";
/**
- *
* Defines contants references in Service Data
- *
*/
public interface SERVICE_DATA {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/Data.java Sun Feb 25 12:14:38 2007
@@ -17,7 +17,6 @@
/**
* Data contains instance of the data Object for the specified identifier if applicable.
- *
*/
public class Data {
@@ -27,6 +26,7 @@
/**
* Constructor
+ *
* @param in_data instance of Object about the data
* @param in_identifier identifier of the data instance.
*/
@@ -38,6 +38,7 @@
/**
* Returns data
+ *
* @return data Object
*/
@@ -47,6 +48,7 @@
/**
* Returns string representing identifier of this data object.
+ *
* @return
*/
public String getIdentifier(){
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataLocatorFactory.java Sun Feb 25 12:14:38 2007
@@ -38,20 +38,19 @@
if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_WSDL)){
dataLocator = getWsdlDataLocator(serviceDataArray);
- }
- else if (dialect.trim().equals(DRConstants.SPEC.DIALECT_TYPE_POLICY)){
- if (policyDataLocator == null)
+ } else if (dialect.trim().equals(DRConstants.SPEC.DIALECT_TYPE_POLICY)) {
+ if (policyDataLocator == null) {
dataLocator = new PolicyDataLocator(serviceDataArray);
- else
+ } else {
dataLocator = policyDataLocator;
}
- else if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_SCHEMA)){
- if (schemaDataLocator == null)
+ } else if (dialect.equals(DRConstants.SPEC.DIALECT_TYPE_SCHEMA)) {
+ if (schemaDataLocator == null) {
dataLocator = new SchemaDataLocator(serviceDataArray);
- else
+ } else {
dataLocator = schemaDataLocator;
}
- else {
+ } else {
dataLocator = null;
}
return dataLocator;
@@ -59,9 +58,9 @@
protected static AxisDataLocator getWsdlDataLocator(ServiceData[] serviceDataArray) {
- if (wsdlDataLocator == null)
+ if (wsdlDataLocator == null) {
wsdlDataLocator = new org.apache.axis2.dataretrieval.WSDLDataLocator(serviceDataArray);
- else {
+ } else {
wsdlDataLocator.setServiceData(serviceDataArray);
}
return wsdlDataLocator;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalException.java Sun Feb 25 12:14:38 2007
@@ -20,7 +20,6 @@
/**
* Exception class for reporting Data Retrieval problems
- *
*/
public class DataRetrievalException extends AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalRequest.java Sun Feb 25 12:14:38 2007
@@ -21,7 +21,6 @@
/**
* Allow to specify options/parameters for getData request. The list is extensible
* based on the information needed for the Data Locator to process the request.
- *
*/
public class DataRetrievalRequest extends HashMap{
@@ -42,22 +41,24 @@
public final static String OUTPUT_FORM = "OutputForm";
-
/**
* Returns the Dialect value specified in the request.
+ *
* @return a String that has dialect info.
*/
public String getDialect() throws DataRetrievalException{
String dialect = (String)(get(DIALET));
- if (dialect == null || dialect.length() == 0)
+ if (dialect == null || dialect.length() == 0) {
throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
+ }
return (dialect);
}
/**
* Returns the Identifier value specified in the request.
+ *
* @return a String that has Identifier info.
*/
@@ -67,6 +68,7 @@
/**
* Returns the output format specified in the request.
+ *
* @return output format of data retrieved.
*/
@@ -76,18 +78,21 @@
/**
* Allow to set the dialect of data to retrieve
+ *
* @param dialect - Valid dialect value supported by the Data Locator.
* @throws DataRetrievalException
*/
public void putDialect(String dialect)throws DataRetrievalException {
- if (dialect == null || dialect.length() == 0)
+ if (dialect == null || dialect.length() == 0) {
throw new DataRetrievalException("Empty dialect was detected. Dialect must have value.");
+ }
put(DIALET, dialect);
}
/**
* Allow to set the identifier of data to retrieve
+ *
* @param identifier - identifier value
* @throws DataRetrievalException
*/
@@ -98,6 +103,7 @@
/**
* Allow to set the output format of the data retrieved.
+ *
* @param form - Valid output format types supported by the Data Locator.
* @throws DataRetrievalException
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java Sun Feb 25 12:14:38 2007
@@ -16,9 +16,6 @@
package org.apache.axis2.dataretrieval;
-import java.io.InputStream;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -27,6 +24,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import java.io.InputStream;
+
public class DataRetrievalUtil {
private static final Log log = LogFactory.getLog(DataRetrievalUtil.class);
@@ -41,10 +42,10 @@
/**
* Loading xml file content and convert to OMElement.
+ *
* @param file - file path relative to the Service Repository
* @return OMElement format of the xml file content
* @throws DataRetrievalException
- *
*/
public OMElement buildOM(ClassLoader classLoader, String file)
@@ -64,6 +65,7 @@
/**
* Convert servicexmlStream to OMElement
+ *
* @param servicexmlStream InputStream contain xml content
* @return OMElement format of the xml content
* @throws XMLStreamException
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/LocatorType.java Sun Feb 25 12:14:38 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.dataretrieval;
/**
- *
* Defines Data Locator types as described below:
* DEFAULT_AXIS - Default Axis2 data locator
* GLOBAL_LEVEL - Global level data locator i.e.,plug-in data locator registered
@@ -28,7 +27,6 @@
* using <dataLocator> element in services.xml.
* SERVICE_DIALECT - Service level dialect specific data locator i.e. plug-in data locator registered
* using <dialectLocator> element in services.xml.
- *
*/
public class LocatorType {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/PolicyDataLocator.java Sun Feb 25 12:14:38 2007
@@ -17,11 +17,9 @@
package org.apache.axis2.dataretrieval;
/**
- *
* Axis 2 Data Locator responsibles for retrieving Policy metadata.
* The class is created as model for policy specific data locator; and also
* easier for any future implementation policy specific data retrieval logic.
- *
*/
public class PolicyDataLocator extends BaseAxisDataLocator implements AxisDataLocator {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/SchemaDataLocator.java Sun Feb 25 12:14:38 2007
@@ -20,7 +20,6 @@
* Axis 2 Data Locator responsibles for retrieving Schema metadata.
* The class is created as model for schema specific data locator; and also
* easier for any future implementation schema specific data retrieval logic.
- *
*/
public class SchemaDataLocator extends BaseAxisDataLocator implements AxisDataLocator {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/ServiceData.java Sun Feb 25 12:14:38 2007
@@ -16,17 +16,15 @@
package org.apache.axis2.dataretrieval;
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import javax.xml.namespace.QName;
+
/**
- *
* This represents the service data for a dialect and identifier if specified.
* Basically, the Data element defined in the ServiceData.xml packaged in
* a Web Service's achieve file.
- *
*/
public class ServiceData {
@@ -40,8 +38,8 @@
/**
* Constructor
- * @param in_data an Data element in the ServiceData.
*
+ * @param in_data an Data element in the ServiceData.
*/
protected ServiceData(OMElement in_data) {
@@ -55,8 +53,9 @@
String value = null;
OMAttribute attribute = data.getAttribute(new QName(qName));
- if (attribute != null)
+ if (attribute != null) {
value = attribute.getAttributeValue();
+ }
return value;
@@ -85,8 +84,9 @@
String urlValue = null;
OMElement url = data.getFirstChildWithName(new QName(
DRConstants.SERVICE_DATA.URL));
- if (url != null)
+ if (url != null) {
urlValue = url.getText();
+ }
return urlValue;
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/WSDLDataLocator.java Sun Feb 25 12:14:38 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.dataretrieval;
import org.apache.axiom.om.OMElement;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisService2OM;
@@ -26,7 +25,6 @@
/**
* Axis 2 Data Locator responsibles for retrieving WSDL metadata.
- *
*/
public class WSDLDataLocator extends BaseAxisDataLocator implements AxisDataLocator {
private static final Log log = LogFactory.getLog(WSDLDataLocator.class);
@@ -41,6 +39,7 @@
/**
* Constructor
+ *
* @param data an array of ServiceData instance defined in the
* ServiceData.xml for the WSDL dialect.
*/
@@ -70,24 +69,23 @@
if (outputform == OutputForm.INLINE_FORM) {
output = outputInlineForm(msgContext, dataList);
- }
- else if (outputform == OutputForm.LOCATION_FORM) {
+ } else if (outputform == OutputForm.LOCATION_FORM) {
output = outputLocationForm(dataList);
- }
- else if (outputform == OutputForm.REFERENCE_FORM) {
+ } else if (outputform == OutputForm.REFERENCE_FORM) {
output = outputReferenceForm(msgContext, dataList);
- }
- else {
+ } else {
output = outputInlineForm(msgContext, dataList);
}
- if (output == null)
- if (log.isTraceEnabled())
+ if (output == null) {
+ if (log.isTraceEnabled()) {
log.trace("Null data return! Data Locator does not know how to handle request for dialect= " + (String) request.getDialect()
+ " in the form of " + outputFormString);
+ }
+ }
log.trace("Default WSDL DataLocator getData ends");
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dataretrieval/client/MexClient.java Sun Feb 25 12:14:38 2007
@@ -1,8 +1,4 @@
package org.apache.axis2.dataretrieval.client;
-import java.net.URL;
-
-import javax.wsdl.Definition;
-import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -13,6 +9,10 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.dataretrieval.DRConstants;
import org.apache.axis2.description.AxisService;
+
+import javax.wsdl.Definition;
+import javax.xml.namespace.QName;
+import java.net.URL;
public class MexClient extends ServiceClient {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Sun Feb 25 12:14:38 2007
@@ -24,7 +24,12 @@
import org.apache.axis2.dataretrieval.DRConstants;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.ModuleConfiguration;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.PolicyInclude;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisObserver;
import org.apache.axis2.engine.MessageReceiver;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ClusterBuilder.java Sun Feb 25 12:14:38 2007
@@ -17,10 +17,6 @@
package org.apache.axis2.deployment;
-import java.io.InputStream;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axis2.cluster.ClusterManager;
import org.apache.axis2.description.AxisService;
@@ -28,6 +24,9 @@
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import javax.xml.namespace.QName;
+import java.io.InputStream;
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/Deployer.java Sun Feb 25 12:14:38 2007
@@ -1,8 +1,7 @@
package org.apache.axis2.deployment;
-import org.apache.axis2.deployment.repository.util.DeploymentFileData;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.deployment.repository.util.DeploymentFileData;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java Sun Feb 25 12:14:38 2007
@@ -16,19 +16,8 @@
package org.apache.axis2.deployment;
-import java.io.InputStream;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.builder.OMBuilder;
@@ -52,7 +41,15 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.PolicyReference;
-import org.omg.CORBA.OBJ_ADAPTER;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.InputStream;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
/**
* This class does the common tasks for all *Builder class.
@@ -115,9 +112,10 @@
}
if (service != null) {
messageReceiver = service.getMessageReceiver(mepURL);
- if (messageReceiver != null)
+ if (messageReceiver != null) {
return messageReceiver;
}
+ }
return axisConfig.getMessageReceiver(mepURL);
}
@@ -293,8 +291,7 @@
if ((className != null) && !"".equals(className)) {
selectorClass = Loader.loadClass(Thread.currentThread()
.getContextClassLoader(), className);
- }else
- {
+ } else {
throw new DeploymentException(Messages.getMessage(errorMsg,
"Invalid Class Name",className));
}
@@ -310,11 +307,9 @@
/**
* Processes flow elements in services.xml .
*
- * @param flowelement
- * <code>OMElement</code>
+ * @param flowelement <code>OMElement</code>
* @return Returns Flow.
- * @throws DeploymentException
- * <code>DeploymentException</code>
+ * @throws DeploymentException <code>DeploymentException</code>
*/
protected Flow processFlow(OMElement flowelement, ParameterInclude parent)
throws DeploymentException {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/FileSystemConfigurator.java Sun Feb 25 12:14:38 2007
@@ -105,7 +105,9 @@
throw new AxisFault("System can not find the given axis2.xml " + axis2xml);
}
Parameter axis2repoPara = axisConfig.getParameter(DeploymentConstants.AXIS2_REPO);
- if (axis2repoPara != null) repoLocation = (String) axis2repoPara.getValue();
+ if (axis2repoPara != null) {
+ repoLocation = (String) axis2repoPara.getValue();
+ }
if (!(repoLocation == null || "".equals(repoLocation))) {
loadRepository(repoLocation);
} else {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java Sun Feb 25 12:14:38 2007
@@ -17,22 +17,9 @@
package org.apache.axis2.deployment;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
-
-
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.util.Loader;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.AxisModule;
import org.apache.axis2.description.AxisOperation;
@@ -44,6 +31,16 @@
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.modules.Module;
+import org.apache.axis2.util.Loader;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Iterator;
/**
* Builds a module description from OM
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java Sun Feb 25 12:14:38 2007
@@ -112,9 +112,12 @@
}
}
- public void setDirectory(String directory) {}
+ public void setDirectory(String directory) {
+ }
- public void setExtension(String extension) {}
+ public void setExtension(String extension) {
+ }
- public void unDeploy(String fileName) {}
+ public void unDeploy(String fileName) {
+ }
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java Sun Feb 25 12:14:38 2007
@@ -8,7 +8,12 @@
import org.apache.axis2.util.Loader;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.ws.java2wsdl.AnnotationConstants;
-import org.codehaus.jam.*;
+import org.codehaus.jam.JAnnotation;
+import org.codehaus.jam.JClass;
+import org.codehaus.jam.JamClassIterator;
+import org.codehaus.jam.JamService;
+import org.codehaus.jam.JamServiceFactory;
+import org.codehaus.jam.JamServiceParams;
import java.io.File;
import java.io.FileInputStream;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/RepositoryListener.java Sun Feb 25 12:14:38 2007
@@ -126,8 +126,9 @@
for (int i = 0; (urls != null) && i < urls.length; i++) {
String path = urls[i].getPath();
//If it is a drive letter, adjust accordingly.
- if (path.length() >= 3 && path.charAt(0) == '/' && path.charAt(2) == ':')
+ if (path.length() >= 3 && path.charAt(0) == '/' && path.charAt(2) == ':') {
path = path.substring(1);
+ }
java.io.File file = new java.io.File(URLDecoder.decode(urls[i].getPath()).replace('/',
File.separatorChar).replace('|', ':'));
if (file.isFile()) {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Sun Feb 25 12:14:38 2007
@@ -24,7 +24,14 @@
import org.apache.axis2.dataretrieval.DRConstants;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.*;
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.InOutAxisOperation;
+import org.apache.axis2.description.ModuleConfiguration;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.PolicyInclude;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.engine.ServiceLifeCycle;
@@ -40,7 +47,11 @@
import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
/**
* Builds a service description from OM
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java Sun Feb 25 12:14:38 2007
@@ -8,7 +8,6 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java Sun Feb 25 12:14:38 2007
@@ -13,7 +13,11 @@
import javax.servlet.ServletConfig;
import javax.xml.stream.XMLStreamException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARBasedWSDLLocator.java Sun Feb 25 12:14:38 2007
@@ -1,17 +1,20 @@
package org.apache.axis2.deployment.resolver;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.deployment.util.Utils;
-import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.xml.sax.InputSource;
import javax.wsdl.xml.WSDLLocator;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import java.net.URI;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -92,7 +95,9 @@
throw new RuntimeException(e);
} finally {
try {
- if (zin != null) zin.close();
+ if (zin != null) {
+ zin.close();
+ }
} catch (IOException e) {
log.debug(e);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/AARFileBasedURIResolver.java Sun Feb 25 12:14:38 2007
@@ -1,16 +1,18 @@
package org.apache.axis2.deployment.resolver;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.deployment.util.Utils;
-import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.xml.sax.InputSource;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URI;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import java.net.URI;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -84,7 +86,9 @@
throw new RuntimeException(e);
} finally {
try {
- if (zin != null) zin.close();
+ if (zin != null) {
+ zin.close();
+ }
} catch (IOException e) {
log.debug(e);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarBasedWSDLLocator.java Sun Feb 25 12:14:38 2007
@@ -1,13 +1,13 @@
package org.apache.axis2.deployment.resolver;
-import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.xml.sax.InputSource;
import javax.wsdl.xml.WSDLLocator;
+import java.io.InputStream;
import java.net.URI;
-import java.io.*;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/resolver/WarFileBasedURIResolver.java Sun Feb 25 12:14:38 2007
@@ -1,8 +1,8 @@
package org.apache.axis2.deployment.resolver;
-import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ws.commons.schema.resolver.DefaultURIResolver;
import org.xml.sax.InputSource;
import java.net.URI;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sun Feb 25 12:14:38 2007
@@ -8,9 +8,17 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.deployment.DeploymentException;
-import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.deployment.repository.util.ArchiveReader;
-import org.apache.axis2.description.*;
+import org.apache.axis2.deployment.repository.util.DeploymentFileData;
+import org.apache.axis2.description.AxisMessage;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.description.AxisOperationFactory;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisServiceGroup;
+import org.apache.axis2.description.Flow;
+import org.apache.axis2.description.HandlerDescription;
+import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.MessageReceiver;
@@ -19,20 +27,32 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.schema.utils.NamespaceMap;
+import org.apache.ws.java2wsdl.AnnotationConstants;
import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.AnnotationConstants;
import org.apache.ws.java2wsdl.utils.TypeTable;
-import org.codehaus.jam.JMethod;
import org.codehaus.jam.JAnnotation;
+import org.codehaus.jam.JMethod;
import javax.xml.namespace.QName;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Stack;
+import java.util.StringTokenizer;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -494,7 +514,8 @@
}
int leadingSlashes = 0;
for (leadingSlashes = 0 ; leadingSlashes < uri.length()
- && uri.charAt(leadingSlashes) == '/' ; ++leadingSlashes) {}
+ && uri.charAt(leadingSlashes) == '/'; ++leadingSlashes) {
+ }
boolean isDir = (uri.charAt(uri.length() - 1) == '/');
StringTokenizer st = new StringTokenizer(uri, "/");
LinkedList clean = new LinkedList();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Sun Feb 25 12:14:38 2007
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.description;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
public class AxisBinding extends AxisDescription{
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java Sun Feb 25 12:14:38 2007
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.description;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
public class AxisBindingMessage extends AxisDescription{
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java Sun Feb 25 12:14:38 2007
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.description;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
public class AxisBindingOperation extends AxisDescription {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Sun Feb 25 12:14:38 2007
@@ -16,13 +16,6 @@
package org.apache.axis2.description;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.engine.AxisConfiguration;
@@ -33,6 +26,12 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
public abstract class AxisDescription implements ParameterInclude,
DescriptionConstants {
@@ -90,7 +89,9 @@
public Object getParameterValue(String name) {
Parameter param = getParameter(name);
- if (param == null) return null;
+ if (param == null) {
+ return null;
+ }
return param.getValue();
}
@@ -150,7 +151,7 @@
/**
* This method sets the policy as the default of this AxisDescription
* instance. Further more this method does the followings.
- *
+ * <p/>
* (1) Engage whatever modules necessary to execute new the effective policy
* of this AxisDescription instance. (2) Disengage whatever modules that are
* not necessary to execute the new effective policy of this AxisDescription
@@ -159,12 +160,10 @@
* notify the user. (5) Else notify each module about the new effective
* policy.
*
- * @param policy
- * the new policy of this AxisDescription instance. The effective
+ * @param policy the new policy of this AxisDescription instance. The effective
* policy is the merge of this argument with effective policy of
* parent of this AxisDescription.
- * @throws AxisFault
- * if any module is unable to execute the effective policy of
+ * @throws AxisFault if any module is unable to execute the effective policy of
* this AxisDescription instance successfully or no module to
* execute some portion (one or more PrimtiveAssertions ) of
* that effective policy.
@@ -245,7 +244,6 @@
* Applies the policies on the Description Hierarchy recursively.
*
* @throws AxisFault
- *
*/
public void applyPolicy() throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Sun Feb 25 12:14:38 2007
@@ -18,12 +18,12 @@
*/
package org.apache.axis2.description;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
import javax.xml.namespace.QName;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
public class AxisEndpoint extends AxisDescription{
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java?view=diff&rev=511588&r1=511587&r2=511588
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisModule.java Sun Feb 25 12:14:38 2007
@@ -24,9 +24,9 @@
import org.apache.axis2.modules.Module;
import javax.xml.namespace.QName;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.net.URL;
/**
* <p>This holds the information about a Module. </p>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org