You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/19 20:17:01 UTC
svn commit: r423550 - in /geronimo/sandbox/svkmerge/trunk: ./
applications/remote-deploy/src/webapp/WEB-INF/web.xml
applications/remote-deploy/src/webapp/images/
applications/remote-deploy/src/webapp/images/logo_head_570x86.gif
Author: jdillon
Date: Wed Jul 19 11:17:01 2006
New Revision: 423550
URL: http://svn.apache.org/viewvc?rev=423550&view=rev
Log:
r462@Bliss (orig r423470): sppatel | 2006-07-19 07:30:51 -0700
GERONIMO-1967
Added:
geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/images/
geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/images/logo_head_570x86.gif (with props)
Modified:
geronimo/sandbox/svkmerge/trunk/ (props changed)
geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml
Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jul 19 11:17:01 2006
@@ -1,2 +1,2 @@
13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:423293
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:423470
Modified: geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml?rev=423550&r1=423549&r2=423550&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/WEB-INF/web.xml Wed Jul 19 11:17:01 2006
@@ -27,11 +27,6 @@
<!-- [INSERT FRAGMENT HERE] -->
<servlet-mapping>
- <servlet-name>404-error</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>file-upload</servlet-name>
<url-pattern>/upload</url-pattern>
</servlet-mapping>
Added: geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/images/logo_head_570x86.gif
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/images/logo_head_570x86.gif?rev=423550&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/sandbox/svkmerge/trunk/applications/remote-deploy/src/webapp/images/logo_head_570x86.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif