Anonymous avatar Anonymous committed 529760c

First small cleanups & improvements, more to come

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@1792 573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (10)

webapps/showcase/Showcase.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE">
+<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
   <component name="ModuleRootManager" />
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/build/java" />
     <exclude-output />
+    <exploded url="file://$MODULE_DIR$/exploded" />
     <exclude-exploded />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Generic" level="application_server_libraries" />
     <orderEntry type="module" module-name="WebWork" />
+    <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
     <orderEntryProperties />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="USE_PROJECT_VCS" value="false" />
   </component>
   <component name="WebModuleBuildComponent">
-    <setting name="EXPLODED_URL" value="file://" />
-    <setting name="EXPLODED_ENABLED" value="false" />
+    <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/exploded" />
+    <setting name="EXPLODED_ENABLED" value="true" />
     <setting name="JAR_URL" value="file://" />
     <setting name="JAR_ENABLED" value="false" />
     <setting name="SYNC_EXPLODED_DIR" value="true" />
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/cewolf.jar" />
       <url>jar://$MODULE_DIR$/../../lib/cewolf/cewolf.jar!/</url>
     </containerElement>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xwork.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/xwork.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/cos.jar" />
       <url>jar://$MODULE_DIR$/../../lib/fileupload-cos/cos.jar!/</url>
     </containerElement>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/pluto.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/pluto.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/portlet-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/ant.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
       <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-collections.jar!/</url>
     </containerElement>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler-jdt.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler-jdt.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-runtime.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jsp-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jsp-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
       <url>jar://$MODULE_DIR$/../../lib/quickstart/log4j.jar!/</url>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/org.mortbay.jetty.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
       <url>jar://$MODULE_DIR$/../../lib/sitemesh/sitemesh.jar!/</url>
     </containerElement>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
       <url>jar://$MODULE_DIR$/../../lib/spring/spring-aop.jar!/</url>
     </containerElement>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
       <attribute name="URI" value="/WEB-INF/lib/velocity-dep.jar" />
       <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-dep.jar!/</url>
     </containerElement>
       <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view.jar" />
       <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-tools-view.jar!/</url>
     </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/dom.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm-attrs.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/asm-attrs.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-web.jar!/</url>
-    </containerElement>
     <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" version="2.3" />
+    <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/META-INF/context.xml" version="5.x" />
     <webroots>
       <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
       <root url="file://$MODULE_DIR$/src/webapp/WEB-INF" relative="/WEB-INF" />

webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml

         <default-interceptor-ref name="crudStack"/>
 
         <action name="list" class="com.opensymphony.webwork.showcase.action.SkillAction" method="list">
-            <result>listSkills.jsp</result>
+            <result>/empmanager/listSkills.jsp</result>
             <interceptor-ref name="basicStack"/>
         </action>
         <action name="edit" class="com.opensymphony.webwork.showcase.action.SkillAction" method="execute">
-            <result>editSkill.jsp</result>
+            <result>/empmanager/editSkill.jsp</result>
             <interceptor-ref name="params" />
             <interceptor-ref name="basicStack"/>
         </action>
         <action name="save" class="com.opensymphony.webwork.showcase.action.SkillAction" method="save">
-            <result name="input">editSkill.jsp</result>
+            <result name="input">/empmanager/editSkill.jsp</result>
             <result type="redirect">edit.action?skillName=${currentSkill.name}</result>
         </action>
         <action name="delete" class="com.opensymphony.webwork.showcase.action.SkillAction" method="delete">
-            <result name="error">editSkill.jsp</result>
+            <result name="error">/empmanager/editSkill.jsp</result>
             <result type="redirect">edit.action?skillName=${currentSkill.name}</result>
         </action>
     </package>
         <default-interceptor-ref name="crudStack"/>
 
         <action name="list" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="list">
-            <result>listEmployees.jsp</result>
+            <result>/empmanager/listEmployees.jsp</result>
         </action>
         <action name="edit" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="execute">
