You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/09/13 19:46:17 UTC

[isis] branch v2 updated: ISIS-2158 simple web.xml for simple-app & demo

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 16827e5  ISIS-2158 simple web.xml for simple-app & demo
16827e5 is described below

commit 16827e58c20af64e5cd22262db695ec535837d86
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 13 21:46:07 2019 +0200

    ISIS-2158 simple web.xml for simple-app & demo
---
 examples/apps/demo/src/main/webapp/WEB-INF/web.xml | 29 +++++++++++++++++---
 .../webapp/src/main/webapp/WEB-INF/web.xml         | 31 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/examples/apps/demo/src/main/webapp/WEB-INF/web.xml b/examples/apps/demo/src/main/webapp/WEB-INF/web.xml
index 87f9a2a..c8965be 100644
--- a/examples/apps/demo/src/main/webapp/WEB-INF/web.xml
+++ b/examples/apps/demo/src/main/webapp/WEB-INF/web.xml
@@ -1,10 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
+<!--
+  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
   
-    <display-name>Isis Demo</display-name>
+         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.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	id="WebApp_ID" version="3.1"> 
+
+    <display-name>Apache Isis Demo</display-name>
 
     <welcome-file-list>
         <welcome-file>about/index.html</welcome-file>
     </welcome-file-list>
-  
-</web-app>
\ No newline at end of file
+
+</web-app>
diff --git a/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml b/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..23536d6
--- /dev/null
+++ b/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	id="WebApp_ID" version="3.1"> 
+
+    <display-name>Simple App</display-name>
+
+    <welcome-file-list>
+        <welcome-file>about/index.html</welcome-file>
+    </welcome-file-list>
+
+</web-app>