From 83355a7557cf91c455a65e0ce79ea8dd4d880052 Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Jan 2010 02:16:12 +0000
Subject: Refactoring sandbox structure to accomodate 1.x versus 2.x stuff

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@898623 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/webapp/WEB-INF/geronimo-web.xml       | 73 ----------------------
 .../src/main/webapp/WEB-INF/web.xml                | 60 ------------------
 2 files changed, 133 deletions(-)
 delete mode 100644 sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
 delete mode 100644 sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml

(limited to 'sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF')

diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 705010bf7c..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<web:web-app
-	xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
-	xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
-	xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
-	xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
-	xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-2.0"
-	xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
-	xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2"
-	xmlns:pers="http://java.sun.com/xml/ns/persistence"
-	xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
-	xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
-	xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-	<dep:environment>
-		<dep:moduleId>
-			<dep:groupId>org.apache.tuscany</dep:groupId>
-			<dep:artifactId>sample-store-secure-webapp</dep:artifactId>
-			<dep:version>1.0</dep:version>
-			<dep:type>car</dep:type>
-		</dep:moduleId>
-		<!-- TUSCANY-2622 -->
-		<dep:hidden-classes>
-			<dep:filter>org.apache.axiom</dep:filter>
-			<dep:filter>org.apache.axis2</dep:filter>
-			<dep:filter>org.apache.commons</dep:filter>
-			<dep:filter>org.jdom</dep:filter>
-		</dep:hidden-classes>		
-	</dep:environment>
-	
-	<web:context-root>/sample-store-secure-webapp</web:context-root>
-	
-	<web:security-realm-name>ldap-realm</web:security-realm-name>
-    <sec:security>
-        <sec:role-mappings>
-            <!--
-            <sec:role role-name="manager">
-                <sec:principal name="lmanager" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />
-            </sec:role>            
-            <sec:role role-name="user">
-                <sec:principal name="lresende" class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />
-            </sec:role>
-            -->
-            <sec:role role-name="manager">
-                <sec:principal name="managers" class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" designated-run-as="true"/>
-            </sec:role>            
-        </sec:role-mappings>
-    </sec:security>
-    
-    <dep:gbean name="ldap-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
-        <dep:attribute name="realmName">ldap-realm</dep:attribute>
-        <dep:xml-reference name="LoginModuleConfiguration">
-            <lc:login-config>
-                <lc:login-module control-flag="REQUIRED" wrap-principals="false">
-                    <lc:login-domain-name>ldap-realm</lc:login-domain-name>
-                    <lc:login-module-class>org.apache.geronimo.security.realm.providers.LDAPLoginModule</lc:login-module-class>
-                    <!-- lc:option name="users">foo,bar</lc:option-->
-                    <lc:option name="initialContextFactory">com.sun.jndi.ldap.LdapCtxFactory</lc:option>
-                    <lc:option name="connectionURL">ldap://dpev007.innovate.ibm.com:389</lc:option>
-                    <lc:option name="connectionUsername">cn=ldaproot,dc=tnc,dc=org</lc:option>
-                    <lc:option name="connectionPassword">ldappass</lc:option>
-                    <lc:option name="authentication">simple</lc:option>
-                    <lc:option name="userBase">ou=people,dc=tnc,dc=org</lc:option>
-                    <lc:option name="userSearchMatching">uid={0}</lc:option>
-                    <lc:option name="userSearchSubtree">false</lc:option>
-                    <lc:option name="roleBase">ou=groups,dc=tnc,dc=org</lc:option>
-                    <lc:option name="roleName">cn</lc:option>
-                    <lc:option name="roleSearchMatching">(member={0})</lc:option>
-                    <lc:option name="roleSearchSubtree">false</lc:option>                    
-                </lc:login-module>
-            </lc:login-config>
-        </dep:xml-reference>
-    </dep:gbean>
-</web:web-app>
diff --git a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml b/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 704c7631b0..0000000000
--- a/sandbox/lresende/sca/samples/store-secure-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>sample-store-secure-webapp</display-name>
-
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>store.html</welcome-file>
-  </welcome-file-list>
-  
-  <!-- login-config>
-  	<auth-method>BASIC</auth-method>
-  	<realm-name>ldap-realm</realm-name>
-  </login-config-->
-  
-  <login-config>
-    <auth-method>FORM</auth-method>
-    <realm-name>ldap-realm</realm-name>
-    <form-login-config>
-       <form-login-page>/auth/logon.html</form-login-page>
-       <form-error-page>/auth/logonError.html</form-error-page>
-    </form-login-config>
-  </login-config>
-    
-  <security-role>
-  	<description>Application managers</description>
-  	<role-name>manager</role-name>
-  </security-role>
-
-  <security-role>
-  	<description>Application users</description>
-  	<role-name>user</role-name>
-  </security-role>
-  
-  <security-constraint>
-  	<web-resource-collection>
-  		<web-resource-name>Areas with authentication required</web-resource-name>
-  		<url-pattern>/protected/*</url-pattern>
-  		<http-method>GET</http-method>
-  		<http-method>POST</http-method>
-  	</web-resource-collection>
-  	<auth-constraint>
-  		<role-name>manager</role-name>
-  	</auth-constraint>
-  </security-constraint>
-  
-  <env-entry>
-     <env-entry-name>org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled</env-entry-name>
-     <env-entry-type>java.lang.String</env-entry-type>
-     <env-entry-value>false</env-entry-value>
-  </env-entry>
-</web-app>
\ No newline at end of file
-- 
cgit v1.2.3