maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r381146 [1/2] - in /maven/components/branches/maven-embedder-refactor: ./ bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/ maven-cli/ maven-cli/src/ maven-cli/src/assemble/ maven-cli/src/bin/ maven-cli/src/c...
Date Sun, 26 Feb 2006 19:59:31 GMT
Author: jvanzyl
Date: Sun Feb 26 11:59:28 2006
New Revision: 381146

URL: http://svn.apache.org/viewcvs?rev=381146&view=rev
Log:
o adding maven-cli module, and am creating the assembly from there, removed all the CLI related bits
  from maven-core and am preparing to use the embedder in the CLI
-This line, and those below, will be ignored--

M    maven-embedder-refactor/pom.xml
A    maven-embedder-refactor/maven-cli
AM   maven-embedder-refactor/maven-cli/NOTICE.txt
AM   maven-embedder-refactor/maven-cli/LICENSE.txt
A    maven-embedder-refactor/maven-cli/src
A    maven-embedder-refactor/maven-cli/src/main
A    maven-embedder-refactor/maven-cli/src/main/java
A    maven-embedder-refactor/maven-cli/src/main/java/org
A    maven-embedder-refactor/maven-cli/src/main/java/org/apache
A    maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven
A    maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli
AM   maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
AM   maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
AM   maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
AM   maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
A    maven-embedder-refactor/maven-cli/src/conf
AM   maven-embedder-refactor/maven-cli/src/conf/settings.xml
A    maven-embedder-refactor/maven-cli/src/bin
AM   maven-embedder-refactor/maven-cli/src/bin/mvn
A    maven-embedder-refactor/maven-cli/src/bin/m2.conf
AM   maven-embedder-refactor/maven-cli/src/bin/m2.bat
AM   maven-embedder-refactor/maven-cli/src/bin/mvn.bat
AM   maven-embedder-refactor/maven-cli/src/bin/m2
A    maven-embedder-refactor/maven-cli/src/assemble
AM   maven-embedder-refactor/maven-cli/src/assemble/bin.xml
AM   maven-embedder-refactor/maven-cli/pom.xml
AM   maven-embedder-refactor/maven-cli/README.txt
AM   maven-embedder-refactor/maven-cli/checkstyle-license.txt
M    maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
M    maven-embedder-refactor/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
D    maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/cli
D    maven-embedder-refactor/maven-core/src/conf
D    maven-embedder-refactor/maven-core/src/bin
D    maven-embedder-refactor/maven-core/src/assemble

Added:
    maven/components/branches/maven-embedder-refactor/maven-cli/
    maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/README.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.conf
    maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java   (with props)
    maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java   (with props)
Removed:
    maven/components/branches/maven-embedder-refactor/maven-core/src/assemble/
    maven/components/branches/maven-embedder-refactor/maven-core/src/bin/
    maven/components/branches/maven-embedder-refactor/maven-core/src/conf/
    maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/cli/
Modified:
    maven/components/branches/maven-embedder-refactor/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
    maven/components/branches/maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/branches/maven-embedder-refactor/pom.xml

Modified: maven/components/branches/maven-embedder-refactor/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java?rev=381146&r1=381145&r2=381146&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java (original)
+++ maven/components/branches/maven-embedder-refactor/bootstrap/bootstrap-installer/src/main/java/org/apache/maven/bootstrap/installer/BootstrapInstaller.java Sun Feb 26 11:59:28 2006
@@ -121,19 +121,19 @@
 
         bootstrapper.buildProject( new File( basedir ), true );
 
-        ModelReader mavenCoreModel = bootstrapper.getCachedModel( "org.apache.maven", "maven-core" );
+        ModelReader mavenCliModel = bootstrapper.getCachedModel( "org.apache.maven", "maven-cli" );
 
         File installation = new File( basedir, "bootstrap/target/installation" );
-        createInstallation( installation, mavenCoreModel );
+        createInstallation( installation, mavenCliModel );
 
         // TODO: should just need assembly from basedir
         runMaven( installation, new File( basedir ), new String[]{"clean", "install"} );
 