-            <result>editEmployee.jsp</result>
+            <result>/empmanager/editEmployee.jsp</result>
         </action>
         <action name="save" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="save">
-            <result name="error">editEmployee.jsp</result>
+            <result name="error">/empmanager/editEmployee.jsp</result>
             <result type="redirect">edit.action?empId=${currentEmployee.empId}</result>
         </action>
         <action name="delete" class="com.opensymphony.webwork.showcase.action.EmployeeAction" method="delete">
-            <result name="error">editEmployee.jsp</result>
+            <result name="error">/empmanager/editEmployee.jsp</result>
             <result type="redirect">edit.action?empId=${currentEmployee.empId}</result>
         </action>
     </package>

webapps/showcase/src/webapp/editEmployee.jsp

-<%--
-  Created by IntelliJ IDEA.
-  User: rene
-  Date: 17.12.2005
-  Time: 13:52:15
-  To change this template use File | Settings | File Templates.
---%>
-<%@ taglib uri="/webwork" prefix="ww" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<ww:if test="currentEmployee!=null">
-    <ww:set name="title" value="'Edit Employee'"/>
-</ww:if>
-<ww:else>
-    <ww:set name="title" value="'Create Employee'"/>
-</ww:else>
-<html>
-<head>
-    <title><ww:property value="#title"/></title>
-    <link href="<%=request.getContextPath()%>/webwork/jscalendar/calendar-blue.css" rel="stylesheet" type="text/css" media="all"/>
-</head>
-
-<body>
-<h1><ww:property value="#title"/></h1>
-
-<ww:action id="skillAction" namespace="/showcase/skill" name="list"/>
-<ww:form name="editForm" action="save">
-    <ww:textfield label="Employee Id" name="currentEmployee.empId"/>
-    <ww:textfield label="First Name" name="currentEmployee.firstName"/>
-    <ww:textfield label="Last Name" name="currentEmployee.lastName"/>
-    <ww:datepicker label="Birthdate" name="currentEmployee.birthDate"/>
-    <ww:textfield label="Salary" name="currentEmployee.salary"/>
-    <ww:checkbox fieldValue="true" label="Married" name="currentEmployee.married"/>
-    <ww:combobox list="availablePositions" label="Position" name="currentEmployee.position"/>
-    <ww:select list="#skillAction.availableItems" listKey="name" label="Main Skill" name="currentEmployee.mainSkill.name"/>
-    <ww:select list="#skillAction.availableItems" listKey="name" listValue="description" label="Other Skills" name="selectedSkills" multiple="true"/>
-    <ww:password label="Password" name="currentEmployee.password"/>
-    <ww:radio list="availableLevels" name="currentEmployee.level"/>
-    <ww:textarea label="Comment" name="currentEmployee.comment" cols="50" rows="3"/>
-    <ww:submit value="Save"/>
-</ww:form>
-<p><a href="<ww:url action="list"/>">Back to Employee List</a></p>
-</body>
-</html>

webapps/showcase/src/webapp/editSkill.jsp

-<%--
-  Created by IntelliJ IDEA.
-  User: rene
-  Date: 17.12.2005
-  Time: 13:52:15
-  To change this template use File | Settings | File Templates.
---%>
-<%@ taglib uri="/webwork" prefix="ww" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-
-<ww:if test="currentSkill!=null">
-    <ww:set name="submitType" value="'update'"/>
-    <ww:text id="title" name="item.edit"><ww:param><ww:text name="skill"/></ww:param></ww:text>
-</ww:if>
-<ww:else>
-    <ww:set name="submitType" value="'create'"/>
-    <ww:text id="title" name="item.edit"><ww:param><ww:text name="skill"/></ww:param></ww:text>
-</ww:else>
-<html>
-<head><title><ww:property value="#title"/></title></head>
-
-<body>
-<h1><ww:property value="#title"/></h1>
-
-<ww:form action="save">
-    <ww:textfield label="%{getText('skill.name')}" name="currentSkill.name"/>
-    <ww:textfield label="%{getText('skill.description')}" name="currentSkill.description"/>
-    <ww:submit name="%{#submitType}" value="%{getText('save')}" />
-</ww:form>
-<p><a href="<ww:url action="list"/>"><ww:text name="skill.backtolist"/></a></p>
-</body>
-</html>

