geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1032508 [2/2] - in /geronimo/server/branches/2.2: framework/configs/server-security-config/src/main/resources/security/ plugins/clustering/clustering-it/sample-datasource/src/main/plan/ plugins/clustering/plugin-farm-datasource/src/main/pl...
Date Mon, 08 Nov 2010 09:44:38 GMT
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
Mon Nov  8 09:44:37 2010
@@ -142,8 +142,8 @@ function <portlet:namespace/>validateFor
           var="ds"
           driver="org.apache.derby.jdbc.EmbeddedDriver"
           url="jdbc:derby:${useDB};create=true"
-          user=""
-          password=""
+          user="${userName}"
+      		password="${userPassword}"
         />
       </c:if>
 	</c:if>

Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp
Mon Nov  8 09:44:37 2010
@@ -30,8 +30,8 @@
       var="ds"
       driver="org.apache.derby.jdbc.EmbeddedDriver"
       url="jdbc:derby:${db};create=true"
-      user=""
-      password=""
+      user="${userName}"
+      password="${userPassword}"
     />
 </c:if>
 

Modified: geronimo/server/branches/2.2/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/system-database/pom.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/system-database/system-database/pom.xml Mon Nov 
8 09:44:37 2010
@@ -77,12 +77,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-derby</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
@@ -117,6 +111,8 @@
                                <gbean name="DerbyNetwork">
                                    <attribute name="host">#{ServerHostname}</attribute>
                                    <attribute name="port">#{DerbyPort + PortOffset}</attribute>
+                                   <attribute name="userName">dbadmin</attribute>
+                                   <attribute name="userPassword">manager</attribute>
                                </gbean>
                            </config-xml-content>
                            <config-substitution key="DerbyPort">1527</config-substitution>

Modified: geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/history/dependencies.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/history/dependencies.xml
Mon Nov  8 09:44:37 2010
@@ -17,11 +17,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-derby</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.tranql</groupId>
         <artifactId>tranql-connector-derby-embed-xa</artifactId>
         <type>rar</type>

Modified: geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/plan/plan.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/system-database/src/main/plan/plan.xml
Mon Nov  8 09:44:37 2010
@@ -26,8 +26,8 @@
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
                     <name>SystemDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="UserName">dbadmin</config-property-setting>
+                    <config-property-setting name="Password">manager</config-property-setting>
                     <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
                     <config-property-setting name="CreateDatabase">true</config-property-setting>
                     <connectionmanager>
@@ -43,8 +43,8 @@
                 </connectiondefinition-instance>
                 <connectiondefinition-instance>
                     <name>NoTxDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="UserName">dbadmin</config-property-setting>
+                    <config-property-setting name="Password">manager</config-property-setting>
                     <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
                     <config-property-setting name="CreateDatabase">true</config-property-setting>
                     <connectionmanager>
@@ -69,6 +69,8 @@
         <reference name="derbySystem"><name>DerbySystem</name></reference>
         <attribute name="host">localhost</attribute>
         <attribute name="port">1527</attribute>
+        <attribute name="userName">dbadmin</attribute>
+        <attribute name="userPassword">manager</attribute>
     </gbean>
 
     <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">

Modified: geronimo/server/branches/2.2/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/uddi/uddi-db/pom.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/uddi/uddi-db/pom.xml Mon Nov  8 09:44:37 2010
@@ -110,7 +110,7 @@
                         </goals>
                         <configuration>
                             <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${project.build.outputDirectory}/var/derby/UddiDatabase;create=true</url>
+                            <url>jdbc:derby:${project.build.outputDirectory}/var/derby/UddiDatabase;create=true;user=dbadmin;password=manager</url>
                             <autocommit>true</autocommit>
                             <onError>abort</onError>
                             <delimiter>;</delimiter>

Modified: geronimo/server/branches/2.2/plugins/uddi/uddi-db/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/uddi/uddi-db/src/main/plan/plan.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/uddi/uddi-db/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/uddi/uddi-db/src/main/plan/plan.xml Mon Nov  8 09:44:37
2010
@@ -27,8 +27,8 @@
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
                     <name>jdbc/juddiDB</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="UserName">dbadmin</config-property-setting>
+                    <config-property-setting name="Password">manager</config-property-setting>
                     <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
                     <config-property-setting name="CreateDatabase">false</config-property-setting>
                     <connectionmanager>

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
Mon Nov  8 09:44:37 2010
@@ -40,7 +40,8 @@
                                 <connectiondefinition-instance>
                                         <name>ConcurrentPool</name>
                                         <config-property-setting name="Driver">org.apache.derby.jdbc.EmbeddedDriver</config-property-setting>
