You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/12/09 19:20:49 UTC
svn commit: r485023 - in
/incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver: conf/httpd.conf
startserver.bat startserver.sh
Author: jsdelfino
Date: Sat Dec 9 10:20:48 2006
New Revision: 485023
URL: http://svn.apache.org/viewvc?view=rev&rev=485023
Log:
Added configuration of HTTPD DocumentRoot.
Modified:
incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf
incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat
incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh
Modified: incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf?view=diff&rev=485023&r1=485022&r2=485023
==============================================================================
--- incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf (original)
+++ incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/conf/httpd.conf Sat Dec 9 10:20:48 2006
@@ -1,25 +1,26 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# This is the main Apache HTTP server configuration file. It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
-
-Listen 9090
-
-# Generated by the startserver script
-Include conf/mod_axis2.conf
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This is the main Apache HTTP server configuration file. It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+
+Listen 9090
+
+# Generated by the startserver script
+Include conf/base.conf
+Include conf/mod_axis2.conf
Modified: incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat?view=diff&rev=485023&r1=485022&r2=485023
==============================================================================
--- incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat (original)
+++ incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.bat Sat Dec 9 10:20:48 2006
@@ -40,21 +40,34 @@
)
echo Using Axis2C installed at %AXIS2C_HOME%
-set PATH=%TUSCANY_SCACPP%\extensions\sca\reference\bin;%TUSCANY_SCACPP%\extensions\sca\service\bin;%TUSCANY_SCACPP%\extensions\ws\reference\bin;%TUSCANY_SCACPP%\extensions\ws\service\bin;%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
+if "%HTTPD_HOME%" == "" (
+echo "HTTPD_HOME not set"
+goto end
+)
+echo Using HTTPD installed at %HTTPD_HOME%
+
+set PATH=%TUSCANY_SCACPP%\extensions\sca\reference\bin;%TUSCANY_SCACPP%\extensions\sca\service\bin;%TUSCANY_SCACPP%\extensions\ws\reference\bin;%TUSCANY_SCACPP%\extensions\ws\service\bin;%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%HTTPD_HOME%\bin;\%PATH%
set TUSCANY_SCACPP_ROOT=%APFULLDIR%\..\
@REM Generate the mod_axis2 configuration
if not exist %APFULLDIR%\conf\mod_axis2.conf (
- echo LoadModule axis2_module %AXIS2C_HOME%/lib/mod_axis2.dll > %APFULLDIR%\conf\mod_axis2.conf
+ echo LoadModule axis2_module %AXIS2C_HOME%\lib\mod_axis2.dll > %APFULLDIR%\conf\mod_axis2.conf
echo ^<Location /axis2^> >> %APFULLDIR%\conf\mod_axis2.conf
echo SetHandler axis2_module >> %APFULLDIR%\conf\mod_axis2.conf
echo RepoPath %AXIS2C_HOME% >> %APFULLDIR%\conf\mod_axis2.conf
- echo LogFile %AXIS2C_HOME%/logs/httpd.log >> %APFULLDIR%\conf\mod_axis2.conf
+ echo LogFile %AXIS2C_HOME%\logs\httpd.log >> %APFULLDIR%\conf\mod_axis2.conf
echo Axis2LogLevel AXIS2_LOG_LEVEL_DEBUG >> %APFULLDIR%\conf\mod_axis2.conf
echo ^</Location^> >> %APFULLDIR%\conf\mod_axis2.conf
)
+@REM Generate the base HTTPD configuration
+if not exist %APFULLDIR%\conf\base.conf (
+ echo LoadModule mime_module %HTTPD_HOME%\modules\mod_mime.so > %APFULLDIR%\conf\base.conf
+ echo LoadModule dir_module %HTTPD_HOME%\modules\mod_dir.so >> %APFULLDIR%\conf\base.conf
+ echo DocumentRoot %APFULLDIR%\htdocs >> %APFULLDIR%\conf\base.conf
+)
+
@REM Create logs directory
if not exist %APFULLDIR%\logs mkdir %APFULLDIR%\logs
set TUSCANY_SCACPP_LOG=%APFULLDIR%\logs\tuscany-server.log
@@ -63,4 +76,3 @@
@REM Start the HTTP server
echo Starting Apache httpd
httpd -d %APFULLDIR%
-
Modified: incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh?view=diff&rev=485023&r1=485022&r2=485023
==============================================================================
--- incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/HttpdBigBank/httpserver/startserver.sh Sat Dec 9 10:20:48 2006
@@ -52,6 +52,11 @@
echo "</Location>" >>conf/mod_axis2.conf
fi
+# Generate the HTTPD base configuration
+if [ ! -f conf/base.conf ]; then
+ echo "DocumentRoot $APFULLDIR/htdocs" >conf/base.conf
+fi
+
# Create logs directory
if [ ! -d logs ]; then
mkdir logs
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org