axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r351670 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/deployment/util/ core/src/org/apache/axis2/description/ core/webapp/ samples/src/sample/axisversion/META-INF/
Date Fri, 02 Dec 2005 10:47:29 GMT
Author: deepal
Date: Fri Dec  2 02:47:02 2005
New Revision: 351670

URL: http://svn.apache.org/viewcvs?rev=351670&view=rev
Log:
fixing jsp , and some other bugs

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
    webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp
    webservices/axis2/trunk/java/modules/core/webapp/viewServiceContext.jsp
    webservices/axis2/trunk/java/modules/core/webapp/viewServiceGroupContext.jsp
    webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/services.xml

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Fri Dec  2 02:47:02 2005
@@ -521,6 +521,7 @@
                                 de.printStackTrace(error_ptintWriter);
                                 serviceStatus = "Error:\n" +
                                         errorWriter.toString();
+                                de.printStackTrace();
                             } catch (AxisFault axisFault) {
                                 log.info(Messages.getMessage(DeploymentErrorMsgs.INVALID_SERVICE,
                                         currentArchiveFile.getName(), axisFault.getMessage()));

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/PhasesInfo.java
Fri Dec  2 02:47:02 2005
@@ -20,6 +20,7 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.engine.Phase;
+import org.apache.axis2.engine.Handler;
 import org.apache.axis2.om.OMElement;
 import org.apache.axis2.phaseresolver.PhaseException;
 import org.apache.axis2.phaseresolver.PhaseMetadata;
@@ -188,8 +189,8 @@
         Iterator handlers = phase.getHandlers().iterator();
         while (handlers.hasNext()) {
             try {
-                HandlerDescription handlerDescription = (HandlerDescription) handlers.next();
-                newPhase.addHandler(handlerDescription);
+                Handler handlerDescription = (Handler) handlers.next();
+                newPhase.addHandler(handlerDescription.getHandlerDesc());
             } catch (PhaseException e) {
                 throw new DeploymentException(e);
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisOperation.java
Fri Dec  2 02:47:02 2005
@@ -94,6 +94,7 @@
         if (moduleref == null) {
             return;
         }
+        boolean needToadd = true;
         Iterator module_itr = engagedModules.iterator();
         while (module_itr.hasNext()) {
             ModuleDescription module = (ModuleDescription) module_itr.next();
@@ -101,11 +102,14 @@
                 log.info(moduleref.getName().getLocalPart() +
                         " module has alredy engaged to the operation" +
                         "  operation terminated !!!");
-//                return;
+                needToadd = false;
+                // return;
             }
         }
         new PhaseResolver(axisConfig).engageModuleToOperation(this, moduleref);
-        engagedModules.add(moduleref);
+        if (needToadd) {
+            engagedModules.add(moduleref);
+        }
     }
 
     /*
@@ -211,16 +215,24 @@
 
 
     public abstract ArrayList getPhasesInFaultFlow();
-    public abstract ArrayList getPhasesOutFaultFlow() ;
-    public abstract ArrayList getPhasesOutFlow() ;
-    public abstract ArrayList getRemainingPhasesInFlow() ;
+
+    public abstract ArrayList getPhasesOutFaultFlow();
+
+    public abstract ArrayList getPhasesOutFlow();
+
+    public abstract ArrayList getRemainingPhasesInFlow();
+
     public abstract AxisMessage getMessage(String label);
 
-    public abstract void setPhasesInFaultFlow(ArrayList list) ;
-    public abstract void setPhasesOutFaultFlow(ArrayList list) ;
-    public abstract void setPhasesOutFlow(ArrayList list) ;
-    public abstract void setRemainingPhasesInFlow(ArrayList list) ;
-    public abstract void addMessage(AxisMessage message,String label);
+    public abstract void setPhasesInFaultFlow(ArrayList list);
+
+    public abstract void setPhasesOutFaultFlow(ArrayList list);
+
+    public abstract void setPhasesOutFlow(ArrayList list);
+
+    public abstract void setRemainingPhasesInFlow(ArrayList list);
+
+    public abstract void addMessage(AxisMessage message, String label);
 
 
     public void addModule(QName moduleName) {

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
Fri Dec  2 02:47:02 2005
@@ -124,6 +124,7 @@
         if (moduleref == null) {
             return;
         }
+        boolean needToadd = true;
         Iterator itr_engageModules = engagedModules.iterator();
         while (itr_engageModules.hasNext()) {
             ModuleDescription module = (ModuleDescription) itr_engageModules.next();
@@ -131,6 +132,7 @@
                 log.info(moduleref.getName().getLocalPart() +
                         " module has alredy been engaged on the service. " +
                         " Operation terminated !!!");
+                needToadd = false;
 //                return;
             }
         }
@@ -142,7 +144,9 @@
             AxisOperation axisOperation = (AxisOperation) operations.next();
             axisOperation.engageModule(moduleref, axisConfig);
         }
-        engagedModules.add(moduleref);
+        if (needToadd) {
+            engagedModules.add(moduleref);
+        }
     }
 
     /**

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisServiceGroup.java
Fri Dec  2 02:47:02 2005
@@ -143,6 +143,7 @@
         if (moduleName == null) {
             return;
         }
+        boolean needToadd = true;
         for (Iterator iterator = engagedModules.iterator();
              iterator.hasNext();) {
             QName modu = (QName) iterator.next();
@@ -150,7 +151,8 @@
                 log.info(moduleName.getLocalPart() +
                         " module has alredy been engaged on the service Group. " +
                         " Operation terminated !!!");
-                //return;
+                needToadd = false;
+//                return;
             }
         }
         Iterator srevice = getServices();
@@ -166,7 +168,9 @@
                 }
             }
         }
-        addToengagedModules(moduleName);
+        if (needToadd) {
+            addToengagedModules(moduleName);
+        }
     }
 
     public ArrayList getEngagedModules() {

Modified: webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/ListServiceGroup.jsp Fri Dec  2 02:47:02
2005
@@ -20,7 +20,7 @@
     <%
         while (axisServiceIter.hasNext()){
             AxisService axisService = (AxisService) axisServiceIter.next();
-            String serviceName = axisService.getAxisServiceName();
+            String serviceName = axisService.getName().getLocalPart();
     %>
     <li><font color="blue"><a href="listGroupService.jsp?serviceName=<%=serviceName%>">
         <%=serviceName%></a></font></li>

Modified: webservices/axis2/trunk/java/modules/core/webapp/viewServiceContext.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/viewServiceContext.jsp?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/viewServiceContext.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/viewServiceContext.jsp Fri Dec  2 02:47:02
2005
@@ -4,6 +4,7 @@
 <%@ page import="org.apache.axis2.context.ServiceGroupContext"%>
 <%@ page import="java.util.HashMap"%>
 <%@ page import="java.util.Iterator"%>
+<%@ page import="java.util.Map"%>
 <%--
   Created by IntelliJ IDEA.
   User: Indika Deepal
@@ -28,7 +29,7 @@
     if(sgID !=null && serviceContext !=null){
         if(type != null){
             if("VIEW".equals(type)){
-             HashMap perMap = serviceContext.getPersistentMap();
+             Map perMap = serviceContext.getProperties();
              if(perMap.size()>0){
              %>
              <h4>Persistance properties</h4><ul>
@@ -48,27 +49,6 @@
              <h4>No persistance property found in the context</h4>
             <%
              }
-             HashMap transientMap = serviceContext.getNonPersistentMap();
-                          if(perMap.size()>0){
-             %>
-             <h4>Non persistance properties</h4><ul>
-             <%
-                 Iterator itr = transientMap.keySet().iterator();
-                 while (itr.hasNext()) {
-                     String key = (String) itr.next();
-                     Object property =  transientMap.get(key);
-              %>
-                   <li><%=key%> : <%=property.toString()%></li>
-              <%
-                 }
-                 %></ul>
-                 <%
-             } else {
-            %>
-            <h4> No non-persistance property found in the context</h4>
-            <%
-             }
-            }
         }
     } else {
 %> <h4>No Service Context found</h4><%

Modified: webservices/axis2/trunk/java/modules/core/webapp/viewServiceGroupContext.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/viewServiceGroupContext.jsp?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/viewServiceGroupContext.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/viewServiceGroupContext.jsp Fri Dec 
2 02:47:02 2005
@@ -3,6 +3,7 @@
 <%@ page import="org.apache.axis2.context.ServiceGroupContext"%>
 <%@ page import="java.util.HashMap"%>
 <%@ page import="java.util.Iterator"%>
+<%@ page import="java.util.Map"%>
 <%--
   Created by IntelliJ IDEA.
   User: Indika Deepal
@@ -22,7 +23,7 @@
     if(sgID !=null && sgContext !=null){
         if(type != null){
             if("VIEW".equals(type)){
-             HashMap perMap = sgContext.getPersistentMap();
+             Map perMap = sgContext.getProperties();
              if(perMap.size()>0){
              %>
              <h4>Persistance properties</h4><ul>
@@ -40,26 +41,6 @@
              } else {
             %>
              <h4>No persistance properties found in the context</h4>
-            <%
-             }
-             HashMap transientMap = sgContext.getNonPersistentMap();
-                          if(perMap.size()>0){
-             %>
-             <h4>Non persistance properties</h4><ul>
-             <%
-                 Iterator itr = transientMap.keySet().iterator();
-                 while (itr.hasNext()) {
-                     String key = (String) itr.next();
-                     Object property =  transientMap.get(key);
-              %>
-                   <li><%=key%> : <%=property.toString()%></li>
-              <%
-                 }
-                 %></ul>
-                 <%
-             } else {
-            %>
-            <h4> No non-persistance properties found in the context</h4>
             <%
              }
             }   else if("DELETE".equals(type)){

Modified: webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/services.xml?rev=351670&r1=351669&r2=351670&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/services.xml
(original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/services.xml
Fri Dec  2 02:47:02 2005
@@ -1,6 +1,6 @@
 <service name="Version">
     <description>
-        This servics is to get the running Axis version
+        This service is to get the running Axis version
     </description>
     <parameter name="ServiceClass" locked="false">sample.axisversion.Version</parameter>
     <operation name="getVersion">



Mime
View raw message