-        File mavenCoreDir = mavenCoreModel.getProjectFile().getParentFile();
-        runMaven( installation, mavenCoreDir, new String[]{"clean", "assembly:assembly"} );
+        File mavenCliDir = mavenCliModel.getProjectFile().getParentFile();
+        runMaven( installation, mavenCliDir, new String[]{"clean", "assembly:assembly"} );
 
-        String finalName = "maven-" + mavenCoreModel.getVersion();
-        File file = new File( mavenCoreDir, "target/" + finalName + "-bin.zip" );
+        String finalName = "maven-" + mavenCliModel.getVersion();
+        File file = new File( mavenCliDir, "target/" + finalName + "-bin.zip" );
 
         File mavenHome = new File( prefix, finalName );
 
@@ -225,7 +225,7 @@
         }
     }
 
-    private void createInstallation( File dir, ModelReader mavenCoreModel )
+    private void createInstallation( File dir, ModelReader mavenCliModel )
         throws IOException, CommandLineException, InterruptedException
     {
         FileUtils.deleteDirectory( dir );
@@ -243,7 +243,7 @@
         File bootDirectory = new File( coreDirectory, "boot" );
         bootDirectory.mkdir();
 
-        for ( Iterator i = mavenCoreModel.getDependencies().iterator(); i.hasNext(); )
+        for ( Iterator i = mavenCliModel.getDependencies().iterator(); i.hasNext(); )
         {
             Dependency dep = (Dependency) i.next();
 
@@ -263,13 +263,13 @@
             }
         }
 
