axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r757156 - in /webservices/axis2/branches/java/1_5: ./ modules/webapp/ modules/webapp/conf/ modules/webapp/src/main/java/ modules/webapp/src/main/java/org/ modules/webapp/src/main/java/org/apache/ modules/webapp/src/main/java/org/apache/axis...
Date Sun, 22 Mar 2009 09:36:09 GMT
Author: veithen
Date: Sun Mar 22 09:36:09 2009
New Revision: 757156

URL: http://svn.apache.org/viewvc?rev=757156&view=rev
Log:
Merged fixes to the webapp from trunk to the 1.5 branch.

Added:
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/
      - copied from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/
      - copied from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/org/
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/
      - copied from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/
      - copied from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/
      - copied from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
      - copied unchanged from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
      - copied unchanged from r757153, webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
Modified:
    webservices/axis2/branches/java/1_5/   (props changed)
    webservices/axis2/branches/java/1_5/modules/webapp/conf/web.xml
    webservices/axis2/branches/java/1_5/modules/webapp/pom.xml
    webservices/axis2/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp

Propchange: webservices/axis2/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 22 09:36:09 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503,757151-757153

Modified: webservices/axis2/branches/java/1_5/modules/webapp/conf/web.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/webapp/conf/web.xml?rev=757156&r1=757155&r2=757156&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/webapp/conf/web.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/webapp/conf/web.xml Sun Mar 22 09:36:09 2009
@@ -43,7 +43,7 @@
         <servlet-name>AxisAdminServlet</servlet-name>
         <display-name>Apache-Axis AxisAdmin Servlet (Web Admin)</display-name>
         <servlet-class>
-            org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
+            org.apache.axis2.webapp.AxisAdminServlet</servlet-class>
     </servlet>
     <servlet-mapping>
         <servlet-name>AxisServlet</servlet-name>

Modified: webservices/axis2/branches/java/1_5/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/webapp/pom.xml?rev=757156&r1=757155&r2=757156&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/webapp/pom.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/webapp/pom.xml Sun Mar 22 09:36:09 2009
@@ -1328,6 +1328,11 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
         </dependency>

Modified: webservices/axis2/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp?rev=757156&r1=757155&r2=757156&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp
(original)
+++ webservices/axis2/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/ViewGlobalHandlers.jsp
Sun Mar 22 09:36:09 2009
@@ -21,7 +21,7 @@
                  org.apache.axis2.engine.AxisConfiguration,
                  org.apache.axis2.engine.Handler,
                  org.apache.axis2.engine.Phase,
-                 java.util.ArrayList"%>
+                 java.util.List"%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <jsp:include page="include/adminheader.jsp"></jsp:include>
 <h1>View Global Execution Chains</h1>
@@ -29,8 +29,8 @@
             AxisConfiguration axisConfig = (AxisConfiguration)request.getSession().
                     getAttribute(Constants.GLOBAL_HANDLERS);
              if(axisConfig != null ){
-                 java.util.List handlers ;
-                 ArrayList phases = axisConfig.getInFlowPhases();
+                 List handlers ;
+                 List phases = axisConfig.getInFlowPhases();
                  %>
                  <h3> In Flow Up To and Including Dispatcher </h3>
                  <ul>



Mime
View raw message