geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r553914 - in /geronimo/server/trunk/applications: geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/ geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/ geronimo-remote-deploy/src/main/webapp/WEB-INF/ geronimo...
Date Fri, 06 Jul 2007 14:56:03 GMT
Author: dwoods
Date: Fri Jul  6 07:56:02 2007
New Revision: 553914

URL: http://svn.apache.org/viewvc?view=rev&rev=553914
Log:
GERONIMO-3189 Allow jsp/servlet examples to be deployed as WAR files on Tomcat or Jetty. 
Update to latest schemas and security config.

Added:
    geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
  (with props)
Modified:
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=553914&r1=553913&r2=553914
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
Fri Jul  6 07:56:02 2007
@@ -17,15 +17,15 @@
 
 <!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-  <dep:environment >
+  <dep:environment>
     <dep:moduleId>
       <dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
       <dep:artifactId>geronimo-jsp-examples</dep:artifactId>
       <dep:version>2.0-SNAPSHOT</dep:version>
-      <dep:type>war</dep:type>
     </dep:moduleId>
     <dep:dependencies/>
     <dep:hidden-classes/>
@@ -34,16 +34,17 @@
   
   <context-root>/jsp-examples</context-root>
   <!--<context-priority-classloader>false</context-priority-classloader>-->
-  <security-realm-name>geronimo-properties-realm</security-realm-name>
-  <security>
-      <default-principal>
-          <principal name="anonymous" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
-      </default-principal>
-      <role-mappings>
-          <role role-name="tomcat">
-              <principal name="admin" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
-          </role>
-      </role-mappings>
-  </security>
-
+  <security-realm-name>geronimo-admin</security-realm-name>
+  <sec:security>
+      <sec:default-principal>
+          <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
+                         name="anonymous"/>
+      </sec:default-principal>
+      <sec:role-mappings>
+          <sec:role role-name="tomcat">
+              <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+                             name="admin"/>
+          </sec:role>
+      </sec:role-mappings>
+  </sec:security>
 </web-app>

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=553914&r1=553913&r2=553914
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
Fri Jul  6 07:56:02 2007
@@ -17,7 +17,8 @@
 
 <!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
   <dep:environment>
@@ -25,7 +26,6 @@
       <dep:groupId>org.apache.geronimo.applications.examples</dep:groupId>
       <dep:artifactId>geronimo-servlet-examples</dep:artifactId>
       <dep:version>2.0-SNAPSHOT</dep:version>
-      <dep:type>war</dep:type>
     </dep:moduleId>
     <dep:dependencies/>
     <dep:hidden-classes/>
@@ -34,16 +34,17 @@
 
   <context-root>/servlet-examples</context-root>
   <!--<context-priority-classloader>false</context-priority-classloader>-->
-  <security-realm-name>geronimo-properties-realm</security-realm-name>
-  <security>
-      <default-principal>
-          <principal name="anonymous" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
-      </default-principal>
-      <role-mappings>
-          <role role-name="tomcat">
-              <principal name="admin" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
-          </role>
-      </role-mappings>
-  </security>
-
+  <security-realm-name>geronimo-admin</security-realm-name>
+  <sec:security>
+      <sec:default-principal>
+          <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
+                         name="anonymous"/>
+      </sec:default-principal>
+      <sec:role-mappings>
+          <sec:role role-name="tomcat">
+              <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+                             name="admin"/>
+          </sec:role>
+      </sec:role-mappings>
+  </sec:security>
 </web-app>

Modified: geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=553914&r1=553913&r2=553914
==============================================================================
--- geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
Fri Jul  6 07:56:02 2007
@@ -18,15 +18,21 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
-         xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-         xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.0"
-         configId="geronimo/remote-deploy/1.0/car">
-    <cfg:dependency>
-        <cfg:groupId>geronimo</cfg:groupId>
-        <cfg:artifactId>geronimo-remote-deploy-lib</cfg:artifactId>
-        <cfg:version>1.0</cfg:version>
-    </cfg:dependency>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
+         xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+    <dep:environment>
+      <dep:moduleId>
+        <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+        <dep:artifactId>geronimo-remote-deploy</dep:artifactId>
+        <dep:version>2.0-SNAPSHOT</dep:version>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
+
     <context-root>/remote-deploy</context-root>
     <context-priority-classloader>true</context-priority-classloader>
     <security-realm-name>geronimo-admin</security-realm-name>

Added: geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=553914
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
(added)
+++ geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
Fri Jul  6 07:56:02 2007
@@ -0,0 +1,39 @@
+<!--
+    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: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+         xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <dep:environment>
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.applications</dep:groupId>
+      <dep:artifactId>welcome</dep:artifactId>
+      <dep:version>2.0-SNAPSHOT</dep:version>
+      <dep:type>war</dep:type>
+    </dep:moduleId>
+    <dep:dependencies/>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+
+  <context-root>/</context-root>
+
+</web-app>
+

Propchange: geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message