[Git][java-team/sitemesh][master] 6 commits: Standards-Version updated to 4.7.3
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Tue Feb 10 09:24:12 GMT 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / sitemesh
Commits:
b71811e8 by Emmanuel Bourg at 2026-02-10T10:16:05+01:00
Standards-Version updated to 4.7.3
- - - - -
8292d5f6 by Emmanuel Bourg at 2026-02-10T10:16:05+01:00
Depend on libservlet-api-java instead of libservlet3.1-java
- - - - -
6d16d0aa by Emmanuel Bourg at 2026-02-10T10:16:05+01:00
Converted debian/watch to the version 5 format
- - - - -
31bfad87 by Emmanuel Bourg at 2026-02-10T10:17:15+01:00
New upstream version 2.4.2
- - - - -
dcf2d64b by Emmanuel Bourg at 2026-02-10T10:17:16+01:00
Update upstream source from tag 'upstream/2.4.2'
Update to upstream version '2.4.2'
with Debian dir 93889ee67ec4d21209600c28abe33ee1cb2fec5d
- - - - -
9a3a2001 by Emmanuel Bourg at 2026-02-10T10:23:49+01:00
New upstream release (2.4.2)
- - - - -
25 changed files:
- + .cvsignore
- CHANGES.txt
- LICENSE.txt
- README.txt
- build.properties
- + continuous-integration.xml
- debian/changelog
- debian/classpath-debian
- debian/control
- debian/copyright
- − debian/orig-tar.sh
- debian/watch
- − docs/CHANGES.txt
- − docs/README.txt
- + docs/api.css
- docs/download.html
- − docs/dtd/sitemesh_1_0_decorators.dtd
- − docs/dtd/sitemesh_1_5_decorators.dtd
- docs/install.html
- docs/meta.xml
- − src/Sitemesh.iml
- + src/example-webapp/.cvsignore
- src/java/com/opensymphony/module/sitemesh/Factory.java
- + src/java/com/opensymphony/module/sitemesh/html/tokenizer/.cvsignore
- + www/index.html
Changes:
=====================================
.cvsignore
=====================================
@@ -0,0 +1,9 @@
+build
+dist
+target
+velocity.log*
+maven.log*
+clover
+*.i*
+.classpath
+.project
=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,8 @@
+--------------------------
+-- Changes in 2.4.2 --
+--------------------------
+Minor update to allow SiteMesh to initialize correctly when deployed on Google AppEngine.
+
--------------------------
-- Changes in 2.4.1 --
--------------------------
=====================================
LICENSE.txt
=====================================
=====================================
README.txt
=====================================
@@ -1,5 +1,5 @@
*************************************
-** OpenSymphony SiteMesh 2.4.1 **
+** OpenSymphony SiteMesh 2.4.2 **
*************************************
SiteMesh is a web-page layout system that can be used to abstract common look
=====================================
build.properties
=====================================
@@ -18,4 +18,4 @@ compile.nowarn = off
Name = OpenSymphony SiteMesh
name = sitemesh
-version = 2.4.1
+version = 2.4.2
=====================================
continuous-integration.xml
=====================================
@@ -0,0 +1,31 @@
+<!-- Ant build for continuous integration server to auto deploy snapshot -->
+<project name="continuous-integration" default="publish">
+
+ <!-- Note: This are temporary paths used by the BeetleJuice server on
+ beaver.codehaus.org. These should switch over to the
+ opensymphony.com server when it's ready. -->
+
+ <!-- http://www.codehaus.org/~joe/sitemesh-SNAPSHOT.zip -->
+ <property name="dist.path" value="/home/users/joe/public_html"/>
+
+ <!-- http://www.codehaus.org/~joe/sitemesh-SNAPSHOT.jar -->
+ <property name="jar.path" value="/home/users/joe/public_html"/>
+
+ <property name="version" value="SNAPSHOT"/>
+
+ <target name="full-test">
+ <!-- clean -->
+ <ant dir="testsuite" target="clean"/>
+ <!-- build, test, jar and dist -->
+ <ant dir="." target="dist"/>
+ <!-- acceptance tests on embedded server -->
+ <ant dir="testsuite" target="test-embedded"/>
+ </target>
+
+ <target name="publish" depends="full-test">
+ <!-- publish -->
+ <copy file="dist/sitemesh-${version}.jar" todir="${jar.path}"/>
+ <copy file="dist/sitemesh-${version}.zip" todir="${dist.path}"/>
+ </target>
+
+</project>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+sitemesh (2.4.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * Depend on libservlet-api-java instead of libservlet3.1-java
+ * Standards-Version updated to 4.7.3
+ * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 10 Feb 2026 10:23:10 +0100
+
sitemesh (2.4.1+dfsg-7) unstable; urgency=medium
* Team upload.
=====================================
debian/classpath-debian
=====================================
@@ -1,6 +1,6 @@
usr/share/java/jflex.jar
-usr/share/java/servlet-api-3.1.jar
-usr/share/java/jsp-api-2.3.jar
+usr/share/java/servlet-api.jar
+usr/share/java/jsp-api.jar
usr/share/java/velocity-tools-view.jar
usr/share/java/freemarker.jar
usr/share/java/velocity.jar
=====================================
debian/control
=====================================
@@ -13,10 +13,11 @@ Build-Depends:
jflex (>= 1.6),
junit,
libfreemarker-java,
- libservlet3.1-java,
+ libjsp-api-java,
+ libservlet-api-java,
libvelocity-tools-java,
velocity
-Standards-Version: 4.2.1
+Standards-Version: 4.7.3
Vcs-Git: https://salsa.debian.org/java-team/sitemesh.git
Vcs-Browser: https://salsa.debian.org/java-team/sitemesh
Homepage: http://www.sitemesh.org
=====================================
debian/copyright
=====================================
@@ -2,6 +2,8 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: SiteMesh
Upstream-Contact: Patrick Lightbody <plightbo at gmail.com>
Source: http://www.sitemesh.org
+Files-Excluded: *.jar
+ testsuite/*
Comment: The upstream tarball has been modified as follows, to comply with DFSG:
* All .jar files under lib directory have been removed since Debian packages
must build with libraries installed on system.
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# called by uscan with '--upstream-version' <version> <file>
-echo "version $2"
-package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-debian_version=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*+dfsg\)-.*/\1/p'`
-TAR=../"$package"_${debian_version}.orig.tar.gz
-DIR=$package-${debian_version}.orig
-
-# clean up the upstream tarball
-unzip -d $DIR $3
-GZIP=--best tar -c -z -f $TAR --exclude 'lib/*' --exclude 'docs/api/*' $DIR
-rm -rf $3 ./$DIR
=====================================
debian/watch
=====================================
@@ -1,5 +1,5 @@
-version=3
-opts=dversionmangle=s/\+dfsg// \
-http://www.opensymphony.com/sitemesh/download.action \
- https://sitemesh.dev.java.net/files/documents/887/.+/sitemesh-(.+).zip \
- debian debian/orig-tar.sh
+Version: 5
+Template: GitHub
+Owner: sitemesh
+Project: sitemesh2
+Version-Type: STABLE_VERSION
=====================================
docs/CHANGES.txt deleted
=====================================
@@ -1,225 +0,0 @@
---------------------------
--- Changes in 2.4.1 --
---------------------------
-Fixed error in Page.getRequest() implementation. Now deprecated and removed from examples.
-
---------------------------
--- Changes in 2.4 --
---------------------------
-Mostly minor fixes.
-
-Bug fixes
- * [SIM-156] - Style Tags are stripped from <HEAD>
- * [SIM-172] - Unclosed quotes cause parsing problems
- * [SIM-180] - Header content after a <content> tag gets treated as part of the body
- * [SIM-186] - SM should honor (at least) 304 (SC_NOT_MODIFIED)
- * [SIM-197] - when bodyContent is null,page:applyDecorator will throw NullPointerException
- * [SIM-198] - Deleted '<' in included content
- * [SIM-206] - XML Declaration in XHTML
- * [SIM-216] - NoSuchElementException in com.opensymphony.module.sitemesh.html.HTMLProcessor$1.currentBuffer(HTMLProcessor.java:44)
- * [SIM-241] - ArrayIndexOutofBounds exception in HTMLPageParser
- * [SIM-247] - OSDecoratorMapper == FAIL
- * [SIM-249] - tlds are broken - shortname does not conform to NMTOKEN
-Improvements
- * [SIM-151] - Allow the forced session creation to be optional
- * [SIM-174] - Simple (but measurable) Performance improvements for DefaultFactory and ConfigLoader
- * [SIM-192] - Need more user-friendly log error message when decorators.xml is missing
-Tasks
- * [SIM-229] - Update Sitemesh testsuite to use Cargo
- * [SIM-230] - Remove PageFilter, in favour of new SiteMeshFilter
-
---------------------------
--- Changes in 2.3 --
---------------------------
-Default parser has been moved from FastPageParser to HTMLPageParser.
-Misc bug fixes.
-Added components to enable decorators to be built with Tapestry (contributed by Erik Hatcher).
-
---------------------------
--- Changes in 2.2.1 --
---------------------------
-SiteMesh 2.2 introduced a few critical bugs, which have stopped it
-from being a seamless upgrade to many users.
-
--- Fixed critical bugs --
-
-* ClassNotFound: DefaultPageParser
-This is a class that no longer exists but may still lurk in
-sitemesh.xml if based on a 1.0 version. The config loader now just
-silently ignores this.
-
-* Head of content page chopped off
-This was caused by setContentType() always resetting the buffer,
-however sometimes setContentType() was called half way through a page
-(for instance by the Servlet engine whilst doing an include).
-
---------------------------
--- Changes in 2.2 --
---------------------------
-This release fixes a number of minor bugs, and no code changes are required
-from 2.1.
-
-The following improvements have been made:
- - The <excludes> tag in decorators.xml now takes into account ServletPath, PathInfo and QueryString.
- - Overhaul of the main Servlet Filter to remove unnecessary complexity and more gracefully handle situations
- where the order of calls on the HttpServletResponse, PrintWriter and ServletOutputStream occur in an
- awkward order.
-
-JIRA issues fixed:
- - SIM-125 Internal Tomcat CGI throws NullPointerException.
- - SIM-128 HTML parser cannot handle attributes that span multiple lines.
- - SIM-86 Requests that use setHeader("Content-type") instead of setContentType() do not get decorated.
- - SIM-134 Not calling setContentType() caused NullPointerException.
-
-
---------------------------
--- Changes in 2.1 --
---------------------------
-This release fixes a number of major bugs, and no code changes are required
-from 2.0.1. We recommend all users upgrade.
-
-This release mainly contains application server compatibilty changes.
-Sitemesh is now compatible with more servers than ever before, and this
-release fixes the number one bug which was decoration of static pages under
-Tomcat.
-
-- The URI's for the SiteMesh tag libraries have changed:
-
- sitemesh-decorator becomes http://www.opensymphony.com/sitemesh/decorator
- sitemesh-page becomes http://www.opensymphony.com/sitemesh/page
-
- There have been no other changes to the tag library descriptors (.tld) files from
- the previous version, so you don't need to replace you existing ones.
-
-- Added VelocityDecoratorServlet (SIM-62; see 'Velocity Decorators' in the documentation and the example webapp).
-- The example webapp and blank webapp use Packaged Tag Libraries (specifying the URI of the taglib).
-- Hardened ConfigLoader to ignore whitespace inserted by XMLBuddy.
-- A new method, isPathExcluded(), has been added to the Factory interface (SIM-98)
-- There is no longer the concept of a default parser for unknown content types.
-
-JIRA issues fixed:
- - SIM-82 IllegalStateException when decorating static pages in Tomcat 4 & 5
- - SIM-114 Sitemesh truncates content on non-decorated pages.
- - SIM-73 PageFilter is not final and you can now subclass the newly protected applyDecorator and parsePage methods
- - SIM-83 RequestDispatcher.forward() support
- - SIM-91 Remove singleton configuration
- - SIM-55 applyDecorator tag doesn't work on resin
- - SIM-73 Make PageFilter subclassable
- - SIM-89 <url-pattern> mapping on deployment descriptor
- - SIM-97 Sitemesh captures the response even for non-parseable content
- - SIM-98 Add the ability to exclude content from being decorated
-
---------------------------
--- Changes from 2.0 --
---------------------------
-
-Chris Miller has been working like a demon on FastPageParser, and it's now as
-fast and efficient as it can get. To give you a rough idea, 2.0 is about 3 times
-faster than 1.5. 2.0.1 is about 5 times faster than 1.5.
-
-With regards to memory usage, it's basically been knocked down to be negligible.
-Previously (1.5), a 50k page parsed 250 times (separate instances strongly
-referenced, with an explicit gc call to remove temporary objects) used up 37mb.
-Currently, it uses 25mb (and it's no coincidence that 50k * 250 * 2 bytes per
-char == 25mb).
-
-- Minor DTD fix.
-- Updates to documentation and build process.
-- Added ParserGrinder to load test FastPageParser.
-
---------------------------
--- Changes from 1.5 --
---------------------------
-- SiteMesh now hosted at http://sitemesh.dev.java.net.
-- FastPageParser performance improvements.
-- DTD location has changed; now http://www.opensymphony.com/sitemesh/dtd/sitemesh_1_5_decorators.dtd
-- API change in Decorator (check your custom written Decorator classes):
- Added new method getRole() to enable role based decorators.
-- Updated documentation to align with new Opensymphony website.
-
-JIRA issues fixed:
- SIM-16 Tomcat IllegalStateException
- SIM-41 NoSuchMethodException with Orion
- SIM-2 Response bug on WebLogic 6.1
- SIM-13 Tomcat4 throws IOException after response.sendRedirect()
- SIM-29 WebLogic 7 doesn't work
- SIM-40 Let properties be retrieved programatically
- SIM-27 Example apps don't work in Pramati
- SIM-17 Can't set headers from decorator page.
- SIM-8 body tag not correctly parsed
- SIM-56 Decorator taglibs allowed to contain body
- SIM-37 role based decorators
- SIM-46 Place TLDs in Jar file.
-
---------------------------
--- Changes from 1.4.1 --
---------------------------
-- API change in DecoratorMapper (check your custom written DecoratorMappers):
- before
- Decorator getNamedDecorator(String name);
- after
- Decorator getNamedDecorator(HttpServletRequest request, String name);
-
-- API change in Decorator (check your custom written Decorator classes):
- Added new method getURIPath() to enable cross web-app support for decorators.
-
-- New (shorter!) decorator xml format (backward compability is maintained),
- check above or the decorators.xml file in the /example/WEB-INF directory for an example.
- DTD: http://www.opensymphony.com/sitemesh/dtd/sitemesh_1_5_decorators.dtd
-- Default SiteMesh configuration if sitemesh.xml is not present.
-- When the request contains a Page object (under the key RequestConstants.PAGE)
- use this one (supports SiteMesh aware applications) so we don't need to parse.
-- EnvEntryDecoratorMapper: allows the reference to a web-app environment entry for the
- decorator name, and falls back to ConfigDecoratorMapper's behavior if no matching
- environment entry is found.
-- Cross web-app support for decorators by specifying <decorator ... webapp="anotherwebapp"/>.
- This will first try to get the decorator from anotherwebapp and fall back if not found.
-- Small performance improvements in RobotDecoratorMapper.
-- Some improvements to get SiteMesh working on different web containers.
- If you need to detect on which container your application is running,
- have a look at the com.opensymphony.module.sitemesh.util.Container class.
-
-- BUGFIX: DefaultDecorator returned bad init param
-- BUGFIX: small fixes to make SiteMesh work better on Tomcat
-- BUGFIX: javadoc fixes
-
-JIRA issues fixed:
- SIM-1 Finalize RE support in PathMapper
- SIM-3 Page filter strips <xmp> tags
- SIM-4 PathMapper order is incorrect
- SIM-5 Add a mapper that uses environment entries
- SIM-6 When using the EnvEntryDecoratorMapper, decorations fail for html
- SIM-7 Parsing of body should strip doctype
- SIM-8 body tag not correctly parsed
- SIM-11 Parsing the text "<>" causes problems
- SIM-16 Define how charsets should work
- SIM-20 Cross web-app support for decorators
- SIM-21 FactoryException thrown when starting testsuite on WebLogic
- SIM-22 Create template web-app
- SIM-23 Distribution bundle
- SIM-32 A smaller than sign (<) in javascript fails
-
---------------------------
--- Changes from 1.4 --
---------------------------
-
-- complete support for WebLogic 6.1 / 7
-- complete support for Jetty 4
-- internal optimizations to filter
-
-- BUGFIX: StringIndexOutOfBoundsException in RobotDecoratorMapper
-
---------------------------
--- Changes from 1.3 --
---------------------------
-
-- changed package structure from com.sitemesh to com.opensymphony.module.sitemesh
-- many performance optimizations in FastPageParser
-- various bug fixes and small performance improvements
-
-- BUGFIX: memory leak in PageFilter
-- BUGFIX: meta http-equiv tags are now added as properties with prefix meta.http-equiv.x where x
- is the value of the http-equiv attribute (eg refresh)
-- BUGFIX: the configuration files are not case-sensitive anymore
-
-
=====================================
docs/README.txt deleted
=====================================
@@ -1,171 +0,0 @@
-*************************************
-** OpenSymphony SiteMesh 2.4.1 **
-*************************************
-
-SiteMesh is a web-page layout system that can be used to abstract common look
-and feel from the functionality of a web-application and to assemble large
-webpages from smaller components. Pages and components can have meta-data
-extracted from them (such as body, title and meta-tags) which can be used by
-decorators (skins) that are applied.
-
-SiteMesh won't tread on your toes or force you to work in a certain way (except
-for cleaner) - you install and carry on working as before. It seamlessly fits in
-with existing frameworks.
-
-Forget the hype - just try it! You'll be impressed with how it can simplify
-things.
-
---------------------------
--- Obtaining --
---------------------------
-
-The latest version of SiteMesh can be obtained from:
-
- http://www.opensymphony.com/sitemesh/
-
---------------------------
--- Requirements --
---------------------------
-
-SiteMesh requires a Java Servlet container conforming to the Servlet 2.3
-specification. Versions prior to 2.3 are not enough.
-
-Currently known containers that support this and SiteMesh was tested with:
-
-* Orion 1.5.4 and up - http://www.orionserver.com
-* Tomcat 4.0, 4.1 and 5.0.19 - http://jakarta.apache.org/tomcat
-* Resin 2.1.11, 2.1.12, 2.1.13 and 3.0.7 - http://www.caucho.com
-* Oracle OC4J 2 - http://www.oracle.com
-* WebLogic 7.0 SP2, 8.1 and 8.1 SP2 - http://www.bea.com
-* WebSphere 5.0 - http://www.ibm.com
-* Jetty 4.2.20 - http://jetty.mortbay.org
-
---------------------------
--- Installation --
---------------------------
-
-* Copy sitemesh-2.4.1.jar to the WEB-INF/lib/ directory of your web-app.
-
-* OPTIONAL: Copy sitemesh.xml to the WEB-INF/ directory if you need to specify a custom
- decorator mapper configuration then the default configuration.
-
-* Add the following to WEB-INF/web.xml:
-
- <filter>
- <filter-name>sitemesh</filter-name>
- <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>sitemesh</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- * ORION USERS ONLY. For performance reasons, Orion does not auto-load tab library descriptors
- from Jars by default. To get passed this you will also have to copy sitemesh-decorator.tld
- and sitemesh-page.tld to WEB-INF/lib and add the following to WEB-INF/web.xml:
-
- <taglib>
- <taglib-uri>http://www.opensymphony.com/sitemesh/decorator</taglib-uri>
- <taglib-location>/WEB-INF/lib/sitemesh-decorator.tld</taglib-location>
- </taglib>
-
- <taglib>
- <taglib-uri>http://www.opensymphony.com/sitemesh/page</taglib-uri>
- <taglib-location>/WEB-INF/lib/sitemesh-page.tld</taglib-location>
- </taglib>
-
-
---------------------------
--- Getting started --
---------------------------
-
-Ok, let's assume you have some basic JSPs already on the site.
-These should contain vanilla HTML.
-
-If you don't, here's a JSP to get you started (test.jsp).
-
- <html>
- <head>
- <title>Hello world</title>
- </head>
- <body>
- <p>Today is <%= new java.util.Date() %>.</p>
- </body>
- </html>
-
-Once you have some content (preferably more imaginative than the example above),
-a decorator should be created (decorator.jsp).
-
- <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
- <html>
- <head>
- <title>My Site - <decorator:title default="Welcome!" /></title>
- <decorator:head />
- </head>
- <body>
- <decorator:body />
- </body>
- </html>
-
-Now you need tell SiteMesh about that decorator and when to use it. Create the
-file WEB-INF/decorators.xml:
-
- <decorators>
-
- <decorator name="mydecorator" page="/decorator.jsp">
- <pattern>/*</pattern>
- </decorator>
-
- </decorators>
-
-Access your original JSP (test.jsp) though your web-browser and it should look
-pretty normal. Now if you add some styling to your decorator it shall
-automatically be applied to all the other pages in your web-app.
-
-You can define as many decorators as you want in decorators.xml. Example:
-
- <decorators defaultdir="/decorators">
-
- <decorator name="default" page="default.jsp">
- <pattern>/*</pattern>
- </decorator>
-
- <decorator name="anotherdecorator" page="decorator2.jsp">
- <pattern>/subdir/*</pattern>
- </decorator>
-
- <decorator name="htmldecorator" page="html.jsp">
- <pattern>*.html</pattern>
- <pattern>*.htm</pattern>
- </decorator>
-
- <decorator name="none">
- <!-- These files will not get decorated. -->
- <pattern>/anotherdir/*</pattern>
- </decorator>
-
- </decorators>
-
---------------------------
--- Further support --
---------------------------
-
-You get the idea. Play around. See the SiteMesh website for
-full documentation.
-
- http://www.opensymphony.com/sitemesh/
-
---------------------------
--- Credits --
---------------------------
-
-Thank these guys:
-* Mathias Bogaert <NOSPAMm.bogaert at memenco.com>
-* Mike Cannon-Brookes <mikeNOSPAM at atlassian.com>
-* Victor Salaman <salamanNOSPAM at teknos.com>
-* Joseph Ottinger <joeoNOSPAM at adjacency.org>
-* Hani Suleiman <NOSPAMfate at users.sourceforge.net>
-* Scott Farquhar <scottNOSPAM at atlassian.com>
-
- - Joe Walnes <joe at NOSPAMtruemesh.com>
=====================================
docs/api.css
=====================================
@@ -0,0 +1,64 @@
+body {
+ background-color: #FFFFFF;
+}
+
+.TableHeadingColor {
+ background: #99CCFF;
+}
+
+.TableSubHeadingColor {
+ background: #BBBBBB;
+ color: #FFFFFF; /* Dark grey */
+}
+
+.TableRowColor {
+ background: #EFEFEF; /* White */
+}
+
+/* Font used in left-hand frame lists */
+.FrameTitleFont {
+ font-size: normal;
+ font-family: normal;
+ color: #000000;
+}
+
+.FrameHeadingFont {
+ font-size: normal;
+ font-family: normal;
+ color: #000000;
+}
+
+.FrameItemFont {
+ font-size: normal;
+ font-family: normal;
+ color: #000000;
+}
+
+/* Navigation bar fonts and colors */
+.NavBarCell1 {
+ background-color: #DDDDDD;
+}
+/* Light mauve */
+.NavBarCell1Rev {
+ background-color: #888888;
+}
+/* Dark Blue */
+.NavBarFont1 {
+ font-family: Arial, Helvetica, sans-serif;
+ color: #000000;
+}
+
+.NavBarFont1Rev {
+ font-family: Arial, Helvetica, sans-serif;
+ color: #FFFFFF;
+}
+
+.NavBarCell2 {
+ font-family: Arial, Helvetica, sans-serif;
+ background-color: #FFFFFF;
+}
+
+.NavBarCell3 {
+ font-family: Arial, Helvetica, sans-serif;
+ background-color: #FFFFFF;
+}
\ No newline at end of file
=====================================
docs/download.html
=====================================
@@ -10,6 +10,13 @@
<p>The following versions of SiteMesh are currently available.</p>
<ul>
+ <li>SiteMesh 2.4.1 - <a
+ href="https://sitemesh.dev.java.net/files/documents/887/129893/sitemesh-blank.war">sitemesh-blank.war</a> |
+ <a href="https://sitemesh.dev.java.net/files/documents/887/129894/sitemesh-example.war">sitemesh-example.war</a> |
+ <a href="https://sitemesh.dev.java.net/files/documents/887/129892/sitemesh-2.4.1.zip">full zip (with source)</a> |
+ <a href="https://sitemesh.dev.java.net/files/documents/887/129891/sitemesh-2.4.1.jar">jar file only</a>
+ - Mar 15th, 2009</li>
+
<li>SiteMesh 2.4 - <a
href="https://sitemesh.dev.java.net/files/documents/887/124380/sitemesh-blank.war">sitemesh-blank.war</a> |
<a href="https://sitemesh.dev.java.net/files/documents/887/124381/sitemesh-example.war">sitemesh-example.war</a> |
=====================================
docs/dtd/sitemesh_1_0_decorators.dtd deleted
=====================================
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DTD Version: 1.0
-
-This is the DTD for the SiteMesh 1.0 decorator.xml file.
-
-It's style and order are based on the web.xml DTD file
-listed in the Servlet 2.3 specification. This means that
-the declaration of decorators and mappings follows the same
-format as servlets / servlet mappings or filters / filter
-mappings.
-
-Valid decorator.xml files must contain the following DOCTYPE
-declaration
-
-<!DOCTYPE decorators PUBLIC "-//OpenSymphony//SiteMesh 1.0 Decorators//EN" "http://www.opensymphony.com/sitemesh/dtd/sitemesh_1_0_decorators.dtd">
--->
-
-<!--
-The decorators element is the root element of the file.
-It contains decorator and decorator mapping elements.
--->
-<!ELEMENT decorators (decorator*, decorator-mapping*)>
-
-<!--
-The decorator element contains the declarative data of a
-decorator.
--->
-<!ELEMENT decorator (decorator-name, jsp-file)>
-
-<!--
-The decorator-name element contains the canonical name
-of the decorator
--->
-<!ELEMENT decorator-name (#PCDATA)>
-
-<!--
-The jsp-file element contains the full path to a JSP file
-within the web application.
--->
-<!ELEMENT jsp-file (#PCDATA)>
-
-<!--
-The decorator-mapping element defines a mapping between a
-decorator and a url pattern
--->
-<!ELEMENT decorator-mapping (decorator-name, url-pattern*)>
-
-<!--
-The url-pattern element contains the url pattern of the
-mapping.
--->
-<!ELEMENT url-pattern (#PCDATA)>
\ No newline at end of file
=====================================
docs/dtd/sitemesh_1_5_decorators.dtd deleted
=====================================
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DTD Version: 1.5
-
-This is the DTD for the SiteMesh 1.5 decorator.xml file.
-
-It's style and order are based on the web.xml DTD file
-listed in the Servlet 2.3 specification. This means that
-the declaration of decorators and mappings follows the same
-format as servlets / servlet mappings or filters / filter
-mappings.
-
-Valid decorator.xml files must contain the following DOCTYPE
-declaration
-
-<!DOCTYPE decorators PUBLIC "-//OpenSymphony//SiteMesh 1.5 Decorators//EN" "http://www.opensymphony.com/sitemesh/dtd/sitemesh_1_5_decorators.dtd">
--->
-
-<!--
-The decorators element is the root element of the file.
-It contains decorator and decorator mapping elements.
--->
-<!ELEMENT decorators (excludes?, decorator+)>
-<!ATTLIST decorators
- defaultdir CDATA #IMPLIED
->
-
-<!--
-A list of patterns to exclude
--->
-<!ELEMENT excludes (pattern*)>
-
-<!--
-The decorator element contains the declarative data of a
-decorator.
--->
-<!ELEMENT decorator (pattern*)>
-<!ATTLIST decorator
- name CDATA #REQUIRED
- page CDATA #IMPLIED
- webapp CDATA #IMPLIED
->
-
-<!--
-The url-pattern element contains the url pattern of the
-mapping.
--->
-<!ELEMENT pattern (#PCDATA)>
\ No newline at end of file
=====================================
docs/install.html
=====================================
@@ -8,7 +8,7 @@
<ul>
<li>Setup a web-app as usual (or skip all this by using the pre-configured <a href="download.html">sitemesh-blank.war</a>).</li>
- <li>Copy <b><code>sitemesh-2.4.1.jar</code></b> into <b><code>[web-app]/WEB-INF/lib</code></b>.</li>
+ <li>Copy <b><code>sitemesh- at VERSION@.jar</code></b> into <b><code>[web-app]/WEB-INF/lib</code></b>.</li>
<li>Create the file <b><code>[web-app]/WEB-INF/decorators.xml</code></b> that contains the following:</p>
<blockquote><code><decorators><br></decorators></code></blockquote></li>
=====================================
docs/meta.xml
=====================================
@@ -108,6 +108,29 @@
</developers>
<releases>
+ <release>
+ <version>2.4.1</version>
+ <date>3/15/2009</date>
+ <jiraId>21821</jiraId>
+ <downloads>
+ <download>
+ <name>JAR</name>
+ <url>https://sitemesh.dev.java.net/files/documents/887/129891/sitemesh-2.4.1.jar</url>
+ </download>
+ <download>
+ <name>Full</name>
+ <url>https://sitemesh.dev.java.net/files/documents/887/129892/sitemesh-2.4.1.zip</url>
+ </download>
+ <download>
+ <name>Blank app</name>
+ <url>https://sitemesh.dev.java.net/files/documents/887/129893/sitemesh-blank.war</url>
+ </download>
+ <download>
+ <name>Example app</name>
+ <url>https://sitemesh.dev.java.net/files/documents/887/129894/sitemesh-example.war</url>
+ </download>
+ </downloads>
+ </release>
<release>
<version>2.4</version>
<date>1/22/2009</date>
=====================================
src/Sitemesh.iml deleted
=====================================
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/etc/blank/WEB-INF/web.xml" optional="false" version="2.5" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/etc/blank" relative="/" />
- </webroots>
- <building>
- <setting name="EXPLODED_URL" value="file://" />
- <setting name="EXPLODED_ENABLED" value="false" />
- <setting name="JAR_URL" value="file://" />
- <setting name="JAR_ENABLED" value="false" />
- <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
- </building>
- <packaging>
- <containerElement type="module" name="Sitemesh">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- </packaging>
- </configuration>
- </facet>
- <facet type="web" name="Web2">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/example-webapp/WEB-INF/web.xml" optional="false" version="2.5" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/example-webapp" relative="/" />
- </webroots>
- <building>
- <setting name="EXPLODED_URL" value="file://" />
- <setting name="EXPLODED_ENABLED" value="false" />
- <setting name="JAR_URL" value="file://" />
- <setting name="JAR_ENABLED" value="false" />
- <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
- </building>
- <packaging>
- <containerElement type="module" name="Sitemesh">
- <attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/classes" />
- </containerElement>
- </packaging>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../dist/sitemesh-2.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jflex.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/freemarker.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/servlet.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/tapestry-3.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/crimson.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/velocity-tools-view-1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/velocity-dep-1.3.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/commons-collections.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jaxp.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/junit-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/hostedqa-remote-ant-1.0-20060901.190754-5-standalone.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/servlet-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/commons-el.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/tomcat-util.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/naming-resources.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/jasper-compiler.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/tomcat-http.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/naming-factory.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/jasper-compiler-jdt.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/commons-modeler.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/catalina-optional.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/catalina.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/servlets-default.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/jasper-runtime.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/tomcat-coyote.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/jsp-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/embedded/tomcat/lib/commons-logging.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/jetty-4.2.21.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/log4j-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/junit-3.8.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/jaxp.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/electricxml.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/commons-logging.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/ant-1.6.5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/httpunit-1.6.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/crimson.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/jasper-runtime.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/cargo-ant-0.8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/jasper-compiler.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/jtidy.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/cargo-core-uberjar-0.8.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../testsuite/lib/oscore-2.2.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- </component>
-</module>
-
=====================================
src/example-webapp/.cvsignore
=====================================
@@ -0,0 +1 @@
+*.iml
=====================================
src/java/com/opensymphony/module/sitemesh/Factory.java
=====================================
@@ -26,7 +26,7 @@ import java.lang.reflect.InvocationTargetException;
* If this doesn't exist, it defaults to {@link com.opensymphony.module.sitemesh.factory.DefaultFactory} .</p>
*
* @author <a href="mailto:joe at truemesh.com">Joe Walnes</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public abstract class Factory implements PageParserSelector {
/** Web context lookup key */
@@ -95,6 +95,7 @@ public abstract class Factory implements PageParserSelector {
}
}
catch (Exception e) { } // failed - don't moan, just return default.
+ catch (NoClassDefFoundError e) { } // to deal with restricted class loaders (i.e. on AppEngine).
return result == null || result.trim().length() == 0 ? defaultValue : result;
}
}
\ No newline at end of file
=====================================
src/java/com/opensymphony/module/sitemesh/html/tokenizer/.cvsignore
=====================================
@@ -0,0 +1 @@
+Lexer.java
=====================================
www/index.html
=====================================
@@ -0,0 +1,5 @@
+<html>
+ <body>
+ This is the default project content.
+ </body>
+</html>
View it on GitLab: https://salsa.debian.org/java-team/sitemesh/-/compare/7571b43a857482be031f7d7b1caf944afc69d2ef...9a3a2001f7e07492da9d0601a33062a9f6c59acb
--
View it on GitLab: https://salsa.debian.org/java-team/sitemesh/-/compare/7571b43a857482be031f7d7b1caf944afc69d2ef...9a3a2001f7e07492da9d0601a33062a9f6c59acb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260210/50ad4f45/attachment.htm>
More information about the pkg-java-commits
mailing list