From d57f6c070dc2cc59088d408c3875040cac4cb867 Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Mon, 3 Dec 2007 04:10:57 +0000 Subject: [PATCH] Change username in samples and DocBook to "rod". --- src/docbkx/springsecurity.xml | 28 ++++++++++++++-------------- src/site/apt/petclinic-tutorial.apt | 2 +- src/site/resources/dbinit.txt | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/docbkx/springsecurity.xml b/src/docbkx/springsecurity.xml index 082870fd92..d8d8a985c1 100644 --- a/src/docbkx/springsecurity.xml +++ b/src/docbkx/springsecurity.xml @@ -1771,7 +1771,7 @@ if (obj instanceof UserDetails) { class="org.springframework.security.userdetails.memory.InMemoryDaoImpl"> <property name="userMap"> <value> - marissa=koala,ROLE_TELLER,ROLE_SUPERVISOR + rod=koala,ROLE_TELLER,ROLE_SUPERVISOR dianne=emu,ROLE_TELLER scott=wombat,ROLE_TELLER peter=opal,disabled,ROLE_TELLER @@ -3002,10 +3002,10 @@ key: A private key to prevent modification of the remember-me token certificates is also included which you can use to configure your server. These are - marissa.p12: A PKCS12 format file + user.p12: A PKCS12 format file containing the client key and certificate. These should be - installed in your browser. It maps to the user - marissa in the application. + installed in your browser. It maps to a use in the + application. @@ -3015,7 +3015,7 @@ key: A private key to prevent modification of the remember-me token ca.jks: A Java keystore containing - the certificate for the authority which issued marissa's + the certificate for the authority which issued the user's certificate. This will be used by the container to validate client certificates. @@ -3627,7 +3627,7 @@ key: A private key to prevent modification of the remember-me token <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl"> <property name="userMap"> <value> - marissa=koala,ROLES_IGNORED_BY_CAS + rod=koala,ROLES_IGNORED_BY_CAS dianne=emu,ROLES_IGNORED_BY_CAS scott=wombat,ROLES_IGNORED_BY_CAS peter=opal,disabled,ROLES_IGNORED_BY_CAS @@ -3743,7 +3743,7 @@ key: A private key to prevent modification of the remember-me token <bean id="inMemoryDaoImpl" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl"> <property name="userMap"> <value> - marissa=koala,ROLES_IGNORED_BY_CAS + rod=koala,ROLES_IGNORED_BY_CAS dianne=emu,ROLES_IGNORED_BY_CAS scott=wombat,ROLES_IGNORED_BY_CAS peter=opal,disabled,ROLES_IGNORED_BY_CAS @@ -6428,7 +6428,7 @@ INSERT INTO acl_object_identity VALUES (1, 'corp.DomainObject:1', null, INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1); INSERT INTO acl_permission VALUES (null, 2, 'ROLE_SUPERVISOR', 0); -INSERT INTO acl_permission VALUES (null, 2, 'marissa', 2); +INSERT INTO acl_permission VALUES (null, 2, 'rod', 2); INSERT INTO acl_permission VALUES (null, 3, 'scott', 14); INSERT INTO acl_permission VALUES (null, 6, 'scott', 1); @@ -6563,7 +6563,7 @@ END; --------------------------------------------------------------------- --- 1 ROLE_SUPERVISOR Administer --- 2 ROLE_SUPERVISOR None (overrides parent #1) ---- marissa Read +--- rod Read --- 3 ROLE_SUPERVISOR Administer (from parent #1) --- scott Read, Write, Create --- 4 ROLE_SUPERVISOR Administer (from parent #1) @@ -6675,8 +6675,8 @@ END; Authentication object as a String: org.springframework.security.adapters.PrincipalSpringSecurityUserToken@e9a7c2: - Username: marissa; Password: [PROTECTED]; Authenticated: true; - Granted Authorities: ROLE_TELLER, ROLE_SUPERVISOR + Username: rod; Password: [PROTECTED]; Authenticated: true; Granted + Authorities: ROLE_TELLER, ROLE_SUPERVISOR Authentication object holds the following granted authorities: @@ -6720,9 +6720,9 @@ END; web services protocols. This demonstrates how to use Spring Security for authentication with Spring remoting protocols. To try this client, ensure your servlet container is still running the Contacts sample - application, and then execute client marissa koala. - The command-line parameters respectively represent the username to - use, and the password to use. Note that you may need to edit + application, and then execute client rod koala. The + command-line parameters respectively represent the username to use, + and the password to use. Note that you may need to edit client.properties to use a different target URL. diff --git a/src/site/apt/petclinic-tutorial.apt b/src/site/apt/petclinic-tutorial.apt index fba81bb5d1..f12c7935df 100644 --- a/src/site/apt/petclinic-tutorial.apt +++ b/src/site/apt/petclinic-tutorial.apt @@ -189,7 +189,7 @@ copy dist\petclinic.war %TOMCAT_HOME%\webapps Redeploy your web application. Use the earlier process to do that. Be careful to ensure that the old Petclinic WAR is replaced by the new Petclinic WAR in your - servlet container. Login as "marissa", who has ROLE_SUPERVISOR. You will be able to + servlet container. Login as "rod", who has ROLE_SUPERVISOR. You will be able to then view a customer and add a visit. Logout, then login as anyone other than Marissa. You will receive an access denied error when you attempt to add a visit. diff --git a/src/site/resources/dbinit.txt b/src/site/resources/dbinit.txt index b33f3eaeff..26cdd99acb 100644 --- a/src/site/resources/dbinit.txt +++ b/src/site/resources/dbinit.txt @@ -23,13 +23,13 @@ CREATE UNIQUE INDEX ix_auth_username ON authorities ( username, authority ); ALTER TABLE authorities ADD CONSTRAINT fk_authorities_users foreign key (username) REFERENCES users(username); -INSERT INTO users VALUES ('marissa', 'koala', true); +INSERT INTO users VALUES ('rod', 'koala', true); INSERT INTO users VALUES ('dianne', 'emu', true); INSERT INTO users VALUES ('scott', 'wombat', true); INSERT INTO users VALUES ('peter', 'opal', false); -INSERT INTO authorities VALUES ('marissa', 'ROLE_TELLER'); -INSERT INTO authorities VALUES ('marissa', 'ROLE_SUPERVISOR'); +INSERT INTO authorities VALUES ('rod', 'ROLE_TELLER'); +INSERT INTO authorities VALUES ('rod', 'ROLE_SUPERVISOR'); INSERT INTO authorities VALUES ('dianne', 'ROLE_TELLER'); INSERT INTO authorities VALUES ('scott', 'ROLE_TELLER'); INSERT INTO authorities VALUES ('peter', 'ROLE_TELLER'); @@ -66,7 +66,7 @@ CREATE TABLE acl_permission ( --------------------------------------------------------------------- --- 1 ROLE_SUPERVISOR Administer --- 2 ROLE_SUPERVISOR None (overrides parent #1) ---- marissa Read +--- rod Read --- 3 ROLE_SUPERVISOR Administer (from parent #1) --- scott Read, Write, Create --- 4 ROLE_SUPERVISOR Administer (from parent #1) @@ -85,7 +85,7 @@ INSERT INTO acl_object_identity VALUES (6, 'org.springframework.security.acl.Dom INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1); INSERT INTO acl_permission VALUES (null, 2, 'ROLE_SUPERVISOR', 0); -INSERT INTO acl_permission VALUES (null, 2, 'marissa', 2); +INSERT INTO acl_permission VALUES (null, 2, 'rod', 2); INSERT INTO acl_permission VALUES (null, 3, 'scott', 14); INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);