Re: svn commit: r450379 - in /maven/components/branches/maven-2.1-jvz: ./ maven-toolchain/ maven-toolchain/src/ maven-toolchain/src/main/ maven-toolchain/src/main/java/ maven-toolchain/src/main/java/org/ maven-toolchain/src/main/java/org/apache/ maven-tool...

Wed, 27 Sep 2006 05:23:23 -0700

can yu remove your IDEA files and ignore them? They make a lot of noise in commits. 

Thanks,
Brett


On 27/09/2006, at 6:41 PM, [EMAIL PROTECTED] wrote:


Author: jvanzyl
Date: Wed Sep 27 01:41:10 2006
New Revision: 450379

URL: http://svn.apache.org/viewvc?view=rev&rev=450379
Log:
adding toolchain interface and milos is going to add some stuff using netbeans toolchain definitions 

Added:
    maven/components/branches/maven-2.1-jvz/maven-toolchain/
maven/components/branches/maven-2.1-jvz/maven-toolchain/ pom.xml (with props) 
    maven/components/branches/maven-2.1-jvz/maven-toolchain/src/
    maven/components/branches/maven-2.1-jvz/maven-toolchain/src/main/
maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/ maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/ maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/apache/ maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/apache/maven/ maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/apache/maven/Toolchain.java (with props) 
Modified:
    maven/components/branches/maven-2.1-jvz/maven.ipr
    maven/components/branches/maven-2.1-jvz/maven.iws
    maven/components/branches/maven-2.1-jvz/pom.xml

Added: maven/components/branches/maven-2.1-jvz/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/ maven-2.1-jvz/maven-toolchain/pom.xml?view=auto&rev=450379 ====================================================================== ======== --- maven/components/branches/maven-2.1-jvz/maven-toolchain/pom.xml (added) +++ maven/components/branches/maven-2.1-jvz/maven-toolchain/pom.xml Wed Sep 27 01:41:10 2006 
@@ -0,0 +1,21 @@
+<?xml version="1.0"?><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-toolchain</artifactId>
+  <name>Maven Toolchain</name>
+  <version>1.0-SNAPSHOT</version>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
Propchange: maven/components/branches/maven-2.1-jvz/maven-toolchain/ pom.xml ---------------------------------------------------------------------- -------- 
    svn:eol-style = native
Propchange: maven/components/branches/maven-2.1-jvz/maven-toolchain/ pom.xml ---------------------------------------------------------------------- -------- 
    svn:keywords = "Author Date Id Revision"
Added: maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/apache/maven/Toolchain.java URL: http://svn.apache.org/viewvc/maven/components/branches/ maven-2.1-jvz/maven-toolchain/src/main/java/org/apache/maven/ Toolchain.java?view=auto&rev=450379 ====================================================================== ======== --- maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/apache/maven/Toolchain.java (added) +++ maven/components/branches/maven-2.1-jvz/maven-toolchain/src/ main/java/org/apache/maven/Toolchain.java Wed Sep 27 01:41:10 2006 
@@ -0,0 +1,10 @@
+package org.apache.maven;
+
+/**
+ * @author Jason van Zyl
+ */
+public interface Toolchain
+{
+    //classpath
+    //path to binaries
+}
Propchange: maven/components/branches/maven-2.1-jvz/maven-toolchain/ src/main/java/org/apache/maven/Toolchain.java ---------------------------------------------------------------------- -------- 
    svn:eol-style = native
Propchange: maven/components/branches/maven-2.1-jvz/maven-toolchain/ src/main/java/org/apache/maven/Toolchain.java ---------------------------------------------------------------------- -------- 
    svn:keywords = "Author Date Id Revision"

