maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r495699 - in /maven/components/trunk/maven-cli/src/bin: m2 m2.bat m2.conf mvn mvn.bat
Date Fri, 12 Jan 2007 19:34:00 GMT
Author: jvanzyl
Date: Fri Jan 12 11:33:59 2007
New Revision: 495699

URL: http://svn.apache.org/viewvc?view=rev&rev=495699
Log:
o fix license headers


Modified:
    maven/components/trunk/maven-cli/src/bin/m2
    maven/components/trunk/maven-cli/src/bin/m2.bat
    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
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/m2?view=diff&rev=495699&r1=495698&r2=495699
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/m2 (original)
+++ maven/components/trunk/maven-cli/src/bin/m2 Fri Jan 12 11:33:59 2007
@@ -1,18 +1,21 @@
 #!/bin/sh
 # ----------------------------------------------------------------------------
-#  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.
+# 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 (c) 2001-2002 The Apache Software Foundation.  All rights

Modified: maven/components/trunk/maven-cli/src/bin/m2.bat
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-cli/src/bin/m2.bat?view=diff&rev=495699&r1=495698&r2=495699
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/m2.bat (original)
+++ maven/components/trunk/maven-cli/src/bin/m2.bat Fri Jan 12 11:33:59 2007
@@ -1,19 +1,21 @@
 @REM ----------------------------------------------------------------------------
-@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 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 ----------------------------------------------------------------------------
-@REM 
 
 @ECHO OFF
 echo.

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=495699&r1=495698&r2=495699
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/m2.conf (original)
+++ maven/components/trunk/maven-cli/src/bin/m2.conf Fri Jan 12 11:33:59 2007
@@ -1,9 +1,9 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
+main is org.apache.maven.cli.MavenCli from plexus.core.maven
 
 set maven.home default ${user.home}/m2
 
 [plexus.core]
 load ${maven.home}/core/*.jar
-load ${maven.home}/lib/*.jar
-#[plexus.core.maven]
 
+[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=495699&r1=495698&r2=495699
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/mvn (original)
+++ maven/components/trunk/maven-cli/src/bin/mvn Fri Jan 12 11:33:59 2007
@@ -1,18 +1,21 @@
 #!/bin/sh
 # ----------------------------------------------------------------------------
-#  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.
+# 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 (c) 2001-2002 The Apache Software Foundation.  All rights
@@ -143,7 +146,7 @@
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
@@ -157,7 +160,7 @@
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  -classpath "${M2_HOME}"/core/boot/plexus-classworlds-*.jar \
+  -classpath "${M2_HOME}"/core/boot/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=495699&r1=495698&r2=495699
==============================================================================
--- maven/components/trunk/maven-cli/src/bin/mvn.bat (original)
+++ maven/components/trunk/maven-cli/src/bin/mvn.bat Fri Jan 12 11:33:59 2007
@@ -1,19 +1,21 @@
 @REM ----------------------------------------------------------------------------
-@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 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 ----------------------------------------------------------------------------
-@REM 
 
 @REM ----------------------------------------------------------------------------
 @REM Maven2 Start Up Batch script
@@ -122,8 +124,8 @@
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 
 @REM Start MAVEN2
-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%
+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%
 if ERRORLEVEL 1 goto error
 goto end
 



Mime
View raw message