Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 20850 invoked from network); 6 Feb 2005 11:24:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Feb 2005 11:24:11 -0000 Received: (qmail 46215 invoked by uid 500); 6 Feb 2005 11:24:10 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 46193 invoked by uid 500); 6 Feb 2005 11:24:10 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 46179 invoked by uid 99); 6 Feb 2005 11:24:10 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 06 Feb 2005 03:24:10 -0800 Received: (qmail 20829 invoked by uid 65534); 6 Feb 2005 11:24:08 -0000 Message-ID: <20050206112408.20828.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sun, 06 Feb 2005 11:24:08 -0000 Subject: svn commit: r151576 - geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java To: scm@geronimo.apache.org From: jgenender@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jgenender Date: Sun Feb 6 03:24:06 2005 New Revision: 151576 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151576 Log: Updated tests to handle the component and transaction contexts Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/Abstr= actWebModuleTest.java Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat= /AbstractWebModuleTest.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/o= rg/apache/geronimo/tomcat/AbstractWebModuleTest.java?view=3Ddiff&r1=3D15157= 5&r2=3D151576 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/Abstr= actWebModuleTest.java (original) +++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/Abstr= actWebModuleTest.java Sun Feb 6 03:24:06 2005 @@ -19,10 +19,7 @@ import java.io.File; import java.net.URI; import java.security.PermissionCollection; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import java.util.*; import javax.management.ObjectName; =20 import junit.framework.TestCase; @@ -47,6 +44,7 @@ import org.apache.geronimo.tomcat.connector.HTTPConnector; import org.apache.geronimo.transaction.context.TransactionContextManager; import org.apache.geronimo.transaction.manager.TransactionManagerImpl; +import org.apache.geronimo.transaction.OnlineUserTransaction; =20 =20 /** @@ -55,6 +53,9 @@ public class AbstractWebModuleTest extends TestCase { =20 protected static final String securityRealmName =3D "demo-properties-r= ealm"; + protected static final String POLICY_CONTEXT_ID =3D "securetest"; + + protected Kernel kernel; private GBeanData container; private ObjectName containerName; @@ -91,7 +92,12 @@ app.setAttribute("webAppRoot", new File("target/var/catalina/webap= ps/war1/").toURI()); app.setAttribute("webClassPath", new URI[]{}); app.setAttribute("configurationBaseUrl", new File("target/var/cata= lina/webapps/war1/WEB-INF/web.xml").toURL()); + app.setAttribute("componentContext", Collections.EMPTY_MAP); app.setReferencePattern("Container", containerName); + OnlineUserTransaction userTransaction =3D new OnlineUserTransactio= n(); + app.setAttribute("userTransaction", userTransaction); + app.setReferencePattern("TransactionContextManager", tcmName); + app.setReferencePattern("TrackedConnectionAssociator", ctcName); app.setAttribute("path", "/test"); =20 start(app); @@ -103,6 +109,7 @@ app.setAttribute("webClassPath", new URI[]{}); app.setAttribute("configurationBaseUrl", new File("target/var/cata= lina/webapps/war3/WEB-INF/web.xml").toURL()); app.setAttribute("path", "/securetest"); + app.setAttribute("policyContextID", POLICY_CONTEXT_ID); =20 LoginConfig loginConfig =3D new LoginConfig(); loginConfig.setAuthMethod(Constants.FORM_METHOD); @@ -120,7 +127,15 @@ realm.setRoleClassNames("org.apache.geronimo.security.realm.provid= ers.GeronimoGroupPrincipal"); app.setAttribute("tomcatRealm", realm); =20 + OnlineUserTransaction userTransaction =3D new OnlineUserTransactio= n(); + app.setAttribute("userTransaction", userTransaction); + app.setReferencePattern("TransactionContextManager", tcmName); + app.setReferencePattern("TrackedConnectionAssociator", ctcName); + + app.setAttribute("componentContext", Collections.EMPTY_MAP); app.setReferencePattern("Container", containerName); + app.setAttribute("kernel", null); + start(app); =20 return webModuleName; @@ -139,7 +154,8 @@ app.setAttribute("webClassPath", new URI[]{}); app.setAttribute("configurationBaseUrl", new File("target/var/cata= lina/webapps/war3/WEB-INF/web.xml").toURL()); app.setAttribute("path", "/securetest"); - + app.setAttribute("policyContextID", POLICY_CONTEXT_ID); +=20 LoginConfig loginConfig =3D new LoginConfig(); loginConfig.setAuthMethod(Constants.FORM_METHOD); loginConfig.setRealmName("Test JACC Realm"); @@ -150,7 +166,7 @@ app.setAttribute("securityConstraints", securityConstraints); app.setAttribute("securityRoles", securityRoles); =20 - TomcatGeronimoRealm realm =3D new TomcatGeronimoRealm("securetest"= , + TomcatGeronimoRealm realm =3D new TomcatGeronimoRealm(POLICY_CONTE= XT_ID, securityConfig= , "demo-properti= es-realm", securityRoles, @@ -161,6 +177,12 @@ realm.setRoleClassNames("org.apache.geronimo.security.realm.provid= ers.GeronimoGroupPrincipal"); app.setAttribute("tomcatRealm", realm); =20 + OnlineUserTransaction userTransaction =3D new OnlineUserTransactio= n(); + app.setAttribute("userTransaction", userTransaction); + app.setReferencePattern("TransactionContextManager", tcmName); + app.setReferencePattern("TrackedConnectionAssociator", ctcName); + + app.setAttribute("componentContext", Collections.EMPTY_MAP); app.setReferencePattern("Container", containerName); start(app); =20