Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tomcat/tomcat-examples.p5m
changeset 3732 0f62cc221c7e
parent 1948 2d1537e7942d
child 4295 8e6a71e8754b 
--- a/components/tomcat/tomcat-examples.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/tomcat/tomcat-examples.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=var/tomcat6/(.+)$ -> \
@@ -29,19 +29,16 @@
     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=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.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
@@ -53,32 +50,25 @@
 file path=var/tomcat6/webapps/ROOT.example/tomcat-power.gif
 file path=var/tomcat6/webapps/ROOT.example/tomcat.gif
 file path=var/tomcat6/webapps/ROOT.example/tomcat.svg
-file path=var/tomcat6/webapps/ROOT/index.htm mode=0644 preserve=renamenew \
-    original_name=SUNWtcat-examples:var/tomcat6/webapps/ROOT/index.htm
+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/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/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
@@ -89,124 +79,73 @@
 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$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.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/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/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/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/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.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/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
@@ -285,16 +224,12 @@
 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/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/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
@@ -306,8 +241,7 @@
 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/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
@@ -319,13 +253,10 @@
 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/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/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
@@ -335,8 +266,7 @@
 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/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
@@ -406,8 +336,6 @@
 file path=var/tomcat6/webapps/examples/servlets/reqinfo.html
 file path=var/tomcat6/webapps/examples/servlets/reqparams.html
 file path=var/tomcat6/webapps/examples/servlets/sessions.html
-link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs
-
 license tomcat.license license="Apache v2.0"
-
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/tomcat6/bin/bootstrap.jar
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/tomcat6/bin/bootstrap.jar
upstream/oracle/userland-gate