You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by is...@apache.org on 2018/10/24 05:12:00 UTC
svn commit: r1844723 - in /tomcat/trunk/bin: makebase.bat makebase.sh
Author: isapir
Date: Wed Oct 24 05:12:00 2018
New Revision: 1844723
URL: http://svn.apache.org/viewvc?rev=1844723&view=rev
Log:
Added empty ROOT dir and run instructions to makebase
Modified:
tomcat/trunk/bin/makebase.bat
tomcat/trunk/bin/makebase.sh
Modified: tomcat/trunk/bin/makebase.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1844723&r1=1844722&r2=1844723&view=diff
==============================================================================
--- tomcat/trunk/bin/makebase.bat (original)
+++ tomcat/trunk/bin/makebase.bat Wed Oct 24 05:12:00 2018
@@ -90,6 +90,8 @@ if "%COPY_WEBAPPS%" == "true" (
) else (
rem copy conf directory without subdirectories and suppress warning
robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul
+ rem create empty ROOT directory
+ mkdir %BASE_TGT%\webapps\ROOT
)
rem copy setenv.bat if exists
@@ -97,8 +99,16 @@ robocopy %CATALINA_HOME%\bin %BASE_TGT%\
echo Created CATALINA_BASE directory at %BASE_TGT%
+echo
+echo You can launch the new instance by running:
+echo set CATALINA_HOME=%CATALINA_HOME%
+echo set CATALINA_BASE=%BASE_TGT%
+echo %%CATALINA_HOME%%/bin/catalina.bat run
+
+echo
echo Attention: The ports in conf\server.xml might be bound by a
-echo different instance. Please review your config files
-echo and update them where necessary.
+echo different instance. Please review your config files
+echo and update them where necessary.
+echo
:EOF
Modified: tomcat/trunk/bin/makebase.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1844723&r1=1844722&r2=1844723&view=diff
==============================================================================
--- tomcat/trunk/bin/makebase.sh (original)
+++ tomcat/trunk/bin/makebase.sh Wed Oct 24 05:12:00 2018
@@ -92,6 +92,8 @@ if [ "$COPY_WEBAPPS" = true ]; then
else
# copy conf directory without subdirectories and suppress warning
cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null
+ # create empty ROOT directory
+ mkdir "$BASE_TGT/webapps/ROOT"
fi
# copy setenv.sh if exists
@@ -100,6 +102,14 @@ fi
echo "Created CATALINA_BASE directory at $BASE_TGT"
+echo
+echo "You can launch the new instance by running:"
+echo " export CATALINA_HOME=$CATALINA_HOME"
+echo " export CATALINA_BASE=$BASE_TGT"
+echo " \$CATALINA_HOME/bin/catalina.sh run"
+
+echo
echo "Attention: The ports in conf/server.xml might be bound by a "
-echo " different instance. Please review your config files "
-echo " and update them as necessary."
+echo " different instance. Please review your config files "
+echo " and update them as necessary."
+echo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1844723 - in /tomcat/trunk/bin: makebase.bat makebase.sh
Posted by Igal Sapir <ig...@lucee.org>.
On Wed, Oct 24, 2018 at 9:01 AM Mark Thomas <ma...@apache.org> wrote:
> On October 24, 2018 3:44:23 PM UTC, Igal Sapir <ig...@lucee.org> wrote:
> >On Wed, Oct 24, 2018 at 1:55 AM Mark Thomas <ma...@apache.org> wrote:
> <snip/>
> >> >New Revision: 1844723
> >> >
> >> >URL: http://svn.apache.org/viewvc?rev=1844723&view=rev
> >> >Log:
> >> >Added empty ROOT dir
> >>
> >> What is the purpose of the above change?
> >
> >I always find myself adding a ROOT directory after using makebase, so I
> >thought that that is the case for most users. It seems to me that it'd
> >be easier to remove the empty directory in cases where it's not needed
> >than to add it in most cases.
> >
> >I actually considered asking for opinions here before changing, but
> >went ahead with the CTR workflow.
> >
> >Should I remove it?
>
> No need. I just wondered. I don't use the feature so I can't comment.
> Let's wait for some feedback before considering changing it.
>
Sounds good. I find the makebase utility very handy, and use it many times
when I want to test a Tomcat update outside of a development environment.
I actually showed how I use it in a video, at 2:57 [1], that I published
last month. At 4:34 [2] I create the ROOT directory, which is a step that
this change will make obsolete if we keep it.
Igal
[1] https://youtu.be/nuugoG5c-7M?t=177
[2] https://youtu.be/nuugoG5c-7M?t=274
> Mark
>
>
> >
> >Igal
> >
> >
> >> Mark
> >>
> >>
> >> > and run instructions to makebase
> >> >
> >> >Modified:
> >> > tomcat/trunk/bin/makebase.bat
> >> > tomcat/trunk/bin/makebase.sh
> >> >
> >> >Modified: tomcat/trunk/bin/makebase.bat
> >> >URL:
> >> >
> >>
> >
> http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1844723&r1=1844722&r2=1844723&view=diff
> >>
> >>
>
> >>==============================================================================
> >> >--- tomcat/trunk/bin/makebase.bat (original)
> >> >+++ tomcat/trunk/bin/makebase.bat Wed Oct 24 05:12:00 2018
> >> >@@ -90,6 +90,8 @@ if "%COPY_WEBAPPS%" == "true" (
> >> > ) else (
> >> > rem copy conf directory without subdirectories and suppress
> >warning
> >> > robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul
> >> >+ rem create empty ROOT directory
> >> >+ mkdir %BASE_TGT%\webapps\ROOT
> >> > )
> >> >
> >> > rem copy setenv.bat if exists
> >> >@@ -97,8 +99,16 @@ robocopy %CATALINA_HOME%\bin %BASE_TGT%\
> >> >
> >> > echo Created CATALINA_BASE directory at %BASE_TGT%
> >> >
> >> >+echo
> >> >+echo You can launch the new instance by running:
> >> >+echo set CATALINA_HOME=%CATALINA_HOME%
> >> >+echo set CATALINA_BASE=%BASE_TGT%
> >> >+echo %%CATALINA_HOME%%/bin/catalina.bat run
> >> >+
> >> >+echo
> >> > echo Attention: The ports in conf\server.xml might be bound by a
> >> >-echo different instance. Please review your config files
> >> >-echo and update them where necessary.
> >> >+echo different instance. Please review your config files
> >> >+echo and update them where necessary.
> >> >+echo
> >> >
> >> > :EOF
> >> >
> >> >Modified: tomcat/trunk/bin/makebase.sh
> >> >URL:
> >> >
> >>
> >
> http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1844723&r1=1844722&r2=1844723&view=diff
> >>
> >>
>
> >>==============================================================================
> >> >--- tomcat/trunk/bin/makebase.sh (original)
> >> >+++ tomcat/trunk/bin/makebase.sh Wed Oct 24 05:12:00 2018
> >> >@@ -92,6 +92,8 @@ if [ "$COPY_WEBAPPS" = true ]; then
> >> > else
> >> > # copy conf directory without subdirectories and suppress
> >warning
> >> > cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null
> >> >+ # create empty ROOT directory
> >> >+ mkdir "$BASE_TGT/webapps/ROOT"
> >> > fi
> >> >
> >> > # copy setenv.sh if exists
> >> >@@ -100,6 +102,14 @@ fi
> >> >
> >> > echo "Created CATALINA_BASE directory at $BASE_TGT"
> >> >
> >> >+echo
> >> >+echo "You can launch the new instance by running:"
> >> >+echo " export CATALINA_HOME=$CATALINA_HOME"
> >> >+echo " export CATALINA_BASE=$BASE_TGT"
> >> >+echo " \$CATALINA_HOME/bin/catalina.sh run"
> >> >+
> >> >+echo
> >> > echo "Attention: The ports in conf/server.xml might be bound by a "
> >> >-echo " different instance. Please review your config
> >files "
> >> >-echo " and update them as necessary."
> >> >+echo " different instance. Please review your config files "
> >> >+echo " and update them as necessary."
> >> >+echo
> >> >
> >> >
> >> >
> >>
> >>---------------------------------------------------------------------
> >> >To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> >> >For additional commands, e-mail: dev-help@tomcat.apache.org
> >>
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> >> For additional commands, e-mail: dev-help@tomcat.apache.org
> >>
> >>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: svn commit: r1844723 - in /tomcat/trunk/bin: makebase.bat makebase.sh
Posted by Mark Thomas <ma...@apache.org>.
On October 24, 2018 3:44:23 PM UTC, Igal Sapir <ig...@lucee.org> wrote:
>On Wed, Oct 24, 2018 at 1:55 AM Mark Thomas <ma...@apache.org> wrote:
>
>> On October 24, 2018 5:12:00 AM UTC, isapir@apache.org wrote:
>> >Author: isapir
>> >Date: Wed Oct 24 05:12:00 2018
>> >New Revision: 1844723
>> >
>> >URL: http://svn.apache.org/viewvc?rev=1844723&view=rev
>> >Log:
>> >Added empty ROOT dir
>>
>> What is the purpose of the above change?
>>
>
>I always find myself adding a ROOT directory after using makebase, so I
>thought that that is the case for most users. It seems to me that it'd
>be
>easier to remove the empty directory in cases where it's not needed
>than to
>add it in most cases.
>
>I actually considered asking for opinions here before changing, but
>went
>ahead with the CTR workflow.
>
>Should I remove it?
No need. I just wondered. I don't use the feature so I can't comment. Let's wait for some feedback before considering changing it.
Mark
>
>Igal
>
>
>> Mark
>>
>>
>> > and run instructions to makebase
>> >
>> >Modified:
>> > tomcat/trunk/bin/makebase.bat
>> > tomcat/trunk/bin/makebase.sh
>> >
>> >Modified: tomcat/trunk/bin/makebase.bat
>> >URL:
>> >
>>
>http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1844723&r1=1844722&r2=1844723&view=diff
>>
>>
>>==============================================================================
>> >--- tomcat/trunk/bin/makebase.bat (original)
>> >+++ tomcat/trunk/bin/makebase.bat Wed Oct 24 05:12:00 2018
>> >@@ -90,6 +90,8 @@ if "%COPY_WEBAPPS%" == "true" (
>> > ) else (
>> > rem copy conf directory without subdirectories and suppress
>warning
>> > robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul
>> >+ rem create empty ROOT directory
>> >+ mkdir %BASE_TGT%\webapps\ROOT
>> > )
>> >
>> > rem copy setenv.bat if exists
>> >@@ -97,8 +99,16 @@ robocopy %CATALINA_HOME%\bin %BASE_TGT%\
>> >
>> > echo Created CATALINA_BASE directory at %BASE_TGT%
>> >
>> >+echo
>> >+echo You can launch the new instance by running:
>> >+echo set CATALINA_HOME=%CATALINA_HOME%
>> >+echo set CATALINA_BASE=%BASE_TGT%
>> >+echo %%CATALINA_HOME%%/bin/catalina.bat run
>> >+
>> >+echo
>> > echo Attention: The ports in conf\server.xml might be bound by a
>> >-echo different instance. Please review your config files
>> >-echo and update them where necessary.
>> >+echo different instance. Please review your config files
>> >+echo and update them where necessary.
>> >+echo
>> >
>> > :EOF
>> >
>> >Modified: tomcat/trunk/bin/makebase.sh
>> >URL:
>> >
>>
>http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1844723&r1=1844722&r2=1844723&view=diff
>>
>>
>>==============================================================================
>> >--- tomcat/trunk/bin/makebase.sh (original)
>> >+++ tomcat/trunk/bin/makebase.sh Wed Oct 24 05:12:00 2018
>> >@@ -92,6 +92,8 @@ if [ "$COPY_WEBAPPS" = true ]; then
>> > else
>> > # copy conf directory without subdirectories and suppress
>warning
>> > cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null
>> >+ # create empty ROOT directory
>> >+ mkdir "$BASE_TGT/webapps/ROOT"
>> > fi
>> >
>> > # copy setenv.sh if exists
>> >@@ -100,6 +102,14 @@ fi
>> >
>> > echo "Created CATALINA_BASE directory at $BASE_TGT"
>> >
>> >+echo
>> >+echo "You can launch the new instance by running:"
>> >+echo " export CATALINA_HOME=$CATALINA_HOME"
>> >+echo " export CATALINA_BASE=$BASE_TGT"
>> >+echo " \$CATALINA_HOME/bin/catalina.sh run"
>> >+
>> >+echo
>> > echo "Attention: The ports in conf/server.xml might be bound by a "
>> >-echo " different instance. Please review your config
>files "
>> >-echo " and update them as necessary."
>> >+echo " different instance. Please review your config files "
>> >+echo " and update them as necessary."
>> >+echo
>> >
>> >
>> >
>>
>>---------------------------------------------------------------------
>> >To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> >For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1844723 - in /tomcat/trunk/bin: makebase.bat makebase.sh
Posted by Igal Sapir <ig...@lucee.org>.
On Wed, Oct 24, 2018 at 1:55 AM Mark Thomas <ma...@apache.org> wrote:
> On October 24, 2018 5:12:00 AM UTC, isapir@apache.org wrote:
> >Author: isapir
> >Date: Wed Oct 24 05:12:00 2018
> >New Revision: 1844723
> >
> >URL: http://svn.apache.org/viewvc?rev=1844723&view=rev
> >Log:
> >Added empty ROOT dir
>
> What is the purpose of the above change?
>
I always find myself adding a ROOT directory after using makebase, so I
thought that that is the case for most users. It seems to me that it'd be
easier to remove the empty directory in cases where it's not needed than to
add it in most cases.
I actually considered asking for opinions here before changing, but went
ahead with the CTR workflow.
Should I remove it?
Igal
> Mark
>
>
> > and run instructions to makebase
> >
> >Modified:
> > tomcat/trunk/bin/makebase.bat
> > tomcat/trunk/bin/makebase.sh
> >
> >Modified: tomcat/trunk/bin/makebase.bat
> >URL:
> >
> http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1844723&r1=1844722&r2=1844723&view=diff
>
> >==============================================================================
> >--- tomcat/trunk/bin/makebase.bat (original)
> >+++ tomcat/trunk/bin/makebase.bat Wed Oct 24 05:12:00 2018
> >@@ -90,6 +90,8 @@ if "%COPY_WEBAPPS%" == "true" (
> > ) else (
> > rem copy conf directory without subdirectories and suppress warning
> > robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul
> >+ rem create empty ROOT directory
> >+ mkdir %BASE_TGT%\webapps\ROOT
> > )
> >
> > rem copy setenv.bat if exists
> >@@ -97,8 +99,16 @@ robocopy %CATALINA_HOME%\bin %BASE_TGT%\
> >
> > echo Created CATALINA_BASE directory at %BASE_TGT%
> >
> >+echo
> >+echo You can launch the new instance by running:
> >+echo set CATALINA_HOME=%CATALINA_HOME%
> >+echo set CATALINA_BASE=%BASE_TGT%
> >+echo %%CATALINA_HOME%%/bin/catalina.bat run
> >+
> >+echo
> > echo Attention: The ports in conf\server.xml might be bound by a
> >-echo different instance. Please review your config files
> >-echo and update them where necessary.
> >+echo different instance. Please review your config files
> >+echo and update them where necessary.
> >+echo
> >
> > :EOF
> >
> >Modified: tomcat/trunk/bin/makebase.sh
> >URL:
> >
> http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1844723&r1=1844722&r2=1844723&view=diff
>
> >==============================================================================
> >--- tomcat/trunk/bin/makebase.sh (original)
> >+++ tomcat/trunk/bin/makebase.sh Wed Oct 24 05:12:00 2018
> >@@ -92,6 +92,8 @@ if [ "$COPY_WEBAPPS" = true ]; then
> > else
> > # copy conf directory without subdirectories and suppress warning
> > cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null
> >+ # create empty ROOT directory
> >+ mkdir "$BASE_TGT/webapps/ROOT"
> > fi
> >
> > # copy setenv.sh if exists
> >@@ -100,6 +102,14 @@ fi
> >
> > echo "Created CATALINA_BASE directory at $BASE_TGT"
> >
> >+echo
> >+echo "You can launch the new instance by running:"
> >+echo " export CATALINA_HOME=$CATALINA_HOME"
> >+echo " export CATALINA_BASE=$BASE_TGT"
> >+echo " \$CATALINA_HOME/bin/catalina.sh run"
> >+
> >+echo
> > echo "Attention: The ports in conf/server.xml might be bound by a "
> >-echo " different instance. Please review your config files "
> >-echo " and update them as necessary."
> >+echo " different instance. Please review your config files "
> >+echo " and update them as necessary."
> >+echo
> >
> >
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> >For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: svn commit: r1844723 - in /tomcat/trunk/bin: makebase.bat makebase.sh
Posted by Mark Thomas <ma...@apache.org>.
On October 24, 2018 5:12:00 AM UTC, isapir@apache.org wrote:
>Author: isapir
>Date: Wed Oct 24 05:12:00 2018
>New Revision: 1844723
>
>URL: http://svn.apache.org/viewvc?rev=1844723&view=rev
>Log:
>Added empty ROOT dir
What is the purpose of the above change?
Mark
> and run instructions to makebase
>
>Modified:
> tomcat/trunk/bin/makebase.bat
> tomcat/trunk/bin/makebase.sh
>
>Modified: tomcat/trunk/bin/makebase.bat
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1844723&r1=1844722&r2=1844723&view=diff
>==============================================================================
>--- tomcat/trunk/bin/makebase.bat (original)
>+++ tomcat/trunk/bin/makebase.bat Wed Oct 24 05:12:00 2018
>@@ -90,6 +90,8 @@ if "%COPY_WEBAPPS%" == "true" (
> ) else (
> rem copy conf directory without subdirectories and suppress warning
> robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul
>+ rem create empty ROOT directory
>+ mkdir %BASE_TGT%\webapps\ROOT
> )
>
> rem copy setenv.bat if exists
>@@ -97,8 +99,16 @@ robocopy %CATALINA_HOME%\bin %BASE_TGT%\
>
> echo Created CATALINA_BASE directory at %BASE_TGT%
>
>+echo
>+echo You can launch the new instance by running:
>+echo set CATALINA_HOME=%CATALINA_HOME%
>+echo set CATALINA_BASE=%BASE_TGT%
>+echo %%CATALINA_HOME%%/bin/catalina.bat run
>+
>+echo
> echo Attention: The ports in conf\server.xml might be bound by a
>-echo different instance. Please review your config files
>-echo and update them where necessary.
>+echo different instance. Please review your config files
>+echo and update them where necessary.
>+echo
>
> :EOF
>
>Modified: tomcat/trunk/bin/makebase.sh
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1844723&r1=1844722&r2=1844723&view=diff
>==============================================================================
>--- tomcat/trunk/bin/makebase.sh (original)
>+++ tomcat/trunk/bin/makebase.sh Wed Oct 24 05:12:00 2018
>@@ -92,6 +92,8 @@ if [ "$COPY_WEBAPPS" = true ]; then
> else
> # copy conf directory without subdirectories and suppress warning
> cp "${CATALINA_HOME}/conf"/* "$BASE_TGT/conf" 2> /dev/null
>+ # create empty ROOT directory
>+ mkdir "$BASE_TGT/webapps/ROOT"
> fi
>
> # copy setenv.sh if exists
>@@ -100,6 +102,14 @@ fi
>
> echo "Created CATALINA_BASE directory at $BASE_TGT"
>
>+echo
>+echo "You can launch the new instance by running:"
>+echo " export CATALINA_HOME=$CATALINA_HOME"
>+echo " export CATALINA_BASE=$BASE_TGT"
>+echo " \$CATALINA_HOME/bin/catalina.sh run"
>+
>+echo
> echo "Attention: The ports in conf/server.xml might be bound by a "
>-echo " different instance. Please review your config files "
>-echo " and update them as necessary."
>+echo " different instance. Please review your config files "
>+echo " and update them as necessary."
>+echo
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>For additional commands, e-mail: dev-help@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org