geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r696335 - in /geronimo/samples/trunk/samples/app-per-port: app-per-port-war1/src/main/webapp/ app-per-port-war1/src/main/webapp/WEB-INF/ app-per-port-war2/src/main/webapp/ app-per-port-war2/src/main/webapp/WEB-INF/
Date Wed, 17 Sep 2008 15:00:28 GMT
Author: jbohn
Date: Wed Sep 17 08:00:27 2008
New Revision: 696335

URL: http://svn.apache.org/viewvc?rev=696335&view=rev
Log:
add sample headers for the app-per-port samples as with the other samples - integrate display
content into the index.jsp so that the page jsp does not need to be specified on url

Added:
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
      - copied unchanged from r696333, geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
      - copied unchanged from r696333, geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
      - copied unchanged from r696333, geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
      - copied unchanged from r696333, geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
      - copied unchanged from r696333, geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
      - copied unchanged from r696333, geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
Removed:
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/page1.jsp
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/page2.jsp
Modified:
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml?rev=696335&r1=696334&r2=696335&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
Wed Sep 17 08:00:27 2008
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright 2004 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.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,4 +25,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
+    <welcome-file-list>
+        <welcome-file>/index.html</welcome-file>
+    </welcome-file-list>
+
 </web-app>

Modified: geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml?rev=696335&r1=696334&r2=696335&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/samples/trunk/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml
Wed Sep 17 08:00:27 2008
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright 2004 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.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -23,4 +25,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
+    <welcome-file-list>
+        <welcome-file>/index.html</welcome-file>
+    </welcome-file-list>
+
 </web-app>



Mime
View raw message