-        Dependency coreAsDep = new Dependency( mavenCoreModel.getGroupId(), mavenCoreModel.getArtifactId(),
-                                               mavenCoreModel.getVersion(), mavenCoreModel.getPackaging(),
+        Dependency coreAsDep = new Dependency( mavenCliModel.getGroupId(), mavenCliModel.getArtifactId(),
+                                               mavenCliModel.getVersion(), mavenCliModel.getPackaging(),
                                                Collections.EMPTY_LIST );
 
         FileUtils.copyFileToDirectory( bootstrapper.getArtifactFile( coreAsDep ), libDirectory );
 
-        File srcBinDirectory = new File( mavenCoreModel.getProjectFile().getParentFile(), "src/bin" );
+        File srcBinDirectory = new File( mavenCliModel.getProjectFile().getParentFile(), "src/bin" );
 
         FileUtils.copyDirectory( srcBinDirectory, binDirectory, null, "**/.svn/**" );
 

Added: maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt Sun Feb 26 11:59:28 2006
@@ -0,0 +1,202 @@
+
+                                 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.

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt Sun Feb 26 11:59:28 2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/README.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/README.txt?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/README.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/README.txt Sun Feb 26 11:59:28 2006
@@ -0,0 +1,23 @@
+Installing Maven 2
+==================
+
+The following instructions show how to install Maven 2:
+
+1) Unpack the archive where you would like to store the binaries, eg:
+  tar zxvf maven-2.0.tar.gz
+or
+  unzip maven-2.0.zip
+
+2) A directory called "maven-2.0" will be created.
+
+3) Add the bin directory to your PATH, eg:
+  export PATH=/usr/local/maven-2.0/bin:$PATH
+or
+  set PATH="c:\program files\maven-2.0\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 more information, please see http://maven.apache.org
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/README.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt Sun Feb 26 11:59:28 2006
@@ -0,0 +1,18 @@
+
+
+/* ====================================================================
+ *   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.
+ * ====================================================================
+ */

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/checkstyle-license.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml Sun Feb 26 11:59:28 2006
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <parent>
+    <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <version>2.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven</groupId>
+  <artifactId>maven-cli</artifactId>
+  <name>Maven Core</name>
+  <version>2.1-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptor>src/assemble/bin.xml</descriptor>
+          <finalName>maven-${version}</finalName>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-embedder</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-lang</artifactId>
+          <groupId>commons-lang</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml Sun Feb 26 11:59:28 2006
@@ -0,0 +1,77 @@
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>*.bat</include>
+        <include>*.conf</include>
+      </includes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>m2</include>
+        <include>mvn</include>
+      </includes>
+      <lineEnding>unix</lineEnding>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>src/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
+      <directory>target</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>maven-cli-*.jar</include>
+      </includes>
+      <excludes>
+        <exclude>maven-cli-*-sources.jar</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>core</outputDirectory>
+      <includes>
+        <include>org.codehaus.plexus:plexus-container-default</include>
+        <include>org.codehaus.plexus:plexus-utils</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>core/boot</outputDirectory>
+      <includes>
+        <include>classworlds:classworlds</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <excludes>
+        <exclude>org.codehaus.plexus:plexus-container-default</exclude>
+        <exclude>classworlds:classworlds</exclude>
+        <exclude>org.codehaus.plexus:plexus-utils</exclude>
+        <!-- transitively picked up via default container - not needed -->
+        <exclude>plexus:plexus-utils</exclude>
+        <exclude>junit:junit</exclude>
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2 (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2 Sun Feb 26 11:59:28 2006
@@ -0,0 +1,25 @@
+#!/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.
+# ----------------------------------------------------------------------------
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+
+echo ""
+echo THE m2 COMMMAND IS DEPRECATED - PLEASE RUN mvn INSTEAD
+echo ""
+
+exec "`dirname "$0"`/mvn" $@

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2
------------------------------------------------------------------------------
    svn:executable = *

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat Sun Feb 26 11:59:28 2006
@@ -0,0 +1,24 @@
+@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 ----------------------------------------------------------------------------
+@REM 
+
+@ECHO OFF
+echo.
+echo THE m2 COMMMAND IS DEPRECATED - PLEASE RUN mvn INSTEAD
+echo.
+
+%~dps0\mvn %*
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.bat
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.conf
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.conf?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.conf (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/m2.conf Sun Feb 26 11:59:28 2006
@@ -0,0 +1,9 @@
+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
+
+[plexus.core.maven]
+load ${maven.home}/lib/*.jar

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn Sun Feb 26 11:59:28 2006
@@ -0,0 +1,138 @@
+#!/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.
+# ----------------------------------------------------------------------------
+
+#   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+#   reserved.
+
+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;
+case "`uname`" in
+  CYGWIN*) cygwin=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 [ -e /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  # try to find MAVEN
+  if [ -d /opt/m2 ] ; then
+    MAVEN_HOME=/opt/m2
+  fi
+
+  if [ -d "$HOME/m2" ] ; then
+    MAVEN_HOME="$HOME/m2"
+  fi
+
+  ## 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
+
+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=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.classworlds.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}"/core/boot/classworlds-*.jar \
+  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+  "-Dmaven.home=${M2_HOME}"  \
+  ${CLASSWORLDS_LAUNCHER} $@
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn
------------------------------------------------------------------------------
    svn:executable = *

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat Sun Feb 26 11:59:28 2006
@@ -0,0 +1,155 @@
+@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 ----------------------------------------------------------------------------
+@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 Execute a user defined script before this one
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+set ERROR_CODE=0
+
+@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=%~dps0\..
+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
+if exist "%M2_HOME%\bin\m2.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 -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
+
+@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 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%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" 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
+
+: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%
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/bin/mvn.bat
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml Sun Feb 26 11:59:28 2006
@@ -0,0 +1,222 @@
+<!--
+ | This is the configuration file for Maven. It can be specified at two levels:
+ |
+ |  1. User Level. This settings.xml file provides configuration for a single user, 
+ |                 and is normally provided in $HOME/.m2/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the system property:
+ |
+ |                 -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ |
+ |  2. Global Level. This settings.xml file provides configuration for all maven
+ |                 users on a machine (assuming they're all using the same maven
+ |                 installation). It's normally provided in 
+ |                 ${maven.home}/conf/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the system property:
+ |
+ |                 -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ |
+ | The sections in this sample file are intended to give you a running start at
+ | getting the most out of your Maven installation. Where appropriate, the default
+ | values (values used when the setting is not specified) are provided.
+ |
+ |-->
+<settings>
+  <!-- localRepository
+   | The path to the local repository maven will use to store artifacts.
+   |
+   | Default: ~/.m2/repository
+  <localRepository>/path/to/local/repo</localRepository>
+  -->
+
+  <!-- interactiveMode
+   | This will determine whether maven prompts you when it needs input. If set to false,
+   | maven will use a sensible default value, perhaps based on some other setting, for
+   | the parameter in question.
+   |
+   | Default: true
+  <interactiveMode>true</interactiveMode>
+  -->
+
+  <!-- offline
+   | Determines whether maven should attempt to connect to the network when executing a build.
+   | This will have an effect on artifact downloads, artifact deployment, and others.
+   |
+   | Default: false
+  <offline>false</offline>
+  -->
+
+  <!-- proxies
+   | This is a list of proxies which can be used on this machine to connect to the network.
+   | Unless otherwise specified (by system property or command-line switch), the first proxy
+   | specification in this list marked as active will be used.
+   |-->
+  <proxies>
+    <!-- proxy
+     | Specification for one proxy, to be used in connecting to the network.
+     |
+    <proxy>
+      <id>optional</id>
+      <active>true</active>
+      <protocol>http</protocol>
+      <username>proxyuser</username>
+      <password>proxypass</password>
+      <host>proxy.host.net</host>
+      <port>80</port>
+      <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+    </proxy>
+    -->
+  </proxies>
+
+  <!-- servers
+   | This is a list of authentication profiles, keyed by the server-id used within the system.
+   | Authentication profiles can be used whenever maven must make a connection to a remote server.
+   |-->
+  <servers>
+    <!-- server
+     | Specifies the authentication information to use when connecting to a particular server, identified by
+     | a unique name within the system (referred to by the 'id' attribute below).
+     | 
+     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are 
+     |       used together.
+     |
+    <server>
+      <id>deploymentRepo</id>
+      <username>repouser</username>
+      <password>repopwd</password>
+    </server>
+    -->
+    
+    <!-- Another sample, using keys to authenticate.
+    <server>
+      <id>siteServer</id>
+      <privateKey>/path/to/private/key</privateKey>
+      <passphrase>optional; leave empty if not used.</passphrase>
+    </server>
+    -->
+  </servers>
+
+  <!-- mirrors
+   | This is a list of mirrors to be used in downloading artifacts from remote repositories.
+   | 
+   | It works like this: a POM may declare a repository to use in resolving certain artifacts.
+   | However, this repository may have problems with heavy traffic at times, so people have mirrored
+   | it to several places.
+   |
+   | That repository definition will have a unique id, so we can create a mirror reference for that
+   | repository, to be used as an alternate download site. The mirror site will be the preferred 
+   | server for that repository.
+   |-->
+  <mirrors>
+    <!-- mirror
+     | Specifies a repository mirror site to use instead of a given repository. The repository that
+     | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
+     | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
+     |
+    <mirror>
+      <id>mirrorId</id>
+      <mirrorOf>repositoryId</mirrorOf>
+      <name>Human Readable Name for this Mirror.</name>
+      <url>http://my.repository.com/repo/path</url>
+    </mirror>
+     -->
+  </mirrors>
+  
+  <!-- profiles
+   | This is a list of profiles which can be activated in a variety of ways, and which can modify
+   | the build process. Profiles provided in the settings.xml are intended to provide local machine-
+   | specific paths and repository locations which allow the build to work in the local environment.
+   |
+   | For example, if you have an integration testing plugin - like cactus - that needs to know where
+   | your Tomcat instance is installed, you can provide a variable here such that the variable is 
+   | dereferenced during the build process to configure the cactus plugin.
+   |
+   | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
+   | section of this document (settings.xml) - will be discussed later. Another way essentially
+   | relies on the detection of a system property, either matching a particular value for the property,
+   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a 
+   | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
+   | Finally, the list of active profiles can be specified directly from the command line.
+   |
+   | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
+   |       repositories, plugin repositories, and free-form properties to be used as configuration
+   |       variables for plugins in the POM.
+   |
+   |-->
+  <profiles>
+    <!-- profile
+     | Specifies a set of introductions to the build process, to be activated using one or more of the
+     | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
+     | or the command line, profiles have to have an ID that is unique.
+     |
+     | An encouraged best practice for profile identification is to use a consistent naming convention
+     | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
+     | This will make it more intuitive to understand what the set of introduced profiles is attempting
+     | to accomplish, particularly when you only have a list of profile id's for debug.
+     |
+     | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
+    <profile>
+      <id>jdk-1.4</id>
+
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+
+      <repositories>
+        <repository>
+	  <id>jdk14</id>
+	  <name>Repository for JDK 1.4 builds</name>
+	  <url>http://www.myhost.com/maven/jdk14</url>
+	  <layout>default</layout>
+	  <snapshotPolicy>always</snapshotPolicy>
+	</repository>
+      </repositories>
+    </profile>
+    -->
+
+    <!--
+     | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
+     | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
+     | might hypothetically look like:
+     |
+     | ...
+     | <plugin>
+     |   <groupId>org.myco.myplugins</groupId>
+     |   <artifactId>myplugin</artifactId>
+     |   
+     |   <configuration>
+     |     <tomcatLocation>${tomcatPath}</tomcatLocation>
+     |   </configuration>
+     | </plugin>
+     | ...
+     |
+     | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
+     |       anything, you could just leave off the <value/> inside the activation-property.
+     |
+    <profile>
+      <id>env-dev</id>
+
+      <activation>
+        <property>
+	  <name>target-env</name>
+	  <value>dev</value>
+	</property>
+      </activation>
+
+      <properties>
+        <tomcatPath>/path/to/tomcat/instance</tomcatPath>
+      </properties>
+    </profile>
+    -->
+  </profiles>
+
+  <!-- activeProfiles
+   | List of profiles that are active for all builds.
+   |
+  <activeProfiles>
+    <activeProfile>alwaysActiveProfile</activeProfile>
+    <activeProfile>anotherAlwaysActiveProfile</activeProfile>
+  </activeProfiles>
+  -->
+</settings>

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/conf/settings.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java Sun Feb 26 11:59:28 2006
@@ -0,0 +1,79 @@
+package org.apache.maven.cli;
+
+/*
+ * Copyright 2001-2005 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.
+ */
+
+import org.apache.maven.wagon.WagonConstants;
+import org.apache.maven.wagon.events.TransferEvent;
+import org.apache.maven.wagon.events.TransferListener;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+/**
+ * Console download progress meter.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class BatchModeDownloadMonitor
+    extends AbstractLogEnabled
+    implements TransferListener
+{
+    public void transferInitiated( TransferEvent transferEvent )
+    {
+        String message = transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "Uploading" : "Downloading";
+
+        String url = transferEvent.getWagon().getRepository().getUrl();
+
+        // TODO: can't use getLogger() because this isn't currently instantiated as a component
+        System.out.println( message + ": " + url + "/" + transferEvent.getResource().getName() );
+    }
+
+    public void transferStarted( TransferEvent transferEvent )
+    {
+        // This space left intentionally blank
+    }
+
+    public void transferProgress( TransferEvent transferEvent, byte[] buffer, int length )
+    {
+        // This space left intentionally blank
+    }
+
+    public void transferCompleted( TransferEvent transferEvent )
+    {
+        long contentLength = transferEvent.getResource().getContentLength();
+        if ( contentLength != WagonConstants.UNKNOWN_LENGTH )
+        {
+            String type = ( transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" );
+            String l = contentLength >= 1024 ? ( contentLength / 1024 ) + "K" : contentLength + "b";
+            System.out.println( l + " " + type );
+        }
+    }
+
+    public void transferError( TransferEvent transferEvent )
+    {
+        // TODO: can't use getLogger() because this isn't currently instantiated as a component
+        transferEvent.getException().printStackTrace();
+    }
+
+    public void debug( String message )
+    {
+        // TODO: can't use getLogger() because this isn't currently instantiated as a component
+//        getLogger().debug( message );
+    }
+}
+
+
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java Sun Feb 26 11:59:28 2006
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2006 Your Corporation. All Rights Reserved.
+ */
+package org.apache.maven.cli;
+
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+
+/**
+ * @author Jason van Zyl
+ * @version $Revision: 381114 $
+ */
+public class CLIManager
+{
+    public static final char ALTERNATE_POM_FILE = 'f';
+
+    public static final char BATCH_MODE = 'B';
+
+    public static final char SET_SYSTEM_PROPERTY = 'D';
+
+    public static final char OFFLINE = 'o';
+
+    public static final char REACTOR = 'r';
+
+    public static final char DEBUG = 'X';
+
+    public static final char ERRORS = 'e';
+
+    public static final char HELP = 'h';
+
+    public static final char VERSION = 'v';
+
+    public static final char NON_RECURSIVE = 'N';
+
+    public static final char UPDATE_SNAPSHOTS = 'U';
+
+    public static final char ACTIVATE_PROFILES = 'P';
+
+    public static final String FORCE_PLUGIN_UPDATES = "cpu";
+
+    public static final String FORCE_PLUGIN_UPDATES2 = "up";
+
+    public static final String SUPPRESS_PLUGIN_UPDATES = "npu";
+
+    public static final String SUPPRESS_PLUGIN_REGISTRY = "npr";
+
+    public static final char CHECKSUM_FAILURE_POLICY = 'C';
+
+    public static final char CHECKSUM_WARNING_POLICY = 'c';
+
+    public static final char ALTERNATE_USER_SETTINGS = 's';
+
+    public static final String FAIL_FAST = "ff";
+
+    public static final String FAIL_AT_END = "fae";
+
+    public static final String FAIL_NEVER = "fn";
+
+    private Options options;
+
+    public CLIManager()
+    {
+        options = new Options();
+
+        options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription(
+            "Force the use of an alternate POM file." ).create( ALTERNATE_POM_FILE ) );
+
+        options.addOption(
+            OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create(
+                SET_SYSTEM_PROPERTY ) );
+        options.addOption(
+            OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) );
+        options.addOption(
+            OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) );
+        options.addOption(
+            OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create(
+                VERSION ) );
+        options.addOption(
+            OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce execution debug output" ).create(
+                DEBUG ) );
+        options.addOption(
+            OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce execution error messages" ).create(
+                ERRORS ) );
+        options.addOption( OptionBuilder.withLongOpt( "reactor" ).withDescription(
+            "Execute goals for project found in the reactor" ).create( REACTOR ) );
+        options.addOption( OptionBuilder.withLongOpt( "non-recursive" ).withDescription(
+            "Do not recurse into sub-projects" ).create( NON_RECURSIVE ) );
+        options.addOption( OptionBuilder.withLongOpt( "update-snapshots" ).withDescription(
+            "Update all snapshots regardless of repository policies" ).create( UPDATE_SNAPSHOTS ) );
+        options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription(
+            "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription(
+            "Run in non-interactive (batch) mode" ).create( BATCH_MODE ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription(
+            "Force upToDate check for any relevant registered plugins" ).create( FORCE_PLUGIN_UPDATES ) );
+        options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription(
+            "Synonym for " + FORCE_PLUGIN_UPDATES ).create( FORCE_PLUGIN_UPDATES2 ) );
+        options.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription(
+            "Suppress upToDate check for any relevant registered plugins" ).create( SUPPRESS_PLUGIN_UPDATES ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription(
+            "Don't use ~/.m2/plugin-registry.xml for plugin versions" ).create( SUPPRESS_PLUGIN_REGISTRY ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "strict-checksums" ).withDescription(
+            "Fail the build if checksums don't match" ).create( CHECKSUM_FAILURE_POLICY ) );
+        options.addOption(
+            OptionBuilder.withLongOpt( "lax-checksums" ).withDescription( "Warn if checksums don't match" ).create(
+                CHECKSUM_WARNING_POLICY ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "settings" )
+            .withDescription( "Alternate path for the user settings file" ).hasArg()
+            .create( ALTERNATE_USER_SETTINGS ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "fail-fast" ).withDescription(
+            "Stop at first failure in reactorized builds" ).create( FAIL_FAST ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "fail-at-end" ).withDescription(
+            "Only fail the build afterwards; allow all non-impacted builds to continue" ).create( FAIL_AT_END ) );
+
+        options.addOption( OptionBuilder.withLongOpt( "fail-never" ).withDescription(
+            "NEVER fail the build, regardless of project result" ).create( FAIL_NEVER ) );
+    }
+
+    public CommandLine parse( String[] args )
+        throws ParseException
+    {
+        CommandLineParser parser = new GnuParser();
+        return parser.parse( options, args );
+    }
+
+    public void displayHelp()
+    {
+        System.out.println();
+
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp( "mvn [options] [<goal(s)>] [<phase(s)>]", "\nOptions:", options, "\n" );
+    }
+}

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=381146&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java (added)
+++ maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java Sun Feb 26 11:59:28 2006
@@ -0,0 +1,95 @@
+package org.apache.maven.cli;
+
+/*
+ * Copyright 2001-2005 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.
+ */
+
+import org.apache.maven.wagon.WagonConstants;
+import org.apache.maven.wagon.events.TransferEvent;
+import org.apache.maven.wagon.events.TransferListener;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+/**
+ * Console download progress meter.
+ *
+ * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class ConsoleDownloadMonitor
+    extends AbstractLogEnabled
+    implements TransferListener
+{
+    private long complete;
+
+    public void transferInitiated( TransferEvent transferEvent )
+    {
+        String message = transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "Uploading" : "Downloading";
+
+        String url = transferEvent.getWagon().getRepository().getUrl();
+
+        // TODO: can't use getLogger() because this isn't currently instantiated as a component
+        System.out.println( message + ": " + url + "/" + transferEvent.getResource().getName() );
+
+        complete = 0;
+    }
+
+    public void transferStarted( TransferEvent transferEvent )
+    {
+        // This space left intentionally blank
+    }
+
+    public void transferProgress( TransferEvent transferEvent, byte[] buffer, int length )
+    {
+        long total = transferEvent.getResource().getContentLength();
+        complete += length;
+        // TODO [BP]: Sys.out may no longer be appropriate, but will \r work with getLogger()?
+        if ( total >= 1024 )
+        {
+            System.out.print(
+                ( complete / 1024 ) + "/" + ( total == WagonConstants.UNKNOWN_LENGTH ? "?" : ( total / 1024 ) + "K" ) +
+                    "\r" );
+        }
+        else
+        {
+            System.out.print( complete + "/" + ( total == WagonConstants.UNKNOWN_LENGTH ? "?" : total + "b" ) + "\r" );
+        }
+    }
+
+    public void transferCompleted( TransferEvent transferEvent )
+    {
+        long contentLength = transferEvent.getResource().getContentLength();
+        if ( contentLength != WagonConstants.UNKNOWN_LENGTH )
+        {
+            String type = ( transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" );
+            String l = contentLength >= 1024 ? ( contentLength / 1024 ) + "K" : contentLength + "b";
+            System.out.println( l + " " + type );
+        }
+    }
+
+    public void transferError( TransferEvent transferEvent )
+    {
+        // TODO: can't use getLogger() because this isn't currently instantiated as a component
+        transferEvent.getException().printStackTrace();
+    }
+
+    public void debug( String message )
+    {
+        // TODO: can't use getLogger() because this isn't currently instantiated as a component
+//        getLogger().debug( message );
+    }
+}
+
+
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"



Mime
View raw message