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 2011/07/19 12:23:04 UTC
svn commit: r1148264 - in
/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF:
geronimo-web.xml web.xml
Author: violalu
Date: Tue Jul 19 10:23:04 2011
New Revision: 1148264
URL: http://svn.apache.org/viewvc?rev=1148264&view=rev
Log:
update datasource in geronimo-web.xml and web.xml
Modified:
geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1148264&r1=1148263&r2=1148264&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jul 19 10:23:04 2011
@@ -29,14 +29,14 @@
<sys:type>car</sys:type>
</sys:moduleId>
- <sys:dependencies>
+ <!--<sys:dependencies>
<sys:dependency>
<sys:groupId>org.apache.geronimo.samples.daytrader.plugins</sys:groupId>
<sys:artifactId>daytrader-derby-datasource</sys:artifactId>
<sys:version>${project.version}</sys:version>
<sys:type>car</sys:type>
</sys:dependency>
- </sys:dependencies>
+ </sys:dependencies>-->
</sys:environment>
<context-root>/${project.artifactId}</context-root>
Modified: geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml?rev=1148264&r1=1148263&r2=1148264&view=diff
==============================================================================
--- geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/javaee6/modules/web/src/main/webapp/WEB-INF/web.xml Tue Jul 19 10:23:04 2011
@@ -77,7 +77,7 @@
<error-code>500</error-code>
<location>/error.jsp</location>
</error-page>
- <!--
+
<resource-ref>
<res-ref-name>jdbc/TradeDataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
@@ -90,7 +90,7 @@
<res-auth>Container</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
- <resource-ref>
+ <!-- <resource-ref>
<res-ref-name>jms/QueueConnectionFactory</res-ref-name>
<res-type>javax.jms.QueueConnectionFactory</res-type>
<res-auth>Application</res-auth>