Skip to content

Commit 2b02435

Browse files
Lubos Koscotrondn
Lubos Kosco
authored andcommitted
add tomcat 5.5 for linux
add the indicator for polling of autocomplete
1 parent 7d3d639 commit 2b02435

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

OpenGrok

+18-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#
1010
# Supported Deployment Engines:
1111
# - Tomcat 6
12+
# - Tomcat 5.5
1213
# - Glassfish
1314
#
1415
# Supported Environment Variables:
@@ -42,7 +43,7 @@
4243
Usage()
4344
{
4445
echo 1>&2
45-
echo "Usage: ${0} <deploy|update|updateQuietly|updateConfiguration|usage>" 1>&2
46+
echo "Usage: ${0} <deploy|update|updateQuietly|usage>" 1>&2
4647
echo " ${0} index [<directory>]" 1>&2
4748
echo 1>&2
4849
echo " Optional environment variables:" 1>&2
@@ -148,6 +149,9 @@ DefaultInstanceConfiguration()
148149
# REQUIRED: Java Virtual Machine
149150
JAVA="${JAVA:-$JAVA_HOME/bin/java}"
150151

152+
# DEVELOPMENT: Debug option, if enabled current indexer will listen on the port 8010 until a debugger connects
153+
#JAVA_DEBUG="-agentlib:jdwp=transport=dt_socket,server=y,address=8010,suspend=y"
154+
151155
# OPTIONAL: Ignore these patterns as names of files or directories
152156
#IGNORE_PATTERNS="-i dummy"
153157

@@ -195,6 +199,11 @@ DefaultInstanceConfiguration()
195199
CVS="`Which cvs`"
196200
SVN="`Which svn`"
197201
SCCS="`Which sccs`"
202+
CLEARCASE="`Which cleartool`"
203+
GIT="`Which git`"
204+
P4="`Which p4`"
205+
MTN="`Which mtn`"
206+
BZR="`Which bzr`"
198207

199208
# OPTIONAL: Override Built-in Properties
200209
# Assumption: We should not set properties to the empty string
@@ -203,6 +212,11 @@ ${HG:+-Dorg.opensolaris.opengrok.history.Mercurial=$HG} \
203212
${CVS:+-Dorg.opensolaris.opengrok.history.cvs=$CVS} \
204213
${SVN:+-Dorg.opensolaris.opengrok.history.Subversion=$SVN} \
205214
${SCCS:+-Dorg.opensolaris.opengrok.history.SCCS=$SCCS} \
215+
${CLEARCASE:+-Dorg.opensolaris.opengrok.history.ClearCase=$CLEARCASE} \
216+
${GIT:+-Dorg.opensolaris.opengrok.history.git=$GIT} \
217+
${P4:+-Dorg.opensolaris.opengrok.history.Perforce=$P4} \
218+
${MTN:+-Dorg.opensolaris.opengrok.history.Monotone=$MTN} \
219+
${BZR:+-Dorg.opensolaris.opengrok.history.Bazaar=$BZR} \
206220
"
207221

208222
# OPTIONAL: Store The History Cache in Java DB (derby),
@@ -357,6 +371,7 @@ FindApplicationServerType()
357371

358372
if [ -d "/var/tomcat6/webapps" \
359373
-o -d "/var/lib/tomcat6/webapps" \
374+
-o -d "/var/lib/tomcat5.5/webapps" \
360375
]
361376
then
362377
echo "Tomcat"
@@ -389,6 +404,7 @@ DetermineWarDirectoryTomcat()
389404
${OPENGROK_TOMCAT_BASE} \
390405
/var/tomcat6 \
391406
/var/lib/tomcat6 \
407+
/var/lib/tomcat5.5 \
392408

393409
do
394410
if [ -d "${prefix}/webapps" ]
@@ -559,6 +575,7 @@ StdInvocation()
559575
{
560576
${DO} ${JAVA} ${JAVA_OPTS} ${PROPERTIES} \
561577
${LOGGER_PROPERTIES} \
578+
${JAVA_DEBUG} \
562579
-jar ${OPENGROK_JAR} \
563580
${IGNORE_PATTERNS} ${ENABLE_PROJECTS} \
564581
${DERBY_HISTORY_CACHE} \

web/indicator.gif

1.52 KB
Loading

0 commit comments

Comments
 (0)