You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/07/01 06:50:15 UTC
svn commit: r208709 - in /webservices/axis/trunk/java/modules/core:
src/org/apache/axis/description/ src/org/apache/axis/phaseresolver/ webapp/
Author: deepal
Date: Thu Jun 30 21:50:13 2005
New Revision: 208709
URL: http://svn.apache.org/viewcvs?rev=208709&view=rev
Log:
Fix some bugs in jsps
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
webservices/axis/trunk/java/modules/core/webapp/listService.jsp
webservices/axis/trunk/java/modules/core/webapp/listServices.jsp
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java?rev=208709&r1=208708&r2=208709&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/OperationDescription.java Thu Jun 30 21:50:13 2005
@@ -89,6 +89,12 @@
public void addToEngageModuleList(ModuleDescription moduleName){
Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
+ for (Iterator iterator = collectionModule.iterator(); iterator.hasNext();) {
+ ModuleDescription moduleDescription = (ModuleDescription) iterator.next();
+ if(moduleName.getName().equals(moduleDescription.getName())){
+ return;
+ }
+ }
collectionModule.add(moduleName);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java?rev=208709&r1=208708&r2=208709&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/description/ServiceDescription.java Thu Jun 30 21:50:13 2005
@@ -132,6 +132,12 @@
public void addToEngagModuleList(ModuleDescription moduleName){
Collection collectionModule = (Collection) this.getComponentProperty(MODULEREF_KEY);
+ for (Iterator iterator = collectionModule.iterator(); iterator.hasNext();) {
+ ModuleDescription moduleDescription = (ModuleDescription) iterator.next();
+ if(moduleName.getName().equals(moduleDescription.getName())){
+ return;
+ }
+ }
collectionModule.add(moduleName);
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java?rev=208709&r1=208708&r2=208709&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/phaseresolver/PhaseResolver.java Thu Jun 30 21:50:13 2005
@@ -143,6 +143,7 @@
}
}
axisService.addToEngagModuleList(module);
+ operation.addToEngageModuleList(module);
} else {
throw new PhaseException("referance to invalid module " + modulename.getLocalPart() + " by axis2.xml");
}
Modified: webservices/axis/trunk/java/modules/core/webapp/listService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/webapp/listService.jsp?rev=208709&r1=208708&r2=208709&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/webapp/listService.jsp (original)
+++ webservices/axis/trunk/java/modules/core/webapp/listService.jsp Thu Jun 30 21:50:13 2005
@@ -57,6 +57,7 @@
operationsList = operations.values();
serviceName = axisService.getName().getLocalPart();
%><hr><h2><font color="blue"><a href="<%=prifix + axisService.getName().getLocalPart()%>?wsdl=<%=serviceName%>"><%=serviceName%></a></font></h2>
+ <font color="blue">Service EPR : <font color="black"><%=prifix + axisService.getName().getLocalPart()%></font>
<h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
<%
Collection engagdeModules = axisService.getEngagedModules();
@@ -82,8 +83,7 @@
for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
OperationDescription axisOperation = (OperationDescription) iterator1.next();
%><li><%=axisOperation.getName().getLocalPart()%></li>
- <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"
- + axisOperation.getName().getLocalPart()%>
+<%-- <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
<%
engagdeModules = null;
engagdeModules = axisOperation.getModules();
Modified: webservices/axis/trunk/java/modules/core/webapp/listServices.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/webapp/listServices.jsp?rev=208709&r1=208708&r2=208709&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/webapp/listServices.jsp (original)
+++ webservices/axis/trunk/java/modules/core/webapp/listServices.jsp Thu Jun 30 21:50:13 2005
@@ -48,7 +48,8 @@
operationsList = operations.values();
serviceName = axisService.getName().getLocalPart();
%><hr><h2><font color="blue"><a href="<%=prifix + axisService.getName().getLocalPart()%>?wsdl=<%=serviceName%>"><%=serviceName%></a></font></h2>
- <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
+ <font color="blue">Service EPR : <font color="black"><%=prifix + axisService.getName().getLocalPart()%></font>
+ <h4>Service Description : <font color="black"><%=axisService.getServiceDescription()%></h4>
<%
if (operationsList.size() > 0) {
%><i>Available operations</i><%
@@ -59,8 +60,7 @@
for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
OperationDescription axisOperation = (OperationDescription) iterator1.next();
%><li><%=axisOperation.getName().getLocalPart()%></li>
- <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"
- + axisOperation.getName().getLocalPart()%>
+<%-- <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
<%
}
%></ul>