From db643afb251e5344e108f804c210fd2e6fbe114c Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 16 Apr 2008 04:57:44 +0000 Subject: [PATCH] o removing the distribution assembly from the embedder git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@648511 13f79535-47bb-0310-9956-ffa450edef68 --- maven-embedder/LICENSE.txt | 202 ------------------ maven-embedder/NOTICE.txt | 20 -- maven-embedder/README.txt | 79 ------- maven-embedder/pom.xml | 258 ----------------------- maven-embedder/src/bin/m2.conf | 6 - maven-embedder/src/bin/mvn | 164 -------------- maven-embedder/src/bin/mvn.bat | 189 ----------------- maven-embedder/src/bin/mvnDebug | 168 --------------- maven-embedder/src/bin/mvnDebug.bat | 193 ----------------- maven-embedder/src/bin/mvnr | 24 --- maven-embedder/src/bin/mvnr.rb | 40 ---- maven-embedder/src/conf/settings.xml | 241 --------------------- maven-embedder/src/main/assembly/bin.xml | 97 --------- 13 files changed, 1681 deletions(-) delete mode 100644 maven-embedder/LICENSE.txt delete mode 100644 maven-embedder/NOTICE.txt delete mode 100644 maven-embedder/README.txt delete mode 100644 maven-embedder/src/bin/m2.conf delete mode 100755 maven-embedder/src/bin/mvn delete mode 100644 maven-embedder/src/bin/mvn.bat delete mode 100755 maven-embedder/src/bin/mvnDebug delete mode 100644 maven-embedder/src/bin/mvnDebug.bat delete mode 100755 maven-embedder/src/bin/mvnr delete mode 100644 maven-embedder/src/bin/mvnr.rb delete mode 100644 maven-embedder/src/conf/settings.xml delete mode 100644 maven-embedder/src/main/assembly/bin.xml diff --git a/maven-embedder/LICENSE.txt b/maven-embedder/LICENSE.txt deleted file mode 100644 index d645695673..0000000000 --- a/maven-embedder/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/maven-embedder/NOTICE.txt b/maven-embedder/NOTICE.txt deleted file mode 100644 index 2422ebf74f..0000000000 --- a/maven-embedder/NOTICE.txt +++ /dev/null @@ -1,20 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - == in this case for the Apache Maven distribution. == - ========================================================================= - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -This product includes software (Plexus and Classworlds) developed by -The Codehaus Foundation (http://www.codehaus.org/). - -This product includes software (JSCH) developed by -JCraft Inc. (http://www.jcraft.com/). - -This product includes software (JTidy) developed by -SourceForge (http://www.sourceforge.net/). - -This product includes software (AspectJ) developed by -The Eclipse Foundation (http://www.eclipse.org/aspectj/). diff --git a/maven-embedder/README.txt b/maven-embedder/README.txt deleted file mode 100644 index 201dfda280..0000000000 --- a/maven-embedder/README.txt +++ /dev/null @@ -1,79 +0,0 @@ - - Apache Maven - - What is it? - ----------- - - Maven is a software project management and comprehension tool. Based on - the concept of a Project Object Model (POM), Maven can manage a project's - build, reporting and documentation from a central piece of information. - - Documentation - ------------- - - The documentation available as of the date of this release is included in - HTML format in the docs/ directory. - The most up-to-date documentation can be found at http://maven.apache.org/. - - Release Notes - ------------- - - The full list of changes can be found at http://maven.apache.org/release-notes.html. - - System Requirements - ------------------- - - JDK: - 1.4 or above (this is to execute Maven - it still allows you to build against 1.3 - and prior JDK's). - Memory: - No minimum requirement. - Disk: - No minimum requirement. Approximately 100MB will be used for your local repository, - however this will vary depending on usage and can be removed and redownloaded at - any time. - Operating System: - No minimum requirement. On Windows, Windows NT and above or Cygwin is required for - the startup scripts. Tested on Windows XP, Fedora Core and Mac OS X. - - Installing Maven - ---------------- - - 1) Unpack the archive where you would like to store the binaries, eg: - - Unix-based Operating Systems (Linux, Solaris and Mac OS X) - tar zxvf apache-maven-2.1.x.tar.gz - Windows 2000/XP - unzip apache-maven-2.1.x.zip - - 2) A directory called "apache-maven-2.1.x" will be created. - - 3) Add the bin directory to your PATH, eg: - - Unix-based Operating Systems (Linux, Solaris and Mac OS X) - export PATH=/usr/local/apache-maven-2.1.x/bin:$PATH - Windows 2000/XP - set PATH="c:\program files\apache-maven-2.1.x\bin";%PATH% - - 4) Make sure JAVA_HOME is set to the location of your JDK - - 5) Run "mvn --version" to verify that it is correctly installed. - - For complete documentation, see http://maven.apache.org/download.html#Installation - - Licensing - --------- - - Please see the file called LICENSE.TXT - - Maven URLS - ---------- - - Home Page: http://maven.apache.org/ - Downloads: http://maven.apache.org/downloads.html - Release Notes: http://maven.apache.org/release-notes.html - Mailing Lists: http://maven.apache.org/mail-lists.html - Source Code: http://svn.apache.org/repos/asf/maven/ - Issue Tracking: http://jira.codehaus.org/browse/MNG - Wiki: http://docs.codehaus.org/display/MAVENUSER/ - Available Plugins: http://maven.apache.org/plugins/index.html diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 6a81857b28..faae13716d 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -97,13 +97,6 @@ under the License. - - - apache.website - scp://people.apache.org/www/maven.apache.org/embedder/${project.version}/ - - - @@ -131,257 +124,6 @@ under the License. - - - idea - - - - shade-maven-plugin - org.codehaus.mojo - 1.0-alpha-12 - - - package - - shade - - - - maven-embedder-idea-2.1 - false - true - - - - - - org.codehaus.plexus:plexus-component-api - classworlds:classworlds - junit:junit - jmock:jmock - xml-apis:xml-apis - - jdom:jdom - jtidy:jtidy - - - - - org.codehaus.plexus.util - - org.codehaus.plexus.util.xml.Xpp3Dom - org.codehaus.plexus.util.xml.pull.* - - - - - - - - - - - - - - tycho - - 2.1.0.v20071120-1632 - - - - - src/main/resources - true - - - - - shade-maven-plugin - org.codehaus.mojo - 1.0-alpha-12 - - - package - - shade - - - maven-embedder-tycho-${bundleVersion} - false - true - - - - - - org.codehaus.plexus:plexus-component-api - classworlds:classworlds - junit:junit - jmock:jmock - xml-apis:xml-apis - - - - - org.codehaus.plexus.util - - org.codehaus.plexus.util.xml.Xpp3Dom - org.codehaus.plexus.util.xml.pull.* - - - - - - - - - - - - - - netbeans - - - - shade-maven-plugin - org.codehaus.mojo - 1.0-alpha-12 - - - package - - shade - - - false - true - - - - - - org.codehaus.plexus:plexus-component-api - classworlds:classworlds - junit:junit - jmock:jmock - xml-apis:xml-apis - - - - - org.codehaus.plexus.util - - org.codehaus.plexus.util.xml.Xpp3Dom - org.codehaus.plexus.util.xml.pull.* - - - - - - - - - - - - - standard - - true - - - - - maven-assembly-plugin - 2.2-beta-1 - - - create-distro - package - - single - - - src/main/assembly/bin.xml - apache-maven-${pom.version} - - - - - - maven-surefire-plugin - 2.3 - - once - - - - - - - - include-site - - - - org.apache.maven.plugins - maven-scm-plugin - - scm:svn:http://svn.apache.org/repos/asf/maven/site/trunk - ${project.build.directory}/maven-site - - - - initialize - - checkout - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - ${project.build.directory}/maven-site - ${project.build.directory}/maven-site/pom.xml - - clean - site - - - - - initialize - initialize - - run - - - - - - - - st diff --git a/maven-embedder/src/bin/m2.conf b/maven-embedder/src/bin/m2.conf deleted file mode 100644 index 78cafb06b8..0000000000 --- a/maven-embedder/src/bin/m2.conf +++ /dev/null @@ -1,6 +0,0 @@ -main is org.apache.maven.cli.MavenCli from plexus.core - -set maven.home default ${user.home}/m2 - -[plexus.core] -load ${maven.home}/lib/*.jar diff --git a/maven-embedder/src/bin/mvn b/maven-embedder/src/bin/mvn deleted file mode 100755 index 2a1d3ab0c2..0000000000 --- a/maven-embedder/src/bin/mvn +++ /dev/null @@ -1,164 +0,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# ---------------------------------------------------------------------------- - -QUOTED_ARGS="" -while [ "$1" != "" ] ; do - - QUOTED_ARGS="$QUOTED_ARGS \"$1\"" - shift - -done - -if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc -fi - -if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " We cannot execute $JAVACMD" - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$HOME" ] && - HOME=`cygpath --path --windows "$HOME"` -fi - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ - "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dmaven.home=${M2_HOME}" \ - ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS - - diff --git a/maven-embedder/src/bin/mvn.bat b/maven-embedder/src/bin/mvn.bat deleted file mode 100644 index 354ad2e62b..0000000000 --- a/maven-embedder/src/bin/mvn.bat +++ /dev/null @@ -1,189 +0,0 @@ -@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 ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@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" - -set ERROR_CODE=0 - -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo ERROR: JAVA_HOME not found in your environment. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory. -echo JAVA_HOME = %JAVA_HOME% -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error - -:chkMHome -if not "%M2_HOME%"=="" goto valMHome - -if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0.. -if "%OS%"=="WINNT" SET M2_HOME=%~dp0.. -if not "%M2_HOME%"=="" goto valMHome - -echo. -echo ERROR: M2_HOME not found in your environment. -echo Please set the M2_HOME variable in your environment to match the -echo location of the Maven installation -echo. -goto error - -:valMHome - -:stripMHome -if not _%M2_HOME:~-1%==_\ goto checkMBat -set M2_HOME=%M2_HOME:~0,-1% -goto stripMHome - -:checkMBat -if exist "%M2_HOME%\bin\mvn.bat" goto init - -echo. -echo ERROR: M2_HOME is set to an invalid directory. -echo M2_HOME = %M2_HOME% -echo Please set the M2_HOME variable in your environment to match the -echo location of the Maven installation -echo. -goto error -@REM ==== END VALIDATION ==== - -:init -@REM Decide how to startup depending on the version of windows - -@REM -- Windows NT with Novell Login -if "%OS%"=="WINNT" goto WinNTNovell - -@REM -- Win98ME -if NOT "%OS%"=="Windows_NT" goto Win9xArg - -:WinNTNovell - -@REM -- 4NT shell -if "%@eval[2+2]" == "4" goto 4NTArgs - -@REM -- Regular WinNT shell -set MAVEN_CMD_LINE_ARGS=%* -goto endInit - -@REM The 4NT Shell from jp software -:4NTArgs -set MAVEN_CMD_LINE_ARGS=%$ -goto endInit - -:Win9xArg -@REM Slurp the command line arguments. This loop allows for an unlimited number -@REM of agruments (up to the command line limit, anyway). -set MAVEN_CMD_LINE_ARGS= -:Win9xApp -if %1a==a goto endInit -set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1 -shift -goto Win9xApp - -@REM Reaching here means variables are defined and arguments have been captured -: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%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM The 4NT Shell from jp software -:4NTCWJars -for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM Start MAVEN2 -:runm2 -%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 - -:error -if "%OS%"=="Windows_NT" @endlocal -if "%OS%"=="WINNT" @endlocal -set ERROR_CODE=1 - -:end -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" goto endNT -if "%OS%"=="WINNT" goto endNT - -@REM For old DOS remove the set variables from ENV - we assume they were not set -@REM before we started - at least we don't leave any baggage around -set MAVEN_JAVA_EXE= -set MAVEN_CMD_LINE_ARGS= -goto postExec - -:endNT -@endlocal & set ERROR_CODE=%ERROR_CODE% - -:postExec -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% - - diff --git a/maven-embedder/src/bin/mvnDebug b/maven-embedder/src/bin/mvnDebug deleted file mode 100755 index dbec423420..0000000000 --- a/maven-embedder/src/bin/mvnDebug +++ /dev/null @@ -1,168 +0,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# ---------------------------------------------------------------------------- - -INT_MAVEN_OPTS="$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - -echo Preparing to Execute Maven in Debug Mode - -QUOTED_ARGS="" -while [ "$1" != "" ] ; do - - QUOTED_ARGS="$QUOTED_ARGS \"$1\"" - shift - -done - -if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc -fi - -if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - else - echo "Using Java version: $JAVA_VERSION" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " We cannot execute $JAVACMD" - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$HOME" ] && - HOME=`cygpath --path --windows "$HOME"` -fi - -exec "$JAVACMD" \ - $INT_MAVEN_OPTS \ - -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \ - "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ - "-Dmaven.home=${M2_HOME}" \ - ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS - - diff --git a/maven-embedder/src/bin/mvnDebug.bat b/maven-embedder/src/bin/mvnDebug.bat deleted file mode 100644 index 891b27359b..0000000000 --- a/maven-embedder/src/bin/mvnDebug.bat +++ /dev/null @@ -1,193 +0,0 @@ -@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 ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM ---------------------------------------------------------------------------- - -set INT_MAVEN_OPTS=%MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@echo Preparing to Execute Maven in Debug Mode - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@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" - -set ERROR_CODE=0 - -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo ERROR: JAVA_HOME not found in your environment. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory. -echo JAVA_HOME = %JAVA_HOME% -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation -echo. -goto error - -:chkMHome -if not "%M2_HOME%"=="" goto valMHome - -if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0.. -if "%OS%"=="WINNT" SET M2_HOME=%~dp0.. -if not "%M2_HOME%"=="" goto valMHome - -echo. -echo ERROR: M2_HOME not found in your environment. -echo Please set the M2_HOME variable in your environment to match the -echo location of the Maven installation -echo. -goto error - -:valMHome - -:stripMHome -if not _%M2_HOME:~-1%==_\ goto checkMBat -set M2_HOME=%M2_HOME:~0,-1% -goto stripMHome - -:checkMBat -if exist "%M2_HOME%\bin\mvn.bat" goto init - -echo. -echo ERROR: M2_HOME is set to an invalid directory. -echo M2_HOME = %M2_HOME% -echo Please set the M2_HOME variable in your environment to match the -echo location of the Maven installation -echo. -goto error -@REM ==== END VALIDATION ==== - -:init -@REM Decide how to startup depending on the version of windows - -@REM -- Windows NT with Novell Login -if "%OS%"=="WINNT" goto WinNTNovell - -@REM -- Win98ME -if NOT "%OS%"=="Windows_NT" goto Win9xArg - -:WinNTNovell - -@REM -- 4NT shell -if "%@eval[2+2]" == "4" goto 4NTArgs - -@REM -- Regular WinNT shell -set MAVEN_CMD_LINE_ARGS=%* -goto endInit - -@REM The 4NT Shell from jp software -:4NTArgs -set MAVEN_CMD_LINE_ARGS=%$ -goto endInit - -:Win9xArg -@REM Slurp the command line arguments. This loop allows for an unlimited number -@REM of agruments (up to the command line limit, anyway). -set MAVEN_CMD_LINE_ARGS= -:Win9xApp -if %1a==a goto endInit -set MAVEN_CMD_LINE_ARGS=%MAVEN_CMD_LINE_ARGS% %1 -shift -goto Win9xApp - -@REM Reaching here means variables are defined and arguments have been captured -: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%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM The 4NT Shell from jp software -:4NTCWJars -for %%i in ("%M2_HOME%\boot\plexus-classworlds-*") do set CLASSWORLDS_JAR="%%i" -goto runm2 - -@REM Start MAVEN2 -:runm2 - -%MAVEN_JAVA_EXE% %INT_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 - -:error -if "%OS%"=="Windows_NT" @endlocal -if "%OS%"=="WINNT" @endlocal -set ERROR_CODE=1 - -:end -@REM set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" goto endNT -if "%OS%"=="WINNT" goto endNT - -@REM For old DOS remove the set variables from ENV - we assume they were not set -@REM before we started - at least we don't leave any baggage around -set MAVEN_JAVA_EXE= -set MAVEN_CMD_LINE_ARGS= -goto postExec - -:endNT -@endlocal & set ERROR_CODE=%ERROR_CODE% - -:postExec -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% - - diff --git a/maven-embedder/src/bin/mvnr b/maven-embedder/src/bin/mvnr deleted file mode 100755 index fef9d2b051..0000000000 --- a/maven-embedder/src/bin/mvnr +++ /dev/null @@ -1,24 +0,0 @@ -#!/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. -# ---------------------------------------------------------------------------- - -export M2_HOME=$HOME/m2 -export JRUBY_HOME=$HOME/jruby -export CLASSPATH=$M2_HOME/lib/maven-embedder-2.1-SNAPSHOT-uber.jar -$JRUBY_HOME/bin/jruby $M2_HOME/bin/mvnr.rb diff --git a/maven-embedder/src/bin/mvnr.rb b/maven-embedder/src/bin/mvnr.rb deleted file mode 100644 index cde1ef4d21..0000000000 --- a/maven-embedder/src/bin/mvnr.rb +++ /dev/null @@ -1,40 +0,0 @@ -# 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. - -require 'java' - -class Maven - def initialize goals - @goals = goals - end - - include_class 'java.io.File' - include_class 'org.apache.maven.embedder.MavenEmbedder' - include_class 'org.apache.maven.embedder.DefaultConfiguration' - include_class 'org.apache.maven.execution.DefaultMavenExecutionRequest' - - def run - configuration = DefaultConfiguration.new - maven = MavenEmbedder.new(configuration) - r = DefaultMavenExecutionRequest.new - r.setBaseDirectory( File.new( "." ) ) - r.setGoals( @goals ) - result = maven.execute( r ); - end -end - -m = Maven.new( ["clean"] ).run diff --git a/maven-embedder/src/conf/settings.xml b/maven-embedder/src/conf/settings.xml deleted file mode 100644 index 84862915ee..0000000000 --- a/maven-embedder/src/conf/settings.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/maven-embedder/src/main/assembly/bin.xml b/maven-embedder/src/main/assembly/bin.xml deleted file mode 100644 index a9ab3f6006..0000000000 --- a/maven-embedder/src/main/assembly/bin.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - bin - - tar.gz - tar.bz2 - zip - - - - boot - - org.codehaus.plexus:plexus-classworlds - - - - lib - - org.codehaus.plexus:plexus-classworlds - org.codehaus.plexus:plexus-component-api - classworlds:classworlds - junit:junit - jmock:jmock - xml-apis:xml-apis - org.apache.maven:maven-artifact - org.apache.maven:maven-monitor - org.apache.maven:maven-plugin-descriptor - - jdom:jdom - - - - - - - README* - LICENSE* - NOTICE* - - - - src/bin - bin - - *.bat - *.conf - - dos - - - src/bin - bin - - m2 - mvn - mvnDebug - - unix - 0755 - - - src/conf - conf - - - target - lib - - maven-embedder-*.jar - - - - target/maven-site/target/site - docs - - -