You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2010/12/30 06:44:50 UTC

svn commit: r1053798 - in /geronimo/daytrader/branches/2.2/assemblies/javaee: daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml plans/dayTrader-derby-plan.xml

Author: violalu
Date: Thu Dec 30 05:44:49 2010
New Revision: 1053798

URL: http://svn.apache.org/viewvc?rev=1053798&view=rev
Log:
DAYTRADER-90 Update daytrader derby plan.xml to pass derby db authentication

Modified:
    geronimo/daytrader/branches/2.2/assemblies/javaee/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/daytrader/branches/2.2/assemblies/javaee/plans/dayTrader-derby-plan.xml

Modified: geronimo/daytrader/branches/2.2/assemblies/javaee/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.2/assemblies/javaee/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1053798&r1=1053797&r2=1053798&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.2/assemblies/javaee/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/daytrader/branches/2.2/assemblies/javaee/daytrader-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Dec 30 05:44:49 2010
@@ -18,10 +18,9 @@
 -->
 
     <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
-        xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
-        configId="TradeWeb" parentId="Trade">
+        xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2">
     
-    <context-priority-classloader>false</context-priority-classloader>
+    <!--<context-priority-classloader>false</context-priority-classloader>-->
 
     <naming:resource-ref>
         <naming:ref-name>jdbc/TradeDataSource</naming:ref-name>

Modified: geronimo/daytrader/branches/2.2/assemblies/javaee/plans/dayTrader-derby-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/2.2/assemblies/javaee/plans/dayTrader-derby-plan.xml?rev=1053798&r1=1053797&r2=1053798&view=diff
==============================================================================
--- geronimo/daytrader/branches/2.2/assemblies/javaee/plans/dayTrader-derby-plan.xml (original)
+++ geronimo/daytrader/branches/2.2/assemblies/javaee/plans/dayTrader-derby-plan.xml Thu Dec 30 05:44:49 2010
@@ -226,8 +226,8 @@
                         <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                         <connectiondefinition-instance>
                             <name>jdbc/TradeDataSource</name>
-                            <config-property-setting name="UserName"></config-property-setting>
-                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="UserName">app</config-property-setting>
+                            <config-property-setting name="Password">app</config-property-setting>
                             <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
                             <connectionmanager>
@@ -245,8 +245,8 @@
                         </connectiondefinition-instance>
                         <connectiondefinition-instance>
                             <name>jdbc/NoTxTradeDataSource</name>
-                            <config-property-setting name="UserName"></config-property-setting>
-                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="UserName">app</config-property-setting>
+                            <config-property-setting name="Password">app</config-property-setting>
                             <config-property-setting name="DatabaseName">DaytraderDatabase</config-property-setting>
                             <config-property-setting name="CreateDatabase">true</config-property-setting>
                             <connectionmanager>