Modified: maven/components/branches/maven-2.1-jvz/maven.ipr
URL: http://svn.apache.org/viewvc/maven/components/branches/ maven-2.1-jvz/maven.ipr?view=diff&rev=450379&r1=450378&r2=450379 ====================================================================== ======== 
--- maven/components/branches/maven-2.1-jvz/maven.ipr (original)
+++ maven/components/branches/maven-2.1-jvz/maven.ipr Wed Sep 27 01:41:10 2006 
@@ -287,6 +287,7 @@
<module fileurl="file://$PROJECT_DIR$/maven-script/maven- script-ant/maven-script-ant.iml" filepath="$PROJECT_DIR$/maven- script/maven-script-ant/maven-script-ant.iml" /> <module fileurl="file://$PROJECT_DIR$/maven-script/maven- script-beanshell/maven-script-beanshell.iml" filepath="$PROJECT_DIR $/maven-script/maven-script-beanshell/maven-script-beanshell.iml" /> <module fileurl="file://$PROJECT_DIR$/maven-settings/maven- settings.iml" filepath="$PROJECT_DIR$/maven-settings/maven- settings.iml" /> + <module fileurl="file://$PROJECT_DIR$/maven-toolchain/maven- toolchain.iml" filepath="$PROJECT_DIR$/maven-toolchain/maven- toolchain.iml" /> <module fileurl="file://$PROJECT_DIR$/maven-tools/maven- tools.iml" filepath="$PROJECT_DIR$/maven-tools/maven-tools.iml" /> 
     </modules>
   </component>
@@ -300,7 +301,10 @@
     <option name="ADDITIONAL_OPTIONS_STRING" value="" />
   </component>
   <component name="StarteamVcsAdapter" />
-  <component name="VssVcs" />
+  <component name="VssVcs">
+ <SourceSafePersistencyRemovedFolder>/Users/jvanzyl/js/org/ codehaus/plexus/trunk/plexus-sandbox/plexus-classworlds/src/test/ java/org/codehaus/classworlds/configurator</ SourceSafePersistencyRemovedFolder> + <SourceSafePersistencyRemovedFolder>/Users/jvanzyl/js/org/ codehaus/plexus/trunk/plexus-sandbox/plexus-classworlds/src/main/ java/org/codehaus/classworlds/configurator</ SourceSafePersistencyRemovedFolder> 
+  </component>
   <component name="com.intellij.jsf.UserDefinedFacesConfigs">
     <option name="USER_DEFINED_CONFIGS">
       <value>

Modified: maven/components/branches/maven-2.1-jvz/maven.iws
URL: http://svn.apache.org/viewvc/maven/components/branches/ maven-2.1-jvz/maven.iws?view=diff&rev=450379&r1=450378&r2=450379 ====================================================================== ======== 
--- maven/components/branches/maven-2.1-jvz/maven.iws (original)
+++ maven/components/branches/maven-2.1-jvz/maven.iws Wed Sep 27 01:41:10 2006 
@@ -17,15 +17,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- cli/src/main/java/org/apache/maven/cli/MavenCli.java" afterPath="$PROJECT_DIR$/maven-cli/src/main/java/org/apache/maven/ cli/MavenCli.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- core/src/main/java/org/apache/maven/plugin/ DefaultPluginManager.java" afterPath="$PROJECT_DIR$/maven-core/src/ main/java/org/apache/maven/plugin/DefaultPluginManager.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- embedder/src/main/java/org/apache/maven/embedder/ MavenEmbedder.java" afterPath="$PROJECT_DIR$/maven-embedder/src/ main/java/org/apache/maven/embedder/MavenEmbedder.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- core/src/main/java/org/apache/maven/lifecycle/ DefaultLifecycleExecutor.java" afterPath="$PROJECT_DIR$/maven-core/ src/main/java/org/apache/maven/lifecycle/ DefaultLifecycleExecutor.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- core/src/main/java/org/apache/maven/lifecycle/ LifecycleExecutor.java" afterPath="$PROJECT_DIR$/maven-core/src/ main/java/org/apache/maven/lifecycle/LifecycleExecutor.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- core/src/main/java/org/apache/maven/plugin/ MavenPluginCollector.java" afterPath="$PROJECT_DIR$/maven-core/src/ main/java/org/apache/maven/plugin/MavenPluginCollector.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- core/src/main/java/org/apache/maven/plugin/PluginManager.java" afterPath="$PROJECT_DIR$/maven-core/src/main/java/org/apache/maven/ plugin/PluginManager.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ maven.ipr" afterPath="$PROJECT_DIR$/maven.ipr" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven- embedder/src/test/java/org/apache/maven/embedder/ MavenEmbedderTest.java" afterPath="$PROJECT_DIR$/maven-embedder/src/ test/java/org/apache/maven/embedder/MavenEmbedderTest.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ maven.iws" afterPath="$PROJECT_DIR$/maven.iws" /> 
     </list>
   </component>
