Author: azeez
Date: Thu Jan 6 12:14:06 2011
New Revision: 1055844
URL: http://svn.apache.org/viewvc?rev=1055844&view=rev
Log:
Fix for AXIS2-3073
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat
axis/axis2/java/core/trunk/modules/tool/script/setenv.sh
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1055844&r1=1055843&r2=1055844&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Thu Jan 6 12:14:06 2011
@@ -100,7 +100,7 @@
<fileSet>
<directory>../../modules/kernel/conf</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>conf</outputDirectory>
<includes>
<include>log4j.properties</include>
<include>commons-logging.properties</include>
Modified: axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat?rev=1055844&r1=1055843&r2=1055844&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat (original)
+++ axis/axis2/java/core/trunk/modules/tool/script/axis2server.bat Thu Jan 6
12:14:06 2011
@@ -98,7 +98,7 @@ goto end
:runAxis2
rem set the classes by looping through the libs
setlocal EnableDelayedExpansion
-set AXIS2_CLASS_PATH=%AXIS2_HOME%;%JAVA_HOME%\lib\tools.jar;
+set AXIS2_CLASS_PATH=%AXIS2_HOME%;%AXIS2_HOME%\conf;%JAVA_HOME%\lib\tools.jar;
FOR %%c in ("%AXIS2_HOME%\lib\*.jar") DO set
AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
echo Using JAVA_HOME %JAVA_HOME%
Modified: axis/axis2/java/core/trunk/modules/tool/script/setenv.sh
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/script/setenv.sh?rev=1055844&r1=1055843&r2=1055844&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/script/setenv.sh (original)
+++ axis/axis2/java/core/trunk/modules/tool/script/setenv.sh Thu Jan 6
12:14:06 2011
@@ -89,7 +89,7 @@ for f in "$AXIS2_HOME"/lib/*.jar
do
AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f
done
-AXIS2_CLASSPATH="$AXIS2_HOME":"$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
+AXIS2_CLASSPATH="$AXIS2_HOME":"$AXIS2_HOME/conf":"$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