webapps/showcase/src/webapp/empmanager/editEmployee.jsp

+<%@ taglib uri="/webwork" prefix="ww" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<ww:if test="currentEmployee!=null">
+    <ww:set name="title" value="'Edit Employee'"/>
+</ww:if>
+<ww:else>
+    <ww:set name="title" value="'Create Employee'"/>
+</ww:else>
+<html>
+<head>
+    <title><ww:property value="#title"/></title>
+    <link href="<%=request.getContextPath()%>/webwork/jscalendar/calendar-blue.css" rel="stylesheet" type="text/css"
+          media="all"/>
+</head>
+
+<body>
+<h1><ww:property value="#title"/></h1>
+
+<ww:action id="skillAction" namespace="/showcase/skill" name="list"/>
+<ww:form name="editForm" action="save">
+    <ww:textfield label="Employee Id" name="currentEmployee.empId"/>
+    <ww:textfield label="First Name" name="currentEmployee.firstName"/>
+    <ww:textfield label="Last Name" name="currentEmployee.lastName"/>
+    <ww:datepicker label="Birthdate" name="currentEmployee.birthDate"/>
+    <ww:textfield label="Salary" name="currentEmployee.salary"/>
+    <ww:checkbox fieldValue="true" label="Married" name="currentEmployee.married"/>
+    <ww:combobox list="availablePositions" label="Position" name="currentEmployee.position"/>
+    <ww:select list="#skillAction.availableItems" listKey="name" label="Main Skill"
+               name="currentEmployee.mainSkill.name"/>
+    <ww:select list="#skillAction.availableItems" listKey="name" listValue="description" label="Other Skills"
+               name="selectedSkills" multiple="true"/>
+    <ww:password label="Password" name="currentEmployee.password"/>
+    <ww:radio list="availableLevels" name="currentEmployee.level"/>
+    <ww:textarea label="Comment" name="currentEmployee.comment" cols="50" rows="3"/>
+    <ww:submit value="Save"/>
+</ww:form>
+<p><a href="<ww:url action="list"/>">Back to Employee List</a></p>
+</body>
+</html>

webapps/showcase/src/webapp/empmanager/editSkill.jsp

+<%@ taglib uri="/webwork" prefix="ww" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<ww:if test="currentSkill!=null">
+    <ww:set name="submitType" value="'update'"/>
+    <ww:text id="title" name="item.edit"><ww:param><ww:text name="skill"/></ww:param></ww:text>
+</ww:if>
+<ww:else>
+    <ww:set name="submitType" value="'create'"/>
+    <ww:text id="title" name="item.edit"><ww:param><ww:text name="skill"/></ww:param></ww:text>
+</ww:else>
+<html>
+<head><title><ww:property value="#title"/></title></head>
+
+<body>
+<h1><ww:property value="#title"/></h1>
+
+<ww:form action="save">
+    <ww:textfield label="%{getText('skill.name')}" name="currentSkill.name"/>
+    <ww:textfield label="%{getText('skill.description')}" name="currentSkill.description"/>
+    <ww:submit name="%{#submitType}" value="%{getText('save')}" />
+</ww:form>
+<p><a href="<ww:url action="list"/>"><ww:text name="skill.backtolist"/></a></p>
+</body>
+</html>

webapps/showcase/src/webapp/empmanager/listEmployees.jsp

