|
From: Pelle B. <pe...@us...> - 2004-04-01 23:30:39
|
Update of /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4049/src/test-cactus/org/neuclear/asset/receiver/servlet Modified Files: AssetControllerServletTest.java Log Message: Split Identity into Signatory and Identity class. Identity remains a signed named object and will in the future just be used for self declared information. Signatory now contains the PublicKey etc and is NOT a signed object. Index: AssetControllerServletTest.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/test-cactus/org/neuclear/asset/receiver/servlet/AssetControllerServletTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AssetControllerServletTest.java 2 Mar 2004 18:58:35 -0000 1.3 --- AssetControllerServletTest.java 1 Apr 2004 23:18:34 -0000 1.4 *************** *** 4,8 **** import org.apache.cactus.ServletTestCase; import org.apache.cactus.WebRequest; - import org.neuclear.id.auth.AuthenticationServlet; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; --- 4,7 ---- *************** *** 12,16 **** import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; ! import org.neuclear.id.resolver.NSResolver; import org.neuclear.id.verifier.VerifyingReader; import org.neuclear.xml.XMLException; --- 11,16 ---- import org.neuclear.id.SignatureRequest; import org.neuclear.id.SignedNamedObject; ! import org.neuclear.id.auth.AuthenticationServlet; ! import org.neuclear.id.resolver.Resolver; import org.neuclear.id.verifier.VerifyingReader; import org.neuclear.xml.XMLException; *************** *** 42,45 **** --- 42,50 ---- $Id$ $Log$ + Revision 1.4 2004/04/01 23:18:34 pelle + Split Identity into Signatory and Identity class. + Identity remains a signed named object and will in the future just be used for self declared information. + Signatory now contains the PublicKey etc and is NOT a signed object. + Revision 1.3 2004/03/02 18:58:35 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 61,65 **** * Time: 6:52:08 PM */ ! public class AssetControllerServletTest extends ServletTestCase{ public AssetControllerServletTest(String string) throws NeuClearException { super(string); --- 66,70 ---- * Time: 6:52:08 PM */ ! public class AssetControllerServletTest extends ServletTestCase { public AssetControllerServletTest(String string) throws NeuClearException { super(string); *************** *** 77,82 **** assertEquals(request.getContentType(), "application/x-www-form-urlencoded"); assertEquals(request.getMethod(), "POST"); ! config.setInitParameter("serviceid","neu://test"); ! config.setInitParameter("title","cactustest"); AuthenticationServlet servlet = new AuthenticationServlet(); servlet.init(config); --- 82,87 ---- assertEquals(request.getContentType(), "application/x-www-form-urlencoded"); assertEquals(request.getMethod(), "POST"); ! config.setInitParameter("serviceid", "neu://test"); ! config.setInitParameter("title", "cactustest"); AuthenticationServlet servlet = new AuthenticationServlet(); servlet.init(config); *************** *** 100,105 **** assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket"); assertEquals(sigreq.getUserid(), "neu://bob@test"); ! assertEquals(NSResolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction()); } JCESigner signer; } --- 105,111 ---- assertEquals(sigreq.getUnsigned().getElement().getName(), "AuthenticationTicket"); assertEquals(sigreq.getUserid(), "neu://bob@test"); ! assertEquals(Resolver.resolveIdentity("neu://bob@test").getSigner(), forms[0].getAction()); } + JCESigner signer; } |