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/06/01 12:55:32 UTC

svn commit: r179372 - in /webservices/axis/trunk/java/modules/core: html/ samples/deployment/echo/org/apache/axis/echo/ src/org/apache/axis/transport/http/

Author: deepal
Date: Wed Jun  1 03:55:30 2005
New Revision: 179372

URL: http://svn.apache.org/viewcvs?rev=179372&view=rev
Log:
formatting jsp and fixing servlet bug (writting HTTP OK twice)

Modified:
    webservices/axis/trunk/java/modules/core/html/LeftFrame.jsp
    webservices/axis/trunk/java/modules/core/html/Loging.jsp
    webservices/axis/trunk/java/modules/core/html/MainFrame.jsp
    webservices/axis/trunk/java/modules/core/html/TopFrame.jsp
    webservices/axis/trunk/java/modules/core/html/admin.jsp
    webservices/axis/trunk/java/modules/core/html/enaggingtoanopeartion.jsp
    webservices/axis/trunk/java/modules/core/html/engagingglobally.jsp
    webservices/axis/trunk/java/modules/core/html/engagingtoaservice.jsp
    webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java

Modified: webservices/axis/trunk/java/modules/core/html/LeftFrame.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/LeftFrame.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/LeftFrame.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/LeftFrame.jsp Wed Jun  1 03:55:30 2005
@@ -20,11 +20,6 @@
 <head>
 <title>Untitled Document</title>
 <style type="text/css">
-<!--
-body {
-	background-color: #FFFFCC;
-}
--->
 </style></head>
 
 <body>

Modified: webservices/axis/trunk/java/modules/core/html/Loging.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/Loging.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/Loging.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/Loging.jsp Wed Jun  1 03:55:30 2005
@@ -14,6 +14,7 @@
 <html>
   <head><title>Loging to Axis2:: Administartion page</title></head>
   <body>
+  <jsp:include page="include/header.inc"></jsp:include>
     <form method="get" name="LogingForm" action="adminloging">
         <table border="0" width="100%" cellspacing="1" cellpadding="1">
             <tr>
@@ -38,6 +39,7 @@
              </tr>
          </table>
        </form>
+       <jsp:include page="include/footer.inc"></jsp:include>
      </body>
   </html>
 

Modified: webservices/axis/trunk/java/modules/core/html/MainFrame.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/MainFrame.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/MainFrame.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/MainFrame.jsp Wed Jun  1 03:55:30 2005
@@ -5,14 +5,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>Axis2 Administration </title>
 <style type="text/css">
-<!--
-body {
-	background-color: #FFCC99;
-}
--->
 </style></head>
 
 <body>
-No yet Implemented
 </body>
 </html>

Modified: webservices/axis/trunk/java/modules/core/html/TopFrame.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/TopFrame.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/TopFrame.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/TopFrame.jsp Wed Jun  1 03:55:30 2005
@@ -3,14 +3,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>Untitled Document</title>
 <style type="text/css">
-<!--
-body {
-	background-color: #009999;
-}
--->
 </style></head>
 
 <body>
-Axis2 Adminstration Page
+<jsp:include page="include/header.inc"></jsp:include>
 </body>
 </html>

Modified: webservices/axis/trunk/java/modules/core/html/admin.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/admin.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/admin.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/admin.jsp Wed Jun  1 03:55:30 2005
@@ -21,11 +21,11 @@
 <title>Axis2 :: Administrations Page</title>
 </head>
 
-<frameset rows="80,*" cols="*" frameborder="NO" border="0" framespacing="0">
-<frame src="TopFrame.jsp" name="topFrame" scrolling="NO" noresize >
+<frameset rows="200,*" frameborder="NO" border="0" framespacing="0">
+<frame src="TopFrame.jsp" name="topFrame" scrolling="NO"  >
 <frameset rows="*" cols="245,*" framespacing="0" frameborder="NO" border="0">
-<frame src="LeftFrame.jsp" name="leftFrame" scrolling="NO" noresize>
-<frame src="MainFrame.jsp" name="mainFrame">
+<frame src="LeftFrame.jsp" name="leftFrame"  border="0" scrolling="NO"  noresize>
+<frame src="MainFrame.jsp"  border="0" name="mainFrame">
 </frameset>
 </frameset>
 <noframes><body>
@@ -35,6 +35,5 @@
           throw new Exception("Invalid logging");
       }
   %>
-
 </body></noframes>
 </html>

Modified: webservices/axis/trunk/java/modules/core/html/enaggingtoanopeartion.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/enaggingtoanopeartion.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/enaggingtoanopeartion.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/enaggingtoanopeartion.jsp Wed Jun  1 03:55:30 2005
@@ -5,11 +5,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>Untitled Document</title>
 <style type="text/css">
-<!--
-body {
-	background-color: #FFCCCC;
-}
--->
 </style></head>
 
 <body>

Modified: webservices/axis/trunk/java/modules/core/html/engagingglobally.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/engagingglobally.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/engagingglobally.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/engagingglobally.jsp Wed Jun  1 03:55:30 2005
@@ -8,11 +8,6 @@
 <head>
 <title>Engaging Module Globally</title>
 <style type="text/css">
-<!--
-body {
-background-color: #FFCCCC;
-}
--->
 </style></head>
 
 <body>

Modified: webservices/axis/trunk/java/modules/core/html/engagingtoaservice.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/engagingtoaservice.jsp?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/engagingtoaservice.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/engagingtoaservice.jsp Wed Jun  1 03:55:30 2005
@@ -11,11 +11,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <title>Engaging Module to a Service</title>
 <style type="text/css">
-<!--
-body {
-	background-color: #FFCCCC;
-}
--->
+
 </style></head>
 
 <body>

Modified: webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java (original)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java Wed Jun  1 03:55:30 2005
@@ -30,7 +30,8 @@
     public Echo() {
     }
     public OMElement echoOMElement(OMElement omEle) {
-        omEle.setLocalName(omEle.getLocalName() + "Response");
+        omEle.getNextSibling();
+        omEle.detach();
         return omEle;
     }
     public String echoString(String in) {

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=179372&r1=179371&r2=179372&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java Wed Jun  1 03:55:30 2005
@@ -123,6 +123,7 @@
             ConfigurationContextFactory erfac =
                     new ConfigurationContextFactory();
             engineContext = erfac.buildEngineContext(repoDir);
+            engineContext.setProperty(Constants.CONTAINER_MANAGED,Constants.VALUE_TRUE);
         } catch (Exception e) {
             throw new ServletException(e);
         }
@@ -221,7 +222,7 @@
                             engineContext.getAxisConfiguration().getTransportOut(
                                     new QName(Constants.TRANSPORT_HTTP)));
             msgContext.setServerSide(true);
-            msgContext.setProperty(Constants.CONTAINER_MANAGED,Constants.VALUE_TRUE);
+
             
             String filePart = req.getRequestURL().toString();
             msgContext.setTo(