--- a/components/tomcat/tomcat-examples.p5m Mon Mar 31 06:47:28 2014 -0700
+++ b/components/tomcat/tomcat-examples.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=var/tomcat6/(.+)$ -> \
@@ -35,7 +35,7 @@
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=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)
@@ -43,68 +43,6 @@
set name=org.opensolaris.arc-caseid \
value=PSARC/2008/711
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=var
-dir path=var/tomcat6
-dir path=var/tomcat6/webapps group=webservd owner=webservd
-dir path=var/tomcat6/webapps/ROOT
-dir path=var/tomcat6/webapps/ROOT.example
-dir path=var/tomcat6/webapps/ROOT.example/WEB-INF
-dir path=var/tomcat6/webapps/examples
-dir path=var/tomcat6/webapps/examples/WEB-INF
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/cal
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/chat
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/colors
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/dates
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/error
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/examples
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/filters
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/num
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/util
-dir path=var/tomcat6/webapps/examples/WEB-INF/classes/validators
-dir path=var/tomcat6/webapps/examples/WEB-INF/jsp
-dir path=var/tomcat6/webapps/examples/WEB-INF/jsp/applet
-dir path=var/tomcat6/webapps/examples/WEB-INF/jsp2
-dir path=var/tomcat6/webapps/examples/WEB-INF/lib
-dir path=var/tomcat6/webapps/examples/WEB-INF/tags
-dir path=var/tomcat6/webapps/examples/jsp
-dir path=var/tomcat6/webapps/examples/jsp/cal
-dir path=var/tomcat6/webapps/examples/jsp/chat
-dir path=var/tomcat6/webapps/examples/jsp/checkbox
-dir path=var/tomcat6/webapps/examples/jsp/colors
-dir path=var/tomcat6/webapps/examples/jsp/dates
-dir path=var/tomcat6/webapps/examples/jsp/error
-dir path=var/tomcat6/webapps/examples/jsp/forward
-dir path=var/tomcat6/webapps/examples/jsp/images
-dir path=var/tomcat6/webapps/examples/jsp/include
-dir path=var/tomcat6/webapps/examples/jsp/jsp2
-dir path=var/tomcat6/webapps/examples/jsp/jsp2/el
-dir path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute
-dir path=var/tomcat6/webapps/examples/jsp/jsp2/jspx
-dir path=var/tomcat6/webapps/examples/jsp/jsp2/misc
-dir path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag
-dir path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles
-dir path=var/tomcat6/webapps/examples/jsp/jsptoserv
-dir path=var/tomcat6/webapps/examples/jsp/num
-dir path=var/tomcat6/webapps/examples/jsp/plugin
-dir path=var/tomcat6/webapps/examples/jsp/plugin/applet
-dir path=var/tomcat6/webapps/examples/jsp/security
-dir path=var/tomcat6/webapps/examples/jsp/security/protected
-dir path=var/tomcat6/webapps/examples/jsp/sessions
-dir path=var/tomcat6/webapps/examples/jsp/simpletag
-dir path=var/tomcat6/webapps/examples/jsp/snp
-dir path=var/tomcat6/webapps/examples/jsp/tagplugin
-dir path=var/tomcat6/webapps/examples/jsp/xml
-dir path=var/tomcat6/webapps/examples/servlets
-dir path=var/tomcat6/webapps/examples/servlets/images
file path=var/tomcat6/webapps/ROOT.example/RELEASE-NOTES.txt
file path=var/tomcat6/webapps/ROOT.example/WEB-INF/web.xml
file path=var/tomcat6/webapps/ROOT.example/asf-logo-wide.gif
@@ -471,3 +409,5 @@
link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs
license tomcat.license license="Apache v2.0"
+
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/tomcat6/bin/bootstrap.jar