debian/0000755000000000000000000000000012157761201007170 5ustar debian/libsitemesh-java-doc.doc-base.20000644000000000000000000000037112157165760014732 0ustar Document: libsitemesh-java-doc2 Title: Sitemesh overview Abstract: web-page layout and decoration framework Section: Programming Format: HTML Index: /usr/share/doc/libsitemesh-java/html/index.html Files: /usr/share/doc/libsitemesh-java/html/*.html debian/libsitemesh-java.jlibs0000644000000000000000000000002212157165760013446 0ustar dist/sitemesh.jar debian/classpath-debian0000644000000000000000000000027412157165760012330 0ustar usr/share/java/JFlex.jar usr/share/java/servlet-api-3.0.jar usr/share/java/jsp-api-2.1.jar usr/share/java/velocity-tools-view.jar usr/share/java/freemarker.jar usr/share/java/velocity.jar debian/libsitemesh-java-doc.doc-base.10000644000000000000000000000037712157165760014737 0ustar Document: libsitemesh-java-doc1 Title: API for Sitemesh Abstract: web-page layout and decoration framework Section: Programming Format: HTML Index: /usr/share/doc/libsitemesh-java/api/overview-frame.html Files: /usr/share/doc/libsitemesh-java/api/*.html debian/README.Debian0000644000000000000000000000072212157165760011242 0ustar --------------------------- libsitemesh-java for Debian --------------------------- *** Removal of functionalities *** Sitemesh Debian package doesn't contains some of the functionalities of upstream binary releases. Here is a list of excluded files regarding original content of SiteMesh. * tapestry [not-in-debian] Tapestry framework com/opensymphony/module/sitemesh/tapestry/** -- Miguel Landaeta Fri, 19 Feb 2010 19:54:11 -0430 debian/watch0000644000000000000000000000030712157165760010231 0ustar 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 debian/rules0000755000000000000000000000077512157165760010271 0ustar #!/usr/bin/make -f DEB_UPSTREAM_VERSION := \ $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+dfsg-.*/\1/p') %: dh --with javahelper $@ override_dh_auto_build: # this file was dropped by accident from the orig source tarball cp debian/api.css docs/api.css ant dist override_dh_auto_clean: ant clean rm -f docs/api.css get-orig-source: uscan \ --verbose \ --no-symlink \ --upstream-version $(DEB_UPSTREAM_VERSION) \ --download-version $(DEB_UPSTREAM_VERSION) \ --force-download debian/changelog0000644000000000000000000000260012157165760011050 0ustar sitemesh (2.4.1+dfsg-3) unstable; urgency=low * Transition to the Servlet API 3.0 * debian/control: - Moved velocity and freemarker to suggested dependencies for libsitemesh-java - Removed the suggested dependency on junit for libsitemesh-java - Updated the URL of the homepage - Updated Standards-Version to 3.9.4 (no changes) - Use canonical URLs for the Vcs-* fields * debian/copyright: Updated the Format URI -- Emmanuel Bourg Sun, 16 Jun 2013 00:33:04 +0200 sitemesh (2.4.1+dfsg-2) unstable; urgency=low The "let's fix all my newbie mistakes" release. * Fix FTBFS caused by API changes in Velocity Tools 2.0. (Closes: #625764). * Bump Standards-Version to 3.9.2. No changes were required. * Rename Servlet compatibility patch filename for clarity's sake. * Replace dependencies on libservlet2.4-java with libservlet2.5-java. * Wrap dependencies list correctly. * Remove unneeded dependencies on JREs. * Remove redundant fields in control file. * Remove typo in Vcs-Git field. * Fix javadocs generation and add links to system javadoc. * Update copyright dates and make it DEP-5 compliant. -- Miguel Landaeta Tue, 10 May 2011 11:00:00 +0200 sitemesh (2.4.1+dfsg-1) unstable; urgency=low * Initial release (closes: #466809). -- Miguel Landaeta Sat, 20 Feb 2010 22:57:13 -0430 debian/api.css0000644000000000000000000000175612157165760010474 0ustar 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; }debian/libsitemesh-java-doc.install0000644000000000000000000000135512157165760014566 0ustar dist/docs/api usr/share/doc/libsitemesh-java dist/docs/*.html usr/share/doc/libsitemesh-java/html dist/docs/images usr/share/doc/libsitemesh-java/html dist/docs/meta.xml usr/share/doc/libsitemesh-java/html dist/docs/style.jsp.txt usr/share/doc/libsitemesh-java/html dist/docs/cache.jsp.txt usr/share/doc/libsitemesh-java/html dist/docs/navpanel.jsp usr/share/doc/libsitemesh-java/html dist/docs/dtd usr/share/doc/libsitemesh-java/html dist/sitemesh-blank.war usr/share/doc/libsitemesh-java/examples dist/sitemesh-example.war usr/share/doc/libsitemesh-java/examples dist/docs/CHANGES.txt usr/share/doc/libsitemesh-java dist/docs/README.txt usr/share/doc/libsitemesh-java debian/patches/0000755000000000000000000000000012157165760010627 5ustar debian/patches/add_classpath_to_manifest.diff0000644000000000000000000000153012157165760016642 0ustar Description: Add classpath to sitemesh jar Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 diff --git a/build.xml b/build.xml index fb28188..f6bd4fb 100644 --- a/build.xml +++ b/build.xml @@ -118,8 +118,11 @@ - + + + + debian/patches/add_compatability_with_servlet_2.4.diff0000644000000000000000000000152112157165760020313 0ustar Description: Compatibility with Servlet 2.4 Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 diff --git a/src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java b/src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java index e4015d5..ee3ee18 100644 --- a/src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java +++ b/src/java/com/opensymphony/sitemesh/compatability/Content2HTMLPage.java @@ -21,6 +21,10 @@ public class Content2HTMLPage implements HTMLPage { private final Content content; private HttpServletRequest request; + public Content2HTMLPage(Content content) { + this.content = content; + } + public Content2HTMLPage(Content content, HttpServletRequest request) { this.content = content; this.request = request; debian/patches/disable_tapestry.diff0000644000000000000000000000135112157165760015017 0ustar Description: Exclude Tapestry features Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 diff --git a/build.xml b/build.xml index fb28188..5b91afd 100644 --- a/build.xml +++ b/build.xml @@ -49,6 +49,7 @@ > + @@ -81,6 +82,7 @@ destdir="dist/docs/api" stylesheetfile="docs/api.css" packagenames="com.opensymphony.*" + excludepackagenames="com.opensymphony.module.sitemesh.tapestry.*" classpathref="cp" author="true" version="true" debian/patches/625764.diff0000644000000000000000000000750612157165760012246 0ustar Description: Compatibility with Velocity Tools 2.0 Author: Miguel Landaeta Bug-Debian: http://bugs.debian.org/625764 Forwarded: no Last-Update: 2011-05-06 --- sitemesh-2.4.1+dfsg.orig/src/java/com/opensymphony/module/sitemesh/velocity/VelocityDecoratorServlet.java +++ sitemesh-2.4.1+dfsg/src/java/com/opensymphony/module/sitemesh/velocity/VelocityDecoratorServlet.java @@ -19,6 +19,7 @@ import org.apache.velocity.tools.view.se import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.StringWriter; +import java.io.IOException; /** * Servlet that allows Velocity templates to be used as decorators. @@ -27,7 +28,7 @@ import java.io.StringWriter; * @version $Revision: 1.9 $ */ public class VelocityDecoratorServlet extends VelocityViewServlet { - public Template handleRequest(HttpServletRequest request, HttpServletResponse response, Context context) throws Exception { + public Template handleRequest(HttpServletRequest request, HttpServletResponse response, Context context) { HTMLPage htmlPage = (HTMLPage) request.getAttribute(RequestConstants.PAGE); String template; @@ -48,13 +49,21 @@ public class VelocityDecoratorServlet ex context.put("title", OutputConverter.convert(htmlPage.getTitle())); { StringWriter buffer = new StringWriter(); - htmlPage.writeBody(OutputConverter.getWriter(buffer)); - context.put("body", buffer.toString()); + try { + htmlPage.writeBody(OutputConverter.getWriter(buffer)); + context.put("body", buffer.toString()); + } catch (IOException e) { + context.put("body", "