@@ -142,10 +135,10 @@
   <component name="FavoritesProjectViewPane" />
   <component name="FileEditorManager">
     <leaf>
- <file leaf-file-name="MavenEmbedder.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/maven-embedder/src/main/ java/org/apache/maven/embedder/MavenEmbedder.java"> + <file leaf-file-name="MavenCli.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/maven-cli/src/main/java/ org/apache/maven/cli/MavenCli.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="194" column="35" selection-start="7285" selection-end="7285" vertical-scroll-proportion="-1.2967359"> + <state line="140" column="33" selection-start="4632" selection-end="4632" vertical-scroll-proportion="0.017804155"> 
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -153,13 +146,11 @@
           </provider>
         </entry>
       </file>
- <file leaf-file-name="MavenCli.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/maven-cli/src/main/java/ org/apache/maven/cli/MavenCli.java"> + <file leaf-file-name="Toolchain.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/maven-toolchain/src/main/ java/org/apache/maven/Toolchain.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="495" column="55" selection-start="17564" selection-end="17564" vertical-scroll-proportion="0.78635013"> 
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+ <state line="8" column="22" selection-start="127" selection-end="127" vertical-scroll-proportion="0.14243324"> 
+              <folding />
             </state>
           </provider>
         </entry>
@@ -167,7 +158,7 @@
<file leaf-file-name="CLIManager.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-cli/src/main/java/ org/apache/maven/cli/CLIManager.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.054628223"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> 
               <folding />
             </state>
           </provider>
@@ -176,7 +167,7 @@
<file leaf-file-name="SystemPropertyProfileActivator.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-project/src/main/ java/org/apache/maven/profiles/activation/ SystemPropertyProfileActivator.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.17804155"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> 
               <folding />
             </state>
           </provider>
@@ -185,7 +176,7 @@
<file leaf-file-name="MavenEmbedderTest.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-embedder/src/test/ java/org/apache/maven/embedder/MavenEmbedderTest.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="94" column="27" selection-start="2774" selection-end="2774" vertical-scroll-proportion="1.2848665"> + <state line="94" column="27" selection-start="2774" selection-end="2774" vertical-scroll-proportion="0.017804155"> 
               <folding />
             </state>
           </provider>
@@ -194,7 +185,7 @@
<file leaf-file-name="DefaultPluginManager.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/ org/apache/maven/plugin/DefaultPluginManager.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="948" column="44" selection-start="40853" selection-end="40853" vertical-scroll-proportion="0.9643917"> + <state line="948" column="44" selection-start="40853" selection-end="40853" vertical-scroll-proportion="0.017804155"> 
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -205,7 +196,7 @@
<file leaf-file-name="MavenPluginCollector.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/ org/apache/maven/plugin/MavenPluginCollector.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="73" column="52" selection-start="2888" selection-end="2888" vertical-scroll-proportion="0.4480712"> + <state line="73" column="52" selection-start="2888" selection-end="2888" vertical-scroll-proportion="0.21661721"> 
               <folding />
             </state>
           </provider>
@@ -214,7 +205,7 @@
<file leaf-file-name="Plugin.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-model/target/ generated-sources/modello/org/apache/maven/model/Plugin.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="290" column="25" selection-start="6759" selection-end="6759" vertical-scroll-proportion="0.3323217"> + <state line="290" column="25" selection-start="6759" selection-end="6759" vertical-scroll-proportion="0.23520486"> 
               <folding />
             </state>
           </provider>
@@ -232,7 +223,7 @@
<file leaf-file-name="DefaultMavenExecutionRequest.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/ org/apache/maven/execution/DefaultMavenExecutionRequest.java"> 
           <provider selected="true" editor-type-id="text-editor">
- <state line="241" column="0" selection-start="5236" selection-end="5236" vertical-scroll-proportion="0.9643917"> + <state line="241" column="0" selection-start="5236" selection-end="5236" vertical-scroll-proportion="0.017804155"> 
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -334,6 +325,60 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 
         </PATH_ELEMENT>
         <PATH_ELEMENT>
