Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.classpath
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.classpath	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.classpath	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="Sources"/>
+	<classpathentry kind="con" path="WOFramework/ERExtensions"/>
+	<classpathentry kind="con" path="WOFramework/ERJars"/>
+	<classpathentry kind="con" path="WOFramework/ERPrototypes"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="WOFramework/ERModernLook"/>
+	<classpathentry kind="con" path="WOFramework/JavaDTWGeneration"/>
+	<classpathentry kind="con" path="WOFramework/ERModernDefaultSkin"/>
+	<classpathentry kind="con" path="WOFramework/JavaDirectToWeb"/>
+	<classpathentry kind="con" path="WOFramework/ERModernDirectToWeb"/>
+	<classpathentry kind="con" path="WOFramework/ERDirectToWeb"/>
+	<classpathentry kind="con" path="WOFramework/JavaFoundation"/>
+	<classpathentry kind="con" path="WOFramework/JavaXML"/>
+	<classpathentry kind="con" path="WOFramework/JavaWebObjects"/>
+	<classpathentry kind="con" path="WOFramework/JavaWOExtensions"/>
+	<classpathentry kind="con" path="WOFramework/JavaEOAccess"/>
+	<classpathentry kind="con" path="WOFramework/JavaEOControl"/>
+	<classpathentry kind="con" path="WOFramework/JavaJDBCAdaptor"/>
+	<classpathentry kind="con" path="WOFramework/JavaEOProject"/>
+	<classpathentry kind="con" path="WOFramework/Ajax"/>
+	<classpathentry kind="con" path="WOFramework/WOLips"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.project
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.project	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.project	(revision 0)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>${projectName}</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.objectstyle.wolips.incrementalbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.objectstyle.wolips.incrementalapplicationnature</nature>
+	</natures>
+</projectDescription>
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/build.properties
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/build.properties	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/build.properties	(revision 0)
@@ -0,0 +1,10 @@
+webXML_CustomContent=
+project.name=${projectName}
+eoAdaptorClassName=
+principalClass=${basePackage}.Application
+classes.dir=bin
+project.name.lowercase=${projectName.toLowerCase()}
+customInfoPListContent=
+project.type=application
+servletDeployment=false
+webXML=false
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/build.xml
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/build.xml	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/build.xml	(revision 0)
@@ -0,0 +1,223 @@
+<project name="${projectName}" default="build" basedir=".">
+	<target name="build" depends="init.build,build.woapp,javaclient,ssdd,war,split,package" />
+
+	<target name="install" depends="init.install,build.woapp,javaclient,ssdd,war,split,package" />
+
+	<target name="clean" depends="init.properties">
+		<delete dir="bin" />
+		<delete dir="dist" />
+	</target>
+
+	<!-- basic initializations  -->
+	<target name="init.install" depends="init.properties">
+		<tstamp />
+		<property name="dest.dir" value="${wo.apps.root}" />
+	</target>
+
+	<target name="init.build" depends="init.properties">
+		<tstamp />
+		<property name="dest.dir" value="dist" />
+	</target>
+	
+	<!-- property determination  -->
+	<target name="init.properties">
+		<property file="build.properties" />
+
+		<property name="wolips.properties" value="${user.home}${file.separator}Library${file.separator}Application Support${file.separator}WOLips${file.separator}wolips.properties" />
+		<property file="${wolips.properties}" />
+		<condition property="wo.properties.check.failed">
+			<not>
+				<and>
+					<isset property="wo.system.frameworks" />
+					<isset property="wo.local.frameworks" />
+				</and>
+			</not>
+		</condition>
+		<fail message="The properties 'wo.system.frameworks' and 'wo.local.frameworks' must be set. Check that your ${wolips.properties} is correct." if="wo.properties.check.failed" />
+
+		<property name="build.app.name" value="${project.name}" />
+		<property name="build.app.name.lowercase" value="${project.name.lowercase}" />
+	</target>
+
+	<!-- This copies webserver resources from app.woa's embedded frameworks into split install bundle -->
+	<target name="split" description="Adds embedded framework webserver resources to the split install bundle by copying from deployment build bundle" unless="servletDeployment">
+		<property name="wsdest.dir" value="${dest.dir}/Split" />
+		<mkdir dir="${wsdest.dir}"/>
+		<copy todir="${wsdest.dir}/WebObjects/${build.app.name}.woa" verbose="true">
+			<fileset dir="${dest.dir}/${build.app.name}.woa/Contents">
+				<include name="Frameworks/*.framework/WebServerResources/**"/>
+			</fileset>
+			<fileset dir="${dest.dir}/${build.app.name}.woa">
+				<include name="Contents/WebServerResources/**"/>
+			</fileset>
+		</copy>
+	</target>
+
+  <target name="package" unless="servletDeployment">
+    <tar destfile="${dest.dir}/${build.app.name}-Application.tar.gz"
+        compression="gzip"
+        longfile="gnu">
+      <tarfileset dir="${dest.dir}" mode="750">
+        <include name="${build.app.name}.woa/${build.app.name}"/>
+      </tarfileset>
+      <tarfileset dir="${dest.dir}">
+        <exclude name="${build.app.name}.woa/${build.app.name}"/>
+        <include name="${build.app.name}.woa/**"/>
+      </tarfileset>
+    </tar>
+    <tar destfile="${dest.dir}/${build.app.name}-WebServerResources.tar.gz"
+        compression="gzip"
+        basedir="${wsdest.dir}/WebObjects"
+        longfile="gnu"
+        includes="${build.app.name}.woa/**">
+    </tar>
+	</target>
+
+	<!-- woproject tasks -->
+	<target name="build.woapp" depends="compile">
+		<taskdef name="woapplication" classname="org.objectstyle.woproject.ant.WOApplication"/>
+
+		<woapplication name="${build.app.name}" frameworksBaseURL="/WebObjects/${build.app.name}.woa/Frameworks" destDir="${dest.dir}" customInfoPListContent="${customInfoPListContent}" principalClass="${principalClass}" webXML="${webXML}" webXML_CustomContent="${webXML_CustomContent}" servletAdaptor="com.webobjects.jspservlet.WOServletAdaptor">
+			<classes dir="${classes.dir}">
+				<includesfile name="woproject/classes.include.patternset" />
+				<excludesfile name="woproject/classes.exclude.patternset" />
+				<exclude if="javaClient" name="**/client/**/*.*"/>
+			</classes>
+
+			<wsresources dir=".">
+				<includesfile name="woproject/wsresources.include.patternset" />
+				<excludesfile name="woproject/wsresources.exclude.patternset" />
+			</wsresources>
+
+			<resources dir=".">
+				<includesfile name="woproject/resources.include.patternset" />
+				<excludesfile name="woproject/resources.exclude.patternset" />
+				<exclude if="javaClient" name="**/client/**/*.*"/>
+			</resources>
+
+			<frameworks root="ProjectLocal" embed="${embed.ProjectLocal}" eclipse="true" />
+			<frameworks root="External" embed="${embed.External}" eclipse="true" />
+			<frameworks root="Local" embed="${embed.Local}" eclipse="true" />
+			<frameworks root="User" embed="${embed.User}" eclipse="true" />
+			<frameworks root="System" embed="${embed.System}" eclipse="true" />
+			<frameworks root="Network" embed="${embed.Network}" eclipse="true" />
+
+			<lib dir="Libraries">
+				<include name="*.jar" />
+			</lib>
+		</woapplication>
+	</target>
+	
+	<target name="javaclient" if="javaClient" depends="build.woapp">
+		<mkdir dir="${dest.dir}/${build.app.name}.woa/Contents/WebServerResources/Java" />
+		<jar basedir="${classes.dir}" excludes="**/server/**/*.*, **/server/**/" jarfile="${dest.dir}/${build.app.name}.woa/Contents/WebServerResources/Java/${build.app.name}.jar"/>
+    </target>
+
+	<target name="war" if="servletDeployment" depends="ssdd">
+		<war destfile="${dest.dir}/${build.app.name}.war" webxml="${dest.dir}/${build.app.name}/WEB-INF/web.xml">
+			<fileset dir="${dest.dir}/${build.app.name}">
+				<include name="**" />
+			</fileset>
+		</war>
+	</target>
+
+	<!-- To use this target
+    	1) create the LICENSE in your project directory
+    	2) add JavaWOJSPServlet in your WOFrameworks build path
+    	3) set servlet deployment to true in WOLips Properties
+    -->
+	<target name="ssdd" if="servletDeployment" depends="build.woapp">
+		<mkdir dir="${dest.dir}/${build.app.name}/WEB-INF/classes" />
+		<mkdir dir="${dest.dir}/${build.app.name}/WEB-INF/tlds" />
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
+			<fileset dir="${dest.dir}/${build.app.name}.woa/Contents/">
+				<include name="web.xml" />
+			</fileset>
+		</copy>
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
+			<fileset dir="..">
+				<include name="LICENSE" />
+			</fileset>
+		</copy>
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
+			<fileset dir="${dest.dir}">
+				<include name="${build.app.name}.woa/**" />
+			</fileset>
+		</copy>
+		<!-- copy the frameworks to the WEBINFROOT/Library directory -->
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
+			<fileset dir="${dest.dir}/${build.app.name}.woa/Contents">
+				<include name="Library/**" />
+			</fileset>
+		</copy>
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/">
+			<fileset dir="${dest.dir}/${build.app.name}.woa">
+				<include name="Resources/**" />
+			</fileset>
+		</copy>
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/lib/">
+			<fileset dir="${dest.dir}/${build.app.name}/WEB-INF">
+				<include name="**/Resources/**/*.jar" />
+			</fileset>
+			<mapper type="flatten" />
+		</copy>
+
+		<!--  Get the necessary Frameworks from the webobjects system root instead of the project wrapper -->
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/lib" file="${wo.system.frameworks}/JavaWOJSPServlet.framework/WebServerResources/Java/JavaWOJSPServlet_client.jar" />
+
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/tlds">
+			<fileset dir="${wo.system.frameworks}/JavaWOJSPServlet.framework/Resources/">
+				<include name="WOtaglib_1_0.tld" />
+			</fileset>
+		</copy>
+
+		<!-- the WebObject Extensions -->
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/lib">
+			<fileset dir="${wo.extensions}">
+				<include name="*.jar" />
+				<exclude name="servlet.jar" />
+			</fileset>
+			<mapper type="flatten" />
+		</copy>
+		
+		<!-- the Java Client Client-Side Classes 	  -->
+		<copy todir="${dest.dir}/${build.app.name}/WEB-INF/${build.app.name}.woa/Contents/WebServerResources/Java">
+			<fileset dir="${wo.local.frameworks}"> 
+				<include name="**/WebServerResources/Java/*.jar"/> 
+			</fileset> 
+			<mapper type="flatten"/>
+		</copy>
+		
+		<!-- fix the Macos*ClassPath.txt files  -->
+		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/${build.app.name}.woa/Contents/MacOS/MacOSClassPath.txt" match="APPROOT/Resources/Java/${build.app.name.lowercase}.jar" replace="APPROOT/${build.app.name}.woa/Contents/Resources/Java/${build.app.name.lowercase}.jar" byline="true" />
+		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/${build.app.name}.woa/Contents/MacOS/MacOSXServerClassPath.txt" match="APPROOT/Resources/Java/${build.app.name.lowercase}.jar" replace="APPROOT/${build.app.name}.woa/Contents/Resources/Java/${build.app.name.lowercase}.jar" byline="true" />
+
+		<!-- fix the web.xml file:  the app itself needs build.app.name/Contents -->
+		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/web.xml" match="WEBINFROOT/Resources/Java/${build.app.name.lowercase}.jar" replace="WEBINFROOT/${build.app.name}.woa/Contents/Resources/Java/${build.app.name.lowercase}.jar" byline="true" />
+
+		<!-- fix the web.xml file to remove the extra Frameworks/ directory level for the frameworks -->
+		<replaceregexp file="${dest.dir}/${build.app.name}/WEB-INF/web.xml" match="WEBINFROOT/Frameworks//" replace="WEBINFROOT/" byline="true" />
+	</target>
+
+	<target name="compile" depends="init.properties">
+		<taskdef name="wocompile" classname="org.objectstyle.woproject.ant.WOCompile" />
+
+		<mkdir dir="bin" />
+		<wocompile srcdir="Sources" destdir="bin">
+			<frameworks root="ProjectLocal" embed="false" eclipse="true" />
+			<frameworks root="External" embed="false" eclipse="true" />
+			<frameworks root="Local" embed="false" eclipse="true" />
+			<frameworks root="User" embed="false" eclipse="true" />
+			<frameworks root="System" embed="false" eclipse="true" />
+			<frameworks root="Network" embed="false" eclipse="true" />
+			<classpath>
+				<fileset dir="Libraries">
+					<include name="*.jar" />
+				</fileset>
+				<fileset dir="${wo.extensions}">
+					<include name="*.jar" />
+				</fileset>
+			</classpath>
+		</wocompile>
+	</target>
+</project>
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/template.xml
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/template.xml	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/template.xml	(revision 0)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <template name = "ERModern DirectToWeb Application">
+    <inputs>
+      <input name = "basePackage" type = "Package">
+        <question>Base Package?</question>
+        <default>com.company.application.app</default>
+      </input>
+      <input name = "componentsPackage" type = "Package">
+        <question>Components Package?</question>
+        <default>com.company.application.ui.components</default>
+      </input>
+    </inputs>
+  </template>
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.settings/org.eclipse.core.resources.prefs
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.settings/org.eclipse.core.resources.prefs	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/.settings/org.eclipse.core.resources.prefs	(revision 0)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//Components=UTF-8
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.api
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.api	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.api	(revision 0)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<wodefinitions>
+        <wo wocomponentcontent="false" class="Main.java">
+        </wo>
+</wodefinitions>
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.html
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.html	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.html	(revision 0)
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<title>${projectName} Login</title>
+    <webobject name = "Stylesheet"></webobject>
+	</head>
+	<body>
+	  <webobject name = "HasErrorMessage">
+	  <div class = "ErrBlock"><webobject name = "ErrorMessage"></webobject></div>
+	  </webobject>
+	  <div id="LoginForm">
+	      <webobject name = "LoginForm">
+	      <h2>Login</h2>
+	      <p><label for="username">Username:</label><webobject name = "UsernameField"/></p>
+	      <p><label for="password">Password:</label><webobject name = "PasswordField"/></p>
+        <p class="button_bar"><a href="javascript:void();" onclick="document.forms['LoginForm'].submit()" class="Button PageButton LoginPageButton"><span>Login</span></a></p>
+        </webobject>
+    </div>
+	</body>
+</html>
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.wod
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.wod	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.wod	(revision 0)
@@ -0,0 +1,29 @@
+LoginForm : WOForm {
+  multipleSubmit = false;
+  directActionName = "login";
+  actionClass = "DirectAction";
+  name="LoginForm";
+}
+
+UsernameField : WOTextField {
+  value = username;
+  name = "username";
+}
+
+PasswordField : WOPasswordField {
+  value = password;
+  name = "password";
+}
+
+Stylesheet : ERXStyleSheet {
+	filename = "default_login_page.css";
+	framework = "ERModernDefaultSkin";
+}
+
+HasErrorMessage : WOConditional {
+  condition = errorMessage;
+}
+
+ErrorMessage : WOString {
+  value = errorMessage;
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.woo
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.woo	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/Main.wo/Main.woo	(revision 0)
@@ -0,0 +1,4 @@
+{
+	"WebObjects Release" = "WebObjects 5.0"; 
+	encoding = "UTF-8"; 
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.html
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.html	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.html	(revision 0)
@@ -0,0 +1,15 @@
+<webobject name = "HasValidSession">
+<div class = "MenuHeaderWrapper">
+<div class = "Heading MenuHeaderHeading">
+    <h1>${projectName}</h1>
+</div>
+<div class = "Menu UserMenu">
+    <ul class = "MenuOptions UserMenuOptions">
+        <li class="first"><a href = "#">Logged In User</a></li>
+        <li><webobject name = "HomeLink">Homepage</webobject></li>
+        <li><webobject name = "LoginLink">Log Out</webobject></li>
+    </ul>
+</div>
+</div>
+<webobject name = "ERXNavigationMenu"/>
+</webobject>
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.wod
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.wod	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.wod	(revision 0)
@@ -0,0 +1,16 @@
+ERXNavigationMenu : ERXNavigationMenu {
+  navigationContext = navigationContext;
+}
+
+HasValidSession: WOConditional {
+    condition = context.hasSession;
+}
+
+LoginLink: WOHyperlink {
+    action = logout;
+    target = "_top";
+}
+
+HomeLink: WOHyperlink {
+    action = homeAction;
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.woo
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.woo	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/MenuHeader.wo/MenuHeader.woo	(revision 0)
@@ -0,0 +1,4 @@
+{
+	"WebObjects Release" = "WebObjects 5.0";
+	encoding = "UTF-8";
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.html
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.html	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.html	(revision 0)
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <webobject name = "HeadTag">
+    <webobject name = "StyleSheets">
+    </webobject>
+  </webobject>
+  <webobject name = "BodyTag">
+    <webobject name = "IsDebug">
+        <div id="ERD2WDebugFlags"><webobject name = "ERD2WDebugFlags" /></div>
+    </webobject>
+    <div id = "ContentWrapper">
+      <div id = "MenuHeader">
+        <webobject name = "EntitiesMenu" />
+      </div>
+      <div id = "MainContent"> 
+        <webobject name = "MainContent" />
+      </div>
+    </div>
+  <webobject name = "WOLToolBar"/>
+  <webobject name = "ERMD2WStyleSheetInjector"/>
+  </webobject>
+</html>
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.wod
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.wod	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.wod	(revision 0)
@@ -0,0 +1,33 @@
+MainContent : WOComponentContent {
+    _unroll = YES;
+}
+
+BodyTag : WOBody {
+    class = bodyClass;
+}
+
+HeadTag : ERD2WHead {
+}
+
+EntitiesMenu : MenuHeader {
+}
+
+ERD2WDebugFlags : ERD2WDebugFlags {
+    context = d2wContext;
+}
+
+IsDebug : WOConditional {
+    condition = application.isDevelopmentMode;
+}
+
+StyleSheets : ERMD2WCSSReference {
+    localContext = d2wContext;
+}
+
+ERMD2WStyleSheetInjector : ERMD2WStyleSheetInjector {
+  localContext = d2wContext;
+}
+
+WOLToolBar : WOLToolBar {
+  expanded = true;
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.woo
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.woo	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Components/PageWrapper.wo/PageWrapper.woo	(revision 0)
@@ -0,0 +1,4 @@
+{
+	"WebObjects Release" = "WebObjects 5.0";
+	encoding = "UTF-8";
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/NavigationMenu.plist
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/NavigationMenu.plist	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/NavigationMenu.plist	(revision 0)
@@ -0,0 +1,19 @@
+(
+	{
+		name = Root;
+		children = ("Home","Tab1","Tab2");
+	},
+	{
+		name = "Home";
+		action = "session.navController.homeAction";
+	},
+	{
+		name = Tab1;
+		action = "session.navController.homeAction";
+	},
+	{
+		name = Tab2;
+		action = "session.navController.homeAction";
+	}
+
+)
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/Properties
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/Properties	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/Properties	(revision 0)
@@ -0,0 +1,77 @@
+# OGNL
+ognl.helperFunctions=true
+ognl.inlineBindings=true
+
+# Misc
+er.extensions.stackTrace.cleanup=true
+
+# EOF
+er.extensions.ERXEC.safeLocking=true
+er.extensions.ERXEC.useSharedEditingContext=false
+er.extensions.ERXEnterpriseObject.applyRestrictingQualifierOnInsert=true
+er.extensions.ERXEnterpriseObject.updateInverseRelationships=true
+
+# MySQL Connection Dictionary
+#dbConnectUserGLOBAL=
+#dbConnectPasswordGLOBAL=
+#dbConnectDriverGLOBAL=com.mysql.jdbc.Driver
+#Movies.URL=jdbc:mysql://localhost/movies?capitalizeTypenames=true&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF-8
+
+
+# Migrations
+#er.migration.migrateAtStartup=true
+#er.migration.createTablesIfNecessary=true
+#er.migration.modelNames=YourModel
+
+# Misc Components
+#er.extensions.ERXWOForm.multipleSubmitDefault=true
+#er.extensions.ERXWORepetition.checkHashCodes=true
+#er.extensions.ERXWORepetition.raiseOnUnmatchedObject=true
+#er.extensions.ERXWORepetition.eoSupport=true
+
+er.component.clickToOpen=true
+wolips.password=my_password
+
+# ERJavaMail
+er.javamail.centralize=true
+er.javamail.adminEmail=admin@yourhost.com
+er.javamail.debugEnabled=false
+er.javamail.smtpHost=your.smtpserver.com
+er.javamail.smtpAuth=false
+er.javamail.smtpUser=
+er.javamail.smtpPassword=
+
+# Log4j Configuration
+log4j.loggerFactory=er.extensions.logging.ERXLogger$Factory
+log4j.rootCategory=INFO,A1
+log4j.appender.A1=er.extensions.logging.ERXConsoleAppender
+log4j.appender.A1.layout=er.extensions.logging.ERXPatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{MMM dd HH:mm:ss} %$[%#] %-5p %c %x - %m%n
+
+# Log4j Categories
+# Here are a few log4j sub-categories that are interesting.
+# Don't forget that in developement mode this file will get reloaded
+# everytime it changes, so if you say want to turn adaptor debugging
+# on in the middle of the app simply set the below category to debug.
+# Very handy.
+# Base Category
+log4j.logger.er=INFO
+
+# ERExtensions
+# Transaction - Switching this to debug will start the sql ouputting.
+log4j.logger.er.transaction.adaptor.EOAdaptorDebugEnabled=DEBUG
+
+# Fixes - Turning this on will show all the models that are loaded
+log4j.logger.er.extensions.fixes.ERSharedEOLoader=INFO
+
+er.extensions.ERXNSLogLog4jBridge=INFO
+#log4j.logger.er.eo.ERXGenericRecord=DEBUG
+#log4j.logger.er.validation.ERXEntityClassDescription=DEBUG
+#log4j.logger.er.default.ERXEntityClassDescription=DEBUG
+log4j.logger.er.extensions.ERXDatabaseContextDelegate=WARN
+log4j.logger.er.extensions.ERXConfigurationManager=INFO
+#log4j.logger.er.extensions.ERXApplication.RequestHandling=DEBUG
+
+#ERXNavigation
+
+er.extensions.ERXNavigationManager.localizeDisplayKeys=true
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/d2w.d2wmodel
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/d2w.d2wmodel	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/d2w.d2wmodel	(revision 0)
@@ -0,0 +1,4 @@
+{
+    rules = (
+    );
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/user.d2wmodel
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/user.d2wmodel	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/user.d2wmodel	(revision 0)
@@ -0,0 +1,237 @@
+{
+  "rules" = (
+    {
+      "author" = "40"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "navigationState"; 
+        "value" = "Home"; 
+      }; 
+    }, 
+    {
+      "author" = "50"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+        "key" = "pageConfiguration"; 
+        "selectorName" = "isLike"; 
+        "value" = "*Tab1*"; 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "navigationState"; 
+        "value" = "Tab1"; 
+      }; 
+    }, 
+    {
+      "author" = "50"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+        "key" = "pageConfiguration"; 
+        "selectorName" = "isLike"; 
+        "value" = "*Tab2*"; 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "navigationState"; 
+        "value" = "Tab2"; 
+      }; 
+    }, 
+    {
+      "author" = "60"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOAndQualifier"; 
+        "qualifiers" = (
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "task"; 
+            "selectorName" = "isEqualTo"; 
+            "value" = "edit"; 
+          }, 
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "smartAttribute.className"; 
+            "selectorName" = "isEqualTo"; 
+            "value" = "java.lang.String"; 
+          }, 
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "smartAttribute.width"; 
+            "selectorName" = "isGreaterThanOrEqualTo"; 
+            "value" = {
+              "class" = "java.lang.Number"; 
+              "value" = "110"; 
+            }; 
+          }
+        ); 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "componentName"; 
+        "value" = "ERD2WEditString"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "look"; 
+        "value" = "ERModernLook"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOAndQualifier"; 
+        "qualifiers" = (
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "RuleIsDisabled"; 
+            "selectorName" = "isEqual"; 
+            "value" = "YES"; 
+          }
+        ); 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "datePickerRangeHigh"; 
+        "value" = "20091205"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOAndQualifier"; 
+        "qualifiers" = (
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "RuleIsDisabled"; 
+            "selectorName" = "isEqual"; 
+            "value" = "YES"; 
+          }
+        ); 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "datePickerRangeHigh"; 
+        "value" = "20091215"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.BooleanAssignment"; 
+        "keyPath" = "isEntityEditable"; 
+        "value" = "true"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.BooleanAssignment"; 
+        "keyPath" = "isEntityDeletable"; 
+        "value" = "true"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOAndQualifier"; 
+        "qualifiers" = (
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "RuleIsDisabled"; 
+            "selectorName" = "isEqual"; 
+            "value" = "YES"; 
+          }, 
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "pageConfiguration"; 
+            "selectorName" = "isLike"; 
+            "value" = "EditRelationship*"; 
+          }
+        ); 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.BooleanAssignment"; 
+        "keyPath" = "useAjaxControls"; 
+        "value" = "false"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOAndQualifier"; 
+        "qualifiers" = (
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "task"; 
+            "selectorName" = "isEqualTo"; 
+            "value" = "inspect"; 
+          }, 
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "smartRelationship.isToMany"; 
+            "selectorName" = "isEqualTo"; 
+            "value" = {
+              "class" = "java.lang.Number"; 
+              "value" = "1"; 
+            }; 
+          }
+        ); 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "componentName"; 
+        "value" = "ERDList"; 
+      }; 
+    }, 
+    {
+      "author" = "100"; 
+      "class" = "com.webobjects.directtoweb.Rule"; 
+      "lhs" = {
+        "class" = "com.webobjects.eocontrol.EOAndQualifier"; 
+        "qualifiers" = (
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "smartRelationship"; 
+            "selectorName" = "isNotEqualTo"; 
+            "value" = {
+              "class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; 
+            }; 
+          }, 
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "smartRelationship.isToMany"; 
+            "selectorName" = "isEqualTo"; 
+            "value" = {
+              "class" = "java.lang.Number"; 
+              "value" = "0"; 
+            }; 
+          }, 
+          {
+            "class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; 
+            "key" = "task"; 
+            "selectorName" = "isEqualTo"; 
+            "value" = "inspect"; 
+          }
+        ); 
+      }; 
+      "rhs" = {
+        "class" = "com.webobjects.directtoweb.Assignment"; 
+        "keyPath" = "componentName"; 
+        "value" = "ERD2WDisplayToOne"; 
+      }; 
+    }
+  ); 
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/user.d2wmodel.txt
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/user.d2wmodel.txt	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/user.d2wmodel.txt	(revision 0)
@@ -0,0 +1,14 @@
+(
+    40 : *true* => navigationState = Home [com.webobjects.directtoweb.Assignment],
+    50 : pageConfiguration like '*Tab1*' => navigationState = Tab1 [com.webobjects.directtoweb.Assignment],
+    50 : pageConfiguration like '*Tab2*' => navigationState = Tab2 [com.webobjects.directtoweb.Assignment],
+    60 : (task = 'edit' and smartAttribute.className = 'java.lang.String' and smartAttribute.width >= 110) => componentName = ERD2WEditString [com.webobjects.directtoweb.Assignment],
+    100 : *true* => look = ERModernLook [com.webobjects.directtoweb.Assignment],
+    100 : *true* => datePickerRangeHigh = 20091205 [com.webobjects.directtoweb.Assignment],
+    100 : *true* => datePickerRangeHigh = 20091215 [com.webobjects.directtoweb.Assignment],
+    100 : *true* => isEntityEditable = true [com.webobjects.directtoweb.BooleanAssignment],
+    100 : *true* => isEntityDeletable = true [com.webobjects.directtoweb.BooleanAssignment],
+    100 : pageConfiguration like 'EditRelationship*' => useAjaxControls = false [com.webobjects.directtoweb.BooleanAssignment],
+    100 : (task = 'inspect' and smartRelationship.isToMany = 1) => componentName = ERDList [com.webobjects.directtoweb.Assignment],
+    100 : (smartRelationship != null and smartRelationship.isToMany = 0 and task = 'inspect') => componentName = ERD2WDisplayToOne [com.webobjects.directtoweb.Assignment]
+)
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/English.lproj/Localizable.strings
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/English.lproj/Localizable.strings	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Resources/English.lproj/Localizable.strings	(revision 0)
@@ -0,0 +1,9 @@
+{
+  "Nav.Tab1" = "<span>Tab1</span>";
+  "Nav.Tab2" = "<span>Tab2</span>";
+  "Nav.Home" = "<span>Home</span>";
+  "Nav.Admin" = "<span>Admin</span>";
+  
+  "ERD2W.advancedFindButtonLabel" = "Advanced...";
+  
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/Application.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/Application.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/Application.java	(revision 0)
@@ -0,0 +1,24 @@
+package ${basePackage};
+
+import er.extensions.appserver.ERXApplication;
+import er.extensions.appserver.navigation.ERXNavigationManager;
+
+public class Application extends ERXApplication {
+	public static void main(String[] argv) {
+		ERXApplication.main(argv, Application.class);
+	}
+
+	public Application() {
+		ERXApplication.log.info("Welcome to " + name() + " !");
+		setDefaultRequestHandler(requestHandlerForKey(directActionRequestHandlerKey()));
+	}
+	
+    @Override
+    public void finishInitialization() {
+    	super.finishInitialization();
+    	
+    	// Setup main navigation
+    	ERXNavigationManager.manager().configureNavigation();
+    	
+    }
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/DirectAction.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/DirectAction.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/DirectAction.java	(revision 0)
@@ -0,0 +1,45 @@
+package ${basePackage};
+
+import com.webobjects.appserver.WOActionResults;
+import com.webobjects.appserver.WORequest;
+import com.webobjects.directtoweb.D2W;
+import com.webobjects.foundation.NSLog;
+
+import er.directtoweb.ERD2WDirectAction;
+import ${componentsPackage}.Main;
+
+
+public class DirectAction extends ERD2WDirectAction {
+	public DirectAction(WORequest request) {
+		super(request);
+	}
+
+	@Override
+	public WOActionResults defaultAction() {
+		return pageWithName(Main.class.getName());
+	}
+	
+    /**
+     * Checks if a page configuration is allowed to render.
+     * Provide a more intelligent access scheme as the default just returns false. And
+     * be sure to read the javadoc to the super class.
+     * @param pageConfiguration
+     * @return
+     */
+    protected boolean allowPageConfiguration(String pageConfiguration) {
+        return false;
+    }
+    
+	public WOActionResults loginAction() {
+		
+		String username = request().stringFormValueForKey("username");
+		String password = request().stringFormValueForKey("password");
+		
+		NSLog.out.appendln("***DirectAction.loginAction - username: " + username + " : password: " + password + "***");
+		
+		// ENHANCEME - add appropriate login behaviour here
+		
+		return D2W.factory().defaultPage(session());
+	}
+	
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/MainNavigationController.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/MainNavigationController.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/MainNavigationController.java	(revision 0)
@@ -0,0 +1,111 @@
+package ${basePackage};
+
+import com.webobjects.appserver.WOComponent;
+import com.webobjects.directtoweb.D2W;
+import com.webobjects.directtoweb.EditPageInterface;
+import com.webobjects.directtoweb.ErrorPageInterface;
+import com.webobjects.directtoweb.QueryPageInterface;
+
+public class MainNavigationController {
+
+	private Session _session;
+
+	public MainNavigationController(Session s) {
+		super();
+		_session = s;
+	}
+
+	// NAV ACTIONS
+	
+	public WOComponent homeAction() {
+        return D2W.factory().defaultPage(session());
+    }
+	
+//	// ADMIN
+//	
+//	public WOComponent adminAction() {
+//		return queryPageForEntityName(Talent.ENTITY_NAME);
+//	}
+//	
+//	// MOVIES
+//	
+//	public WOComponent queryMovieAction() {
+//		return queryPageForEntityName(MOVIE);
+//	}
+//	
+//	public WOComponent createMovieAction() {
+//		return newObjectForEntityName(MOVIE);
+//	}
+//	
+//	// STUDIOS
+//	
+//	public WOComponent queryStudioAction() {
+//		return queryPageForEntityName(STUDIO);
+//	}
+//	
+//	public WOComponent createStudioAction() {
+//		return newObjectForEntityName(STUDIO);
+//	}
+//	
+//	// TALENT
+//	
+//	public WOComponent queryTalentAction() {
+//		return queryPageForEntityName(Talent.ENTITY_NAME);
+//	}
+//	
+//	public WOComponent createTalentAction() {
+//		return newObjectForEntityName(Talent.ENTITY_NAME);
+//	}
+//	
+//	// VOTING
+//	
+//	public WOComponent queryVotingAction() {
+//		return queryPageForEntityName(Voting.ENTITY_NAME);
+//	}
+//	
+//	public WOComponent createVotingAction() {
+//		return newObjectForEntityName(Voting.ENTITY_NAME);
+//	}
+//	
+//	// REVIEW
+//	
+//	public WOComponent queryReviewAction() {
+//		return queryPageForEntityName(REVIEW);
+//	}
+//	
+//	public WOComponent createReviewAction() {
+//		return newObjectForEntityName(REVIEW);
+//	}
+	
+	// GENERIC ACTIONS
+	
+    public WOComponent queryPageForEntityName(String entityName) {
+        QueryPageInterface newQueryPage = D2W.factory().queryPageForEntityNamed(entityName, session());
+        return (WOComponent) newQueryPage;
+    }
+    
+    public WOComponent newObjectForEntityName(String entityName) {
+        WOComponent nextPage = null;
+        try {
+            EditPageInterface epi = D2W.factory().editPageForNewObjectWithEntityNamed(entityName, session());
+            epi.setNextPage(session().context().page());
+            nextPage = (WOComponent) epi;
+        } catch (IllegalArgumentException e) {
+            ErrorPageInterface epf = D2W.factory().errorPage(session());
+            epf.setMessage(e.toString());
+            epf.setNextPage(session().context().page());
+            nextPage = (WOComponent) epf;
+        }
+        return nextPage;
+    }
+    
+    // ACCESSORS
+    
+    public Session session() {
+		return _session;
+	}
+
+	public void setSession(Session s) {
+		_session = s;
+	}
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/Session.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/Session.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__basePackage_folder__/Session.java	(revision 0)
@@ -0,0 +1,19 @@
+package ${basePackage};
+
+import er.extensions.appserver.ERXSession;
+
+public class Session extends ERXSession {
+	private static final long serialVersionUID = 1L;
+
+	private MainNavigationController _navController;
+	
+	public Session() {
+	}
+	
+	public MainNavigationController navController() {
+		if (_navController == null) {
+			_navController = new MainNavigationController(this);
+		}
+		return _navController;
+	}
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/Main.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/Main.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/Main.java	(revision 0)
@@ -0,0 +1,40 @@
+package ${componentsPackage};
+
+import com.webobjects.appserver.WOContext;
+import er.extensions.components.ERXStatelessComponent;
+
+public class Main extends ERXStatelessComponent {
+	
+	private String _username;
+	private String _password;
+	private String _errorMessage;
+	
+	public Main(WOContext context) {
+		super(context);
+	}
+	
+	public void setUsername(String username) {
+		_username = username;
+	}
+
+	public String username() {
+		return _username;
+	}
+
+	public void setPassword(String password) {
+		_password = password;
+	}
+
+	public String password() {
+		return _password;
+	}
+
+	public void setErrorMessage(String errorMessage) {
+		_errorMessage = errorMessage;
+	}
+
+	public String errorMessage() {
+		return _errorMessage;
+	}
+	
+}
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/MenuHeader.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/MenuHeader.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/MenuHeader.java	(revision 0)
@@ -0,0 +1,55 @@
+package ${componentsPackage};
+
+import com.webobjects.appserver.WOComponent;
+import com.webobjects.appserver.WOContext;
+import com.webobjects.appserver.WORedirect;
+import com.webobjects.directtoweb.D2W;
+import com.webobjects.directtoweb.D2WPage;
+import com.webobjects.foundation.NSKeyValueCoding;
+import com.webobjects.foundation.NSMutableDictionary;
+
+import er.extensions.appserver.navigation.ERXNavigationManager;
+import er.extensions.appserver.navigation.ERXNavigationState;
+import er.extensions.components.ERXComponent;
+
+public class MenuHeader extends ERXComponent {
+	
+    public MenuHeader(WOContext context) {
+        super(context);
+    }
+    
+	// ERXModernNavigationMenu Support
+	
+    public NSKeyValueCoding navigationContext() {
+    	
+        NSKeyValueCoding context = (NSKeyValueCoding)session().objectForKey("navigationContext");
+
+        if (context().page() instanceof D2WPage) {
+            context = ((D2WPage)context().page()).d2wContext();
+        }
+
+        //log.debug(ERXNavigationManager.manager().navigationStateForSession(session()));
+        if(context == null) {
+            context = new NSMutableDictionary<Object, String>();
+            session().setObjectForKey(context, "navigationContext");
+        }
+        @SuppressWarnings("unused")
+		ERXNavigationState state = ERXNavigationManager.manager().navigationStateForSession(session());
+        // log.debug("NavigationState:" + state + "," + state.state() + "," + state.stateAsString());
+        //log.info("navigationContext:" + session().objectForKey("navigationContext"));
+        return context;
+    }
+    
+    // Actions
+    
+    public WOComponent logout() {
+        WOComponent redirectPage = pageWithName("WORedirect");
+        ((WORedirect) redirectPage).setUrl(D2W.factory().homeHrefInContext(context()));
+        session().terminate();
+        return redirectPage;
+    }
+    
+    public WOComponent homeAction() {
+        return D2W.factory().defaultPage(session());
+    }
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/PageWrapper.java
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/PageWrapper.java	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/Sources/__componentsPackage_folder__/PageWrapper.java	(revision 0)
@@ -0,0 +1,31 @@
+package ${componentsPackage};
+
+import com.webobjects.appserver.WOContext;
+import com.webobjects.directtoweb.D2WContext;
+import com.webobjects.directtoweb.D2WPage;
+
+import er.extensions.components.ERXComponent;
+
+public class PageWrapper extends ERXComponent {
+	
+    public PageWrapper(WOContext context) {
+        super(context);
+    }
+    
+    public D2WContext d2wContext() {
+    	if (context().page() instanceof D2WPage) {
+			D2WPage d2wPage = (D2WPage) context().page();
+			return d2wPage.d2wContext();
+		}
+    	return null;
+    }
+
+	public String bodyClass() {
+		String result = null;
+		String pageConfig = (String)d2wContext().valueForKey("pageConfiguration");
+		if (pageConfig != null && pageConfig.length() > 0) {
+			result = pageConfig + "Body";
+		}
+		return result;
+	}
+}
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/classes.exclude.patternset
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/classes.exclude.patternset	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/classes.exclude.patternset	(revision 0)
@@ -0,0 +1 @@
+build.properties
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/classes.include.patternset
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/classes.include.patternset	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/classes.include.patternset	(revision 0)
@@ -0,0 +1,2 @@
+**/*.class
+*.properties
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/resources.exclude.patternset
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/resources.exclude.patternset	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/resources.exclude.patternset	(revision 0)
@@ -0,0 +1,3 @@
+**/*.eomodeld~/
+**/*.woa/**
+**/*.framework/**
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/resources.include.patternset
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/resources.include.patternset	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/resources.include.patternset	(revision 0)
@@ -0,0 +1,3 @@
+Components/**/*.wo/**/*
+Components/**/*.api
+Resources/**/*
\ No newline at end of file
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/wsresources.exclude.patternset
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/wsresources.exclude.patternset	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/wsresources.exclude.patternset	(revision 0)
@@ -0,0 +1,3 @@
+**/*.woa/**
+**/*.framework/**
+**/*.eomodeld~/**
Index: wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/wsresources.include.patternset
===================================================================
--- wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/wsresources.include.patternset	(revision 0)
+++ wolips/core/plugins/org.objectstyle.wolips.templateengine/ProjectTemplates/ERModern D2W Application/woproject/wsresources.include.patternset	(revision 0)
@@ -0,0 +1 @@
+WebServerResources/**/*