Body?

"); + } } { StringWriter buffer = new StringWriter(); - htmlPage.writeHead(OutputConverter.getWriter(buffer)); - context.put("head", buffer.toString()); + try { + htmlPage.writeHead(OutputConverter.getWriter(buffer)); + context.put("head", buffer.toString()); + } catch (IOException e) { + context.put("head", ""); + } } context.put("page", htmlPage); DecoratorMapper decoratorMapper = getDecoratorMapper(); @@ -70,4 +79,4 @@ public class VelocityDecoratorServlet ex DecoratorMapper decoratorMapper = factory.getDecoratorMapper(); return decoratorMapper; } -} \ No newline at end of file +} --- sitemesh-2.4.1+dfsg.orig/src/java/com/opensymphony/module/sitemesh/util/OutputConverter.java +++ sitemesh-2.4.1+dfsg/src/java/com/opensymphony/module/sitemesh/util/OutputConverter.java @@ -18,14 +18,21 @@ public class OutputConverter public static Writer getWriter(Writer out) { + /* resin 2.1.12 was released at least 8 years ago... + * I guess it is safe to disable this work around if ("true".equalsIgnoreCase(System.getProperty(WORK_AROUND_RESIN_I18N_BUG))) return new ResinWriter(out); else return out; + */ + return out; } - public static String convert(String inputString) throws IOException + // public static String convert(String inputString) throws IOException + public static String convert(String inputString) { + /* resin 2.1.12 was released at least 8 years ago... + * I guess it is safe to disable this work around if ("true".equalsIgnoreCase(System.getProperty(WORK_AROUND_RESIN_I18N_BUG))) { StringWriter sr = new StringWriter(); @@ -34,6 +41,8 @@ public class OutputConverter } else return inputString; + */ + return inputString; } /** debian/patches/build_with_debian_jars.diff0000644000000000000000000000272412157165760016141 0ustar Description: Build using Debian libraries Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 diff --git a/build.xml b/build.xml index fb28188..70447f5 100644 --- a/build.xml +++ b/build.xml @@ -6,15 +6,13 @@ - - - + - + @@ -153,11 +151,13 @@ + debian/patches/disable_network.diff0000644000000000000000000000162412157165760014640 0ustar Description: Disable network access during javadoc generation Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 diff --git a/build.xml b/build.xml index fb28188..3289747 100644 --- a/build.xml +++ b/build.xml @@ -90,11 +90,13 @@ doctitle="${Name} ${version} API" footer="<a href="http://www.opensymphony.com/sitemesh/">www.opensymphony.com/sitemesh/</a>"> + debian/patches/link_javadocs_to_system.diff0000644000000000000000000000103312157165760016373 0ustar Description: Link javadocs to system javadoc Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 --- sitemesh-2.4.1+dfsg.orig/build.xml +++ sitemesh-2.4.1+dfsg/build.xml @@ -97,6 +97,8 @@ --> + + debian/patches/series0000644000000000000000000000031112157165760012037 0ustar disable_tapestry.diff build_with_debian_jars.diff update_lexer.diff add_classpath_to_manifest.diff disable_network.diff add_compatability_with_servlet_2.4.diff 625764.diff link_javadocs_to_system.diff debian/patches/update_lexer.diff0000644000000000000000000000205312157165760014142 0ustar Description: Compatibility with JFlex 1.4.x Author: Miguel Landaeta Forwarded: no Last-Update: 2011-05-07 diff --git a/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex b/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex index 8803fee..1ac608a 100644 --- a/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex +++ b/src/java/com/opensymphony/module/sitemesh/html/tokenizer/lexer.flex @@ -29,7 +29,7 @@ package com.opensymphony.module.sitemesh.html.tokenizer; %{ // Additional methods to add to generated Lexer to aid in error reporting. protected int position() { return yychar; } - protected int length() { return yy_markedPos - yy_startRead; } + protected int length() { return zzMarkedPos - zzStartRead; } protected int line() { return -1; /*yyline;*/ } // useful for debugging, but adds overhead protected int column() { return -1; /*yycolumn;*/ } // useful for debugging, but adds overhead protected void resetLexerState() { yybegin(YYINITIAL); } debian/libsitemesh-java-doc.links0000644000000000000000000000011412157165760014230 0ustar usr/share/doc/libsitemesh-java/api usr/share/doc/libsitemesh-java/html/api debian/orig-tar.sh0000755000000000000000000000072012157165760011262 0ustar #!/bin/sh set -e # called by uscan with '--upstream-version' 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/source/0000755000000000000000000000000012157165760010500 5ustar debian/source/format0000644000000000000000000000001412157165760011706 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000212157165760010376 0ustar 7 debian/copyright0000644000000000000000000001007212157165760011133 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: SiteMesh Upstream-Contact: Patrick Lightbody Source: http://www.sitemesh.org 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. . * All files under docs/api directory have been removed since they can be regenerated during build time. --------------------------------------------------------------------------- The authors of SiteMesh are: * Mathias Bogaert , * Mike Cannon-Brookes , * Victor Salaman , * Joseph Ottinger , * Hani Suleiman , * Scott Farquhar , * Joe Walnes Files: * Copyright: © 2001, The OpenSymphony Group. License: other ==================================================================== The OpenSymphony Software License, Version 1.1 . (this license is derived and fully compatible with the Apache Software License - see http://www.apache.org/LICENSE.txt) . Copyright (c) 2001 The OpenSymphony Group. All rights reserved. . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the OpenSymphony Group (http://www.opensymphony.com/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. . 4. The names "OpenSymphony" and "The OpenSymphony Group" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact license@opensymphony.com . . 5. Products derived from this software may not be called "OpenSymphony" or "SiteMesh", nor may "OpenSymphony" or "SiteMesh" appear in their name, without prior written permission of the OpenSymphony Group. . THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================== Files: debian/* Copyright: © 2010-2011, Miguel Landaeta License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 /usr/share/common-licenses/Apache-2.0 (on Debian systems) . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. debian/control0000644000000000000000000000310012157165760010575 0ustar Source: sitemesh Maintainer: Debian Java Maintainers Uploaders: Miguel Landaeta , Emmanuel Bourg Section: java Priority: optional Build-Depends: debhelper (>= 7.0.50~), ant, default-jdk, javahelper, jflex, libservlet3.0-java, velocity, libvelocity-tools-java, libfreemarker-java, junit, ant-optional, default-jdk-doc Standards-Version: 3.9.4 Homepage: http://www.sitemesh.org Vcs-Git: git://anonscm.debian.org/pkg-java/sitemesh.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sitemesh.git Package: libsitemesh-java Architecture: all Depends: libservlet3.0-java, ${misc:Depends} Suggests: libfreemarker-java, velocity, libvelocity-tools-java Description: web-page layout and decoration framework SiteMesh is framework that aids in creating large sites consisting of many web pages and applications for which a consistent look/feel, navigation and layout scheme is required. . SiteMesh is built with Java servlet, JSP and XML technologies. This makes it ideal for use with Java EE applications, however it can be integrated with server-side web architectures that are not Java based. Package: libsitemesh-java-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: libsitemesh-java (= ${binary:Version}), default-jdk-doc Description: documentation for libsitemesh-java Documentation for SiteMesh which is a framework that aids in creating large sites consisting of many web pages and applications for which a consistent look/feel, navigation and layout scheme is required.