+<%@ taglib uri="/webwork" prefix="ww" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head><title>Available Employees</title></head>
+
+<body>
+<h1>Available Employees</h1>
+<table>
+    <tr>
+        <th>Id</th>
+        <th>First Name</th>
+        <th>Last Name</th>
+    </tr>
+    <ww:iterator value="availableItems">
+        <tr>
+            <td><a href="<ww:url action="edit"><ww:param name="empId" value="empId"/></ww:url>"><ww:property value="empId"/></a></td>
+            <td><ww:property value="firstName"/></td>
+            <td><ww:property value="lastName"/></td>
+        </tr>
+    </ww:iterator>
+</table>
+<p><a href="<ww:url action="edit" includeParams="false"/>">Create new Employee</a></p>
+<p><a href="<ww:url action="showcase" namespace="/" includeParams="false"/>">Back to Showcase Startpage</a></p>
+</body>
+</html>

webapps/showcase/src/webapp/empmanager/listSkills.jsp

+<%@ taglib uri="/webwork" prefix="ww" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head><title>Available Skills</title></head>
+
+<body>
+<h1>Available Skills</h1>
+<table>
+    <tr>
+        <th>Name</th><th>Description</th>
+    </tr>
+    <ww:iterator value="availableItems">
+        <tr>
+            <td><a href="<ww:url action="edit"><ww:param name="skillName" value="name"/></ww:url>"><ww:property value="name"/></a></td>
+            <td><ww:property value="description"/></td>
+        </tr>
+    </ww:iterator>
+</table>
+<!-- Although namescape not correctly specified, the following link should find the right action -->
+<p><a href="<ww:url action="edit" includeParams="false"/>">Create new Skill</a></p>
+<p><a href="<ww:url action="showcase" includeParams="false"/>">Back to Showcase Startpage</a></p>
+</body>
+</html>

webapps/showcase/src/webapp/listEmployees.jsp

-<%--
-  Created by IntelliJ IDEA.
-  User: rene
-  Date: 17.12.2005
-  Time: 13:51:30
-  To change this template use File | Settings | File Templates.
---%>
-<%@ taglib uri="/webwork" prefix="ww" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head><title>Available Employees</title></head>
-
-<body>
-<h1>Available Employees</h1>
-<table>
-    <tr>
-        <th>Id</th>
-        <th>First Name</th>
-        <th>Last Name</th>
-    </tr>
-    <ww:iterator value="availableItems">
-        <tr>
-            <td><a href="<ww:url action="edit"><ww:param name="empId" value="empId"/></ww:url>"><ww:property value="empId"/></a></td>
-            <td><ww:property value="firstName"/></td>
-            <td><ww:property value="lastName"/></td>
-        </tr>
-    </ww:iterator>
-</table>
-<p><a href="<ww:url action="edit" includeParams="false"/>">Create new Employee</a></p>
-<p><a href="<ww:url action="showcase" namespace="/" includeParams="false"/>">Back to Showcase Startpage</a></p>
-</body>
-</html>

webapps/showcase/src/webapp/listSkills.jsp

-<%--
-  Created by IntelliJ IDEA.
-  User: rene
-  Date: 17.12.2005
-  Time: 13:51:30
-  To change this template use File | Settings | File Templates.
---%>
-<%@ taglib uri="/webwork" prefix="ww" %>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head><title>Available Skills</title></head>
-
-<body>
-<h1>Available Skills</h1>
-<table>
-    <tr>
-        <th>Name</th><th>Description</th>
-    </tr>
-    <ww:iterator value="availableItems">
-        <tr>
-            <td><a href="<ww:url action="edit"><ww:param name="skillName" value="name"/></ww:url>"><ww:property value="name"/></a></td>
-            <td><ww:property value="description"/></td>
-        </tr>
-    </ww:iterator>
-</table>
-<!-- Although namescape not correctly specified, the following link should find the right action -->
-<p><a href="<ww:url action="edit" includeParams="false"/>">Create new Skill</a></p>
-<p><a href="<ww:url action="showcase" includeParams="false"/>">Back to Showcase Startpage</a></p>
-</body>
-</html>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.