--- a/components/meta-packages/history/history Thu Aug 27 06:29:25 2015 -0700
+++ b/components/meta-packages/history/history Tue Aug 25 05:42:53 2015 -0700
@@ -257,8 +257,8 @@
[email protected],5.11-0.133 library/python-2/[email protected]
[email protected],5.11-0.133 developer/versioning/[email protected]
[email protected],5.11-0.133 developer/[email protected]
[email protected],5.11-0.133 web/java-servlet/tomcat/[email protected]
[email protected],5.11-0.133 web/java-servlet/[email protected]
[email protected],5.12-5.12.0.0.0.82.0
[email protected],5.12-5.12.0.0.0.82.0
[email protected],5.12-5.12.0.0.0.70.0
[email protected],5.11-0.133 diagnostic/[email protected]
[email protected],5.11-0.133 shell/[email protected]
@@ -342,6 +342,8 @@
system/trusted/[email protected],5.11-0.166 group/feature/trusted-desktop
terminal/[email protected],5.12-5.12.0.0.0.81.0
web/[email protected],5.11-0.174.0.0.0.0.0 group/feature/[email protected]
+web/java-servlet/[email protected],5.12-5.12.0.0.0.82.0
+web/java-servlet/tomcat/[email protected],5.12-5.12.0.0.0.82.0
web/library/apache/apr-13/[email protected],5.12-5.12.0.0.0.57.0
web/library/apache/[email protected],5.12-5.12.0.0.0.57.0
web/library/apache/apr-util-13/[email protected],5.12-5.12.0.0.0.57.0
--- a/components/tomcat/Makefile Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,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
-#
-
-#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-include ../../make-rules/shared-macros.mk
-
-COMPONENT_NAME= tomcat
-COMPONENT_VERSION= 6.0.44
-COMPONENT_PROJECT_URL= http://tomcat.apache.org/
-COMPONENT_SRC_NAME= apache-tomcat
-COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= \
- sha256:c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a
-COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB= utility/tomcat
-
-# Tomcat subcomponents
-COMPONENT_ARCHIVE_1= commons-dbcp-1.4-src.tar.gz
-COMPONENT_ARCHIVE_HASH_1= \
- sha256:f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283
-COMPONENT_ARCHIVE_URL_1= http://archive.apache.org/dist/commons/dbcp/source/$(COMPONENT_ARCHIVE_1)
-COMPONENT_ARCHIVE_2= commons-pool-1.5.7-src.tar.gz
-COMPONENT_ARCHIVE_HASH_2= \
- sha256:e9f414555c41e9584da1f6953af28208ece5cd4664ef2fea297e6a6aadc4377e
-COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2)
-COMPONENT_ARCHIVE_3= ecj-4.3.1.jar
-COMPONENT_ARCHIVE_HASH_3= \
- sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295
-COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3)
-
-TPNO= 23695
-
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/ant.mk
-include $(WS_MAKE_RULES)/ips.mk
-
-PATCH_LEVEL=0
-
-COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR)
-COMPONENT_BUILD_TARGETS=download deploy
-
-# Create configuration backup archive for custom user's deployments.
-COMPONENT_POST_BUILD_ACTION= \
- (cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \
- gtar cfz conf/CONF.tar.gz conf/* )
-
-COMPONENT_TEST_DIR = $(@D)/test
-COMPONENT_TEST_ARGS = $(COMPONENT_BUILD_ARGS) \
- -Djunit.home=/usr/share/lib/java
-COMPONENT_TEST_TARGETS =
-
-COMPONENT_TEST_TRANSFORMS += \
- '-e "/\[java\] Time: .*/d"' \
- '-e "/^Total time:/d"'
-
-ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-
-build: $(BUILD_32)
-
-install: build
-
-test: $(TEST_32)
-
-system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
-REQUIRED_PACKAGES += runtime/java/jre-8
-REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/core-os
-REQUIRED_PACKAGES += system/network
--- a/components/tomcat/Solaris/http-tomcat6 Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#!/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, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-. /lib/svc/share/smf_include.sh
-
-CATALINA_HOME=/usr/tomcat6
-# We allow CATALINA_BASE setting from environment so that we can support
-# multiple Tomcat instances.
-CATALINA_BASE=${CATALINA_BASE:-/var/tomcat6}
-CATALINA_PID=$CATALINA_BASE/logs/pid
-JAVA_HOME=/usr/jdk/instances/jdk1.8.0
-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
--- a/components/tomcat/Solaris/http-tomcat6.xml Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-<?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, 2015, 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='tomcat6' 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>
--- a/components/tomcat/Solaris/index.htm Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example">
--- a/components/tomcat/Solaris/index.jsp Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<html><body><h1>Apache Tomcat (tomcat-examples package not installed)</h1></body></html>
--- a/components/tomcat/Solaris/tomcat.1m Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-'\" te
-.\" Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
-.TH tomcat6 1M "May 2015" "SunOS 5.12" "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
-Similarly it's possible to run multiple SMF Tomcat instances by setting
-CATALINA_BASE for both start and stop methods for newly created Tomcat
-FMRI.
-.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.
-For setting Tomcat environment variables it's possible to create here
-\fBsetenv.sh\fR file which is sourced during start by catalina.sh.
-.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 SEE ALSO
-.sp
-.LP
-http://tomcat.apache.org/tomcat-6.0-doc
--- a/components/tomcat/jdbc41.patch Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,442 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/apache-commons-dbcp.git/tree/jdbc41.patch
-
-diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java
---- src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-02-23 09:11:04.481618663 +0100
-@@ -24,10 +24,12 @@
- import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.Collections;
-+import java.util.logging.Logger;
- import java.sql.Connection;
- import java.sql.Driver;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import javax.sql.DataSource;
-
- import org.apache.commons.pool.KeyedObjectPoolFactory;
-@@ -1579,4 +1581,10 @@
- logWriter.println(message);
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
---- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-02-23 09:13:29.490605580 +0100
-@@ -19,10 +19,12 @@
-
- import java.util.Hashtable;
- import java.util.Properties;
-+import java.util.logging.Logger;
- import java.io.PrintWriter;
- import java.io.Serializable;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import javax.sql.PooledConnection;
- import javax.sql.ConnectionPoolDataSource;
- import javax.naming.Name;
-@@ -719,4 +721,10 @@
- {
- _maxPreparedStatements = maxPreparedStatements;
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java
---- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-02-23 09:12:13.582612432 +0100
-@@ -21,10 +21,12 @@
- import java.io.ObjectInputStream;
- import java.sql.Connection;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.Map;
- import java.util.NoSuchElementException;
-+import java.util.logging.Logger;
-
- import javax.naming.NamingException;
- import javax.naming.Reference;
-@@ -561,4 +563,10 @@
- CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key);
- return mgr == null ? null : (GenericObjectPool) mgr.getPool();
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java
---- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-02-23 09:14:10.326601896 +0100
-@@ -21,6 +21,8 @@
- import java.io.ObjectInputStream;
- import java.sql.Connection;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
-+import java.util.logging.Logger;
-
- import javax.naming.NamingException;
- import javax.naming.Reference;
-@@ -269,5 +271,11 @@
- throw new IOException("NamingException: " + e);
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-
-diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
---- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-02-23 09:17:35.805583354 +0100
-@@ -37,6 +37,7 @@
- import java.sql.RowId;
- import java.sql.SQLXML;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link CallableStatement}.
-@@ -661,4 +662,14 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java
---- src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-02-23 09:04:56.488651873 +0100
-@@ -27,6 +27,7 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
-+import java.util.concurrent.Executor;
- import java.sql.ResultSet;
- /* JDBC_4_ANT_KEY_BEGIN */
- import java.sql.Array;
-@@ -40,6 +41,7 @@
- import java.util.Collections;
- import java.util.Properties;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link Connection}.
-@@ -678,5 +680,31 @@
- return null;
- }
- }
--/* JDBC_4_ANT_KEY_END */
-+ /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public int getNetworkTimeout() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void abort(Executor executor) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public String getSchema() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setSchema(String schema) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-+
-diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java
---- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-02-23 09:20:38.181566898 +0100
-@@ -24,6 +24,7 @@
- import java.sql.RowIdLifetime;
- /* JDBC_4_ANT_KEY_END */
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link DatabaseMetaData}.
-@@ -1208,4 +1209,13 @@
-
- /* JDBC_4_ANT_KEY_END */
-
-+ /* This functionality is not implemented yet */
-+ public boolean generatedKeyAlwaysReturned() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
---- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-02-23 09:04:37.793653560 +0100
-@@ -34,6 +34,7 @@
- import java.sql.RowId;
- import java.sql.SQLXML;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link PreparedStatement}.
-@@ -402,4 +403,15 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public boolean isCloseOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void closeOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java
---- src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-02-23 09:17:19.905584789 +0100
-@@ -40,6 +40,7 @@
- import java.sql.RowId;
- import java.sql.SQLXML;
- /* JDBC_4_ANT_KEY_END */
-+import java.sql.SQLFeatureNotSupportedException;
-
- /**
- * A base delegating implementation of {@link ResultSet}.
-@@ -1079,4 +1080,14 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java
---- src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-02-23 09:04:41.171653252 +0100
-@@ -22,6 +22,7 @@
- import java.sql.SQLException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.List;
-
- /**
-@@ -386,4 +387,15 @@
- }
- }
- /* JDBC_4_ANT_KEY_END */
-+
-+ /* This functionality is not implemented yet */
-+ public boolean isCloseOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void closeOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java
---- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-02-23 09:17:44.514582568 +0100
-@@ -21,6 +21,7 @@
- import java.sql.Connection;
- import java.sql.ResultSet;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.List;
-
- import org.apache.commons.pool.KeyedObjectPool;
-@@ -123,4 +124,13 @@
- super.passivate();
- }
-
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java
---- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-02-23 09:16:01.670591848 +0100
-@@ -21,6 +21,7 @@
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.util.List;
-
- import org.apache.commons.pool.KeyedObjectPool;
-@@ -137,4 +138,14 @@
- super.passivate();
- }
-
-+ /* This functionality is not implemented yet */
-+ public boolean isCloseOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void closeOnCompletion() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
-diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java
---- src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-02-23 09:08:08.716634524 +0100
-@@ -21,8 +21,10 @@
- import java.sql.Connection;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
-
- import java.util.NoSuchElementException;
-+import java.util.concurrent.Executor;
-
- import org.apache.commons.pool.KeyedObjectPool;
- import org.apache.commons.pool.KeyedPoolableObjectFactory;
-@@ -455,4 +457,30 @@
- return buf.toString();
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public int getNetworkTimeout() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void abort(Executor executor) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public String getSchema() throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
-+ /* This functionality is not implemented yet */
-+ public void setSchema(String schema) throws SQLException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-+
-diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java
---- src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-02-23 09:11:31.873616194 +0100
-@@ -23,10 +23,12 @@
- import java.sql.DatabaseMetaData;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
- import java.util.Map;
- import java.util.NoSuchElementException;
-+import java.util.logging.Logger;
-
- import javax.sql.DataSource;
-
-@@ -437,4 +439,9 @@
- }
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
- }
-diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java
---- src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100
-+++ src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-02-23 09:14:12.193601726 +0100
-@@ -27,6 +27,7 @@
- import java.sql.DriverPropertyInfo;
- import java.sql.PreparedStatement;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import java.sql.SQLWarning;
- import java.sql.Statement;
- import java.util.HashMap;
-@@ -34,6 +35,7 @@
- import java.util.NoSuchElementException;
- import java.util.Properties;
- import java.util.Set;
-+import java.util.logging.Logger;
-
- import org.apache.commons.jocl.JOCLContentHandler;
- import org.apache.commons.pool.ObjectPool;
-@@ -496,4 +498,10 @@
- }
- }
- }
-+
-+ /* This functionality is not implemented yet */
-+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+ throw new SQLFeatureNotSupportedException();
-+ }
-+
- }
--- a/components/tomcat/patches/build.properties.patch Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-Patch origin: in-house
-Patch status: Solaris-specific; not suitable for upstream
-
-Redirects build process to use local archives instead of downloading
-from external webs.
-Uses newer version of Commons DBCP which builds with newer JDK.
-
---- build.properties.default
-+++ build.properties.default
-@@ -52,6 +52,12 @@
- # repo.maven.apache.org is the same as repo2.maven.org
- base-maven.loc=http://repo.maven.apache.org/maven2
-
-+# In Userland we really don't want Tomcat to download its build
-+# dependencies itself but instead we will do it ourself in advance.
-+# Therefore those dependencies which are really required need to be
-+# redirected to local file system.
-+userland-files.loc=file://${base.path}/../../
-+
- # ----- Commons Logging, version 1.1 or later -----
- # If this version is updated, check the versions required for the deps
- # - avalon-framework
-@@ -112,7 +118,7 @@
- jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
- # The download will be moved to the archive area eventually. We are taking care of that in advance.
- # Note older JARs were called ecj.jar. Newer JARs are called ecj-${jdt.version}.jar
--jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-+jdt.loc.1=${userland-files.loc}/ecj-${jdt.version}.jar
- jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
-
- # ----- Tomcat native library -----
-@@ -124,16 +130,16 @@
- tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
- tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
-
--# ----- 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.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-+commons-dbcp-src.loc.1=${userland-files.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz
- commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-
- # ----- Commons Pool, version 1.1 or later -----
- commons-pool.version=1.5.7
- commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
--commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
-+commons-pool-src.loc.1=${userland-files.loc}/commons-pool-${commons-pool.version}-src.tar.gz
- commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
-
- # ----- NSIS, version 2.0 or later -----
--- a/components/tomcat/patches/build.xml.patch Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-Patch origin: in-house
-Patch status: Solaris-specific; not suitable for upstream
-
-Download/use only archives we really need.
-Don't install unnecessary stuff.
-Allow to build it with desired JDK version.
-
---- build.xml
-+++ build.xml
-@@ -492,13 +492,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">
-@@ -780,41 +773,6 @@
- description="Download (and build as necessary) dependent components"
- depends="build-manifests">
-
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
-- <param name="destfile" value="${tomcat-native.tar.gz}"/>
-- <param name="destdir" value="${tomcat-native.home}"/>
-- </antcall>
--
-- <antcall target="downloadzip-2">
-- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-- <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
-- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
-- <param name="destdir" value="${tomcat-native.home}"/>
-- </antcall>
--
-- <!-- Download Commons Daemon -->
-- <antcall target="downloadgz-2">
-- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-- <param name="destfile" value="${commons-daemon.jar}"/>
-- </antcall>
--
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
-- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
-- <param name="destdir" value="${commons-daemon.home}"/>
-- </antcall>
--
-- <antcall target="downloadzip-2">
-- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
-- <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-2">
- <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
-@@ -826,6 +784,11 @@
- <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
- <param name="destfile" value="${commons-dbcp.home}/build.xml" />
- </antcall>
-+ <!-- We need to patch DBCP so it can be built with JDK 1.7. -->
-+ <exec executable="sh">
-+ <arg value="-c" />
-+ <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
-+ </exec>
- <mkdir dir="${tomcat-dbcp.home}"/>
- <antcall target="build-tomcat-dbcp" />
-
-@@ -837,15 +800,9 @@
- <param name="destdir" value="${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}">
--- a/components/tomcat/patches/env.patch Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-Patch origin: in-house
-Patch status: Solaris-specific; not suitable for upstream
-
-Support for setenv.sh in $CATALINA_BASE/conf.
-Set default Java version (can be overwritten e.g. via setenv.sh).
-
---- bin/catalina.sh
-+++ bin/catalina.sh
-@@ -90,6 +90,7 @@
- CYGWIN*) cygwin=true;;
- OS400*) os400=true;;
- Darwin*) darwin=true;;
-+SunOS*) solaris=true;;
- esac
-
- # resolve links - $0 may be a softlink
-@@ -118,7 +119,13 @@
- # but allow them to be specified in setenv.sh, in rare case when it is needed.
- CLASSPATH=
-
--if [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
-+# On Solaris we install Tomcat into two different locations
-+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only
-+# location and CATALINA_BASE doesn't contain bin directory. Therefore we
-+# will look for setenv.sh file in CATALINA_BASE/conf directory first.
-+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then
-+ . "$CATALINA_BASE/conf/setenv.sh"
-+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
- . "$CATALINA_BASE/bin/setenv.sh"
- elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
- . "$CATALINA_HOME/bin/setenv.sh"
-@@ -145,6 +152,11 @@
- export QIBM_MULTI_THREADED=Y
- fi
-
-+# For Solaris
-+if $solaris; then
-+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.8.0
-+fi
-+
- # Get standard Java environment variables
- if $os400; then
- # -r will Only work on the os400 if the files are:
---- bin/tool-wrapper.sh
-+++ bin/tool-wrapper.sh
-@@ -33,8 +33,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
-@@ -58,8 +60,16 @@
- # but allow them to be specified in setenv.sh, in rare case when it is needed.
- CLASSPATH=
-
--if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
-- . "$CATALINA_HOME"/bin/setenv.sh
-+# On Solaris we install Tomcat into two different locations
-+# (CATALINA_HOME, CATALINA_BASE). CATALINA_HOME can be on read only
-+# location and CATALINA_BASE doesn't contain bin directory. Therefore we
-+# will look for setenv.sh file in CATALINA_BASE/conf directory first.
-+if [ -r "$CATALINA_BASE/conf/setenv.sh" ]; then
-+ . "$CATALINA_BASE/conf/setenv.sh"
-+elif [ -r "$CATALINA_BASE/bin/setenv.sh" ]; then
-+ . "$CATALINA_BASE/bin/setenv.sh"
-+elif [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
-+ . "$CATALINA_HOME/bin/setenv.sh"
- fi
-
- # For Cygwin, ensure paths are in UNIX format before anything is touched
-@@ -69,6 +79,11 @@
- [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
- fi
-
-+# For Solaris
-+if $solaris; then
-+ [ -z "$JAVA_HOME" ] && JAVA_HOME=/usr/jdk/instances/jdk1.8.0
-+fi
-+
- # Get standard Java environment variables
- if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
- BASEDIR="$CATALINA_HOME"
--- a/components/tomcat/patches/tomcat_strict_servlet.patch Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-Patch origin: in-house
-Patch status: Solaris-specific; not suitable for upstream
-
-Starts Tomcat in desired mode. See:
-https://tomcat.apache.org/tomcat-6.0-doc/config/systemprops.html
-
---- bin/catalina.sh
-+++ bin/catalina.sh
-@@ -285,6 +285,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 "$@" start
- else
- exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-@@ -293,6 +294,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 "$@" start
- fi
- fi
-@@ -312,6 +314,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 "$@" start
- else
- exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
-@@ -319,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 "$@" start
- fi
-
-@@ -376,6 +380,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 "$@" start \
- >> "$CATALINA_OUT" 2>&1 &
-
-@@ -385,6 +390,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 "$@" start \
- >> "$CATALINA_OUT" 2>&1 &
-
-@@ -435,6 +441,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 "$@" stop
-
- if [ ! -z "$CATALINA_PID" ]; then
--- a/components/tomcat/test/results-32.master Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-Buildfile: $(@D)/test/build.xml
-
-compile:
- [mkdir] Created dir: $(@D)/test/output/classes
- [javac] $(@D)/test/build.xml:57: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
- [javac] Compiling 2 source files to $(@D)/test/output/classes
- [javac] warning: [options] bootstrap class path not set in conjunction with -source 1.5
- [javac] warning: [options] source value 1.5 is obsolete and will be removed in a future release
- [javac] warning: [options] To suppress warnings about obsolete options, use -Xlint:-options.
- [javac] 3 warnings
-
-all:
- [java] .Processing [foo=bar; a=b]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo=bar;a=b]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo=bar;a=b;]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo=bar;a=b; ]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo=bar;a=b; ;]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo=;a=b; ;]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo;a=b; ;]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [$Version=1; foo=bar;a=b]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo=bar;a=b; ; ]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo=;a=b; ; ]
- [java] 1 - Cookie: Cookie foo= ; 1 null null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo= ;a=b; ; ]
- [java] 1 - Cookie: Cookie foo= ; 1 null null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo;a=b; ; ]
- [java] 1 - Cookie: Cookie foo= ; 1 null null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="bar";a=b; ; ]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="bar";$Domain=apache.org;a=b]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="bar";$Domain=apache.org;a=b;$Domain=yahoo.com]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null yahoo.com
- [java] Processing [$Version=1;foo="bar";$Domain=apache.org;$Port=8080;a=b]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="b"ar";$Domain=apache.org;$Port=8080;a=b]
- [java] 1 - Cookie: Cookie foo=b ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="b\"ar";$Domain=apache.org;$Port=8080;a=b]
- [java] 1 - Cookie: Cookie foo=b"ar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="b'ar";$Domain=apache.org;$Port=8080;a=b]
- [java] 1 - Cookie: Cookie foo=b'ar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo=b'ar;$Domain=apache.org;$Port=8080;a=b]
- [java] 1 - Cookie: Cookie foo=b'ar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [foo=bar;a="b"]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [foo=bar;a="b";]
- [java] 1 - Cookie: Cookie foo=bar ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] Processing [$Version=1;foo=b'ar;$Domain="apache.org";$Port=8080;a="b\"]
- [java] One Cookie: Cookie foo=b'ar ; 1 null apache.org
- [java] Processing [$Version=1;foo=b'ar;$Domain="apache.org";$Port=8080;a="b\]
- [java] One Cookie: Cookie foo=b'ar ; 1 null apache.org
- [java] Processing [$Version="1"; foo='bar'; $Path=/path; $Domain="localhost"]
- [java] One Cookie: Cookie foo='bar' ; 1 /path localhost
- [java] Processing [$Version=1;foo="bar";$Path=/examples;a=b; ; ]
- [java] 1 - Cookie: Cookie foo=bar ; 1 /examples null
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [$Version=1;foo="bar";$Domain=apache.org;$Port=8080;a=b]
- [java] 1 - Cookie: Cookie foo=bar ; 1 null apache.org
- [java] 2 - Cookie: Cookie a=b ; 1 null null
- [java] Processing [foo;a=b;bar]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar= ; 0 null null
- [java] Processing [foo;a=b;bar;]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar= ; 0 null null
- [java] Processing [foo;a=b;bar ]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar= ; 0 null null
- [java] Processing [foo;a=b;bar ;]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar= ; 0 null null
- [java] Processing [foo;a=b; ;bar]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar= ; 0 null null
- [java] Processing [foo;a=b;;bar]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar= ; 0 null null
- [java] Processing [foo;a=b; ;;bar=rab]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar=rab ; 0 null null
- [java] Processing [foo;a=b;; ;bar=rab]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar=rab ; 0 null null
- [java] Processing [foo;a=b;;#;bar=rab]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie #= ; 0 null null
- [java] 4 - Cookie: Cookie bar=rab ; 0 null null
- [java] Processing [foo;a=b;;\;bar=rab]
- [java] 1 - Cookie: Cookie foo= ; 0 null null
- [java] 2 - Cookie: Cookie a=b ; 0 null null
- [java] 3 - Cookie: Cookie bar=rab ; 0 null null
- [java] Processing [a=()<>@:\"/[]?={} ; foo=bar]
- [java] One Cookie: Cookie foo=bar ; 0 null null
- [java] Processing [$Version=1;foo=bar]
- [java] One Cookie: Cookie foo=bar ; 1 null null
- [java] Processing [$Version=0;foo=bar]
- [java] One Cookie: Cookie foo=bar ; 0 null null
- [java]
- [java]
- [java] OK (1 test)
- [java]
-
-BUILD SUCCESSFUL
--- a/components/tomcat/tomcat-examples.p5m Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,341 +0,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
-#
-
-#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=var/tomcat6/(.+)$ -> \
- set action.hash %<1> >
-<transform file path=var/tomcat6/webapps/ROOT.example/(.+)$ -> \
- set action.hash webapps/ROOT/%<1> >
-<transform file path=var/tomcat6/webapps/ROOT/index.htm -> \
- set action.hash Solaris/index.htm >
-set name=pkg.fmri \
- value=pkg:/web/java-servlet/tomcat/tomcat-examples@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Tomcat Servlet/JSP Container - example applications"
-set name=com.oracle.info.description value="the Tomcat example applications"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2008/711
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-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 \
- original_name=SUNWtcat-examples:var/tomcat6/webapps/ROOT/index.htm \
- preserve=renamenew
-link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs
-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/taglibs-standard-impl-1.2.5.jar
-file path=var/tomcat6/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.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
-license tomcat.license license="Apache v2.0"
-depend type=require fmri=__TBD \
- pkg.debug.depend.file=usr/tomcat6/bin/bootstrap.jar
--- a/components/tomcat/tomcat.license Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-The following applies to all products licensed under the Apache 2.0 License:
-
-You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
-
-You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. A copy of the license is also reproduced below.
-
-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 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.
-
-
-1. The follow files are available in source code form under the Eclipse Public License at: http://archive.eclipse.org/eclipse/downloads/ . (The EPL license is reproduced below).
-
-2. All past Contributors to the Eclipse JDT Java compiler disclaim 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. In addition, such Contributors are not liable for any damages, including direct, indirect, special, incidental and consequential damages, such as lost profits.
-
-3. Any provisions of the Oracle license agreement that differ from the Eclipse Public License are offered by Oracle alone and not by any other party.
-
-
-
-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.
--- a/components/tomcat/tomcat.p5m Thu Aug 27 06:29:25 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,259 +0,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
-#
-
-#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr/tomcat6/(.+)$ -> \
- set action.hash %<1> >
-<transform file path=usr/tomcat6/docs/(.+)$ -> \
- set action.hash webapps/docs/%<1> >
-<transform file path=var/tomcat6/(.+)$ -> \
- set action.hash %<1> >
-<transform file path=var/tomcat6/webapps/ROOT/index.jsp -> \
- set action.hash Solaris/index.jsp >
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform file link hardlink path=usr/tomcat6/docs/.* -> \
- default facet.doc.html true>
-set name=pkg.fmri \
- value=pkg:/web/java-servlet/tomcat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Tomcat Servlet/JSP Container"
-set name=com.oracle.info.description value="the Tomcat Servlet/JSP Container"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2008/711
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=etc/tomcat6 target=../var/tomcat6/conf
-file Solaris/http-tomcat6.xml path=lib/svc/manifest/network/http-tomcat6.xml
-file Solaris/http-tomcat6 path=lib/svc/method/http-tomcat6
-link path=usr/share/man/man1m/tomcat.1 target=tomcat6.1m mediator=tomcat \
- mediator-version=6
-file Solaris/tomcat.1m path=usr/share/man/man1m/tomcat6.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/filter.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/developers.html
-file path=usr/tomcat6/docs/tribes/faq.html
-file path=usr/tomcat6/docs/tribes/interceptors.html
-file path=usr/tomcat6/docs/tribes/introduction.html
-file path=usr/tomcat6/docs/tribes/membership.html
-file path=usr/tomcat6/docs/tribes/setup.html
-file path=usr/tomcat6/docs/tribes/status.html
-file path=usr/tomcat6/docs/tribes/transport.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/ecj-4.3.1.jar
-file path=usr/tomcat6/lib/el-api.jar
-file path=usr/tomcat6/lib/jasper-el.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
-dir path=var/tomcat6/conf owner=webservd group=webservd
-file path=var/tomcat6/conf/CONF.tar.gz
-file path=var/tomcat6/conf/catalina.policy mode=0644 \
- original_name=SUNWtcat:var/tomcat6/conf/catalina.policy preserve=renamenew
-file path=var/tomcat6/conf/catalina.properties mode=0644 \
- original_name=SUNWtcat:var/tomcat6/conf/catalina.properties \
- preserve=renamenew
-file path=var/tomcat6/conf/context.xml mode=0644 \
- original_name=SUNWtcat:var/tomcat6/conf/context.xml preserve=renamenew
-file path=var/tomcat6/conf/logging.properties mode=0644 \
- original_name=SUNWtcat:var/tomcat6/conf/logging.properties \
- preserve=renamenew
-file path=var/tomcat6/conf/server.xml mode=0644 \
- original_name=SUNWtcat:var/tomcat6/conf/server.xml preserve=renamenew
-file path=var/tomcat6/conf/tomcat-users.xml owner=webservd group=webservd \
- mode=0600 original_name=SUNWtcat:var/tomcat6/conf/tomcat-users.xml \
- preserve=renamenew
-file path=var/tomcat6/conf/web.xml mode=0644 \
- original_name=SUNWtcat:var/tomcat6/conf/web.xml preserve=renamenew
-dir path=var/tomcat6/logs owner=webservd group=webservd mode=0700
-dir path=var/tomcat6/temp owner=webservd group=webservd
-dir path=var/tomcat6/webapps owner=webservd group=webservd
-file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 \
- original_name=SUNWtcat:var/tomcat6/webapps/ROOT/index.jsp \
- preserve=renamenew
-file path=var/tomcat6/webapps/host-manager/META-INF/context.xml
-file path=var/tomcat6/webapps/host-manager/WEB-INF/jsp/401.jsp
-file path=var/tomcat6/webapps/host-manager/WEB-INF/jsp/403.jsp
-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/META-INF/context.xml
-file path=var/tomcat6/webapps/manager/WEB-INF/jsp/401.jsp
-file path=var/tomcat6/webapps/manager/WEB-INF/jsp/403.jsp
-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
-dir path=var/tomcat6/work owner=webservd group=webservd
-license tomcat.license license="Apache v2.0"
-depend type=require fmri=__TBD \
- pkg.debug.depend.file=usr/jdk/instances/jdk1.8.0/bin/java