[csw-devel] SF.net SVN: gar:[11260] csw/mgar/pkg/tomcat6/branches/ihsan

[idogan23 at users.sourceforge.net]

Revision: 11260
          http://gar.svn.sourceforge.net/gar/?rev=11260&view=rev
Author:   idogan23
Date:     2010-10-12 08:39:32 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
tomcat6: if available, use OpenCSW java

Modified Paths:
--------------
    csw/mgar/pkg/tomcat6/branches/ihsan/checksums
    csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6

Modified: csw/mgar/pkg/tomcat6/branches/ihsan/checksums
===================================================================
--- csw/mgar/pkg/tomcat6/branches/ihsan/checksums	2010-10-12 08:20:26 UTC (rev 11259)
+++ csw/mgar/pkg/tomcat6/branches/ihsan/checksums	2010-10-12 08:39:32 UTC (rev 11260)
@@ -1,4 +1,4 @@
 a17ccfe15231276c88f63d44334f58d5  LICENSE
 7d614e03d18d3f21fcfdff96f0b6c311  apache-tomcat-6.0.29.tar.gz
-2976e1c7cc26913a698455a7148471df  cswtomcat6
+086e84cce8156899aa3d563da69c33c1  cswtomcat6
 bca5f2de734691fbc486cf00020d81f1  cswusergroup

Modified: csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6
===================================================================
--- csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6	2010-10-12 08:20:26 UTC (rev 11259)
+++ csw/mgar/pkg/tomcat6/branches/ihsan/files/cswtomcat6	2010-10-12 08:39:32 UTC (rev 11260)
@@ -76,7 +76,14 @@
 SPECIFIC_CONFIG_FILE=/etc/opt/csw/tomcat6/conf
 GLOBAL_CONFIG_FILE=/opt/csw/etc/tomcat6/conf/tomcat6
 
-JAVA_HOME=/usr/java
+# If available, use the OpenCSW Java package
+if [ -L /opt/csw/java/jre/jre6 ]
+then
+	JAVA_HOME=/opt/csw/java/jre/jre6
+else
+	JAVA_HOME=/usr/java
+fi
+
 TOMCAT_USER=tomcat
 
 ##################################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.