geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r580541 - /geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
Date Sat, 29 Sep 2007 03:42:10 GMT
Author: gawor
Date: Fri Sep 28 20:42:09 2007
New Revision: 580541

URL: http://svn.apache.org/viewvc?rev=580541&view=rev
Log:
merge some changes from trunk

Modified:
    geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml

Modified: geronimo/server/branches/2.0/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/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml?rev=580541&r1=580540&r2=580541&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
Fri Sep 28 20:42:09 2007
@@ -99,16 +99,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 +117,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>
+                <credential-store-ref>
                         <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-credential-store</name>
-                    </pattern>
-                </credential-store>
+                </credential-store-ref>
                 <default-subject>
                     <realm>test-cms-realm</realm>
                     <id>test</id>
@@ -142,6 +136,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 +167,8 @@
                         </realm>
                     </credential-store>
                 </xml-attribute>
+                <dependency>
+                    <name>test-cms-realm</name>
+		</dependency>
             </gbean>
-        </web-app>
-    </module>
 </application>



Mime
View raw message