aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorale <ale@FreeBSD.org>2009-07-30 00:25:15 +0800
committerale <ale@FreeBSD.org>2009-07-30 00:25:15 +0800
commit44868da29ffd9fc03947dd0cadd4db36690b2def (patch)
tree30ac33bb4d64333f3fcd8eef66857b11496ea7e1
parent90885bb58237b54f91de40f4d209f911a02b7449 (diff)
downloadfreebsd-ports-gnome-44868da29ffd9fc03947dd0cadd4db36690b2def.tar.gz
freebsd-ports-gnome-44868da29ffd9fc03947dd0cadd4db36690b2def.tar.zst
freebsd-ports-gnome-44868da29ffd9fc03947dd0cadd4db36690b2def.zip
Fix endorsed dir.
-rw-r--r--www/tomcat6/files/tomcat6.sh.in4
-rw-r--r--www/tomcat7/files/tomcat6.sh.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/www/tomcat6/files/tomcat6.sh.in b/www/tomcat6/files/tomcat6.sh.in
index 66486830b61f..a2266c310a97 100644
--- a/www/tomcat6/files/tomcat6.sh.in
+++ b/www/tomcat6/files/tomcat6.sh.in
@@ -95,8 +95,8 @@ fi
java_command="%%LOCALBASE%%/bin/java \
${tomcat%%TOMCAT_VERSION%%_java_opts} \
- -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
- -classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
+ -Djava.endorsed.dirs=%%TOMCAT_HOME%%/endorsed \
+ -classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:${tomcat%%TOMCAT_VERSION%%_classpath} \
-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \
diff --git a/www/tomcat7/files/tomcat6.sh.in b/www/tomcat7/files/tomcat6.sh.in
index 66486830b61f..a2266c310a97 100644
--- a/www/tomcat7/files/tomcat6.sh.in
+++ b/www/tomcat7/files/tomcat6.sh.in
@@ -95,8 +95,8 @@ fi
java_command="%%LOCALBASE%%/bin/java \
${tomcat%%TOMCAT_VERSION%%_java_opts} \
- -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS \
- -classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:%%TOMCAT_HOME%%/bin/commons-logging-api.jar:${tomcat%%TOMCAT_VERSION%%_classpath} \
+ -Djava.endorsed.dirs=%%TOMCAT_HOME%%/endorsed \
+ -classpath %%TOMCAT_HOME%%/%%JAR_FILE%%:${tomcat%%TOMCAT_VERSION%%_classpath} \
-Dcatalina.base=${tomcat%%TOMCAT_VERSION%%_catalina_base} \
-Dcatalina.home=${tomcat%%TOMCAT_VERSION%%_catalina_home} \
-Djava.io.tmpdir=${tomcat%%TOMCAT_VERSION%%_catalina_tmpdir} \