From 09f3b3fbbad5b9abdf674617dcb941266b02a953 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Mon, 15 Jan 2007 21:10:57 +0000 Subject: [PATCH] git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@496493 13f79535-47bb-0310-9956-ffa450edef68 --- maven-cli/src/bin/m2.conf | 4 +--- maven-cli/src/bin/mvn | 34 ++++++++++++++++------------------ maven-cli/src/bin/mvn.bat | 35 +++++++++++++++++------------------ 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/maven-cli/src/bin/m2.conf b/maven-cli/src/bin/m2.conf index 708cde39d2..1f1629d0f4 100644 --- a/maven-cli/src/bin/m2.conf +++ b/maven-cli/src/bin/m2.conf @@ -1,9 +1,7 @@ -main is org.apache.maven.cli.MavenCli from plexus.core.maven +main is org.apache.maven.cli.MavenCli from plexus.core set maven.home default ${user.home}/m2 [plexus.core] load ${maven.home}/core/*.jar - -[plexus.core.maven] load ${maven.home}/lib/*.jar diff --git a/maven-cli/src/bin/mvn b/maven-cli/src/bin/mvn index 71ab4918ed..af666aa8ad 100755 --- a/maven-cli/src/bin/mvn +++ b/maven-cli/src/bin/mvn @@ -1,21 +1,18 @@ #!/bin/sh # ---------------------------------------------------------------------------- -# 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. +# Copyright 2001-2004 The Apache Software Foundation. +# +# Licensed 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. # ---------------------------------------------------------------------------- # Copyright (c) 2001-2002 The Apache Software Foundation. All rights @@ -146,7 +143,7 @@ if [ -z "$JAVA_HOME" ] ; then echo "Warning: JAVA_HOME environment variable is not set." fi -CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher # For Cygwin, switch paths to Windows format before running java if $cygwin; then @@ -160,8 +157,9 @@ fi exec "$JAVACMD" \ $MAVEN_OPTS \ - -classpath "${M2_HOME}"/core/boot/classworlds-*.jar \ + -classpath "${M2_HOME}"/core/boot/plexus-classworlds-*.jar \ "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ "-Dmaven.home=${M2_HOME}" \ ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS + diff --git a/maven-cli/src/bin/mvn.bat b/maven-cli/src/bin/mvn.bat index ee3feb5757..4242c1b52f 100644 --- a/maven-cli/src/bin/mvn.bat +++ b/maven-cli/src/bin/mvn.bat @@ -1,21 +1,19 @@ @REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. +@REM Copyright 2001-2004 The Apache Software Foundation. +@REM +@REM Licensed under the Apache License, Version 2.0 (the "License"); +@REM you may not use this file except in compliance with the License. +@REM You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an "AS IS" BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. @REM ---------------------------------------------------------------------------- +@REM @REM ---------------------------------------------------------------------------- @REM Maven2 Start Up Batch script @@ -124,8 +122,8 @@ goto Win9xApp SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" @REM Start MAVEN2 -for %%i in ("%M2_HOME%"\core\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i" -%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS% +for %%i in ("%M2_HOME%"\core\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" +%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.plexus.classworlds.launcher.Launcher %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error goto end @@ -155,3 +153,4 @@ if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% exit /B %ERROR_CODE% +