Author: jaliya
Date: Tue Jun 12 08:37:57 2007
New Revision: 546533
URL: http://svn.apache.org/viewvc?view=rev&rev=546533
Log:
Reverting the changes of the last commit. Still we need to fix the JIRA Axis2
2642
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listService.jsp
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java?view=diff&rev=546533&r1=546532&r2=546533
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
Tue Jun 12 08:37:57 2007
@@ -17,27 +17,38 @@
package org.apache.axis2.description;
import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.util.WSDLSerializationUtil;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.OperationContext;
import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.deployment.DeploymentConstants;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisError;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.modules.Module;
import org.apache.axis2.phaseresolver.PhaseResolver;
-import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Map;
+import java.net.URI;
public abstract class AxisOperation extends AxisDescription
implements WSDLConstants {
@@ -457,7 +468,7 @@
*/
/**
- * Method getEngagedModulesNames.
+ * Method getEngagedModules.
*/
public Collection getEngagedModules() {
return engagedModules;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=546533&r1=546532&r2=546533
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Tue Jun 12 08:37:57 2007
@@ -20,27 +20,38 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.description.java2wsdl.TypeTable;
+import org.apache.axis2.description.java2wsdl.DefaultSchemaGenerator;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.SchemaGenerator;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.dataretrieval.*;
-import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.dataretrieval.AxisDataLocator;
+import org.apache.axis2.dataretrieval.AxisDataLocatorImpl;
+import org.apache.axis2.dataretrieval.DRConstants;
+import org.apache.axis2.dataretrieval.Data;
+import org.apache.axis2.dataretrieval.DataRetrievalException;
+import org.apache.axis2.dataretrieval.DataRetrievalRequest;
+import org.apache.axis2.dataretrieval.LocatorType;
+import org.apache.axis2.dataretrieval.OutputForm;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.deployment.util.Utils;
-import org.apache.axis2.description.java2wsdl.DefaultSchemaGenerator;
-import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
-import org.apache.axis2.description.java2wsdl.SchemaGenerator;
-import org.apache.axis2.description.java2wsdl.TypeTable;
-import org.apache.axis2.engine.*;
+import org.apache.axis2.deployment.DeploymentConstants;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.DefaultObjectSupplier;
+import org.apache.axis2.engine.MessageReceiver;
+import org.apache.axis2.engine.ObjectSupplier;
+import org.apache.axis2.engine.ServiceLifeCycle;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.modules.Module;
import org.apache.axis2.phaseresolver.PhaseResolver;
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.Loader;
import org.apache.axis2.util.XMLUtils;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,7 +82,17 @@
import java.net.SocketException;
import java.net.URL;
import java.security.PrivilegedAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Class AxisService
@@ -103,7 +124,7 @@
private ArrayList moduleRefs = null;
// to store engaged modules
- private ArrayList engagedModulesNames = null;
+ private ArrayList engagedModules = null;
// to store the wsdl definition , which is build at the deployment time
// to keep the time that last update time of the service
@@ -287,7 +308,7 @@
httpLocationDispatcherMap = new HashMap();
messageReceivers = new HashMap();
moduleRefs = new ArrayList();
- engagedModulesNames = new ArrayList();
+ engagedModules = new ArrayList();
schemaList = new ArrayList();
serviceClassLoader = (ClassLoader)
org.apache.axis2.java.security.AccessController
.doPrivileged(new PrivilegedAction() {
@@ -496,10 +517,10 @@
public void addOperation(AxisOperation axisOperation) {
axisOperation.setParent(this);
- Iterator moduleNames = getEngagedModulesNames().iterator();
+ Iterator modules = getEngagedModules().iterator();
- while (moduleNames.hasNext()) {
- AxisModule module = (AxisModule) moduleNames.next();
+ while (modules.hasNext()) {
+ AxisModule module = (AxisModule) modules.next();
AxisServiceGroup parent = (AxisServiceGroup) getParent();
try {
@@ -606,7 +627,7 @@
PolicyInclude policyInclude = new PolicyInclude(operation);
PolicyInclude axisOperationPolicyInclude =
axisOperation.getPolicyInclude();
-
+
if (axisOperationPolicyInclude != null) {
Policy policy = axisOperationPolicyInclude.getPolicy();
if (policy != null) {
@@ -614,7 +635,7 @@
}
}
operation.setPolicyInclude(policyInclude);
-
+
operation.setWsamappingList(axisOperation.getWsamappingList());
operation.setRemainingPhasesInFlow(axisOperation.getRemainingPhasesInFlow());
operation.setPhasesInFaultFlow(axisOperation.getPhasesInFaultFlow());
@@ -647,11 +668,11 @@
if (axisModule == null) {
throw new AxisFault(Messages.getMessage("modulenf"));
}
- Iterator itr_engageModuleNames = engagedModulesNames.iterator();
+ Iterator itr_engageModules = engagedModules.iterator();
boolean isEngagable;
String moduleName = axisModule.getName();
- while (itr_engageModuleNames.hasNext()) {
- AxisModule module = (AxisModule) itr_engageModuleNames.next();
+ while (itr_engageModules.hasNext()) {
+ AxisModule module = (AxisModule) itr_engageModules.next();
String modu = module.getName();
isEngagable = org.apache.axis2.util.Utils.checkVersion(moduleName,
modu);
if (!isEngagable) {
@@ -673,7 +694,7 @@
AxisOperation axisOperation = (AxisOperation) operations.next();
axisOperation.engageModule(axisModule);
}
- engagedModulesNames.add(axisModule);
+ engagedModules.add(axisModule);
}
/**
@@ -776,17 +797,17 @@
* Release the list of schema objects.
* <P>
* In some environments, this can provide significant relief
- * of memory consumption in the java heap, as long as the
+ * of memory consumption in the java heap, as long as the
* need for the schema list has completed.
*/
public void releaseSchemaList() {
if (schemaList != null) {
- // release the schema list
+ // release the schema list
schemaList.clear();
}
if (log.isDebugEnabled()) {
- log.debug("releaseSchemaList: schema list has been released.");
+ log.debug("releaseSchemaList: schema list has been released.");
}
}
@@ -1050,12 +1071,12 @@
}
/**
- * Method getEngagedModulesNames.
+ * Method getEngagedModules.
*
* @return Returns Collection.
*/
- public Collection getEngagedModulesNames() {
- return engagedModulesNames;
+ public Collection getEngagedModules() {
+ return engagedModules;
}
public URL getFileName() {
@@ -1379,7 +1400,7 @@
}
}
}
- engagedModulesNames.remove(module);
+ engagedModules.remove(module);
}
/**
@@ -1401,9 +1422,9 @@
if (module == null) {
return false;
}
- Iterator engagedModuleNamesItr = engagedModulesNames.iterator();
- while (engagedModuleNamesItr.hasNext()) {
- AxisModule axisModule = (AxisModule) engagedModuleNamesItr.next();
+ Iterator engagedModuleItr = engagedModules.iterator();
+ while (engagedModuleItr.hasNext()) {
+ AxisModule axisModule = (AxisModule) engagedModuleItr.next();
if (axisModule.getName().equals(module.getName())) {
return true;
}
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java?view=diff&rev=546533&r1=546532&r2=546533
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisServiceGroup.java
Tue Jun 12 08:37:57 2007
@@ -25,7 +25,6 @@
import org.apache.axis2.util.Utils;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -36,8 +35,8 @@
// to store module ref at deploy time parsing
private ArrayList modulesList = new ArrayList();
- // to store service Group engagedModulesNames name
- private ArrayList engagedModulesNames;
+ // to store service Group engagedModules name
+ private ArrayList engagedModules;
// to store modeule configuration info
private HashMap moduleConfigmap;
@@ -50,7 +49,7 @@
public AxisServiceGroup() {
moduleConfigmap = new HashMap();
- engagedModulesNames = new ArrayList();
+ engagedModules = new ArrayList();
}
public AxisServiceGroup(AxisConfiguration axisDescription) {
@@ -90,10 +89,10 @@
AxisConfiguration axisConfig = (AxisConfiguration) getParent();
if (axisConfig != null) {
- Iterator moduleNames = this.engagedModulesNames.iterator();
+ Iterator modules = this.engagedModules.iterator();
- while (moduleNames.hasNext()) {
- String moduleName = (String) moduleNames.next();
+ while (modules.hasNext()) {
+ String moduleName = (String) modules.next();
AxisModule axisModule = axisConfig.getModule(moduleName);
if (axisModule != null) {
@@ -122,10 +121,10 @@
AxisConfiguration axisConfig = (AxisConfiguration) getParent();
if (axisConfig != null) {
- Iterator moduleNames = this.engagedModulesNames.iterator();
+ Iterator modules = this.engagedModules.iterator();
- while (moduleNames.hasNext()) {
- String moduleName = (String) moduleNames.next();
+ while (modules.hasNext()) {
+ String moduleName = (String) modules.next();
AxisModule axisModule = axisConfig.getModule(moduleName);
if (axisModule != null) {
@@ -148,17 +147,17 @@
}
public void addToengagedModules(String moduleName) {
- engagedModulesNames.add(moduleName);
+ engagedModules.add(moduleName);
}
public void removeFromEngageList(String moduleName) {
- engagedModulesNames.remove(moduleName);
+ engagedModules.remove(moduleName);
}
public void engageModule(AxisModule module) throws AxisFault {
String moduleName = module.getName();
boolean isEngagable;
- for (Iterator iterator = engagedModulesNames.iterator();
iterator.hasNext();) {
+ for (Iterator iterator = engagedModules.iterator();
iterator.hasNext();) {
String modu = (String) iterator.next();
isEngagable = Utils.checkVersion(moduleName, modu);
if (!isEngagable) {
@@ -194,8 +193,8 @@
return (AxisConfiguration) getParent();
}
- public Collection getEngagedModulesNames() {
- return engagedModulesNames;
+ public ArrayList getEngagedModules() {
+ return engagedModules;
}
public ModuleConfiguration getModuleConfig(String moduleName) {
@@ -250,7 +249,7 @@
return false;
}
- for (Iterator engagedModuleItr = engagedModulesNames.iterator();
+ for (Iterator engagedModuleItr = engagedModules.iterator();
engagedModuleItr.hasNext();) {
String axisModule = (String) engagedModuleItr.next();
if (axisModule.equals(module.getName())) {
Modified:
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp?view=diff&rev=546533&r1=546532&r2=546533
==============================================================================
---
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
(original)
+++
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/ListServiceGroup.jsp
Tue Jun 12 08:37:57 2007
@@ -4,7 +4,6 @@
<%@ page import="javax.xml.namespace.QName" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.Collection"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
/*
@@ -34,7 +33,7 @@
while (axisServiceGroupIter.hasNext()) {
AxisServiceGroup axisServiceGroup = (AxisServiceGroup)
axisServiceGroupIter.next();
String groupName = axisServiceGroup.getServiceGroupName();
- Collection moduleNames = axisServiceGroup.getEngagedModulesNames();
+ ArrayList modules = axisServiceGroup.getEngagedModules();
Iterator axisServiceIter = axisServiceGroup.getServices();
%>
<h2><%=groupName%></h2><ul>
@@ -50,12 +49,12 @@
%>
</ul>
<%
- if (moduleNames.size() > 0) {
+ if (modules.size() > 0) {
%>
<I>Engaged modules</I><ul>
<%
- for (Iterator iteratorm = moduleNames.iterator();
iteratorm.hasNext();) {
- String modulDesc = (String) iteratorm.next();
+ for (int i = 0; i < modules.size(); i++) {
+ String modulDesc = (String) modules.get(i);
%>
<li><%=modulDesc%></li>
<%
Modified:
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp?view=diff&rev=546533&r1=546532&r2=546533
==============================================================================
---
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
(original)
+++
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp
Tue Jun 12 08:37:57 2007
@@ -58,13 +58,13 @@
<h4>Service Description : <font
color="black"><%=axisService.getServiceDescription()%></h4>
<i><font color="blue">Service Status : <%=axisService.isActive() ? "Active" :
"InActive"%></font></i><br/>
<%
- Collection engagedModulesNames = axisService.getEngagedModulesNames();
+ Collection engagedModules = axisService.getEngagedModules();
String moduleName;
- if (engagedModulesNames.size() > 0) {
+ if (engagedModules.size() > 0) {
%>
<i>Engaged Modules for the Axis Service</i><ul>
<%
- for (Iterator iteratorm = engagedModulesNames.iterator();
iteratorm.hasNext();) {
+ for (Iterator iteratorm = engagedModules.iterator(); iteratorm.hasNext();)
{
AxisModule axisOperation = (AxisModule) iteratorm.next();
moduleName = axisOperation.getName();
%><li><%=moduleName%></li>
@@ -84,12 +84,12 @@
AxisOperation axisOperation = (AxisOperation) operations.next();
%><li><%=axisOperation.getName().getLocalPart()%></li>
<%
- engagedModulesNames = axisOperation.getEngagedModules();
- if (engagedModulesNames.size() > 0) {
+ engagedModules = axisOperation.getEngagedModules();
+ if (engagedModules.size() > 0) {
%>
<br><i>Engaged Modules for the Operation</i><ul>
<%
- for (Iterator iterator2 = engagedModulesNames.iterator();
iterator2.hasNext();) {
+ for (Iterator iterator2 = engagedModules.iterator(); iterator2.hasNext();)
{
AxisModule moduleDecription = (AxisModule) iterator2.next();
moduleName = moduleDecription.getName();
%><li><%=moduleName%></li><br><%
Modified:
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listService.jsp
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listService.jsp?view=diff&rev=546533&r1=546532&r2=546533
==============================================================================
---
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listService.jsp
(original)
+++
webservices/axis2/trunk/java/modules/webapp/src/main/webapp/axis2-web/listService.jsp
Tue Jun 12 08:37:57 2007
@@ -75,7 +75,7 @@
<h4>Service Description : <font
color="black"><%=serviceDescription%></h4>
<i><font color="blue">Service Status : <%=axisService.isActive() ? "Active" :
"InActive"%></font></i><br>
<%
- Collection engagedModules = axisService.getEngagedModulesNames();
+ Collection engagedModules = axisService.getEngagedModules();
String moduleName;
boolean modules_present = false;
if (engagedModules.size() > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
