Author: jvanzyl Date: Wed Sep 27 05:36:51 2006 New Revision: 450419 URL: http://svn.apache.org/viewvc?view=rev&rev=450419 Log: o moving the toolchain out of the core so that new plugins using it will not be dependent on 2.1
Removed: maven/components/branches/maven-2.1-jvz/maven-toolchain/ Modified: maven/components/branches/maven-2.1-jvz/maven.iws maven/components/branches/maven-2.1-jvz/pom.xml 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=450419&r1=450418&r2=450419 ============================================================================== --- maven/components/branches/maven-2.1-jvz/maven.iws (original) +++ maven/components/branches/maven-2.1-jvz/maven.iws Wed Sep 27 05:36:51 2006 @@ -17,7 +17,7 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-toolchain/src/main/java/org/apache/maven/Toolchain.java" afterPath="$PROJECT_DIR$/maven-toolchain/src/main/java/org/apache/maven/Toolchain.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/maven-toolchain/src/main/java/org/apache/maven/Toolchain.java" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven.iws" afterPath="$PROJECT_DIR$/maven.iws" /> </list> </component> @@ -134,10 +134,10 @@ <component name="FavoritesProjectViewPane" /> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="MavenCli.java" pinned="false" current="false" current-in-tab="false"> + <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"> <provider selected="true" editor-type-id="text-editor"> - <state line="140" column="33" selection-start="4632" selection-end="4632" vertical-scroll-proportion="0.017804155"> + <state line="140" column="33" selection-start="4632" selection-end="4632" vertical-scroll-proportion="-4.166172"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -145,15 +145,6 @@ </provider> </entry> </file> - <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="49" column="69" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.8189911"> - <folding /> - </state> - </provider> - </entry> - </file> <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"> @@ -608,102 +599,6 @@ <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-cli" /> - <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-cli" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-cli" /> - <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-cli" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-cli" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-cli/src" /> - <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-cli" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-cli" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-cli/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-cli/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-cli/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-cli/src/main/java/org/apache/maven/cli" /> - <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" /> - <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" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -883,13 +778,13 @@ </component> <component name="ToolWindowManager"> <frame x="4" y="22" width="1440" height="821" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <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="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="Project" active="true" 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" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24946082" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32872927" order="8" /> @@ -1036,15 +931,6 @@ </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="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-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.0"> @@ -1105,10 +991,12 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/maven-toolchain/src/main/java/org/apache/maven/Toolchain.java"> + <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="49" column="69" selection-start="1342" selection-end="1342" vertical-scroll-proportion="0.8189911"> - <folding /> + <state line="140" column="33" selection-start="4632" selection-end="4632" vertical-scroll-proportion="-4.166172"> + <folding> + <element signature="imports" expanded="true" /> + </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=450419&r1=450418&r2=450419 ============================================================================== --- maven/components/branches/maven-2.1-jvz/pom.xml (original) +++ maven/components/branches/maven-2.1-jvz/pom.xml Wed Sep 27 05:36:51 2006 @@ -132,7 +132,6 @@ <module>maven-cli</module> <module>maven-embedder</module> <module>maven-tools</module> - <module>maven-toolchain</module> </modules> <dependencies> <dependency> @@ -194,4 +193,4 @@ <url>scp://minotaur.apache.org/www/maven.apache.org/ref/${project.version}/</url> </site> </distributionManagement> -</project> \ No newline at end of file +</project>