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/07/31 02:24:56 UTC
svn commit: r561194 - in /maven/components/trunk/maven-embedder: pom.xml
src/bin/mvn src/bin/mvn.bat src/main/assembly/bin.xml
Author: jvanzyl
Date: Mon Jul 30 17:24:55 2007
New Revision: 561194
URL: http://svn.apache.org/viewvc?view=rev&rev=561194
Log:
we have to keep classwords in a separate jar and boot it by itself or we end up with everythign in the primordial classloade
which sucks ass. I didn't notice that until I ran a big slew of tests and the realm out put was entirely different. We defin
definitely want to boot up with just classworlds in the primordial loader so we can do what we like with the rest
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/bin/mvn
maven/components/trunk/maven-embedder/src/bin/mvn.bat
maven/components/trunk/maven-embedder/src/main/assembly/bin.xml
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=561194&r1=561193&r2=561194
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Mon Jul 30 17:24:55 2007
@@ -30,7 +30,7 @@
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
<properties>
- <bundleVersion>2.1.0.v20070601-0109</bundleVersion>
+ <bundleVersion>2.1.0.v20070728-1835</bundleVersion>
</properties>
<build>
<resources>
Modified: maven/components/trunk/maven-embedder/src/bin/mvn
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/bin/mvn?view=diff&rev=561194&r1=561193&r2=561194
==============================================================================
--- maven/components/trunk/maven-embedder/src/bin/mvn (original)
+++ maven/components/trunk/maven-embedder/src/bin/mvn Mon Jul 30 17:24:55 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
@@ -160,8 +157,9 @@
exec "$JAVACMD" \
$MAVEN_OPTS \
- -classpath "${M2_HOME}"/lib/maven-embedder-*.jar \
+ -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
"-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
"-Dmaven.home=${M2_HOME}" \
${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
+
Modified: maven/components/trunk/maven-embedder/src/bin/mvn.bat
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/bin/mvn.bat?view=diff&rev=561194&r1=561193&r2=561194
==============================================================================
--- maven/components/trunk/maven-embedder/src/bin/mvn.bat (original)
+++ maven/components/trunk/maven-embedder/src/bin/mvn.bat Mon Jul 30 17:24:55 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
@@ -37,9 +35,6 @@
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
-
@REM Execute a user defined script before this one
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -101,7 +96,7 @@
if NOT "%OS%"=="Windows_NT" goto Win9xArg
@REM -- 4NT shell
-if "%@eval[2+2]" == "4" goto 4NTArgs
+if "%eval[2+2]" == "4" goto 4NTArgs
@REM -- Regular WinNT shell
set MAVEN_CMD_LINE_ARGS=%*
@@ -126,25 +121,14 @@
:endInit
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-@REM -- 4NT shell
-if "%@eval[2+2]" == "4" goto 4NTCWJars
-
-@REM -- Regular WinNT shell
-for %%i in ("%M2_HOME%"\lib\maven-embedder-*) do set MAVEN_JAR="%%i"
-goto runm2
-
-@REM The 4NT Shell from jp software
-:4NTCWJars
-for %%i in ("%M2_HOME%\lib\maven-embedder-*") do set MAVEN_JAR="%%i"
-goto runm2
-
@REM Start MAVEN2
-:runm2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %MAVEN_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%"\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
:error
+if "%OS%"=="Windows_NT" @endlocal
set ERROR_CODE=1
:end
@@ -168,4 +152,5 @@
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
exit /B %ERROR_CODE%
+
Modified: maven/components/trunk/maven-embedder/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/assembly/bin.xml?view=diff&rev=561194&r1=561193&r2=561194
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/assembly/bin.xml (original)
+++ maven/components/trunk/maven-embedder/src/main/assembly/bin.xml Mon Jul 30 17:24:55 2007
@@ -24,6 +24,14 @@
<format>tar.bz2</format>
<format>zip</format>
</formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>boot</outputDirectory>
+ <includes>
+ <include>org.codehaus.plexus:plexus-classworlds</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<fileSet>
<includes>
@@ -47,8 +55,6 @@
<includes>
<include>m2</include>
<include>mvn</include>
- <include>mvnr</include>
- <include>mvnr.rb</include>
</includes>
<lineEnding>unix</lineEnding>
<fileMode>0755</fileMode>
@@ -61,7 +67,7 @@
<directory>target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>maven-embedder-*.jar</include>
+ <include>maven-embedder*.jar</include>
</includes>
</fileSet>
</fileSets>