Author: painter
Date: Wed Dec 13 16:47:46 2017
New Revision: 1818039
URL: http://svn.apache.org/viewvc?rev=1818039&view=rev
Log:
Updates to better support out of box experience for Eclipse/Tomcat users. Added
context.xml for JNDI support and changed the web.xml schema definition
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/README.txt
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/README.txt
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/README.txt?rev=1818039&r1=1818038&r2=1818039&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/README.txt
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/docs/README.txt
Wed Dec 13 16:47:46 2017
@@ -174,5 +174,5 @@ Be aware of settings and some smaller re
- LoginUser action is included (to check for anonymous user, may be fixed in
future release)
- OM (Torque Object Mapper) stub classes are included (until configurable in
schema with Torque version 2.1)
- TurbineConfiguration returns a Commons configuration object, even if field
is not assignable (will be fixed in Turbine 4.0, you can then assign e.g. to
String instead, cft. SecureScreen)
-- Database connection is done initially by default with JNDI. If you want to
change it, check Torque.properties and jetty-env.xml.
+- Database connection is done initially by default with JNDI. If you want to
change it, check Torque.properties and (1) for Tomcat, META-INF/context.xml or
(2) for Jetty, WEB-INF/jetty-env.xml.
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1818039&r1=1818038&r2=1818039&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Wed Dec 13 16:47:46 2017
@@ -20,7 +20,7 @@
<web-app id="WebApp_ID" version="2.5"
xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/web-app_2_5.xsd";>
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";>
<!-- ========================================================================
-->
<!--
-->
<!-- Web Application descriptor
-->
