You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/01/15 22:10:58 UTC

svn commit: r496493 - in /maven/components/trunk/maven-cli/src/bin: m2.conf mvn mvn.bat

Author: jvanzyl
Date: Mon Jan 15 13:10:57 2007
New Revision: 496493

URL: http://svn.apache.org/viewvc?view=rev&rev=496493
Log: (empty)

Modified:
    maven/components/trunk/maven-cli/src/bin/m2.conf
    maven/components/trunk/maven-cli/src/bin/mvn
    maven/components/trunk/maven-cli/src/bin/mvn.bat

Modified: maven/components/trunk/maven-cli/src/bin/m2.conf
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/m2.conf?view=diff&rev=496493&r1=496492&r2=496493
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/m2.conf (original)
+++ maven/components/trunk/maven-cli/src/bin/m2.conf Mon Jan 15 13:10:57 2007
@@ -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

Modified: maven/components/trunk/maven-cli/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/mvn?view=diff&rev=496493&r1=496492&r2=496493
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/mvn (original)
+++ maven/components/trunk/maven-cli/src/bin/mvn Mon Jan 15 13:10:57 2007
@@ -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 @@
   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 @@
 
 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
+
 

Modified: maven/components/trunk/maven-cli/src/bin/mvn.bat
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/mvn.bat?view=diff&rev=496493&r1=496492&r2=496493
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/mvn.bat (original)
+++ maven/components/trunk/maven-cli/src/bin/mvn.bat Mon Jan 15 13:10:57 2007
@@ -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 @@
 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
 
@@ -154,4 +152,5 @@
 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
 exit /B %ERROR_CODE%
+
 



Re: svn commit: r496493 - in /maven/components/trunk/maven-cli/src/bin: m2.conf mvn mvn.bat

Posted by Patrick Schneider <ps...@gmail.com>.
It also reverts the changes fixed in this bug:
http://jira.codehaus.org/browse/MNG-2692 -- after bootstrapping, I had to
make changes to mvn.bat and m2.conf in order to be able to run...


Patrick

On 1/15/07, Dennis Lundberg <de...@apache.org> wrote:
>
> Not sure why, but this brought back the old license headers...
>
> jvanzyl@apache.org wrote:
> > Author: jvanzyl
> > Date: Mon Jan 15 13:10:57 2007
> > New Revision: 496493
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=496493
> > Log: (empty)
> >
> > Modified:
> >     maven/components/trunk/maven-cli/src/bin/m2.conf
> >     maven/components/trunk/maven-cli/src/bin/mvn
> >     maven/components/trunk/maven-cli/src/bin/mvn.bat
> >
> > Modified: maven/components/trunk/maven-cli/src/bin/m2.conf
> > URL:
> http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/m2.conf?view=diff&rev=496493&r1=496492&r2=496493
> >
> ==============================================================================
> > --- maven/components/trunk/maven-cli/src/bin/m2.conf (original)
> > +++ maven/components/trunk/maven-cli/src/bin/m2.conf Mon Jan 15 13:10:57
> 2007
> > @@ -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
> >
> > Modified: maven/components/trunk/maven-cli/src/bin/mvn
> > URL:
> http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/mvn?view=diff&rev=496493&r1=496492&r2=496493
> >
> ==============================================================================
> > --- maven/components/trunk/maven-cli/src/bin/mvn (original)
> > +++ maven/components/trunk/maven-cli/src/bin/mvn Mon Jan 15 13:10:57
> 2007
> > @@ -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 @@
> >    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 @@
> >
> >  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
> > +
> >
> >
> > Modified: maven/components/trunk/maven-cli/src/bin/mvn.bat
> > URL:
> http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/mvn.bat?view=diff&rev=496493&r1=496492&r2=496493
> >
> ==============================================================================
> > --- maven/components/trunk/maven-cli/src/bin/mvn.bat (original)
> > +++ maven/components/trunk/maven-cli/src/bin/mvn.bat Mon Jan 15 13:10:57
> 2007
> > @@ -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 @@
> >  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
> >
> > @@ -154,4 +152,5 @@
> >  if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
> >
> >  exit /B %ERROR_CODE%
> > +
> >
> >
> >
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>

Re: svn commit: r496493 - in /maven/components/trunk/maven-cli/src/bin: m2.conf mvn mvn.bat

Posted by Dennis Lundberg <de...@apache.org>.
Not sure why, but this brought back the old license headers...

