--- a/components/tomcat/Makefile	Fri Jun 03 05:25:28 2011 -0700
+++ b/components/tomcat/Makefile	Wed Jun 08 01:30:17 2011 -0700
@@ -26,55 +26,42 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache-tomcat
-COMPONENT_VERSION=	6.0.28
+COMPONENT_VERSION=	6.0.32
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=	sha1:0df5e58518607ff738bbf440d829747df6acb9ce
-COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.28/src/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH=	sha1:ec94c511e54da2b02dd2ba45b9fd1703d5771a45
+COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 
 # Tomcat subcomponents
 COMPONENT_ARCHIVE_1= commons-dbcp-1.4-src.tar.gz
 COMPONENT_ARCHIVE_HASH_1= sha1:48702486eaba6ec40fb65e912c8f597d80654f54
 COMPONENT_ARCHIVE_URL_1= http://archive.apache.org/dist/commons/dbcp/source/$(COMPONENT_ARCHIVE_1)
-COMPONENT_ARCHIVE_2= commons-pool-1.5.4-src.tar.gz
-COMPONENT_ARCHIVE_HASH_2= sha1:18279249c27fee5bdedeaff169b9d1b70d135839
+COMPONENT_ARCHIVE_2= commons-pool-1.5.5-src.tar.gz
+COMPONENT_ARCHIVE_HASH_2= sha1:375408d445be1b87e935bb8e68cc9f746a3b59fb
 COMPONENT_ARCHIVE_URL_2= http://archive.apache.org/dist/commons/pool/source/$(COMPONENT_ARCHIVE_2)
-COMPONENT_ARCHIVE_3= eclipse-JDT-3.3.1.zip
-COMPONENT_ARCHIVE_HASH_3= sha1:9628f715ef2e53dd295164eafd70a95f64292d27
+COMPONENT_ARCHIVE_3= ecj.jar
+COMPONENT_ARCHIVE_HASH_3= sha1:f4ddfbb80cb97b0bdfa8730102db9fec1630a983
 COMPONENT_ARCHIVE_URL_3= http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/$(COMPONENT_ARCHIVE_3)
 
 include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
+include ../../make-rules/ant.mk
 include ../../make-rules/ips.mk
 
-TC_ENV=JAVA_HOME=$(JAVA_HOME)
-
-# We have no proto area with Tomcat. Instead several transformation rules
-# are used over mainly Tomcat output directory.
-PKG_PROTO_DIRS =  $(COMPONENT_DIR)
-PKG_PROTO_DIRS += $(BUILD_DIR_32)/output/build
-PKG_PROTO_DIRS += $(BUILD_DIR_32)/output/build/webapps
-PKG_PROTO_DIRS += $(COMPONENT_DIR)/Solaris
-PUBLISH_TRANSFORMS += solaris-transform
-
-GMAKE=ant
-COMPONENT_BUILD_TARGETS=-Dbase.path=$(BUILD_DIR_32) download deploy
-COMPONENT_BUILD_ENV+=$(TC_ENV)
+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.
-# Move default web application to different location so we can package
-# it in separate package and instead provide basic one.
 COMPONENT_POST_BUILD_ACTION= \
