You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/04/27 22:49:28 UTC
svn commit: r397629 - in /beehive/trunk/controls/test/webapps:
common/milton/resources/ common/milton/src/global/ src/global/ web/WEB-INF/
web/WEB-INF/lib/ web/WEB-INF/src/ web/resources/
Author: ekoneil
Date: Thu Apr 27 13:49:25 2006
New Revision: 397629
URL: http://svn.apache.org/viewcvs?rev=397629&view=rev
Log:
Cleanup in the Controls test webapp.
BB: self
Test: Controls pass
Added:
beehive/trunk/controls/test/webapps/src/global/
- copied from r397622, beehive/trunk/controls/test/webapps/common/milton/src/global/
beehive/trunk/controls/test/webapps/src/global/Global.java
- copied unchanged from r397622, beehive/trunk/controls/test/webapps/common/milton/src/global/Global.app
beehive/trunk/controls/test/webapps/web/resources/
- copied from r397622, beehive/trunk/controls/test/webapps/common/milton/resources/
Removed:
beehive/trunk/controls/test/webapps/common/milton/resources/
beehive/trunk/controls/test/webapps/common/milton/src/global/
beehive/trunk/controls/test/webapps/src/global/Global.app
beehive/trunk/controls/test/webapps/web/WEB-INF/lib/
beehive/trunk/controls/test/webapps/web/WEB-INF/server-config.wsdd
beehive/trunk/controls/test/webapps/web/WEB-INF/src/
Modified:
beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml
Modified: beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml?rev=397629&r1=397628&r2=397629&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml (original)
+++ beehive/trunk/controls/test/webapps/web/WEB-INF/web.xml Thu Apr 27 13:49:25 2006
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,19 +49,6 @@
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.beehive.netui.pageflow.PageFlowActionServlet</servlet-class>
- <init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/classes/_pageflow/struts-config.xml</param-value>
- </init-param>
- <init-param>
- <param-name>debug</param-name>
- <param-value>2</param-value>
- </init-param>
- <init-param>
- <param-name>detail</param-name>
- <param-value>2</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
</servlet>
<!-- Struts Action Servlet Mappings -->
@@ -59,16 +63,6 @@
<servlet-name>action</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
-
- <mime-mapping>
- <extension>wsdl</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
-
- <mime-mapping>
- <extension>xsd</extension>
- <mime-type>text/xml</mime-type>
- </mime-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>