--- a/components/tomcat/tomcat.p5m	Mon Mar 31 06:47:28 2014 -0700
+++ b/components/tomcat/tomcat.p5m	Mon Apr 07 04:34:44 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/tomcat6/(.+)$ -> \
@@ -33,14 +33,14 @@
         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/.* -> \
+<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=9075
+set name=com.oracle.info.tpno value=17010
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -48,54 +48,10 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest
-dir path=lib/svc/manifest/network
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1m
-dir path=usr/tomcat6
-dir path=usr/tomcat6/bin
-dir path=usr/tomcat6/docs
-dir path=usr/tomcat6/docs/WEB-INF
-dir path=usr/tomcat6/docs/api
-dir path=usr/tomcat6/docs/appdev
-dir path=usr/tomcat6/docs/appdev/sample
-dir path=usr/tomcat6/docs/appdev/sample/docs
-dir path=usr/tomcat6/docs/appdev/sample/src
-dir path=usr/tomcat6/docs/appdev/sample/src/mypackage
-dir path=usr/tomcat6/docs/appdev/sample/web
-dir path=usr/tomcat6/docs/appdev/sample/web/WEB-INF
-dir path=usr/tomcat6/docs/appdev/sample/web/images
-dir path=usr/tomcat6/docs/architecture
-dir path=usr/tomcat6/docs/architecture/requestProcess
-dir path=usr/tomcat6/docs/architecture/startup
-dir path=usr/tomcat6/docs/config
-dir path=usr/tomcat6/docs/funcspecs
-dir path=usr/tomcat6/docs/images
-dir path=usr/tomcat6/docs/tribes
-dir path=usr/tomcat6/lib
-dir path=var
-dir path=var/tomcat6
 dir path=var/tomcat6/conf group=webservd owner=webservd
 dir path=var/tomcat6/logs group=webservd owner=webservd mode=0700
 dir path=var/tomcat6/temp group=webservd owner=webservd
 dir path=var/tomcat6/webapps group=webservd owner=webservd
-dir path=var/tomcat6/webapps/ROOT
-dir path=var/tomcat6/webapps/host-manager
-dir path=var/tomcat6/webapps/host-manager/META-INF
-dir path=var/tomcat6/webapps/host-manager/WEB-INF
-dir path=var/tomcat6/webapps/host-manager/WEB-INF/jsp
-dir path=var/tomcat6/webapps/host-manager/images
-dir path=var/tomcat6/webapps/manager
-dir path=var/tomcat6/webapps/manager/META-INF
-dir path=var/tomcat6/webapps/manager/WEB-INF
-dir path=var/tomcat6/webapps/manager/WEB-INF/jsp
-dir path=var/tomcat6/webapps/manager/images
 dir path=var/tomcat6/work group=webservd owner=webservd
 file Solaris/http-tomcat6.xml path=lib/svc/manifest/network/http-tomcat6.xml
 file Solaris/http-tomcat6 path=lib/svc/method/http-tomcat6
@@ -234,7 +190,7 @@
 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.2.2.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