jvanzyl@apache.org wrote:
> Author: jvanzyl
> Date: Mon Jan 15 13:10:57 2007
> New Revision: 496493
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=496493
> Log: (empty)
> 
> Modified:
>     maven/components/trunk/maven-cli/src/bin/m2.conf
>     maven/components/trunk/maven-cli/src/bin/mvn
>     maven/components/trunk/maven-cli/src/bin/mvn.bat
> 
> Modified: maven/components/trunk/maven-cli/src/bin/m2.conf
> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/m2.conf?view=diff&rev=496493&r1=496492&r2=496493
> ==============================================================================
> --- maven/components/trunk/maven-cli/src/bin/m2.conf (original)
> +++ maven/components/trunk/maven-cli/src/bin/m2.conf Mon Jan 15 13:10:57 2007
> @@ -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
> 
> Modified: maven/components/trunk/maven-cli/src/bin/mvn
> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/mvn?view=diff&rev=496493&r1=496492&r2=496493
> ==============================================================================
> --- maven/components/trunk/maven-cli/src/bin/mvn (original)
> +++ maven/components/trunk/maven-cli/src/bin/mvn Mon Jan 15 13:10:57 2007
> @@ -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 @@
>    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 @@
>  
>  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
> +
>  
> 
> Modified: maven/components/trunk/maven-cli/src/bin/mvn.bat
> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/mvn.bat?view=diff&rev=496493&r1=496492&r2=496493
> ==============================================================================
> --- maven/components/trunk/maven-cli/src/bin/mvn.bat (original)
> +++ maven/components/trunk/maven-cli/src/bin/mvn.bat Mon Jan 15 13:10:57 2007
> @@ -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 @@
>  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
>  
> @@ -154,4 +152,5 @@
>  if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
>  
>  exit /B %ERROR_CODE%
> +
>  
> 
> 


-- 
Dennis Lundberg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: svn commit: r496493 - in /maven/components/trunk/maven-cli/src/bin: m2.conf mvn mvn.bat

Posted by Brett Porter <br...@apache.org>.
Ah, sorry - don't mind me. Looking at the wrong version. I see you've  
already done this.

On 17/03/2007, at 9:13 PM, Brett Porter wrote:

> Hi Jason,
>
> I had this old message flagged to ask about...
>
> On 16/01/2007, at 8:10 AM, jvanzyl@apache.org wrote:
>
>> Author: jvanzyl
>> Date: Mon Jan 15 13:10:57 2007
>> New Revision: 496493
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=496493
>> Log: (empty)
>>
>> Modified:
>>     maven/components/trunk/maven-cli/src/bin/m2.conf
>>     maven/components/trunk/maven-cli/src/bin/mvn
>>     maven/components/trunk/maven-cli/src/bin/mvn.bat
>>
>> Modified: maven/components/trunk/maven-cli/src/bin/m2.conf
>> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/ 
>> src/bin/m2.conf?view=diff&rev=496493&r1=496492&r2=496493
>> ===================================================================== 
>> =========
>> --- maven/components/trunk/maven-cli/src/bin/m2.conf (original)
>> +++ maven/components/trunk/maven-cli/src/bin/m2.conf Mon Jan 15  
>> 13:10:57 2007
>> @@ -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
>>
>
>
> I assume this was intentional - do we no longer need separate  
> classloaders? If so, mind if I change the assembly to put  
> everything in lib/?
>
> - Brett
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: svn commit: r496493 - in /maven/components/trunk/maven-cli/src/bin: m2.conf mvn mvn.bat

Posted by Brett Porter <br...@apache.org>.
Hi Jason,

I had this old message flagged to ask about...

On 16/01/2007, at 8:10 AM, jvanzyl@apache.org wrote:

> Author: jvanzyl
> Date: Mon Jan 15 13:10:57 2007
> New Revision: 496493
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=496493
> Log: (empty)
>
> Modified:
>     maven/components/trunk/maven-cli/src/bin/m2.conf
>     maven/components/trunk/maven-cli/src/bin/mvn
>     maven/components/trunk/maven-cli/src/bin/mvn.bat
>
> Modified: maven/components/trunk/maven-cli/src/bin/m2.conf
> URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/ 
> src/bin/m2.conf?view=diff&rev=496493&r1=496492&r2=496493
> ====================================================================== 
> ========
> --- maven/components/trunk/maven-cli/src/bin/m2.conf (original)
> +++ maven/components/trunk/maven-cli/src/bin/m2.conf Mon Jan 15  
> 13:10:57 2007
> @@ -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
>


I assume this was intentional - do we no longer need separate  
classloaders? If so, mind if I change the assembly to put everything  
in lib/?

- Brett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org