Author: jsdelfino
Date: Sat Dec 9 09:55:50 2006
New Revision: 485017
URL: http://svn.apache.org/viewvc?view=rev&rev=485017
Log:
Added configuration of HTTPD DocumentRoot.
Modified:
incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.bat
incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.sh
Modified:
incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf?view=diff&rev=485017&r1=485016&r2=485017
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
(original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/conf/httpd.conf
Sat Dec 9 09:55:50 2006
@@ -1,26 +1,27 @@
-# 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/tuscany_sca_mod_rest.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/tuscany_sca_mod_rest.conf
+
Modified:
incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.bat
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.bat?view=diff&rev=485017&r1=485016&r2=485017
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.bat
(original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.bat
Sat Dec 9 09:55:50 2006
@@ -34,17 +34,17 @@
)
echo Using SDO installed at %TUSCANY_SDOCPP%
-if "%AXIS2C_HOME%" == "" (
-echo "AXIS2C_HOME not set"
+if "%HTTPD_HOME%" == "" (
+echo "HTTPD_HOME not set"
goto end
)
-echo Using Axis2C installed at %AXIS2C_HOME%
+echo Using HTTPD installed at %HTTPD_HOME%
-set
PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\extensions\rest\interface\bin;%TUSCANY_SCACPP%\extensions\rest\service\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%PATH%
+set
PATH=%TUSCANY_SCACPP%\extensions\ruby\bin;%TUSCANY_SCACPP%\extensions\rest\interface\bin;%TUSCANY_SCACPP%\extensions\rest\service\bin;%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%HTTPD_HOME%\bin;%PATH%
set TUSCANY_SCACPP_ROOT=%APFULLDIR%\..\
[EMAIL PROTECTED] Generate the mod_axis2 configuration
[EMAIL PROTECTED] Generate the tuscany_sca_mod_rest configuration
if not exist %APFULLDIR%\conf\tuscany_sca_mod_rest.conf (
echo LoadModule sca_rest_module
%TUSCANY_SCACPP%/extensions/rest\service/bin/tuscany_sca_mod_rest.dll >
%APFULLDIR%\conf\tuscany_sca_mod_rest.conf
echo TuscanyHome %TUSCANY_SCACPP% >>
%APFULLDIR%\conf\tuscany_sca_mod_rest.conf
@@ -54,6 +54,13 @@
echo ^</Location^> >> %APFULLDIR%\conf\tuscany_sca_mod_rest.conf
)
[EMAIL PROTECTED] 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
@@ -62,4 +69,3 @@
@REM Start the HTTP server
echo Starting Apache httpd
httpd -d %APFULLDIR%
-
Modified:
incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.sh?view=diff&rev=485017&r1=485016&r2=485017
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.sh
(original)
+++ incubator/tuscany/cpp/sca/samples/RestCalculator/httpserver/startserver.sh
Sat Dec 9 09:55:50 2006
@@ -45,6 +45,10 @@
echo "</Location>" >>conf/tuscany_sca_mod_rest.conf
fi
+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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
