You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/12/12 19:10:44 UTC
svn commit: r356314 - in /maven/continuum/trunk/continuum-webapp: ./ src/
src/main/ src/main/java/ src/main/resources/ src/main/webapp/
src/main/webapp/WEB-INF/ src/main/webapp/css/ src/main/webapp/decorators/
src/main/webapp/images/ src/main/webapp/sc...
Author: evenisse
Date: Mon Dec 12 10:10:27 2005
New Revision: 356314
URL: http://svn.apache.org/viewcvs?rev=356314&view=rev
Log:
Add base dtructure of webwork webapp
Added:
maven/continuum/trunk/continuum-webapp/
maven/continuum/trunk/continuum-webapp/pom.xml (with props)
maven/continuum/trunk/continuum-webapp/src/
maven/continuum/trunk/continuum-webapp/src/main/
maven/continuum/trunk/continuum-webapp/src/main/java/
maven/continuum/trunk/continuum-webapp/src/main/resources/
maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties (with props)
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/css/
maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/
maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/images/
maven/continuum/trunk/continuum-webapp/src/main/webapp/scripts/
Added: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/pom.xml?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (added)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Mon Dec 12 10:10:27 2005
@@ -0,0 +1,30 @@
+<project>
+ <parent>
+ <artifactId>continuum-parent</artifactId>
+ <groupId>org.apache.maven.continuum</groupId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>continuum-webapp</artifactId>
+ <name>Continuum Web APP</name>
+ <version>1.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-xwork-integration</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>sitemesh</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/continuum/trunk/continuum-webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties Mon Dec 12 10:10:27 2005
@@ -0,0 +1 @@
+webwork.tag.altSyntax = true
Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Dec 12 10:10:27 2005
@@ -0,0 +1,16 @@
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.0.dtd">
+
+<xwork>
+
+ <include file="webwork-default.xml"/>
+
+ <package name="default" extends="webwork-default">
+ <default-interceptor-ref name="completeStack"/>
+
+ <action name="helloWorld"
+ class="ch2.example1.HelloWorld">
+ <result name="success">hello.jsp</result>
+ <result name="input">name.jsp</result>
+ </action>
+ </package>
+</xwork>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml Mon Dec 12 10:10:27 2005
@@ -0,0 +1,8 @@
+<decorators defaultdir="/decorators">
+ <decorator name="none" page="none.jsp">
+ <pattern>/login*</pattern>
+ </decorator>
+ <decorator name="default" page="default.jsp">
+ <pattern>/*</pattern>
+ </decorator>
+</decorators>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/decorators.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld Mon Dec 12 10:10:27 2005
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<taglib>
+
+ <tlibversion>1.0</tlibversion>
+ <jspversion>1.1</jspversion>
+ <shortname>SiteMesh Decorator Tags</shortname>
+ <uri>sitemesh-decorator</uri>
+
+ <tag>
+ <name>head</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.HeadTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ </tag>
+
+ <tag>
+ <name>body</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.BodyTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ </tag>
+
+ <tag>
+ <name>title</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.TitleTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>default</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>getProperty</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.PropertyTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>property</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>default</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>writeEntireProperty</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>usePage</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.UsePageTag</tagclass>
+ <teiclass>com.opensymphony.module.sitemesh.taglib.decorator.UsePageTEI</teiclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>useHtmlPage</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.decorator.UsePageTag</tagclass>
+ <teiclass>com.opensymphony.module.sitemesh.taglib.decorator.UseHTMLPageTEI</teiclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+</taglib>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-decorator.tld
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld Mon Dec 12 10:10:27 2005
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<taglib>
+
+ <tlibversion>1.0</tlibversion>
+ <jspversion>1.1</jspversion>
+ <shortname>SiteMesh Page Tags</shortname>
+ <uri>sitemesh-page</uri>
+
+ <tag>
+ <name>applyDecorator</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.page.ApplyDecoratorTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>page</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>title</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>contentType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>encoding</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <!-- Deprecated tag: use applyDecorator instead -->
+ <tag>
+ <name>apply-decorator</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.page.ApplyDecoratorTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>page</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>title</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>contentType</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>encoding</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>param</name>
+ <tagclass>com.opensymphony.module.sitemesh.taglib.page.ParamTag</tagclass>
+ <bodycontent>JSP</bodycontent>
+ <attribute>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+</taglib>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh-page.tld
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml Mon Dec 12 10:10:27 2005
@@ -0,0 +1,17 @@
+<sitemesh>
+ <property name="decorators-file" value="/WEB-INF/decorators.xml" />
+ <excludes file="${decorators-file}" />
+
+ <page-parsers>
+ <parser content-type="text/html"
+ class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
+ <parser content-type="text/html;charset=ISO-8859-1"
+ class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
+ </page-parsers>
+
+ <decorator-mappers>
+ <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
+ <param name="config" value="${decorators-file}" />
+ </mapper>
+ </decorator-mappers>
+</sitemesh>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/sitemesh.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Mon Dec 12 10:10:27 2005
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+ <display-name>Test Web App</display-name>
+
+ <filter>
+ <filter-name>sitemesh</filter-name>
+ <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>sitemesh</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>webwork</servlet-name>
+ <servlet-class>com.opensymphony.webwork.dispatcher.ServletDispatcher</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>webwork</servlet-name>
+ <url-pattern>*.action</url-pattern>
+ </servlet-mapping>
+
+ <taglib>
+ <taglib-uri>sitemesh-page</taglib-uri>
+ <taglib-location>/WEB-INF/sitemesh-page.tld</taglib-location>
+ </taglib>
+
+ <taglib>
+ <taglib-uri>sitemesh-decorator</taglib-uri>
+ <taglib-location>/WEB-INF/sitemesh-decorator.tld</taglib-location>
+ </taglib>
+
+ <taglib>
+ <taglib-uri>webwork</taglib-uri>
+ <taglib-location>/WEB-INF/lib/webwork-2.1.7.jar</taglib-location>
+ </taglib>
+</web-app>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp Mon Dec 12 10:10:27 2005
@@ -0,0 +1,45 @@
+<%@ taglib uri="sitemesh-decorator" prefix="decorator" %>
+<%@ taglib uri="webwork" prefix="ww" %>
+<html>
+ <head>
+ <title><decorator:title/></title>
+ <style type="text/css">
+ <!--
+ @import url("<ww:url value="/shared/styles/main.css"/>");
+ -->
+ </style>
+ <link rel="StyleSheet" href="dtree.css" type="text/css" />
+ <script type="text/javascript" src="<%= request.getContextPath() %>dtree.js"></script>
+ <decorator:head/>
+ </head>
+
+ <body>
+ <table>
+ <tr>
+ <td colspan="2">
+ <img src="<ww:url value="/shared/images/logo.png"/> "/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <div id="nav_items">
+ * <a href="<ww:url value="updateProfile!default.action"/>">My Account</a><br/>
+
+ <p/>
+
+ <ww:form theme="simple" action="search">
+ <ww:textfield label="Search" theme="simple" name="query" size="10"/>
+ <ww:submit theme="simple" value="Go"/>
+ </ww:form>
+
+
+<%-- <ww:action name="categoryTree" executeResult="true"/>--%>
+ </div>
+ </td>
+ <td valign="top">
+ <decorator:body/>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/default.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp?rev=356314&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp Mon Dec 12 10:10:27 2005
@@ -0,0 +1,31 @@
+<%@ taglib uri="sitemesh-decorator" prefix="decorator" %>
+<%@ taglib uri="webwork" prefix="ww" %>
+<html>
+ <head>
+ <title><decorator:title/></title>
+ <style type="text/css">
+ <!--
+ @import url("<ww:url value="/shared/styles/main.css"/>");
+ -->
+ </style>
+ <decorator:head/>
+ </head>
+
+ <body>
+ <table>
+ <tr>
+ <td colspan="2">
+ <img src="<ww:url value="/shared/images/logo.png"/> "/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+
+ </td>
+ <td valign="top">
+ <decorator:body/>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
\ No newline at end of file
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/decorators/none.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"