You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/03/11 19:58:09 UTC
svn commit: r636058 - in /webservices/axis2/trunk/java/modules/tool/script:
axis2.sh axis2server.sh java2wsdl.sh wsdl2java.sh
Author: dims
Date: Tue Mar 11 11:57:59 2008
New Revision: 636058
URL: http://svn.apache.org/viewvc?rev=636058&view=rev
Log:
Fix for AXIS2-2479 - Shell scripts do not tolerate AXIS2_HOME and JAVA_HOME with spaces in paths
Modified:
webservices/axis2/trunk/java/modules/tool/script/axis2.sh
webservices/axis2/trunk/java/modules/tool/script/axis2server.sh
webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh
webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh
Modified: webservices/axis2/trunk/java/modules/tool/script/axis2.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/axis2.sh?rev=636058&r1=636057&r2=636058&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/axis2.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/axis2.sh Tue Mar 11 11:57:59 2008
@@ -28,7 +28,8 @@
# -----------------------------------------------------------------------------
# Get the context and from that find the location of setenv.sh
-. `dirname $0`/setenv.sh
+dir=`dirname "$0"`
+. "${dir}"/setenv.sh
#add any user given classpath's
USER_COMMANDS=""
@@ -48,5 +49,5 @@
done
-$JAVA_HOME/bin/java -classpath "$AXIS2_CLASSPATH" \
+"$JAVA_HOME"/bin/java -classpath "$AXIS2_CLASSPATH" \
-Daxis2.xml="$AXIS2_HOME/conf/axis2.xml" -Daxis2.repo="$AXIS2_HOME/repository" $USER_COMMANDS
Modified: webservices/axis2/trunk/java/modules/tool/script/axis2server.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/axis2server.sh?rev=636058&r1=636057&r2=636058&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/axis2server.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/axis2server.sh Tue Mar 11 11:57:59 2008
@@ -29,5 +29,5 @@
# Get the context and from that find the location of setenv.sh
. `dirname $0`/setenv.sh
-java -classpath $AXIS2_CLASSPATH org.apache.axis2.transport.SimpleAxis2Server \
--repo $AXIS2_HOME/repository -conf $AXIS2_HOME/conf/axis2.xml $*
+java -classpath "$AXIS2_CLASSPATH" org.apache.axis2.transport.SimpleAxis2Server \
+-repo "$AXIS2_HOME"/repository -conf "$AXIS2_HOME"/conf/axis2.xml $*
Modified: webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh?rev=636058&r1=636057&r2=636058&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/java2wsdl.sh Tue Mar 11 11:57:59 2008
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-sh `dirname $0`/axis2.sh org.apache.ws.java2wsdl.Java2WSDL $*
+dir=`dirname "$0"`
+sh "$dir"/axis2.sh org.apache.ws.java2wsdl.Java2WSDL $*
Modified: webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh?rev=636058&r1=636057&r2=636058&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh (original)
+++ webservices/axis2/trunk/java/modules/tool/script/wsdl2java.sh Tue Mar 11 11:57:59 2008
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-sh `dirname $0`/axis2.sh org.apache.axis2.wsdl.WSDL2Java $*
+dir=`dirname "$0"`
+sh "$dir"/axis2.sh org.apache.axis2.wsdl.WSDL2Java $*
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org