+          <option name="myItemId" value="maven-toolchain" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> 
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="maven.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="maven-toolchain" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR $/maven-toolchain" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="maven.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="maven-toolchain" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR $/maven-toolchain" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR $/maven-toolchain/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR $/maven-toolchain/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR $/maven-toolchain/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR $/maven-toolchain/src/main/java/org/apache/maven" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="maven.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
           <option name="myItemId" value="maven-embedder" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> 
         </PATH_ELEMENT>
@@ -770,15 +815,17 @@
         <option name="Make" value="true" />
       </method>
     </tempConfiguration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> 
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
       <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/ appletviewer.policy" /> 
       <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <module name="" />
     </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> 
       <module name="" />
@@ -799,17 +846,15 @@
         <option name="Make" value="true" />
       </method>
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> 
       <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/ appletviewer.policy" /> 
       <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <module name="" />
     </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
@@ -892,12 +937,12 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
- <frame x="0" y="22" width="1440" height="821" extended- state="6" /> + <frame x="4" y="22" width="1440" height="821" extended- state="0" /> 
     <editor active="true" />
     <layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32872927" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24946082" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32872927" order="1" /> 
@@ -916,7 +961,7 @@
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> 
@@ -1003,13 +1048,6 @@
     <option name="myLastEditedConfigurable" />
   </component>
   <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/maven-embedder/src/main/java/ org/apache/maven/embedder/MavenEmbedderException.java"> 
-      <provider selected="true" editor-type-id="text-editor">
- <state line="22" column="13" selection-start="810" selection-end="810" vertical-scroll-proportion="0.3916914"> 
-          <folding />
-        </state>
-      </provider>
-    </entry>
<entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/execution/MavenExecutionRequest.java"> 
       <provider selected="true" editor-type-id="text-editor">
<state line="96" column="7" selection-start="3294" selection-end="3294" vertical-scroll-proportion="0.3323442"> 
@@ -1044,81 +1082,88 @@
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/plugin/DefaultPluginManager.java"> 
-      <provider selected="true" editor-type-id="text-editor">
- <state line="948" column="44" selection-start="40853" selection-end="40853" vertical-scroll-proportion="0.9643917"> 
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
- <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/plugin/MavenPluginCollector.java"> + <entry file="file://$PROJECT_DIR$/maven-cli/src/main/java/org/ apache/maven/cli/CLIManager.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="73" column="52" selection-start="2888" selection-end="2888" vertical-scroll-proportion="0.4480712"> + <state line="0" column="0" selection-start="0" selection- end="0" vertical-scroll-proportion="0.0"> 
           <folding />
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-model/target/generated- sources/modello/org/apache/maven/model/Plugin.java"> + <entry file="file://$PROJECT_DIR$/maven-project/src/main/java/ org/apache/maven/profiles/activation/ SystemPropertyProfileActivator.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="290" column="25" selection-start="6759" selection-end="6759" vertical-scroll-proportion="0.3323217"> + <state line="0" column="0" selection-start="0" selection- end="0" vertical-scroll-proportion="0.0"> 
           <folding />
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/plugin/PluginManager.java"> + <entry file="file://$PROJECT_DIR$/maven-embedder/src/test/java/ org/apache/maven/embedder/MavenEmbedderTest.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="81" column="4" selection-start="4054" selection-end="4054" vertical-scroll-proportion="0.8397626"> + <state line="94" column="27" selection-start="2774" selection-end="2774" vertical-scroll-proportion="0.017804155"> 
           <folding />
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/execution/DefaultMavenExecutionRequest.java"> + <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/plugin/DefaultPluginManager.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="241" column="0" selection-start="5236" selection-end="5236" vertical-scroll-proportion="0.9643917"> + <state line="948" column="44" selection-start="40853" selection-end="40853" vertical-scroll-proportion="0.017804155"> 
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-embedder/src/test/java/ org/apache/maven/embedder/MavenEmbedderTest.java"> + <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/plugin/MavenPluginCollector.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="94" column="27" selection-start="2774" selection-end="2774" vertical-scroll-proportion="1.2848665"> + <state line="73" column="52" selection-start="2888" selection-end="2888" vertical-scroll-proportion="0.21661721"> 
           <folding />
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-project/src/main/java/ org/apache/maven/profiles/activation/ SystemPropertyProfileActivator.java"> + <entry file="file://$PROJECT_DIR$/maven-model/target/generated- sources/modello/org/apache/maven/model/Plugin.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection- end="0" vertical-scroll-proportion="-0.17804155"> + <state line="290" column="25" selection-start="6759" selection-end="6759" vertical-scroll-proportion="0.23520486"> 
           <folding />
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-embedder/src/main/java/ org/apache/maven/embedder/MavenEmbedder.java"> + <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/plugin/PluginManager.java"> 
+      <provider selected="true" editor-type-id="text-editor">
+ <state line="81" column="4" selection-start="4054" selection-end="4054" vertical-scroll-proportion="0.8397626"> 
+          <folding />
+        </state>
+      </provider>
+    </entry>
+ <entry file="file://$PROJECT_DIR$/maven-core/src/main/java/org/ apache/maven/execution/DefaultMavenExecutionRequest.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="194" column="35" selection-start="7285" selection-end="7285" vertical-scroll-proportion="-1.2967359"> + <state line="241" column="0" selection-start="5236" selection-end="5236" vertical-scroll-proportion="0.017804155"> 
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
- <entry file="file://$PROJECT_DIR$/maven-cli/src/main/java/org/ apache/maven/cli/CLIManager.java"> + <entry file="file://$PROJECT_DIR$/maven-embedder/src/main/java/ org/apache/maven/embedder/MavenEmbedder.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection- end="0" vertical-scroll-proportion="-0.054628223"> 
-          <folding />
+ <state line="194" column="35" selection-start="7285" selection-end="7285" vertical-scroll-proportion="0.017804155"> 
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
<entry file="file://$PROJECT_DIR$/maven-cli/src/main/java/org/ apache/maven/cli/MavenCli.java"> 
       <provider selected="true" editor-type-id="text-editor">
