Author: vgritsenko
Date: Fri Nov 7 09:52:49 2008
New Revision: 712208
URL: http://svn.apache.org/viewvc?rev=712208&view=rev
Log:
Fix 'debug' command - new jetty does not seem to have admin servlet
Removed:
xml/xindice/trunk/tools/jetty/conf/admin.xml
Modified:
xml/xindice/trunk/xindiced
xml/xindice/trunk/xindiced.bat
Modified: xml/xindice/trunk/xindiced
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/xindiced?rev=712208&r1=712207&r2=712208&view=diff
==============================================================================
--- xml/xindice/trunk/xindiced (original)
+++ xml/xindice/trunk/xindiced Fri Nov 7 09:52:49 2008
@@ -97,10 +97,6 @@
JETTY_PORT=8888
fi
-if [ "$JETTY_ADMIN_PORT" = "" ] ; then
- JETTY_ADMIN_PORT=8889
-fi
-
if [ "$JETTY_WEBAPP" = "" ] ; then
JETTY_WEBAPP=`ls $XINDICE_HOME/xindice-*.war | head -n 1`
fi
@@ -148,7 +144,7 @@
-Dxindice.home=$XINDICE_HOME -Dxindice.db.home=$XINDICE_DB_HOME -Dxindice.configuration=$XINDICE_CONFIG \
-Dorg.apache.commons.logging.Log=$LOGGER -Dorg.apache.commons.logging.simplelog.defaultlog=$LOGLEVEL \
-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser \
- -Djetty.home=$XINDICE_HOME/tools/jetty -Djetty.port=$JETTY_PORT -Djetty.admin.port=$JETTY_ADMIN_PORT \
+ -Djetty.home=$XINDICE_HOME/tools/jetty -Djetty.port=$JETTY_PORT \
-Dwebapp=$JETTY_WEBAPP"
case "$ACTION" in
@@ -178,7 +174,7 @@
;;
debug)
- "$JAVACMD" $JAVA_OPTIONS -Xdebug -Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n $JAVAARGS org.mortbay.start.Main "$JETTY_CONFIG" "$XINDICE_HOME/tools/jetty/conf/admin.xml" >> $XINDICE_HOME/logs/xindice.out 2>&1
+ "$JAVACMD" $JAVA_OPTIONS -Xdebug -Xrunjdwp:transport=dt_socket,address=$JAVA_DEBUG_PORT,server=y,suspend=n $JAVAARGS org.mortbay.start.Main "$JETTY_CONFIG" >> $XINDICE_HOME/logs/xindice.out 2>&1
;;
stop)
Modified: xml/xindice/trunk/xindiced.bat
URL: http://svn.apache.org/viewvc/xml/xindice/trunk/xindiced.bat?rev=712208&r1=712207&r2=712208&view=diff
==============================================================================
--- xml/xindice/trunk/xindiced.bat (original)
+++ xml/xindice/trunk/xindiced.bat Fri Nov 7 09:52:49 2008
@@ -93,11 +93,6 @@
set _JETTY_PORT=8888
:gotPort
-set _JETTY_ADMIN_PORT=%JETTY_ADMIN_PORT%
-if not "%_JETTY_ADMIN_PORT%" == "" goto gotAdminPort
-set _JETTY_ADMIN_PORT=8889
-:gotAdminPort
-
set _JETTY_WEBAPP=%JETTY_WEBAPP%
if not "%_JETTY_WEBAPP%" == "" goto gotWebapp
set _JETTY_WEBAPP=%_XINDICE_HOME%\xindice-1.2-dev.war
@@ -108,7 +103,7 @@
set _JAVA_DEBUG_PORT=8000
:gotDebugPort
-set _JAVA_ARGS=-classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Djetty.admin.port=%_JETTY_ADMIN_PORT% -Dwebapp=%_JETTY_WEBAPP%
+set _JAVA_ARGS=-classpath %LOCALCLASSPATH% -Djava.endorsed.dirs=lib\endorsed -Dxindice.home="%_XINDICE_HOME%" -Dxindice.db.home="%_XINDICE_HOME%" -Dxindice.configuration="%_XINDICE_CONFIG%" -Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser -Djetty.port=%_JETTY_PORT% -Dwebapp=%_JETTY_WEBAPP%
:: ----- Check action ----------------------------------------------------------
@@ -138,7 +133,7 @@
:: ----- Servlet Debug ---------------------------------------------------------
:doDebug
-%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n %_JAVA_ARGS% -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG org.mortbay.jetty.Server tools\jetty\conf\main.xml tools\jetty\conf\admin.xml
+%_EXEC% %_JAVACMD% %_JAVA_OPTIONS% -Xdebug -Xrunjdwp:transport=dt_socket,address=%_JAVA_DEBUG_PORT%,server=y,suspend=n %_JAVA_ARGS% -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=DEBUG org.mortbay.jetty.Server tools\jetty\conf\main.xml
goto end
@@ -157,7 +152,6 @@
set _EXEC=
set _JAVA_OPTIONS=
set _JETTY_PORT=
-set _JETTY_ADMIN_PORT=
set _JETTY_WEBAPP=
set _JAVA_DEBUG_PORT=
set LOCALCLASSPATH=
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.