-	(cd $(@D)/output/build ; \
-	    gtar cfz conf/CONF.tar.gz conf/* ; \
-	    $(MV) webapps/ROOT webapps/ROOT.example )
+	(cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \
+	    gtar cfz conf/CONF.tar.gz conf/* )
 
 build:	$(BUILD_32)
 
 install: build
 
 test:  build
-	@cd $(BUILD_DIR_32)/test; $(ENV) $(TC_ENV) ant -Djunit.home=/usr/share/lib/java
+	@cd $(BUILD_DIR_32)/test; $(ENV) $(COMPONENT_BUILD_ENV) \
+	    $(ANT) $(COMPONENT_BUILD_ARGS) -Djunit.home=/usr/share/lib/java
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 

--- a/components/tomcat/Solaris/tomcat.1m	Fri Jun 03 05:25:28 2011 -0700
+++ b/components/tomcat/Solaris/tomcat.1m	Wed Jun 08 01:30:17 2011 -0700
@@ -1,7 +1,6 @@
 '\" te
-.\" Copyright (c) 2009, Sun Microsystems Inc.
-.\" All Rights Reserved.
-.TH tomcat 1M "October 2009" "SunOS 5.11" "System Administration Commands"
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+.TH tomcat 1M "June 2011" "SunOS 5.11" "System Administration Commands"
 .SH NAME
 tomcat \- Apache Tomcat Version 6 overview
 .SH DESCRIPTION
@@ -191,32 +190,7 @@
 (such as compiled JSP files) during its work.
 .RE
 
-.SH ATTRIBUTES
-.sp
-.LP
-See attributes(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-AttributeAttribute Value
-_
-Availabilityweb/java-servlet/tomcat
-_
-web/java-servlet/tomcat/tomcat-examples
-_
-Interface StabilityUncommitted
-.TE
-
 .SH SEE ALSO
 .sp
 .LP
-http://tomcat.apache.org
-.SH NOTES
-.sp
-.LP
-Source for Tomcat is available on http://opensolaris.org\&.
+http://tomcat.apache.org/tomcat-6.0-doc

--- a/components/tomcat/patches/build.properties.patch	Fri Jun 03 05:25:28 2011 -0700
+++ b/components/tomcat/patches/build.properties.patch	Wed Jun 08 01:30:17 2011 -0700
@@ -1,38 +1,30 @@
---- apache-tomcat-6.0.28-src/build.properties.default.orig	Thu Mar 17 22:16:15 2011
-+++ apache-tomcat-6.0.28-src/build.properties.default	Thu Mar 17 22:27:32 2011
-@@ -44,13 +44,13 @@
- compile.target=1.5
- compile.debug=true
- 
--base-commons.loc=http://archive.apache.org/dist/commons
--base-tomcat.loc=http://archive.apache.org/dist/tomcat
--base-sf.loc=http://downloads.sourceforge.net
-+base-commons.loc=file://${base.path}/../../
-+base-tomcat.loc=file://${base.path}/../../
-+base-sf.loc=file://${base.path}/../../
+--- apache-tomcat-6.0.32-src/build.properties.default	Wed Feb  2 11:07:31 2011
++++ apache-tomcat-6.0.32-src/build.properties.default	Thu Jun  2 05:02:15 2011
+@@ -49,6 +49,12 @@
+ base-sf.loc=http://downloads.sourceforge.net
+ base-maven1.loc=http://repo1.maven.org/maven
  
++# 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 -----
- commons-logging-version=1.1.1
--commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
-+commons-logging-src.loc=${base-commons.loc}/commons-logging-${commons-logging-version}-src.tar.gz
- 
- # ----- Webservices -----
- jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
-@@ -60,24 +60,24 @@
- jdt.home=${base.path}/eclipse/plugins
- jdt.lib=${jdt.home}
- jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
--jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
-+jdt.loc=${base-tomcat.loc}/eclipse-JDT-3.3.1.zip
+ # If this version is updated, check the versions required for the deps
+ # - avalon-framework
+@@ -108,7 +114,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/drops/${jdt.release}/ecj.jar
++jdt.loc.1=${userland-files.loc}/ecj.jar
+ jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj.jar
  
  # ----- Tomcat native library -----
- tomcat-native.version=1.1.20
- tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
- tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
--tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
--tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
-+tomcat-native.loc=${base-tomcat.loc}/tomcat-native-${tomcat-native.version}-src.tar.gz
-+tomcat-native.dll=${base-tomcat.loc}/binaries
+@@ -118,15 +124,15 @@
+ tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+ tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
  
 -# ----- Commons DBCP, version 1.1 or later -----
 -commons-dbcp.version=1.3
@@ -40,32 +32,13 @@
 +commons-dbcp.version=1.4
  commons-dbcp.home=${base.path}/commons-dbcp-${commons-dbcp.version}-src
 -commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
-+commons-dbcp-src.loc=${base-commons.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz
++commons-dbcp-src.loc=${userland-files.loc}/commons-dbcp-${commons-dbcp.version}-src.tar.gz
  
  # ----- Commons Pool, version 1.1 or later -----
- commons-pool.version=1.5.4
+ commons-pool.version=1.5.5
  commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
 -commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
-+commons-pool-src.loc=${base-commons.loc}/commons-pool-${commons-pool.version}-src.tar.gz
++commons-pool-src.loc=${userland-files.loc}/commons-pool-${commons-pool.version}-src.tar.gz
  
  # ----- NSIS, version 2.0 or later -----
  nsis.home=${base.path}/nsis-2.46
-@@ -85,7 +85,7 @@
- nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
- nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
- nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
--nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
-+nsis.loc=${base-sf.loc}/nsis-2.46.zip
- 
- # ----- Commons Daemon, version 1.0-Alpha or later -----
- commons-daemon.version=1.0.2
-@@ -95,6 +95,6 @@
- commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
- commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
- commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
--commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
--commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
--commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
-+commons-daemon.bin.loc=${base-commons.loc}/commons-daemon-${commons-daemon.version}-bin.tar.gz
-+commons-daemon.native.src.loc=${base-commons.loc}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
-+commons-daemon.native.win.loc=${base-commons.loc}/commons-daemon-${commons-daemon.version}-bin-windows.zip

--- a/components/tomcat/solaris-transform	Fri Jun 03 05:25:28 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Manual page, SMF stuff and our ROOT web application content is
-# delivered directly from $(COMPONENT_DIR)/Solaris.
-# Tomcat stuff except documentation is packaged in usr/tomcat6 and
-# var/tomcat6 directories from $(BUILD_DIR_32)/output/build.
-# While documentation packaged in usr/tomcat6/docs is picked from
-# $(BUILD_DIR_32)/output/build/webapps.
-
-<transform file path=usr/share/man/man1m/(.+)$ -> \
-	set action.hash %<\1> >
-<transform file path=usr/tomcat6/(.+)$ -> \
-	set action.hash %<\1> >
-<transform file path=lib/svc/manifest/network/(.+)$ -> \
-	set action.hash %<\1> >
-<transform file path=lib/svc/method/(.+)$ -> \
-	set action.hash %<\1> >
-<transform file path=var/tomcat6/(.+)$ -> \
-	set action.hash %<\1> >
-<transform file path=var/tomcat6/webapps/ROOT/(.+)$ -> \
-	set action.hash %<\1> >

--- a/components/tomcat/tomcat-examples.p5m	Fri Jun 03 05:25:28 2011 -0700
+++ b/components/tomcat/tomcat-examples.p5m	Wed Jun 08 01:30:17 2011 -0700
@@ -22,6 +22,14 @@
 #
 # Copyright (c) 2011, 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 \

--- a/components/tomcat/tomcat.license	Fri Jun 03 05:25:28 2011 -0700
+++ b/components/tomcat/tomcat.license	Wed Jun 08 01:30:17 2011 -0700
@@ -210,7 +210,7 @@
 conditions of the following licenses. 
 
 
-For the jasper-jdt.jar component:
+For the Eclipse JDT Java compiler:
 
 Eclipse Public License - v 1.0
 

--- a/components/tomcat/tomcat.p5m	Fri Jun 03 05:25:28 2011 -0700
+++ b/components/tomcat/tomcat.p5m	Wed Jun 08 01:30:17 2011 -0700
@@ -23,7 +23,19 @@
 # Copyright (c) 2011, 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 dir 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"
@@ -82,9 +94,9 @@
 dir path=var/tomcat6/webapps/manager/WEB-INF/jsp
 dir path=var/tomcat6/webapps/manager/images
 dir path=var/tomcat6/work group=webservd owner=webservd
-file path=lib/svc/manifest/network/http-tomcat6.xml
-file path=lib/svc/method/http-tomcat6
-file path=usr/share/man/man1m/tomcat.1m
+file Solaris/http-tomcat6.xml path=lib/svc/manifest/network/http-tomcat6.xml
+file Solaris/http-tomcat6 path=lib/svc/method/http-tomcat6
+file Solaris/tomcat.1m path=usr/share/man/man1m/tomcat.1m
 file path=usr/tomcat6/bin/bootstrap.jar
 file path=usr/tomcat6/bin/catalina-tasks.xml
 file path=usr/tomcat6/bin/catalina.sh
@@ -147,6 +159,7 @@
 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
@@ -203,9 +216,14 @@
 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
@@ -213,9 +231,9 @@
 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-3.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-jdt.jar
 file path=usr/tomcat6/lib/jasper.jar
 file path=usr/tomcat6/lib/jsp-api.jar
 file path=usr/tomcat6/lib/servlet-api.jar
@@ -242,6 +260,8 @@
     original_name=SUNWtcat:var/tomcat6/conf/web.xml
 file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew \
     original_name=SUNWtcat:var/tomcat6/webapps/ROOT/index.jsp
+file path=var/tomcat6/webapps/host-manager/401.jsp
+file path=var/tomcat6/webapps/host-manager/403.jsp
 file path=var/tomcat6/webapps/host-manager/META-INF/context.xml
 file path=var/tomcat6/webapps/host-manager/WEB-INF/web.xml
 file path=var/tomcat6/webapps/host-manager/images/add.gif
@@ -255,6 +275,7 @@
 file path=var/tomcat6/webapps/host-manager/images/void.gif
 file path=var/tomcat6/webapps/host-manager/manager.xml
 file path=var/tomcat6/webapps/manager/401.jsp
+file path=var/tomcat6/webapps/manager/403.jsp
 file path=var/tomcat6/webapps/manager/META-INF/context.xml
 file path=var/tomcat6/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 file path=var/tomcat6/webapps/manager/WEB-INF/jsp/sessionsList.jsp