geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r696333 - in /geronimo/samples/branches/2.1/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 14:56:56 GMT
Author: jbohn
Date: Wed Sep 17 07:56:55 2008
New Revision: 696333

URL: http://svn.apache.org/viewvc?rev=696333&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/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
  (with props)
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
  (with props)
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
  (with props)
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
  (with props)
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
  (with props)
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
  (with props)
Removed:
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/page1.jsp
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/page2.jsp
Modified:
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml?rev=696333&r1=696332&r2=696333&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/WEB-INF/web.xml
Wed Sep 17 07:56:55 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>

Added: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html?rev=696333&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
(added)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
Wed Sep 17 07:56:55 2008
@@ -0,0 +1,57 @@
+<!--
+   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.
+-->
+
+<html>
+<head>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
+    <title>Apache Geronimo Sample Applications</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+</head>
+
+<body onload="init()">
+
+<table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif"
border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tbody>
+        <tr>
+            <td valing="top" align="left">
+                <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif"
border="0"></a>
+            </td>
+            <td width="100%">
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tbody>
+        <tr class="topBar">
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo
Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/"
title="Geronimo Documentation" target="_blank">Documentation</a>
+                | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications"
target="_blank">Sample Applications</a>
+            </td>
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                <a href="xref/index.html" target="source_window">Source Code</a>
| <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html?rev=696333&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
(added)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
Wed Sep 17 07:56:55 2008
@@ -0,0 +1,29 @@
+<!--
+   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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
class="cell"">
+<html>
+<head>
+    <title>Apache Geronimo Sample Application</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+</head>
+
+<FRAMESET rows="86px,*" frameborder="0">
+    <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0"
marginwidth="0" noresize scrolling="no">
+    <FRAME src="./index.jsp" name="App-Per-Port-1" title="App-Per-Port-1" frameborder="0"
marginheight="0" marginwidth="0" noresize scrolling="no">
+</FRAMESET>
+
+</html>

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp?rev=696333&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
(added)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
Wed Sep 17 07:56:55 2008
@@ -0,0 +1,26 @@
+<!--
+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.
+-->
+<HTML>
+<HEAD><TITLE>App Per Port Web App 1</TITLE></HEAD>
+<BODY>
+<div align="center">
+    <H2>Application Per Port Example - 1</H2>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml?rev=696333&r1=696332&r2=696333&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/WEB-INF/web.xml
Wed Sep 17 07:56:55 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>

Added: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html?rev=696333&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
(added)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
Wed Sep 17 07:56:55 2008
@@ -0,0 +1,57 @@
+<!--
+   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.
+-->
+
+<html>
+<head>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
+    <title>Apache Geronimo Sample Applications</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+</head>
+
+<body onload="init()">
+
+<table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif"
border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tbody>
+        <tr>
+            <td valing="top" align="left">
+                <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif"
border="0"></a>
+            </td>
+            <td width="100%">
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tbody>
+        <tr class="topBar">
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo
Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/"
title="Geronimo Documentation" target="_blank">Documentation</a>
+                | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications"
target="_blank">Sample Applications</a>
+            </td>
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                <a href="xref/index.html" target="source_window">Source Code</a>
| <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/header.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html?rev=696333&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
(added)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
Wed Sep 17 07:56:55 2008
@@ -0,0 +1,29 @@
+<!--
+   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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
class="cell"">
+<html>
+<head>
+    <title>Apache Geronimo Sample Application</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+</head>
+
+<FRAMESET rows="86px,*" frameborder="0">
+    <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0"
marginwidth="0" noresize scrolling="no">
+    <FRAME src="./index.jsp" name="App-Per-Port-2" title="App-Per-Port-2" frameborder="0"
marginheight="0" marginwidth="0" noresize scrolling="no">
+</FRAMESET>
+
+</html>

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp?rev=696333&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
(added)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
Wed Sep 17 07:56:55 2008
@@ -0,0 +1,26 @@
+<!--
+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.
+-->
+<HTML>
+<HEAD><TITLE>App Per Port Web App 2</TITLE></HEAD>
+<BODY>
+<div align="center">
+    <H2>Application Per Port Example - 2</H2>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message