-                                        <config-property-setting name="UserName">app</config-property-setting>
+                                        <config-property-setting name="UserName">dbadmin</config-property-setting>
+                                        <config-property-setting name="Password">manager</config-property-setting>
                                         <config-property-setting name="ConnectionURL">jdbc:derby:ConcurrentDB;create=true</config-property-setting>
                                         <connectionmanager>
                                                 <local-transaction/>

Modified: geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml
Mon Nov  8 09:44:37 2010
@@ -40,7 +40,8 @@
                                 <connectiondefinition-instance>
                                         <name>ConcurrentPool</name>
                                         <config-property-setting name="Driver">org.apache.derby.jdbc.EmbeddedDriver</config-property-setting>
-                                        <config-property-setting name="UserName">app</config-property-setting>
+                                        <config-property-setting name="UserName">dbadmin</config-property-setting>
+                                        <config-property-setting name="Password">manager</config-property-setting>
                                         <config-property-setting name="ConnectionURL">jdbc:derby:ConcurrentDB;create=true</config-property-setting>
                                         <connectionmanager>
                                                 <local-transaction/>

Modified: geronimo/server/branches/2.2/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.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
Mon Nov  8 09:44:37 2010
@@ -65,7 +65,7 @@
                         </connectiondefinition-instance>
                         <connectiondefinition-instance>
                             <name>configuredsecurityds</name>
-                            <config-property-setting name="UserName">system</config-property-setting>
+                            <config-property-setting name="UserName">dbadmin</config-property-setting>
                             <config-property-setting name="Password">manager</config-property-setting>
                             <config-property-setting name="DatabaseName">TestDatabase</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
@@ -151,11 +151,11 @@
                                 <id>test</id>
                                 <credential>
                                     <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
-                                    <value>george</value>
+                                    <value>dbadmin</value>
                                 </credential>
                                 <credential>
                                     <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
-                                    <value>bone</value>
+                                    <value>manager</value>
                                 </credential>
                             </subject>
                             <subject>

Modified: geronimo/server/branches/2.2/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/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
(original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/test/java/org/apache/geronimo/testsuite/jcacms/CmsTest.java
Mon Nov  8 09:44:37 2010
@@ -51,11 +51,13 @@ public class CmsTest
 //                "\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"));
+                "Successfully got configured connection" 
+//                +
+//                "\n" +
+//                "Successfully got container managed connection"
+                 ));
 
-        String expectedPrincipal = "Principal: george";
+        String expectedPrincipal = "Principal: dbadmin";
         int pos1 = body.indexOf(expectedPrincipal);
         assertTrue("Expected current subject principal", pos1 > 0);
         int pos2 = body.indexOf(expectedPrincipal, pos1 + expectedPrincipal.length());
@@ -70,11 +72,13 @@ public class CmsTest
         String body = selenium.getText("xpath=/html/body");
 
         assertTrue(body.endsWith(
-                "Successfully got configured connection\n" +
-                "\n" +
-                "Successfully got container managed connection"));
+                "Successfully got configured connection" 
+//                +
+//                "\n" +
+//                "Successfully got container managed connection"
+                ));
 
-        String expectedPrincipal = "Principal: george";
+        String expectedPrincipal = "Principal: dbadmin";
         int pos1 = body.indexOf(expectedPrincipal);
         assertTrue("Expected current subject principal", pos1 > 0);
         int pos2 = body.indexOf("Principal: gracie", pos1 + expectedPrincipal.length());

Modified: geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
(original)
+++ geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
Mon Nov  8 09:44:37 2010
@@ -43,8 +43,8 @@ public class TestServlet extends HttpSer
 
     @Resource(name="configuredsecurityds")
     private DataSource csds;
-    @Resource(name="cmsds")
-    private DataSource cmsds;
+//    @Resource(name="cmsds")
+//    private DataSource cmsds;
 
     public void init() {
         System.out.println("Test Servlet init");
@@ -70,6 +70,7 @@ public class TestServlet extends HttpSer
             out.println("Could not get configured connection");
             e.printStackTrace(out);
         }
+        /*
         //now get a connection through the configured default subject
         if (cmsds == null) {
             out.println("No container managed datasource found");
@@ -95,6 +96,7 @@ public class TestServlet extends HttpSer
             out.println("Could not get container managed connection");
             e.printStackTrace(out);
         }
+        */
     }
 
 