- <state line="495" column="55" selection-start="17564" selection-end="17564" vertical-scroll-proportion="0.78635013"> + <state line="140" column="33" selection-start="4632" selection-end="4632" vertical-scroll-proportion="0.017804155"> 
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
+        </state>
+      </provider>
+    </entry>
+ <entry file="file://$PROJECT_DIR$/maven-toolchain/src/main/ java/org/apache/maven/Toolchain.java"> 
+      <provider selected="true" editor-type-id="text-editor">
+ <state line="8" column="22" selection-start="127" selection-end="127" vertical-scroll-proportion="0.14243324"> 
+          <folding />
         </state>
       </provider>
     </entry>

Modified: maven/components/branches/maven-2.1-jvz/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/ maven-2.1-jvz/pom.xml?view=diff&rev=450379&r1=450378&r2=450379 ====================================================================== ======== 
--- maven/components/branches/maven-2.1-jvz/pom.xml (original)
+++ maven/components/branches/maven-2.1-jvz/pom.xml Wed Sep 27 01:41:10 2006 
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
   ~ Copyright 2005-2006 The Apache Software Foundation.
   ~
@@ -14,15 +13,12 @@
~ 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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + --><project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http:// maven.apache.org/maven-v4_0_0.xsd"> 
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>3</version>
+    <version>4</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <artifactId>maven</artifactId>
@@ -121,7 +117,6 @@
     <module>maven-core</module>
     <module>maven-error-diagnostics</module>
     <module>maven-model</module>
-    <module>maven-model-converter</module>
     <module>maven-monitor</module>
     <module>maven-plugin-api</module>
     <module>maven-plugin-descriptor</module>
@@ -137,6 +132,7 @@
     <module>maven-cli</module>
     <module>maven-embedder</module>
     <module>maven-tools</module>
+    <module>maven-toolchain</module>
   </modules>
   <dependencies>
     <dependency>
@@ -152,7 +148,7 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
<!-- We need to upgrade this to 1.0-alpha-10-SNAPSHOT for >= 2.0.5, to correct MNG-2201 --> 
-        <version>1.0-alpha-11-SNAPSHOT</version>
+        <version>1.0-alpha-9</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -184,6 +180,12 @@
         <artifactId>wagon-http-lightweight</artifactId>
         <version>1.0-alpha-6</version>
       </dependency>
+      <dependency>
+        <groupId>easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>1.2_Java1.3</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <distributionManagement>
@@ -192,4 +194,4 @@
<url>scp://minotaur.apache.org/www/maven.apache.org/ref/$ {project.version}/</url> 
     </site>
   </distributionManagement>
-</project>
+</project>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to