geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r562596 - in /geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests: jca-cms-ear/src/main/resources/META-INF/ jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/ jca-cms-war/src/main/webapp/WEB-INF/ src/main/resources/
Date Fri, 03 Aug 2007 21:42:41 GMT
Author: djencks
Date: Fri Aug  3 14:42:40 2007
New Revision: 562596

URL: http://svn.apache.org/viewvc?view=rev&rev=562596
Log:
this now passes for me

Removed:
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/src/main/resources/jca-cms-rar.xml
Modified:
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=562596&r1=562595&r2=562596
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
Fri Aug  3 14:42:40 2007
@@ -83,8 +83,7 @@
                     </connection-definition>
                 </outbound-resourceadapter>
             </resourceadapter>
-            <gbean name="test-cms-realm"
-                   class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+            <gbean name="test-cms-realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
                 <attribute name="realmName">test-cms-realm</attribute>
                 <xml-reference name="LoginModuleConfiguration">
                     <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
@@ -99,16 +98,12 @@
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
                 </reference>
-                <reference name="LoginService">
-                    <name>JaasLoginService</name>
-                </reference>
             </gbean>
             <gbean name="test-cms-credentials"
                    class="org.apache.geronimo.connector.outbound.security.PasswordCredentialLoginModuleWrapperGBean">
                 <attribute name="loginModuleClass">
                     org.apache.geronimo.connector.outbound.security.CallerIdentityPasswordCredentialLoginModule
                 </attribute>
-                <attribute name="serverSide">true</attribute>
                 <reference name="ManagedConnectionFactoryWrapper">
                     <name>cmsds</name>
                 </reference>
@@ -121,11 +116,9 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
             <security-realm-name>test-cms-realm</security-realm-name>
             <security xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
-                <credential-store>
-                    <pattern>
-                        <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-credential-store</name>
-                    </pattern>
-                </credential-store>
+                <credential-store-ref>
+                    <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-credential-store</name>
+                </credential-store-ref>
                 <default-subject>
                     <realm>test-cms-realm</realm>
                     <id>test</id>
@@ -142,6 +135,8 @@
                     </role>
                 </role-mappings>
             </security>
+        </web-app>
+    </module>
             <gbean name="test-credential-store" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
                 <xml-attribute name="credentialStore">
                     <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
@@ -171,7 +166,8 @@
                         </realm>
                     </credential-store>
                 </xml-attribute>
+                <dependency>
+                    <name>test-cms-realm</name>
+		</dependency>
             </gbean>
-        </web-app>
-    </module>
 </application>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java?view=diff&rev=562596&r1=562595&r2=562596
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
Fri Aug  3 14:42:40 2007
@@ -33,11 +33,25 @@
 {
     @Test
     public void testPageContent() throws Exception {
-        selenium.open("http://system:manager@localhost:8080/jca-cms/servlet");
+        selenium.open("http://system:manager@localhost:8080/jca-cms/default-subject-servlet");
         selenium.waitForPageToLoad("30000");
 
-        //TODO the line separators might well be wrong???
-        assertEquals("Successfully got configured connection\n\nSuccessfully got container
managed connection\n", selenium.getText("xpath=/html/body"));
+        assertTrue(selenium.getText("xpath=/html/body").endsWith(
+//                "Current subject: Subject:\n" +
+//                "\tPrincipal: org.apache.geronimo.connector.outbound.security.ResourcePrincipal@cb1c722f\n"
+
+//                "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499145:0x607c7eb7837eabcd6b759e6f9d29e7eee72622d6]]\n"
+
+//                "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499146:0x7622e0831ed59a4cd6c277a53491de74f1489311]]\n"
+
+//                "\tPrivate Credential: javax.resource.spi.security.PasswordCredential@23f33e5c\n"
+
+//                "\n" +
+//                "Next subject:    Subject:\n" +
+//                "\tPrincipal: org.apache.geronimo.connector.outbound.security.ResourcePrincipal@cb1c722f\n"
+
+//                "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499145:0x607c7eb7837eabcd6b759e6f9d29e7eee72622d6]]\n"
+
+//                "\tPrincipal: org.apache.geronimo.security.IdentificationPrincipal[[1186174499146:0x7622e0831ed59a4cd6c277a53491de74f1489311]]\n"
+
+//                "\tPrivate Credential: javax.resource.spi.security.PasswordCredential@23f33e5c\n"
+
+//                "\n" +
+                "Successfully got configured connection\n" +
+                "\n" +
+                "Successfully got container managed connection"));
     }
 }
 



Mime
View raw message