--- a/components/tomcat/tomcat.p5m Thu May 12 13:33:56 2011 -0700
+++ b/components/tomcat/tomcat.p5m Fri May 13 10:23:04 2011 -0700
@@ -225,15 +225,23 @@
file path=usr/tomcat6/lib/tomcat-i18n-fr.jar
file path=usr/tomcat6/lib/tomcat-i18n-ja.jar
file path=var/tomcat6/conf/CONF.tar.gz
-file path=var/tomcat6/conf/catalina.policy mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/catalina.properties mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/context.xml mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/logging.properties mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/server.xml mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/catalina.policy mode=0644 preserve=renamenew \
+ original_name=SUNWtcat:var/tomcat6/conf/catalina.policy
+file path=var/tomcat6/conf/catalina.properties mode=0644 preserve=renamenew \
+ original_name=SUNWtcat:var/tomcat6/conf/catalina.properties
+file path=var/tomcat6/conf/context.xml mode=0644 preserve=renamenew \
+ original_name=SUNWtcat:var/tomcat6/conf/context.xml
+file path=var/tomcat6/conf/logging.properties mode=0644 preserve=renamenew \
+ original_name=SUNWtcat:var/tomcat6/conf/logging.properties
+file path=var/tomcat6/conf/server.xml mode=0644 preserve=renamenew \
+ original_name=SUNWtcat:var/tomcat6/conf/server.xml
file path=var/tomcat6/conf/tomcat-users.xml group=webservd mode=0600 \
- owner=webservd preserve=renamenew
-file path=var/tomcat6/conf/web.xml mode=0644 preserve=renamenew
-file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew
+ owner=webservd preserve=renamenew \
+ original_name=SUNWtcat:var/tomcat6/conf/tomcat-users.xml
+file path=var/tomcat6/conf/web.xml mode=0644 preserve=renamenew \
+ 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/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