7026996 move tomcat to userland
authorPetr Sumbera <petr.sumbera@oracle.com>
Fri, 18 Mar 2011 12:47:51 -0700
changeset 142 6f1cb90a0ef3
parent 141 ed98334a0d5a
child 143 b125d3ff99f0
7026996 move tomcat to userland
components/tomcat/Makefile
components/tomcat/SUNWtcat-examples.p5m
components/tomcat/SUNWtcat.p5m
components/tomcat/Solaris/http-tomcat6
components/tomcat/Solaris/http-tomcat6.xml
components/tomcat/Solaris/index.htm
components/tomcat/Solaris/index.jsp
components/tomcat/Solaris/tomcat.1m
components/tomcat/patches/build.properties.patch
components/tomcat/patches/build.xml.patch
components/tomcat/patches/env.patch
components/tomcat/patches/tomcat_strict_servlet.patch
components/tomcat/solaris-transform
components/tomcat/tomcat-examples.p5m
components/tomcat/tomcat.license
components/tomcat/tomcat.p5m
make-rules/prep.mk
make-rules/shared-macros.mk
transforms/defaults
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/Makefile	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,81 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		apache-tomcat
+COMPONENT_VERSION=	6.0.28
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:0df5e58518607ff738bbf440d829747df6acb9ce
+COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.28/src/$(COMPONENT_ARCHIVE)
+
+# Tomcat subcomponents
+COMPONENT_ARCHIVE_1= commons-dbcp-1.4-src.tar.gz
+COMPONENT_ARCHIVE_HASH_1= sha1:48702486eaba6ec40fb65e912c8f597d80654f54
+COMPONENT_ARCHIVE_URL_1= http://archive.apache.org/dist/commons/dbcp/source/$(COMPONENT_ARCHIVE_1)
+COMPONENT_ARCHIVE_2= commons-pool-1.5.4-src.tar.gz
+COMPONENT_ARCHIVE_HASH_2= sha1:18279249c27fee5bdedeaff169b9d1b70d135839
+COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2)
+COMPONENT_ARCHIVE_3= eclipse-JDT-3.3.1.zip
+COMPONENT_ARCHIVE_HASH_3= sha1:9628f715ef2e53dd295164eafd70a95f64292d27
+COMPONENT_ARCHIVE_URL_3= http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/$(COMPONENT_ARCHIVE_3)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/justmake.mk
+include ../../make-rules/ips.mk
+
+TC_ENV=JAVA_HOME=$(JAVA_HOME)
+
+# We have no proto area with Tomcat. Instead several transformation rules
+# are used over mainly Tomcat output directory.
+PKG_PROTO_DIRS =  $(COMPONENT_DIR)
+PKG_PROTO_DIRS += $(BUILD_DIR_32)/output/build
+PKG_PROTO_DIRS += $(BUILD_DIR_32)/output/build/webapps
+PKG_PROTO_DIRS += $(COMPONENT_DIR)/Solaris
+PUBLISH_TRANSFORMS += solaris-transform
+
+GMAKE=ant
+COMPONENT_BUILD_TARGETS=-Dbase.path=$(BUILD_DIR_32) download deploy
+COMPONENT_BUILD_ENV+=$(TC_ENV)
+
+# Create configuration backup archive for custom user's deployments.
+# Move default web application to different location so we can package
+# it in separate package and instead provide basic one.
+COMPONENT_POST_BUILD_ACTION= \
+	(cd $(@D)/output/build ; \
+	    gtar cfz conf/CONF.tar.gz conf/* ; \
+	    $(MV) webapps/ROOT webapps/ROOT.example )
+
+build:	$(BUILD_32)
+
+install: build
+
+test:  build
+	@cd $(BUILD_DIR_32)/test; $(ENV) $(TC_ENV) ant -Djunit.home=/usr/share/lib/java
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/SUNWtcat-examples.p5m	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWtcat-examples package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=web/java-servlet/tomcat/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/SUNWtcat.p5m	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWtcat package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=web/java-servlet/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/Solaris/http-tomcat6	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,57 @@
+#!/sbin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+. /lib/svc/share/smf_include.sh
+
+CATALINA_HOME=/usr/tomcat6
+CATALINA_BASE=/var/tomcat6
+CATALINA_PID=$CATALINA_BASE/logs/pid
+JAVA_HOME=/usr/java
+export CATALINA_HOME CATALINA_BASE CATALINA_PID JAVA_HOME
+
+case "$1" in
+start)
+	cmd="start";
+	rm -f $CATALINA_PID
+	;;
+
+stop)
+	cmd="stop";
+	;;
+*)
+	echo "Usage: $0 {start|stop}"
+	exit $SMF_EXIT_ERR_CONFIG
+	;;
+esac
+
+$CATALINA_HOME/bin/catalina.sh $cmd 2>&1
+
+if [ $? -ne 0 ]; then
+    echo "Tomcat failed to start. Check the log (defaults to $CATALINA_BASE/logs/catalina.out) for more information, if any."
+    exit $SMF_EXIT_ERR_FATAL
+fi
+
+exit $SMF_EXIT_OK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/Solaris/http-tomcat6.xml	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!--
+CDDL HEADER START
+
+The contents of this file are subject to the terms of the
+Common Development and Distribution License (the "License").
+You may not use this file except in compliance with the License.
+
+You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+or http://www.opensolaris.org/os/licensing.
+See the License for the specific language governing permissions
+and limitations under the License.
+
+When distributing Covered Code, include this CDDL HEADER in each
+file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+If applicable, add the following below this CDDL HEADER, with the
+fields enclosed by brackets "[]" replaced with your own identifying
+information: Portions Copyright [yyyy] [name of copyright owner]
+
+CDDL HEADER END
+-->
+
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+    Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+-->
+
+<service_bundle type='manifest' name='SUNWtcatr:tomcat'>
+
+<service
+	name='network/http'
+	type='service'
+	version='1'>
+
+	<!--
+	  Because we may have multiple instances of network/http
+	  provided by different implementations, we keep dependencies
+	  and methods within the instance.
+	-->
+
+	<instance name='tomcat6' enabled='false'>
+		<!--
+		  Wait for network interfaces to be initialized.
+		-->
+		<dependency name='network'
+		    grouping='require_all'
+		    restart_on='error'
+		    type='service'>
+		    <service_fmri value='svc:/milestone/network:default'/>
+		</dependency>
+
+		<!--
+		  Wait for all local filesystems to be mounted.
+		-->
+		<dependency name='filesystem-local'
+		    grouping='require_all'
+		    restart_on='none'
+		    type='service'>
+		    <service_fmri
+			value='svc:/system/filesystem/local:default'/>
+		</dependency>
+
+		<!--
+		  Wait for automounting to be available, as we may be
+		  serving data from home directories or other remote
+		  filesystems.
+		-->
+		<dependency name='autofs'
+		    grouping='optional_all'
+		    restart_on='error'
+		    type='service'>
+		    <service_fmri
+			value='svc:/system/filesystem/autofs:default'/>
+		</dependency>
+
+		<exec_method
+			type='method'
+			name='start'
+			exec='/lib/svc/method/http-tomcat6 start'
+			timeout_seconds='60'>
+			<method_context>
+			<method_credential
+			  user='webservd' group='webservd'
+			  privileges='basic,net_privaddr'/>
+			</method_context>
+		</exec_method>
+
+		<exec_method
+			type='method'
+			name='stop'
+			exec='/lib/svc/method/http-tomcat6 stop'
+			timeout_seconds='60' />
+
+		<template>
+			<common_name>
+				<loctext xml:lang='C'>
+					Apache Tomcat 6
+				</loctext>
+			</common_name>
+
+			<documentation>
+				<manpage title='tomcat' section='1M'
+					manpath='/usr/share/man' />
+				<doc_link name='apache.org'
+					uri='http://tomcat.apache.org' />
+			</documentation>
+		</template>
+
+	</instance>
+
+	<stability value='Evolving' />
+
+</service>
+
+</service_bundle>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/Solaris/index.htm	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,1 @@
+<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/Solaris/index.jsp	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,1 @@
+<html><body><h1>Apache Tomcat (SUNWtcat-examples package not installed)</h1></body></html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/Solaris/tomcat.1m	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,222 @@
+'\" te
+.\" Copyright (c) 2009, Sun Microsystems Inc.
+.\" All Rights Reserved.
+.TH tomcat 1M "October 2009" "SunOS 5.11" "System Administration Commands"
+.SH NAME
+tomcat \- Apache Tomcat Version 6 overview
+.SH DESCRIPTION
+.sp
+.LP
+Apache Tomcat Version 6 (Tomcat) is implementation of
+the Java Servlet and JavaServer Pages technologies.
+.sp
+Tomcat can be enabled by authorized user within the service
+management facility (SMF), using the following fault management
+resource identifier (FMRI):
+.sp
+.in +2
+.nf
+svc:/network/http:tomcat6
+.fi
+.in -2
+.sp
+Tomcat enabled via SMF is executed for better security with "webserv"
+user credentials and with added "net_privaddr" privilege so it can be
+configured to listen on privileged TCP ports (e.g. 80). With default
+configuration Tomcat listens on TCP port 8080.
+.sp
+Unauthorized user can start Tomcat with his or her credentials using
+ordinary startup scripts and by setting CATALINA_BASE environment
+variable to path with his or her conf/, webapp/ and logs/ subdirectories
+(see Tomcat directory structure bellow).
+.sp
+.LP
+.SH FILES
+.sp
+.LP
+The following files specify the installation locations for Tomcat 6:
+.LP
+\fB\fB/etc/tomcat6/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Symbolic link to directory containing Tomcat 6 configuration files (/var/tomcat6/conf).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/tomcat6/bin/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains Tomcat startup scripts.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/tomcat6/lib/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains Tomcat private libraries.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/usr/tomvat6/docs/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains Tomcat documentation in HTML format. The directory has classical
+WEBAPP structure and it's symbolically linked as /var/tomcat6/webapps/docs
+(the link is part of web/java-servlet/tomcat/tomcat-examples packages).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/conf/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains Tomcat configuration files. A newly-installed Tomcat
+contains a default \fBserver.xml\fR file. This is the main configuration file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/logs/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Contains Tomcat log and output files.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/logs/pid\fR\fR
+.ad
+.sp .6
+.RS 4n
+File where Tomcat which is started via SMF saves its PID number.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/temp/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Directory used by the JVM for temporary files (java.io.tmpdir).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/webapps/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Tomcat Web Application Directory where are WAR files put for deployment.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/webapps/ROOT/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Directory with default (ROOT) web application which is served when URL
+is requested without further path specifier (http://hostname/). After
+Tomcat packages installation this directory is intentionally left empty
+with just index.jsp and index.htm files. The HTML file redirects
+requester to Tomcat home page which is in ROOT.example/ directory (this
+file is part of web/java-servlet/tomcat/tomcat-examples package). The JSP file is default home 
+page which is shown when web/java-servlet/tomcat/tomcat-examples (and thus HTML file) is not
+installed. This shall allow better deployment of custom ROOT web
+application while maintain upgrade ability via packaging system (without
+loosing data).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/webapps/ROOT.example/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Tomcat home web application (part of web/java-servlet/tomcat/tomcat-examples package).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/webapps/examples/\fR\fR
+.ad
+.sp .6
+.RS 4n
+This directory contains web application with various ServLets and JSP
+examples. The directory is part of web/java-servlet/tomcat/tomcat-examples package which can
+be removed if it's required (to permanently disable this web
+application).
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB/var/tomcat6/work/\fR\fR
+.ad
+.sp .6
+.RS 4n
+Directory where Tomcat places for web applications intermediate files
+(such as compiled JSP files) during its work.
+.RE
+
+.SH ATTRIBUTES
+.sp
+.LP
+See attributes(5) for descriptions of the following attributes:
+.sp
+
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i) 
+lw(2.75i) |lw(2.75i) 
+.
+AttributeAttribute Value
+_
+Availabilityweb/java-servlet/tomcat
+_
+web/java-servlet/tomcat/tomcat-examples
+_
+Interface StabilityUncommitted
+.TE
+
+.SH SEE ALSO
+.sp
+.LP
+http://tomcat.apache.org
+.SH NOTES
+.sp
+.LP
+Source for Tomcat is available on http://opensolaris.org\&.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/patches/build.properties.patch	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,71 @@
+--- apache-tomcat-6.0.28-src/build.properties.default.orig	Thu Mar 17 22:16:15 2011
++++ apache-tomcat-6.0.28-src/build.properties.default	Thu Mar 17 22:27:32 2011
[email protected]@ -44,13 +44,13 @@
+ compile.target=1.5
+ compile.debug=true
+ 
+-base-commons.loc=http://archive.apache.org/dist/commons
+-base-tomcat.loc=http://archive.apache.org/dist/tomcat
+-base-sf.loc=http://downloads.sourceforge.net
++base-commons.loc=file://${base.path}/../../
++base-tomcat.loc=file://${base.path}/../../
++base-sf.loc=file://${base.path}/../../
+ 
+ # ----- Commons Logging, version 1.1 or later -----
+ commons-logging-version=1.1.1
+-commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
++commons-logging-src.loc=${base-commons.loc}/commons-logging-${commons-logging-version}-src.tar.gz
+ 
+ # ----- Webservices -----
+ jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
[email protected]@ -60,24 +60,24 @@
+ jdt.home=${base.path}/eclipse/plugins
+ jdt.lib=${jdt.home}
+ jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
+-jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
++jdt.loc=${base-tomcat.loc}/eclipse-JDT-3.3.1.zip
+ 
+ # ----- Tomcat native library -----
+ tomcat-native.version=1.1.20
+ tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
+ tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+-tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
++tomcat-native.loc=${base-tomcat.loc}/tomcat-native-${tomcat-native.version}-src.tar.gz
++tomcat-native.dll=${base-tomcat.loc}/binaries
+ 
+-# ----- Commons DBCP, version 1.1 or later -----
+-commons-dbcp.version=1.3
++# ----- Commons DBCP, version 1.4 (for JDK 1.6) -----
++commons-dbcp.version=1.4
+ commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
+-commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
++commons-dbcp-src.loc=${base-commons.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz
+ 
+ # ----- Commons Pool, version 1.1 or later -----
+ commons-pool.version=1.5.4
+ commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
+-commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
++commons-pool-src.loc=${base-commons.loc}/commons-pool-${commons-pool.version}-src.tar.gz
+ 
+ # ----- NSIS, version 2.0 or later -----
+ nsis.home=${base.path}/nsis-2.46
[email protected]@ -85,7 +85,7 @@
+ nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
+ nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
+ nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
+-nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
++nsis.loc=${base-sf.loc}/nsis-2.46.zip
+ 
+ # ----- Commons Daemon, version 1.0-Alpha or later -----
+ commons-daemon.version=1.0.2
[email protected]@ -95,6 +95,6 @@
+ commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
+ commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+ commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
+-commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
+-commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
+-commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
++commons-daemon.bin.loc=${base-commons.loc}/commons-daemon-${commons-daemon.version}-bin.tar.gz
++commons-daemon.native.src.loc=${base-commons.loc}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
++commons-daemon.native.win.loc=${base-commons.loc}/commons-daemon-${commons-daemon.version}-bin-windows.zip
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/patches/build.xml.patch	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,82 @@
+--- apache-tomcat-6.0.28-src/build.xml.orig	Tue Jun 29 07:33:40 2010
++++ apache-tomcat-6.0.28-src/build.xml	Fri Jul  9 08:12:35 2010
[email protected]@ -471,13 +471,6 @@
+ 
+   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+ 
+-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+-            file="${tomcat-native.tar.gz}" />
+-    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+-            file="${commons-daemon.native.src.tgz}" />
+-
+-    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
[email protected]@ -696,48 +689,6 @@
+           description="Download (and build as necessary) dependent components"
+           depends="build-manifests">
+ 
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${tomcat-native.loc}"/>
+-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
+-      <param name="destdir" value="${tomcat-native.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
+-      <param name="destdir" value="${tomcat-native.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
+-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
+-      <param name="destdir" value="${tomcat-native.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
+-      <param name="destdir" value="${tomcat-native.home}"/>
+-    </antcall>
+-
+-    <!-- Download Commons Daemon -->
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
+-      <param name="destfile" value="${commons-daemon.jar}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
+-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
+-      <param name="destdir" value="${commons-daemon.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
+-      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
+-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
+-    </antcall>
+-
+     <!-- Build Tomcat DBCP bundle -->
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-pool-src.loc}"/>
[email protected]@ -763,15 +714,9 @@
+       <param name="basedir" value="${jasper-jdt.home}" />
+     </antcall>
+ 
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${nsis.loc}"/>
+-      <param name="destfile" value="${nsis.exe}"/>
+-      <param name="destdir" value="${nsis.home}/.."/>
+-    </antcall>
+-
+   </target>
+ 
+-  <target name="build-tomcat-dbcp" unless="jdk16.present"
++  <target name="build-tomcat-dbcp"
+           depends="build-manifests">
+     <copy todir="${tomcat-dbcp.home}">
+       <fileset dir="${commons-pool.home}">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/patches/env.patch	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,47 @@
+--- apache-tomcat-6.0.18-src/bin/catalina.sh.orig	Fri Dec  5 06:54:48 2008
++++ apache-tomcat-6.0.18-src/bin/catalina.sh	Fri Dec  5 07:06:15 2008
[email protected]@ -78,6 +78,7 @@
+ CYGWIN*) cygwin=true;;
+ OS400*) os400=true;;
+ Darwin*) darwin=true;;
++SunOS*) solaris=true;;
+ esac
+ 
+ # resolve links - $0 may be a softlink
[email protected]@ -127,6 +128,11 @@
+   export QIBM_MULTI_THREADED=Y
+ fi
+ 
++# For Solaris
++if $solaris; then
++  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/java
++fi
++
+ # Get standard Java environment variables
+ if $os400; then
+   # -r will Only work on the os400 if the files are:
+--- apache-tomcat-6.0.18-src/bin/tool-wrapper.sh.orig	Fri Dec  5 07:01:29 2008
++++ apache-tomcat-6.0.18-src/bin/tool-wrapper.sh	Fri Dec  5 07:05:52 2008
[email protected]@ -35,8 +35,10 @@
+ 
+ # OS specific support.  $var _must_ be set to either true or false.
+ cygwin=false
++solaris=false
+ case "`uname`" in
+ CYGWIN*) cygwin=true;;
++SunOS*) solaris=true;;
+ esac
+ 
+ # resolve links - $0 may be a softlink
[email protected]@ -66,6 +68,11 @@
+   [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+ fi
+ 
++# For Solaris
++if $solaris; then
++  [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/java
++fi
++
+ # Get standard Java environment variables
+ if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
+   BASEDIR="$CATALINA_HOME"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/patches/tomcat_strict_servlet.patch	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,58 @@
+--- apache-tomcat-6.0.20-src/bin/catalina.sh.orig	2009-03-30 14:34:02.000000000 -0700
++++ apache-tomcat-6.0.20-src/bin/catalina.sh	2009-03-30 14:40:38.000000000 -0700
[email protected]@ -233,6 +233,7 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++        -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+         org.apache.catalina.startup.Bootstrap "[email protected]" start
+     else
+       exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
[email protected]@ -241,6 +242,7 @@
+         -Dcatalina.base="$CATALINA_BASE" \
+         -Dcatalina.home="$CATALINA_HOME" \
+         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++        -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+         org.apache.catalina.startup.Bootstrap "[email protected]" start
+     fi
+   fi
[email protected]@ -258,6 +260,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "[email protected]" start
+   else
+     exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \
[email protected]@ -265,6 +268,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "[email protected]" start
+   fi
+ 
[email protected]@ -282,6 +286,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "[email protected]" start \
+       >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ 
[email protected]@ -294,6 +299,7 @@
+       -Dcatalina.base="$CATALINA_BASE" \
+       -Dcatalina.home="$CATALINA_HOME" \
+       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+       org.apache.catalina.startup.Bootstrap "[email protected]" start \
+       >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+ 
[email protected]@ -316,6 +322,7 @@
+     -Dcatalina.base="$CATALINA_BASE" \
+     -Dcatalina.home="$CATALINA_HOME" \
+     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
++    -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
+     org.apache.catalina.startup.Bootstrap "[email protected]" stop
+ 
+   if [ $FORCE -eq 1 ]; then
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/solaris-transform	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Manual page, SMF stuff and our ROOT web application content is
+# delivered directly from $(COMPONENT_DIR)/Solaris.
+# Tomcat stuff except documentation is packaged in usr/tomcat6 and
+# var/tomcat6 directories from $(BUILD_DIR_32)/output/build.
+# While documentation packaged in usr/tomcat6/docs is picked from
+# $(BUILD_DIR_32)/output/build/webapps.
+
+<transform file path=usr/share/man/man1m/(.+)$ -> \
+	set action.hash %<\1> >
+<transform file path=usr/tomcat6/(.+)$ -> \
+	set action.hash %<\1> >
+<transform file path=lib/svc/manifest/network/(.+)$ -> \
+	set action.hash %<\1> >
+<transform file path=lib/svc/method/(.+)$ -> \
+	set action.hash %<\1> >
+<transform file path=var/tomcat6/(.+)$ -> \
+	set action.hash %<\1> >
+<transform file path=var/tomcat6/webapps/ROOT/(.+)$ -> \
+	set action.hash %<\1> >
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/tomcat-examples.p5m	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,395 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/web/java-servlet/tomcat/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Tomcat Servlet/JSP Container - example applications"
+set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value=http://tomcat.apache.org
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=var
+dir path=var/tomcat6
+dir path=var/tomcat6/webapps group=webservd owner=webservd
+dir path=var/tomcat6/webapps/ROOT
+dir path=var/tomcat6/webapps/ROOT.example
+dir path=var/tomcat6/webapps/ROOT.example/WEB-INF
+dir path=var/tomcat6/webapps/examples
+dir path=var/tomcat6/webapps/examples/WEB-INF
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/cal
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/chat
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/colors
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/dates
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/error
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/examples
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/filters
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/num
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/util
+dir path=var/tomcat6/webapps/examples/WEB-INF/classes/validators
+dir path=var/tomcat6/webapps/examples/WEB-INF/jsp
+dir path=var/tomcat6/webapps/examples/WEB-INF/jsp/applet
+dir path=var/tomcat6/webapps/examples/WEB-INF/jsp2
+dir path=var/tomcat6/webapps/examples/WEB-INF/lib
+dir path=var/tomcat6/webapps/examples/WEB-INF/tags
+dir path=var/tomcat6/webapps/examples/jsp
+dir path=var/tomcat6/webapps/examples/jsp/cal
+dir path=var/tomcat6/webapps/examples/jsp/chat
+dir path=var/tomcat6/webapps/examples/jsp/checkbox
+dir path=var/tomcat6/webapps/examples/jsp/colors
+dir path=var/tomcat6/webapps/examples/jsp/dates
+dir path=var/tomcat6/webapps/examples/jsp/error
+dir path=var/tomcat6/webapps/examples/jsp/forward
+dir path=var/tomcat6/webapps/examples/jsp/images
+dir path=var/tomcat6/webapps/examples/jsp/include
+dir path=var/tomcat6/webapps/examples/jsp/jsp2
+dir path=var/tomcat6/webapps/examples/jsp/jsp2/el
+dir path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute
+dir path=var/tomcat6/webapps/examples/jsp/jsp2/jspx
+dir path=var/tomcat6/webapps/examples/jsp/jsp2/misc
+dir path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag
+dir path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles
+dir path=var/tomcat6/webapps/examples/jsp/jsptoserv
+dir path=var/tomcat6/webapps/examples/jsp/num
+dir path=var/tomcat6/webapps/examples/jsp/plugin
+dir path=var/tomcat6/webapps/examples/jsp/plugin/applet
+dir path=var/tomcat6/webapps/examples/jsp/security
+dir path=var/tomcat6/webapps/examples/jsp/security/protected
+dir path=var/tomcat6/webapps/examples/jsp/sessions
+dir path=var/tomcat6/webapps/examples/jsp/simpletag
+dir path=var/tomcat6/webapps/examples/jsp/snp
+dir path=var/tomcat6/webapps/examples/jsp/tagplugin
+dir path=var/tomcat6/webapps/examples/jsp/xml
+dir path=var/tomcat6/webapps/examples/servlets
+dir path=var/tomcat6/webapps/examples/servlets/images
+file path=var/tomcat6/webapps/ROOT.example/RELEASE-NOTES.txt
+file path=var/tomcat6/webapps/ROOT.example/WEB-INF/web.xml
+file path=var/tomcat6/webapps/ROOT.example/asf-logo-wide.gif
+file path=var/tomcat6/webapps/ROOT.example/build.xml
+file path=var/tomcat6/webapps/ROOT.example/favicon.ico
+file path=var/tomcat6/webapps/ROOT.example/index.html
+file path=var/tomcat6/webapps/ROOT.example/index.jsp
+file path=var/tomcat6/webapps/ROOT.example/tomcat-power.gif
+file path=var/tomcat6/webapps/ROOT.example/tomcat.gif
+file path=var/tomcat6/webapps/ROOT.example/tomcat.svg
+file path=var/tomcat6/webapps/ROOT/index.htm mode=0644 preserve=renamenew
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings.properties
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entry.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
+file path=var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
+file path=var/tomcat6/webapps/examples/WEB-INF/jsp/applet/Clock2.java
+file path=var/tomcat6/webapps/examples/WEB-INF/jsp/debug-taglib.tld
+file path=var/tomcat6/webapps/examples/WEB-INF/jsp/example-taglib.tld
+file path=var/tomcat6/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
+file path=var/tomcat6/webapps/examples/WEB-INF/lib/jstl.jar
+file path=var/tomcat6/webapps/examples/WEB-INF/lib/standard.jar
+file path=var/tomcat6/webapps/examples/WEB-INF/tags/displayProducts.tag
+file path=var/tomcat6/webapps/examples/WEB-INF/tags/helloWorld.tag
+file path=var/tomcat6/webapps/examples/WEB-INF/tags/panel.tag
+file path=var/tomcat6/webapps/examples/WEB-INF/tags/xhtmlbasic.tag
+file path=var/tomcat6/webapps/examples/WEB-INF/web.xml
+file path=var/tomcat6/webapps/examples/index.html
+file path=var/tomcat6/webapps/examples/jsp/cal/Entries.java.html
+file path=var/tomcat6/webapps/examples/jsp/cal/Entry.java.html
+file path=var/tomcat6/webapps/examples/jsp/cal/JspCalendar.java.html
+file path=var/tomcat6/webapps/examples/jsp/cal/TableBean.java.html
+file path=var/tomcat6/webapps/examples/jsp/cal/cal1.jsp
+file path=var/tomcat6/webapps/examples/jsp/cal/cal1.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/cal/cal2.jsp
+file path=var/tomcat6/webapps/examples/jsp/cal/cal2.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/cal/calendar.html
+file path=var/tomcat6/webapps/examples/jsp/cal/login.html
+file path=var/tomcat6/webapps/examples/jsp/chat/index.jsp
+file path=var/tomcat6/webapps/examples/jsp/chat/index.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/chat/login.jsp
+file path=var/tomcat6/webapps/examples/jsp/chat/login.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/chat/post.jsp
+file path=var/tomcat6/webapps/examples/jsp/chat/post.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/checkbox/CheckTest.html
+file path=var/tomcat6/webapps/examples/jsp/checkbox/check.html
+file path=var/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp
+file path=var/tomcat6/webapps/examples/jsp/checkbox/checkresult.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/checkbox/cresult.html
+file path=var/tomcat6/webapps/examples/jsp/colors/ColorGameBean.html
+file path=var/tomcat6/webapps/examples/jsp/colors/clr.html
+file path=var/tomcat6/webapps/examples/jsp/colors/colors.html
+file path=var/tomcat6/webapps/examples/jsp/colors/colrs.jsp
+file path=var/tomcat6/webapps/examples/jsp/colors/colrs.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/dates/date.html
+file path=var/tomcat6/webapps/examples/jsp/dates/date.jsp
+file path=var/tomcat6/webapps/examples/jsp/dates/date.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/error/er.html
+file path=var/tomcat6/webapps/examples/jsp/error/err.jsp
+file path=var/tomcat6/webapps/examples/jsp/error/err.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/error/error.html
+file path=var/tomcat6/webapps/examples/jsp/error/errorpge.jsp
+file path=var/tomcat6/webapps/examples/jsp/error/errorpge.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/forward/forward.jsp
+file path=var/tomcat6/webapps/examples/jsp/forward/forward.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/forward/fwd.html
+file path=var/tomcat6/webapps/examples/jsp/forward/one.jsp
+file path=var/tomcat6/webapps/examples/jsp/forward/one.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/forward/two.html
+file path=var/tomcat6/webapps/examples/jsp/images/code.gif
+file path=var/tomcat6/webapps/examples/jsp/images/execute.gif
+file path=var/tomcat6/webapps/examples/jsp/images/read.gif
+file path=var/tomcat6/webapps/examples/jsp/images/return.gif
+file path=var/tomcat6/webapps/examples/jsp/include/foo.html
+file path=var/tomcat6/webapps/examples/jsp/include/foo.jsp
+file path=var/tomcat6/webapps/examples/jsp/include/foo.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/include/inc.html
+file path=var/tomcat6/webapps/examples/jsp/include/include.jsp
+file path=var/tomcat6/webapps/examples/jsp/include/include.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/index.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/Functions.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/basic-arithmetic.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/basic-comparisons.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/functions.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/functions.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/basic.jspx.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/svgexample.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jpg
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
+file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/config.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/config.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/dynamicattrs.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf
+file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/Functions.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/hello.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/helloWorld.tag.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/panel.tag.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/products.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/xhtmlbasic.tag.html
+file path=var/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsptoserv/hello.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp
+file path=var/tomcat6/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/jsptoserv/jts.html
+file path=var/tomcat6/webapps/examples/jsp/jsptoserv/servletToJsp.java.html
+file path=var/tomcat6/webapps/examples/jsp/num/numguess.html
+file path=var/tomcat6/webapps/examples/jsp/num/numguess.jsp
+file path=var/tomcat6/webapps/examples/jsp/num/numguess.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.class
+file path=var/tomcat6/webapps/examples/jsp/plugin/applet/Clock2.java
+file path=var/tomcat6/webapps/examples/jsp/plugin/plugin.html
+file path=var/tomcat6/webapps/examples/jsp/plugin/plugin.jsp
+file path=var/tomcat6/webapps/examples/jsp/plugin/plugin.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/security/protected/error.jsp
+file path=var/tomcat6/webapps/examples/jsp/security/protected/error.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/security/protected/index.jsp
+file path=var/tomcat6/webapps/examples/jsp/security/protected/index.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/security/protected/login.jsp
+file path=var/tomcat6/webapps/examples/jsp/security/protected/login.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/sessions/DummyCart.html
+file path=var/tomcat6/webapps/examples/jsp/sessions/carts.html
+file path=var/tomcat6/webapps/examples/jsp/sessions/carts.jsp
+file path=var/tomcat6/webapps/examples/jsp/sessions/carts.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/sessions/crt.html
+file path=var/tomcat6/webapps/examples/jsp/simpletag/foo.html
+file path=var/tomcat6/webapps/examples/jsp/simpletag/foo.jsp
+file path=var/tomcat6/webapps/examples/jsp/simpletag/foo.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/snp/snoop.html
+file path=var/tomcat6/webapps/examples/jsp/snp/snoop.jsp
+file path=var/tomcat6/webapps/examples/jsp/snp/snoop.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/source.jsp
+file path=var/tomcat6/webapps/examples/jsp/source.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/choose.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/choose.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/foreach.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/foreach.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/howto.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/if.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/if.jsp
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/if.jsp.html
+file path=var/tomcat6/webapps/examples/jsp/tagplugin/notes.html
+file path=var/tomcat6/webapps/examples/jsp/xml/xml.html
+file path=var/tomcat6/webapps/examples/jsp/xml/xml.jsp
+file path=var/tomcat6/webapps/examples/jsp/xml/xml.jsp.html
+file path=var/tomcat6/webapps/examples/servlets/cookies.html
+file path=var/tomcat6/webapps/examples/servlets/helloworld.html
+file path=var/tomcat6/webapps/examples/servlets/images/code.gif
+file path=var/tomcat6/webapps/examples/servlets/images/execute.gif
+file path=var/tomcat6/webapps/examples/servlets/images/return.gif
+file path=var/tomcat6/webapps/examples/servlets/index.html
+file path=var/tomcat6/webapps/examples/servlets/reqheaders.html
+file path=var/tomcat6/webapps/examples/servlets/reqinfo.html
+file path=var/tomcat6/webapps/examples/servlets/reqparams.html
+file path=var/tomcat6/webapps/examples/servlets/sessions.html
+link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs pkg.linted=true
+
+
+license tomcat.license license="Apache v2.0"
+
+legacy	pkg=SUNWtcat-examples \
+	name="Tomcat Servlet/JSP Container - example applications" \
+	desc="Tomcat Servlet/JSP Container - example applications"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/tomcat.license	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,425 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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
+
+   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.
+
+
+
+APACHE TOMCAT SUBCOMPONENTS: 
+
+Apache Tomcat includes a number of subcomponents with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+
+For the jasper-jdt.jar component:
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to
+its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by
+that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement , including but not limited to the risks and costs
+of program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
+may assign the responsibility to serve as the Agreement Steward to a suitable
+separate entity. Each new version of the Agreement will be given a
+distinguishing version number. The Program (including Contributions) may always
+be distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+above, Recipient receives no rights or licenses to the intellectual property of
+any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tomcat/tomcat.p5m	Fri Mar 18 12:47:51 2011 -0700
@@ -0,0 +1,267 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/web/java-servlet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Tomcat Servlet/JSP Container"
+set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value=http://tomcat.apache.org
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=etc
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest
+dir path=lib/svc/manifest/network
+dir path=lib/svc/method
+dir path=usr
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1m
+dir path=usr/tomcat6
+dir path=usr/tomcat6/bin
+dir path=usr/tomcat6/docs
+dir path=usr/tomcat6/docs/WEB-INF
+dir path=usr/tomcat6/docs/api
+dir path=usr/tomcat6/docs/appdev
+dir path=usr/tomcat6/docs/appdev/sample
+dir path=usr/tomcat6/docs/appdev/sample/docs
+dir path=usr/tomcat6/docs/appdev/sample/src
+dir path=usr/tomcat6/docs/appdev/sample/src/mypackage
+dir path=usr/tomcat6/docs/appdev/sample/web
+dir path=usr/tomcat6/docs/appdev/sample/web/WEB-INF
+dir path=usr/tomcat6/docs/appdev/sample/web/images
+dir path=usr/tomcat6/docs/architecture
+dir path=usr/tomcat6/docs/architecture/requestProcess
+dir path=usr/tomcat6/docs/architecture/startup
+dir path=usr/tomcat6/docs/config
+dir path=usr/tomcat6/docs/funcspecs
+dir path=usr/tomcat6/docs/images
+dir path=usr/tomcat6/docs/tribes
+dir path=usr/tomcat6/lib
+dir path=var
+dir path=var/tomcat6
+dir path=var/tomcat6/conf group=webservd owner=webservd
+dir path=var/tomcat6/logs group=webservd owner=webservd
+dir path=var/tomcat6/temp group=webservd owner=webservd
+dir path=var/tomcat6/webapps group=webservd owner=webservd
+dir path=var/tomcat6/webapps/ROOT
+dir path=var/tomcat6/webapps/host-manager
+dir path=var/tomcat6/webapps/host-manager/META-INF
+dir path=var/tomcat6/webapps/host-manager/WEB-INF
+dir path=var/tomcat6/webapps/host-manager/images
+dir path=var/tomcat6/webapps/manager
+dir path=var/tomcat6/webapps/manager/META-INF
+dir path=var/tomcat6/webapps/manager/WEB-INF
+dir path=var/tomcat6/webapps/manager/WEB-INF/jsp
+dir path=var/tomcat6/webapps/manager/images
+dir path=var/tomcat6/work group=webservd owner=webservd
+file path=lib/svc/manifest/network/http-tomcat6.xml
+file path=lib/svc/method/http-tomcat6
+file path=usr/share/man/man1m/tomcat.1m
+file path=usr/tomcat6/bin/bootstrap.jar
+file path=usr/tomcat6/bin/catalina-tasks.xml
+file path=usr/tomcat6/bin/catalina.sh
+file path=usr/tomcat6/bin/digest.sh
+file path=usr/tomcat6/bin/setclasspath.sh
+file path=usr/tomcat6/bin/shutdown.sh
+file path=usr/tomcat6/bin/startup.sh
+file path=usr/tomcat6/bin/tomcat-juli.jar
+file path=usr/tomcat6/bin/tool-wrapper.sh
+file path=usr/tomcat6/bin/version.sh
+file path=usr/tomcat6/docs/BUILDING.txt
+file path=usr/tomcat6/docs/RELEASE-NOTES.txt
+file path=usr/tomcat6/docs/RUNNING.txt
+file path=usr/tomcat6/docs/WEB-INF/web.xml
+file path=usr/tomcat6/docs/aio.html
+file path=usr/tomcat6/docs/api/index.html
+file path=usr/tomcat6/docs/appdev/build.xml.txt
+file path=usr/tomcat6/docs/appdev/deployment.html
+file path=usr/tomcat6/docs/appdev/index.html
+file path=usr/tomcat6/docs/appdev/installation.html
+file path=usr/tomcat6/docs/appdev/introduction.html
+file path=usr/tomcat6/docs/appdev/processes.html
+file path=usr/tomcat6/docs/appdev/sample/build.xml
+file path=usr/tomcat6/docs/appdev/sample/docs/README.txt
+file path=usr/tomcat6/docs/appdev/sample/index.html
+file path=usr/tomcat6/docs/appdev/sample/sample.war
+file path=usr/tomcat6/docs/appdev/sample/src/mypackage/Hello.java
+file path=usr/tomcat6/docs/appdev/sample/web/WEB-INF/web.xml
+file path=usr/tomcat6/docs/appdev/sample/web/hello.jsp
+file path=usr/tomcat6/docs/appdev/sample/web/images/tomcat.gif
+file path=usr/tomcat6/docs/appdev/sample/web/index.html
+file path=usr/tomcat6/docs/appdev/source.html
+file path=usr/tomcat6/docs/appdev/web.xml.txt
+file path=usr/tomcat6/docs/apr.html
+file path=usr/tomcat6/docs/architecture/index.html
+file path=usr/tomcat6/docs/architecture/overview.html
+file path=usr/tomcat6/docs/architecture/requestProcess.html
+file path=usr/tomcat6/docs/architecture/requestProcess/requestProcess.pdf
+file path=usr/tomcat6/docs/architecture/requestProcess/roseModel.mdl
+file path=usr/tomcat6/docs/architecture/startup.html
+file path=usr/tomcat6/docs/architecture/startup/serverStartup.pdf
+file path=usr/tomcat6/docs/architecture/startup/serverStartup.txt
+file path=usr/tomcat6/docs/balancer-howto.html
+file path=usr/tomcat6/docs/building.html
+file path=usr/tomcat6/docs/cgi-howto.html
+file path=usr/tomcat6/docs/changelog.html
+file path=usr/tomcat6/docs/class-loader-howto.html
+file path=usr/tomcat6/docs/cluster-howto.html
+file path=usr/tomcat6/docs/config/ajp.html
+file path=usr/tomcat6/docs/config/cluster-channel.html
+file path=usr/tomcat6/docs/config/cluster-deployer.html
+file path=usr/tomcat6/docs/config/cluster-interceptor.html
+file path=usr/tomcat6/docs/config/cluster-listener.html
+file path=usr/tomcat6/docs/config/cluster-manager.html
+file path=usr/tomcat6/docs/config/cluster-membership.html
+file path=usr/tomcat6/docs/config/cluster-receiver.html
+file path=usr/tomcat6/docs/config/cluster-sender.html
+file path=usr/tomcat6/docs/config/cluster-valve.html
+file path=usr/tomcat6/docs/config/cluster.html
+file path=usr/tomcat6/docs/config/context.html
+file path=usr/tomcat6/docs/config/engine.html
+file path=usr/tomcat6/docs/config/executor.html
+file path=usr/tomcat6/docs/config/globalresources.html
+file path=usr/tomcat6/docs/config/host.html
+file path=usr/tomcat6/docs/config/http.html
+file path=usr/tomcat6/docs/config/index.html
+file path=usr/tomcat6/docs/config/listeners.html
+file path=usr/tomcat6/docs/config/loader.html
+file path=usr/tomcat6/docs/config/manager.html
+file path=usr/tomcat6/docs/config/realm.html
+file path=usr/tomcat6/docs/config/resources.html
+file path=usr/tomcat6/docs/config/server.html
+file path=usr/tomcat6/docs/config/service.html
+file path=usr/tomcat6/docs/config/systemprops.html
+file path=usr/tomcat6/docs/config/valve.html
+file path=usr/tomcat6/docs/connectors.html
+file path=usr/tomcat6/docs/default-servlet.html
+file path=usr/tomcat6/docs/deployer-howto.html
+file path=usr/tomcat6/docs/developers.html
+file path=usr/tomcat6/docs/extras.html
+file path=usr/tomcat6/docs/funcspecs/fs-admin-apps.html
+file path=usr/tomcat6/docs/funcspecs/fs-admin-objects.html
+file path=usr/tomcat6/docs/funcspecs/fs-admin-opers.html
+file path=usr/tomcat6/docs/funcspecs/fs-default.html
+file path=usr/tomcat6/docs/funcspecs/fs-invoker.html
+file path=usr/tomcat6/docs/funcspecs/fs-jdbc-realm.html
+file path=usr/tomcat6/docs/funcspecs/fs-jndi-realm.html
+file path=usr/tomcat6/docs/funcspecs/fs-memory-realm.html
+file path=usr/tomcat6/docs/funcspecs/index.html
+file path=usr/tomcat6/docs/funcspecs/mbean-names.html
+file path=usr/tomcat6/docs/html-manager-howto.html
+file path=usr/tomcat6/docs/images/add.gif
+file path=usr/tomcat6/docs/images/asf-logo.gif
+file path=usr/tomcat6/docs/images/code.gif
+file path=usr/tomcat6/docs/images/design.gif
+file path=usr/tomcat6/docs/images/docs.gif
+file path=usr/tomcat6/docs/images/fix.gif
+file path=usr/tomcat6/docs/images/printer.gif
+file path=usr/tomcat6/docs/images/tomcat.gif
+file path=usr/tomcat6/docs/images/tomcat.svg
+file path=usr/tomcat6/docs/images/update.gif
+file path=usr/tomcat6/docs/images/void.gif
+file path=usr/tomcat6/docs/index.html
+file path=usr/tomcat6/docs/introduction.html
+file path=usr/tomcat6/docs/jasper-howto.html
+file path=usr/tomcat6/docs/jndi-datasource-examples-howto.html
+file path=usr/tomcat6/docs/jndi-resources-howto.html
+file path=usr/tomcat6/docs/logging.html
+file path=usr/tomcat6/docs/manager-howto.html
+file path=usr/tomcat6/docs/maven-jars.html
+file path=usr/tomcat6/docs/mbeans-descriptor-howto.html
+file path=usr/tomcat6/docs/monitoring.html
+file path=usr/tomcat6/docs/proxy-howto.html
+file path=usr/tomcat6/docs/realm-howto.html
+file path=usr/tomcat6/docs/security-manager-howto.html
+file path=usr/tomcat6/docs/setup.html
+file path=usr/tomcat6/docs/ssi-howto.html
+file path=usr/tomcat6/docs/ssl-howto.html
+file path=usr/tomcat6/docs/tribes/faq.html
+file path=usr/tomcat6/docs/tribes/introduction.html
+file path=usr/tomcat6/docs/tribes/setup.html
+file path=usr/tomcat6/docs/virtual-hosting-howto.html
+file path=usr/tomcat6/docs/windows-service-howto.html
+file path=usr/tomcat6/lib/annotations-api.jar
+file path=usr/tomcat6/lib/catalina-ant.jar
+file path=usr/tomcat6/lib/catalina-ha.jar
+file path=usr/tomcat6/lib/catalina-tribes.jar
+file path=usr/tomcat6/lib/catalina.jar
+file path=usr/tomcat6/lib/el-api.jar
+file path=usr/tomcat6/lib/jasper-el.jar
+file path=usr/tomcat6/lib/jasper-jdt.jar
+file path=usr/tomcat6/lib/jasper.jar
+file path=usr/tomcat6/lib/jsp-api.jar
+file path=usr/tomcat6/lib/servlet-api.jar
+file path=usr/tomcat6/lib/tomcat-coyote.jar
+file path=usr/tomcat6/lib/tomcat-dbcp.jar
+file path=usr/tomcat6/lib/tomcat-i18n-es.jar
+file path=usr/tomcat6/lib/tomcat-i18n-fr.jar
+file path=usr/tomcat6/lib/tomcat-i18n-ja.jar
+file path=var/tomcat6/conf/CONF.tar.gz
+file path=var/tomcat6/conf/catalina.policy mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/catalina.properties mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/context.xml mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/logging.properties mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/server.xml mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/tomcat-users.xml group=webservd owner=webservd mode=0600 preserve=renamenew
+file path=var/tomcat6/conf/web.xml mode=0644 preserve=renamenew
+file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew
+file path=var/tomcat6/webapps/host-manager/META-INF/context.xml
+file path=var/tomcat6/webapps/host-manager/WEB-INF/web.xml
+file path=var/tomcat6/webapps/host-manager/images/add.gif
+file path=var/tomcat6/webapps/host-manager/images/asf-logo.gif
+file path=var/tomcat6/webapps/host-manager/images/code.gif
+file path=var/tomcat6/webapps/host-manager/images/design.gif
+file path=var/tomcat6/webapps/host-manager/images/docs.gif
+file path=var/tomcat6/webapps/host-manager/images/fix.gif
+file path=var/tomcat6/webapps/host-manager/images/tomcat.gif
+file path=var/tomcat6/webapps/host-manager/images/update.gif
+file path=var/tomcat6/webapps/host-manager/images/void.gif
+file path=var/tomcat6/webapps/host-manager/manager.xml
+file path=var/tomcat6/webapps/manager/401.jsp
+file path=var/tomcat6/webapps/manager/META-INF/context.xml
+file path=var/tomcat6/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+file path=var/tomcat6/webapps/manager/WEB-INF/jsp/sessionsList.jsp
+file path=var/tomcat6/webapps/manager/WEB-INF/web.xml
+file path=var/tomcat6/webapps/manager/images/add.gif
+file path=var/tomcat6/webapps/manager/images/asf-logo.gif
+file path=var/tomcat6/webapps/manager/images/code.gif
+file path=var/tomcat6/webapps/manager/images/design.gif
+file path=var/tomcat6/webapps/manager/images/docs.gif
+file path=var/tomcat6/webapps/manager/images/fix.gif
+file path=var/tomcat6/webapps/manager/images/tomcat.gif
+file path=var/tomcat6/webapps/manager/images/update.gif
+file path=var/tomcat6/webapps/manager/images/void.gif
+file path=var/tomcat6/webapps/manager/status.xsd
+file path=var/tomcat6/webapps/manager/xform.xsl
+link path=etc/tomcat6 target=../var/tomcat6/conf
+
+
+license tomcat.license license="Apache v2.0"
+
+legacy	pkg=SUNWtcat \
+	name="Tomcat Servlet/JSP Container" \
+	desc="Tomcat Servlet/JSP Container"
--- a/make-rules/prep.mk	Fri Mar 18 09:25:30 2011 -0700
+++ b/make-rules/prep.mk	Fri Mar 18 12:47:51 2011 -0700
@@ -26,7 +26,6 @@
 
 ARCHIVES += $(COMPONENT_ARCHIVE)
 CLEAN_PATHS += $(SOURCE_DIR)
-CLOBBER_PATHS += $(COMPONENT_ARCHIVE)
 
 PATCH_DIR =	patches
 PATCH_PATTERN =	*.patch
@@ -38,13 +37,23 @@
 	$(GPATCH) -d $(@D) $(GPATCH_FLAGS) < $<
 	$(TOUCH) [email protected]
 
-$(USERLAND_ARCHIVES)$(COMPONENT_ARCHIVE):	Makefile
-	$(FETCH) --file [email protected] \
-		$(COMPONENT_ARCHIVE_URL:%=--url %) \
-		$(COMPONENT_ARCHIVE_HASH:%=--hash %)
-	$(TOUCH) [email protected]
+# template for download rules. add new rules with $(call download-rule, suffix)
+define download-rule
+ARCHIVES += $$(COMPONENT_ARCHIVE$(1))
+CLOBBER_PATHS += $$(COMPONENT_ARCHIVE$(1))
+$$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)):	Makefile
+	$$(FETCH) --file [email protected] \
+		$$(COMPONENT_ARCHIVE_URL$(1):%=--url %) \
+		$$(COMPONENT_ARCHIVE_HASH$(1):%=--hash %)
+	$$(TOUCH) [email protected]
+endef
 
-$(SOURCE_DIR)/.unpacked:	$(USERLAND_ARCHIVES)$(COMPONENT_ARCHIVE) Makefile $(PATCHES)
+# Generate the download rules from the above template
+NUM_ARCHIVES =	1 2 3 4 5 6 7
+$(eval $(call download-rule,))
+$(foreach suffix,$(NUM_ARCHIVES),$(eval $(call download-rule,_$(suffix))))
+
+$(SOURCE_DIR)/.unpacked:	download Makefile $(PATCHES)
 	$(RM) -r $(SOURCE_DIR)
 	$(UNPACK) $(UNPACK_ARGS) $(USERLAND_ARCHIVES)$(COMPONENT_ARCHIVE)
 	$(TOUCH) [email protected]
@@ -58,11 +67,10 @@
 
 prep::	$(SOURCE_DIR)/.prep
 
-download::	$(USERLAND_ARCHIVES)$(COMPONENT_ARCHIVE)
+download::	$(ARCHIVES:%=$(USERLAND_ARCHIVES)%)
 
 clean::
 	$(RM) -r $(CLEAN_PATHS)
 
 clobber::	clean
 	$(RM) -r $(CLOBBER_PATHS)
-
--- a/make-rules/shared-macros.mk	Fri Mar 18 09:25:30 2011 -0700
+++ b/make-rules/shared-macros.mk	Fri Mar 18 12:47:51 2011 -0700
@@ -202,6 +202,7 @@
 MKDIR =		/bin/mkdir -p
 RM =		/bin/rm -f
 CP =		/bin/cp -f
+MV =		/bin/mv -f
 LN =		/bin/ln
 SYMLINK =	/bin/ln -s
 ENV =		/usr/bin/env
--- a/transforms/defaults	Fri Mar 18 09:25:30 2011 -0700
+++ b/transforms/defaults	Fri Mar 18 12:47:51 2011 -0700
@@ -24,6 +24,7 @@
 #
 
 <transform dir path=etc$ -> default group sys>
+<transform dir path=var$ -> default group sys>
 
 #
 # LP print service
@@ -51,6 +52,14 @@
 <transform file path=etc/security/exec_attr.d/.* -> default group sys>
 
 #
+# SMF directories and files
+#
+<transform dir path=lib/svc/manifest$ -> default group sys>
+<transform dir path=lib/svc/manifest/network$ -> default group sys>
+<transform file path=lib/svc/manifest/network/.* -> default group sys>
+<transform file path=lib/svc/method/.* -> default mode 0555>
+
+#
 # Many directories and files under /usr/share are group other
 #
 <transform dir path=usr/share/locale(/.+){0,2}$ -> default group other>