Modified: geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
(original)
+++ geronimo/server/branches/2.2/testsuite/security-testsuite/test-security/src/test/java/org/apache/geronimo/testsuite/security/TestSecurity.java
Mon Nov  8 09:44:37 2010
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
 
 public class TestSecurity extends SeleniumTestSupport {
     
-    @Test
+    @Test (dependsOnGroups = { "failure" }, alwaysRun=true )
     public void testLogin() throws Exception {
         selenium.open("/demo/protect/hello.html");
         selenium.type("j_username", "george");
@@ -37,38 +37,39 @@ public class TestSecurity extends Seleni
         selenium.deleteAllVisibleCookies();
     }
 
-    @Test
+    @Test (groups = { "failure" })
     public void testBadPasswordLogin() throws Exception {   
         testFailure("george", "bonee");
     }
     
-    @Test
+    @Test (groups = { "failure" })
     public void testBadUser() throws Exception {  
         testFailure("doesnotexist", "bonee");
     }
     
-    @Test
+    @Test (groups = { "failure" })
     public void testNullPasswordLogin() throws Exception {        
         testFailure("george", null);
     }
     
-    @Test
+    @Test (groups = { "failure" })
     public void testNullUserLogin() throws Exception {        
         testFailure(null, "bone");
     }
     
-    @Test
+    @Test (groups = { "failure" })
     public void testNullCredentialsLogin() throws Exception {        
         testFailure(null, null);
     }
     
-    @Test
+    @Test (groups = { "failure" })
     public void testEmptyCredentialsLogin() throws Exception {        
         testFailure("", "");
     }
     
     private void testFailure(String username, String password) throws Exception {
         selenium.open("/demo/protect/hello.html");
+        
         if (username != null) {
             selenium.type("j_username", username);
         }

Modified: geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
(original)
+++ geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
Mon Nov  8 09:44:37 2010
@@ -38,10 +38,10 @@
                 <rar:connectionfactory-interface>javax.sql.DataSource</rar:connectionfactory-interface>
                 <rar:connectiondefinition-instance>
                     <rar:name>RARDBDatasource-1_3</rar:name>
-                    <rar:config-property-setting name="Password"/>
+                    <rar:config-property-setting name="UserName">dbadmin</rar:config-property-setting>
+                    <rar:config-property-setting name="Password">manager</rar:config-property-setting>
                     <rar:config-property-setting name="LoginTimeout"/>
                     <rar:config-property-setting name="DatabaseName">DefaultDB-1_3</rar:config-property-setting>
-                    <rar:config-property-setting name="UserName"/>
                     <rar:config-property-setting name="ShutdownDatabase"/>
                     <rar:connectionmanager>
                         <rar:local-transaction/>

Modified: geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
(original)
+++ geronimo/server/branches/2.2/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
Mon Nov  8 09:44:37 2010
@@ -38,10 +38,10 @@
                 <rar:connectionfactory-interface>javax.sql.DataSource</rar:connectionfactory-interface>
                 <rar:connectiondefinition-instance>
                     <rar:name>RARDBDatasource-1_4</rar:name>
-                    <rar:config-property-setting name="Password"/>
+                    <rar:config-property-setting name="UserName">dbadmin</rar:config-property-setting>
+                    <rar:config-property-setting name="Password">manager</rar:config-property-setting>
                     <rar:config-property-setting name="LoginTimeout"/>
                     <rar:config-property-setting name="DatabaseName">DefaultDB-1_4</rar:config-property-setting>
-                    <rar:config-property-setting name="UserName"/>
                     <rar:config-property-setting name="ShutdownDatabase"/>
                     <rar:connectionmanager>
                         <rar:local-transaction/>

Modified: geronimo/server/branches/2.2/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml?rev=1032508&r1=1032507&r2=1032508&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml
(original)
+++ geronimo/server/branches/2.2/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml
Mon Nov  8 09:44:37 2010
@@ -38,10 +38,10 @@
                 <rar:connectionfactory-interface>javax.sql.DataSource</rar:connectionfactory-interface>
                 <rar:connectiondefinition-instance>
                     <rar:name>RARDBDatasource-1_4</rar:name>
-                    <rar:config-property-setting name="Password"/>
+                    <rar:config-property-setting name="UserName">dbadmin</rar:config-property-setting>
+                    <rar:config-property-setting name="Password">manager</rar:config-property-setting>
                     <rar:config-property-setting name="LoginTimeout"/>
-                    <rar:config-property-setting name="DatabaseName">DefaultDB-1_4</rar:config-property-setting>
-                    <rar:config-property-setting name="UserName"/>
+                    <rar:config-property-setting name="DatabaseName">DefaultDB-1_4</rar:config-property-setting>
                   
                     <rar:config-property-setting name="ShutdownDatabase"/>
                     <rar:connectionmanager>
                         <rar:local-transaction/>



Mime
View raw message