geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r428823 - in /geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src: ./ webapp/WEB-INF/aggregation/Banner.jsp webapp/about.jsp webapp/doc/ webapp/images/head_about_51x86.gif webapp/login.jsp webapp/loginerror.jsp
Date Fri, 04 Aug 2006 18:26:54 GMT
Author: jdillon
Date: Fri Aug  4 11:26:54 2006
New Revision: 428823

URL: http://svn.apache.org/viewvc?rev=428823&view=rev
Log:
 r623@jason-dillons-computer (orig r427992):  jdillon | 2006-08-02 07:13:58 -0700
  r608@dyn456093 (orig r427475):  jsisson | 2006-08-01 00:27:45 -0700
  GERONIMO-2136 (Manually merged from 1.1 branch) Remove About icon and about.jsp from console
 

Removed:
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/about.jsp
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/doc/
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/images/head_about_51x86.gif
Modified:
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/   (props
changed)
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/login.jsp
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/loginerror.jsp

Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug  4 11:26:54 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/src:424406
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-framework/src:427992

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp?rev=428823&r1=428822&r2=428823&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp
(original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp
Fri Aug  4 11:26:54 2006
@@ -23,8 +23,6 @@
           <td height="86" class="Logo" border="0"></td>
           <td height="86" class="Top" border="0">&nbsp; </TD>
           <td height="86" class="Top" border="0" width="40">
-<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
-          </td>
           <td height="86" class="Top" border="0" width="40">
 <a href="<%=request.getContextPath()%>/logout.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_logout_63x86.gif"></a>
           </td>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/login.jsp?rev=428823&r1=428822&r2=428823&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/login.jsp
(original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/login.jsp
Fri Aug  4 11:26:54 2006
@@ -14,7 +14,6 @@
           <td height="86" class="LoginLogo" border="0"></td>
           <td height="86" class="Top" border="0">&nbsp; </TD>
           <td height="86" class="Top" border="0" width="40">
-<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
           </td>
         </TR>
         <TR>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/loginerror.jsp?rev=428823&r1=428822&r2=428823&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/loginerror.jsp
(original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/src/webapp/loginerror.jsp
Fri Aug  4 11:26:54 2006
@@ -14,7 +14,6 @@
           <td height="86" class="LoginLogo" border="0"></td>
           <td height="86" class="Top" border="0">&nbsp; </TD>
           <td height="86" class="Top" border="0" width="40">
-<a href="<%=request.getContextPath()%>/about.jsp"><img border="0" src="<%=request.getContextPath()%>/images/head_about_51x86.gif"></a>
           </td>
         </TR>
         <TR>



Mime
View raw message