[pkg-java] r13433 - trunk/tomcat6/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2011-03-16 13:32:50 +0000 (Wed, 16 Mar 2011)
New Revision: 13433

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6-instance-create
   trunk/tomcat6/debian/tomcat6-user.install
Log:
debian/tomcat6-instance-create: Eclipse can now be configured to use a
user instance of tomcat6 using tomcat6-instance-create without any
additional work. Patch from Abhinav Upadhyay (Closes: #551091, LP: #297675)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2011-03-15 22:04:04 UTC (rev 13432)
+++ trunk/tomcat6/debian/changelog	2011-03-16 13:32:50 UTC (rev 13433)
@@ -1,5 +1,6 @@
 tomcat6 (6.0.32-2) UNRELEASED; urgency=low
 
+  [ tony mancill ]
   * Patch debian/tomcat6-instance-create (LP: #707405)
     tomcat6-instance-create should accept -1 as the value of -c option
     as per http://tomcat.apache.org/tomcat-6.0-doc/config/server.html
@@ -7,8 +8,13 @@
   * Move tomcat6-instance-create manpage from section 2 to section 8.
     Thanks to brian m. carlson (Closes: #607682)
 
- -- tony mancill <tmancill at debian.org>  Mon, 14 Mar 2011 21:53:24 -0700
+  [ Thierry Carrez ]
+  * debian/tomcat6-instance-create: Eclipse can now be configured to use a
+    user instance of tomcat6 using tomcat6-instance-create without any
+    additional work. Patch from Abhinav Upadhyay (Closes: #551091, LP: #297675)
 
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Wed, 16 Mar 2011 14:28:01 +0100
+
 tomcat6 (6.0.32-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/tomcat6/debian/tomcat6-instance-create
===================================================================
--- trunk/tomcat6/debian/tomcat6-instance-create	2011-03-15 22:04:04 UTC (rev 13432)
+++ trunk/tomcat6/debian/tomcat6-instance-create	2011-03-16 13:32:50 UTC (rev 13433)
@@ -128,6 +128,10 @@
 mkdir ${TARGET}/temp
 cp -r /usr/share/tomcat6/skel/* ${TARGET}
 
+# Create necessary symbolic links so that eclipse can be properly configured
+ln -s /usr/share/tomcat6/lib ${TARGET}/lib
+ln -s /usr/share/tomcat6/bin/bootstrap.jar ${TARGET}/bin/bootstrap.jar
+
 sed -i -e "s/Connector port=\"8080\"/Connector port=\"${HPORT}\"/;s/Server port=\"8005\" shutdown=\"SHUTDOWN\"/Server port=\"${CPORT}\" shutdown=\"${CWORD}\"/" ${TARGET}/conf/server.xml
 
 cat > ${TARGET}/bin/startup.sh << EOT

Modified: trunk/tomcat6/debian/tomcat6-user.install
===================================================================
--- trunk/tomcat6/debian/tomcat6-user.install	2011-03-15 22:04:04 UTC (rev 13432)
+++ trunk/tomcat6/debian/tomcat6-user.install	2011-03-16 13:32:50 UTC (rev 13433)
@@ -1,5 +1,6 @@
 conf/*.xml /usr/share/tomcat6/skel/conf/
 conf/catalina.properties /usr/share/tomcat6/skel/conf/
+conf/catalina.policy /usr/share/tomcat6/skel/conf/
 debian/logging.properties /usr/share/tomcat6/skel/conf/
 debian/tomcat6-instance-create /usr/bin/
 debian/setenv.sh /usr/share/tomcat6/skel/bin/