- introduced sitemesh for templating, all templates rewritten - added some basic admin stuff
/trunk/WebContent/WEB-INF/sitemesh.xml |
---|
0,0 → 1,50 |
<sitemesh> |
<page-parsers> |
<parser default="true" class="com.opensymphony.module.sitemesh.parser.DefaultPageParser" /> |
<parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser" /> |
</page-parsers> |
<decorator-mappers> |
<mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper"> |
<param name="property.1" value="meta.decorator" /> |
<param name="property.2" value="decorator" /> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper"> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper"> |
<param name="match.MSIE" value="ie" /> |
<param name="match.Mozilla [" value="ns" /> |
<param name="match.Opera" value="opera" /> |
<param name="match.Lynx" value="lynx" /> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper"> |
<param name="decorator" value="printable" /> |
<param name="parameter.name" value="printable" /> |
<param name="parameter.value" value="true" /> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper"> |
<param name="decorator" value="robot" /> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper"> |
<param name="decorator.parameter" value="decorator" /> |
<param name="parameter.name" value="confirm" /> |
<param name="parameter.value" value="true" /> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.FileDecoratorMapper"> |
</mapper> |
<mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper"> |
<param name="config" value="/WEB-INF/decorators.xml" /> |
</mapper> |
</decorator-mappers> |
</sitemesh> |
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: sitemesh-decorator.tld |
=================================================================== |
--- sitemesh-decorator.tld (nonexistent) |
+++ sitemesh-decorator.tld (revision 20) |
@@ -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 |
/sitemesh-decorator.tld |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: decorators.xml |
=================================================================== |
--- decorators.xml (nonexistent) |
+++ decorators.xml (revision 20) |
@@ -0,0 +1,7 @@ |
+<decorators defaultdir="/decorators"> |
+ <decorator name="main" page="mainTemplate.jsp"> |
+ <pattern>*</pattern> |
+ </decorator> |
+ |
+ <!-- <decorator name="panel" page="main.jsp"/>--> |
+</decorators> |
\ No newline at end of file |
/decorators.xml |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: lib/jstl-1.2.jar |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/lib/jstl-1.2.jar |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: lib/sitemesh-2.4.1.jar |
=================================================================== |
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/lib/sitemesh-2.4.1.jar |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: web.xml |
=================================================================== |
--- web.xml (revision 19) |
+++ web.xml (revision 20) |
@@ -2,7 +2,22 @@ |
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5"> |
<display-name>WebEngineeringProject</display-name> |
- <filter> |
+ |
+ <!-- Start of SiteMesh stuff --> |
+ <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> |
+ <!-- End of SiteMesh stuff --> |
+ |
+ |
+ <!-- Begin struts 2 --> |
+ <filter> |
<filter-name>struts2</filter-name> |
<filter-class> |
org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> |
@@ -11,23 +26,10 @@ |
<filter-name>struts2</filter-name> |
<url-pattern>/*</url-pattern> |
</filter-mapping> |
+ <!-- End struts 2 --> |
<welcome-file-list> |
- <welcome-file>index.html</welcome-file> |
- <welcome-file>index.htm</welcome-file> |
<welcome-file>index.jsp</welcome-file> |
- <welcome-file>default.html</welcome-file> |
- <welcome-file>default.htm</welcome-file> |
- <welcome-file>default.jsp</welcome-file> |
</welcome-file-list> |
- <servlet> |
- <description></description> |
- <display-name>Servlet</display-name> |
- <servlet-name>Servlet</servlet-name> |
- <servlet-class>Servlet</servlet-class> |
- </servlet> |
- <servlet-mapping> |
- <servlet-name>Servlet</servlet-name> |
- <url-pattern>/Servlet</url-pattern> |
- </servlet-mapping> |
+ |
</web-app> |
\ No newline at end of file |
/trunk/WebContent/WEB-INF/sitemesh-page.tld |
---|
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> |
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |