Author: markt
Date: Tue Jun 18 12:51:14 2013
New Revision: 1494122
URL: http://svn.apache.org/r1494122
Log:
Refactor
Added:
tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java (with
props)
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Tue Jun 18 12:51:14 2013
@@ -36,7 +36,7 @@ import org.apache.catalina.core.TesterCo
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -283,7 +283,7 @@ public class TestDigestAuthenticator ext
ctxt.addConstraint(sc);
// Configure the Realm
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser(USER, PWD);
realm.addUserRole(USER, ROLE);
ctxt.setRealm(realm);
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Tue Jun 18 12:51:14 2013
@@ -39,7 +39,7 @@ import org.apache.catalina.deploy.LoginC
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.startup.SimpleHttpClient;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -651,7 +651,7 @@ public class TestFormAuthenticator exten
ctx.addApplicationListener(new ApplicationListener(
WsListener.class.getName(), false));
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser("tomcat", "tomcat");
realm.addUserRole("tomcat", "tomcat");
ctx.setRealm(realm);
@@ -729,7 +729,7 @@ public class TestFormAuthenticator exten
setUseCookies(clientShouldUseCookies);
ctx.setCookies(serverShouldUseCookies);
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser("tomcat", "tomcat");
realm.addUserRole("tomcat", "tomcat");
ctx.setRealm(realm);
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
Tue Jun 18 12:51:14 2013
@@ -31,7 +31,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.filters.TesterHttpServletResponse;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.util.ConcurrentMessageDigest;
import org.apache.catalina.util.MD5Encoder;
@@ -108,7 +108,7 @@ public class TesterDigestAuthenticatorPe
ConcurrentMessageDigest.init("MD5");
// Configure the Realm
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser(USER, PWD);
realm.addUserRole(USER, ROLE);
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Tue Jun 18
12:51:14 2013
@@ -49,7 +49,7 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.filters.FailedRequestFilter;
import org.apache.catalina.startup.SimpleHttpClient;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -320,7 +320,7 @@ public class TestRequest extends TomcatB
Tomcat.addServlet(ctx, "servlet", new LoginLogoutServlet());
ctx.addServletMapping("/", "servlet");
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser(LoginLogoutServlet.USER, LoginLogoutServlet.PWD);
ctx.setRealm(realm);
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Tue Jun
18 12:51:14 2013
@@ -62,7 +62,7 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.SimpleHttpClient;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -418,7 +418,7 @@ public class TestStandardContext extends
Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
// Setup realm
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser("tomcat", "tomcat");
realm.addUserRole("tomcat", "tomcat");
ctx.setRealm(realm);
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Tue Jun
18 12:51:14 2013
@@ -53,7 +53,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
import org.apache.catalina.authenticator.BasicAuthenticator;
import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -237,7 +237,7 @@ public class TestStandardWrapper extends
ctx.addServletMapping("/", "servlet");
if (useRole) {
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser("testUser", "testPwd");
realm.addUserRole("testUser", "testRole");
ctx.setRealm(realm);
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Tue Jun 18
12:51:14 2013
@@ -23,11 +23,6 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
import java.net.URLConnection;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import javax.naming.Context;
@@ -48,8 +43,6 @@ import org.junit.Test;
import org.apache.catalina.deploy.ApplicationListener;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResourceLink;
-import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.catalina.realm.RealmBase;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.websocket.server.WsListener;
@@ -191,45 +184,6 @@ public class TestTomcat extends TomcatBa
/**
- * Simple Realm that uses a configurable {@link Map} to link user names and
- * passwords.
- */
- public static final class MapRealm extends RealmBase {
- private Map<String,String> users = new HashMap<>();
- private Map<String,List<String>> roles = new HashMap<>();
-
- public void addUser(String username, String password) {
- users.put(username, password);
- }
-
- public void addUserRole(String username, String role) {
- List<String> userRoles = roles.get(username);
- if (userRoles == null) {
- userRoles = new ArrayList<>();
- roles.put(username, userRoles);
- }
- userRoles.add(role);
- }
-
- @Override
- protected String getName() {
- return "MapRealm";
- }
-
- @Override
- protected String getPassword(String username) {
- return users.get(username);
- }
-
- @Override
- protected Principal getPrincipal(String username) {
- return new GenericPrincipal(username, getPassword(username),
- roles.get(username));
- }
-
- }
-
- /**
* Start tomcat with a single context and one
* servlet - all programmatic, no server.xml or
* web.xml used.
Added: tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java?rev=1494122&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java (added)
+++ tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java Tue Jun
18 12:51:14 2013
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+package org.apache.catalina.startup;
+
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.catalina.realm.RealmBase;
+
+/**
+ * Simple Realm that uses a configurable {@link Map} to link user names and
+ * passwords.
+ */
+public final class TesterMapRealm extends RealmBase {
+ private Map<String,String> users = new HashMap<>();
+ private Map<String,List<String>> roles = new HashMap<>();
+
+ public void addUser(String username, String password) {
+ users.put(username, password);
+ }
+
+ public void addUserRole(String username, String role) {
+ List<String> userRoles = roles.get(username);
+ if (userRoles == null) {
+ userRoles = new ArrayList<>();
+ roles.put(username, userRoles);
+ }
+ userRoles.add(role);
+ }
+
+ @Override
+ protected String getName() {
+ return "MapRealm";
+ }
+
+ @Override
+ protected String getPassword(String username) {
+ return users.get(username);
+ }
+
+ @Override
+ protected Principal getPrincipal(String username) {
+ return new GenericPrincipal(username, getPassword(username),
+ roles.get(username));
+ }
+
+}
\ No newline at end of file
Propchange: tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1494122&r1=1494121&r2=1494122&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Tue Jun 18
12:51:14 2013
@@ -48,7 +48,7 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.startup.TestTomcat.MapRealm;
+import org.apache.catalina.startup.TesterMapRealm;
import org.apache.catalina.startup.Tomcat;
public final class TesterSupport {
@@ -194,7 +194,7 @@ public final class TesterSupport {
ctx.addConstraint(sc);
// Configure the Realm
- MapRealm realm = new MapRealm();
+ TesterMapRealm realm = new TesterMapRealm();
realm.addUser("CN=user1, C=US", "not used");
realm.addUserRole("CN=user1, C=US", "testrole");
ctx.setRealm(realm);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
