You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/11/26 02:38:06 UTC
svn commit: r479253 - in /maven/components/branches/maven.new: ./
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/
Author: jvanzyl
Date: Sat Nov 25 17:38:05 2006
New Revision: 479253
URL: http://svn.apache.org/viewvc?view=rev&rev=479253
Log:
o on to the next level of debugging, we almost have the new continer/classworlds working with trunk
Removed:
maven/components/branches/maven.new/modello.jar
Modified:
maven/components/branches/maven.new/build.xml
maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
maven/components/branches/maven.new/maven.ipr
maven/components/branches/maven.new/maven.iws
maven/components/branches/maven.new/pom.xml
Modified: maven/components/branches/maven.new/build.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/build.xml?view=diff&rev=479253&r1=479252&r2=479253
==============================================================================
--- maven/components/branches/maven.new/build.xml (original)
+++ maven/components/branches/maven.new/build.xml Sat Nov 25 17:38:05 2006
@@ -124,7 +124,7 @@
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-11-SNAPSHOT/plexus-container-default-1.0-alpha-11-SNAPSHOT.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-component-api/1.0-alpha-11-SNAPSHOT/plexus-component-api-1.0-alpha-11-SNAPSHOT.jar"/>
- <pathelement location="${maven.repo.local}/org/codehaus/pleuxs/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar"/>
+ <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar"/>
<pathelement location="${maven.repo.local}/org/apache/maven/wagon/wagon-file/1.0-alpha-7/wagon-file-1.0-alpha-7.jar"/>
<pathelement location="${maven.repo.local}/org/apache/maven/wagon/wagon-provider-api/1.0-beta-1/wagon-provider-api-1.0-beta-1.jar"/>
@@ -138,13 +138,13 @@
<!-- DGF Need to keep these modello classes out of the system classpath at runtime, because different parts of the build
need different versions of modello. -->
<path id="modello.classpath">
- <!--
<path refid="pre.classpath"/>
<pathelement location="${maven.repo.local}/org/codehaus/modello/modello-core/1.0-alpha-12-SNAPSHOT/modello-core-1.0-alpha-12-SNAPSHOT.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/modello/modello-plugin-xml/1.0-alpha-12-SNAPSHOT/modello-plugin-xml-1.0-alpha-12-SNAPSHOT.jar"/>
<pathelement location="${maven.repo.local}/org/codehaus/modello/modello-plugin-xpp3/1.0-alpha-12-SNAPSHOT/modello-plugin-xpp3-1.0-alpha-12-SNAPSHOT.jar"/>
- -->
+ <!--
<pathelement location="modello.jar"/>
+ -->
</path>
<!-- DGF pathconvert immediately so we can validate the classpath -->
<pathconvert property="pre.classpath.str" refid="pre.classpath" pathsep="
"/>
Modified: maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?view=diff&rev=479253&r1=479252&r2=479253
==============================================================================
--- maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sat Nov 25 17:38:05 2006
@@ -35,12 +35,13 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-import org.codehaus.classworlds.ClassWorld;
-import org.codehaus.classworlds.DuplicateRealmException;
+import org.codehaus.plexus.classworlds.ClassWorld;
+import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
import org.codehaus.plexus.PlexusContainerException;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -60,7 +61,7 @@
{
private Settings settings;
- private Embedder embedder;
+ private PlexusContainer container;
private Pom pom;
@@ -120,7 +121,7 @@
{
try
{
- getEmbedder().release( repositoryFactory );
+ getContainer().release( repositoryFactory );
}
catch ( ComponentLifecycleException e )
{
@@ -261,7 +262,7 @@
{
try
{
- return getEmbedder().lookup( role );
+ return getContainer().lookup( role );
}
catch ( ComponentLookupException e )
{
@@ -273,7 +274,7 @@
{
try
{
- return getEmbedder().lookup( role, roleHint );
+ return getContainer().lookup( role, roleHint );
}
catch ( ComponentLookupException e )
{
@@ -293,23 +294,22 @@
return remoteRepository;
}
- protected synchronized Embedder getEmbedder()
+ protected synchronized PlexusContainer getContainer()
{
- if ( embedder == null )
+ if ( container == null )
{
- embedder = (Embedder) getProject().getReference( Embedder.class.getName() );
+ container = (PlexusContainer) getProject().getReference( PlexusContainer.class.getName() );
- if ( embedder == null )
+ if ( container == null )
{
- embedder = new Embedder();
-
try
{
ClassWorld classWorld = new ClassWorld();
classWorld.newRealm( "plexus.core", getClass().getClassLoader() );
- embedder.start( classWorld );
+ container = new DefaultPlexusContainer( null, null, null, classWorld );
+
}
catch ( PlexusContainerException e )
{
@@ -320,10 +320,11 @@
throw new BuildException( "Unable to create embedder ClassRealm", e );
}
- getProject().addReference( Embedder.class.getName(), embedder );
+ getProject().addReference( PlexusContainer.class.getName(),container );
}
}
- return embedder;
+
+ return container;
}
public Pom buildPom( MavenProjectBuilder projectBuilder, ArtifactRepository localArtifactRepository )
@@ -372,7 +373,7 @@
{
try
{
- ErrorDiagnostics diagnostics = (ErrorDiagnostics) embedder.lookup( ErrorDiagnostics.ROLE );
+ ErrorDiagnostics diagnostics = (ErrorDiagnostics) container.lookup( ErrorDiagnostics.ROLE );
StringBuffer message = new StringBuffer();
Modified: maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?view=diff&rev=479253&r1=479252&r2=479253
==============================================================================
--- maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java (original)
+++ maven/components/branches/maven.new/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java Sat Nov 25 17:38:05 2006
@@ -118,7 +118,8 @@
for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
- getEmbedder().getContainer().addJarResource( a.getFile() );
+
+ getContainer().addJarResource( a.getFile() );
}
}
catch ( PlexusContainerException e )
Modified: maven/components/branches/maven.new/maven.ipr
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven.ipr?view=diff&rev=479253&r1=479252&r2=479253
==============================================================================
--- maven/components/branches/maven.new/maven.ipr (original)
+++ maven/components/branches/maven.new/maven.ipr Sat Nov 25 17:38:05 2006
@@ -55,7 +55,7 @@
<option name="OUTPUT_DIRECTORY" />
</component>
<component name="GUI Designer component loader factory" />
- <component name="IdProvider" IDEtalkID="5D491B529C391AE91671E59B9275B4AC" />
+ <component name="IdProvider" IDEtalkID="5E032A0B5DD3C0D60306B469A71B9001" />
<component name="ImportConfiguration">
<option name="VENDOR" />
<option name="RELEASE_TAG" />
@@ -257,6 +257,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/maven.iml" filepath="$PROJECT_DIR$/maven.iml" />
<module fileurl="file://$PROJECT_DIR$/maven-artifact/maven-artifact.iml" filepath="$PROJECT_DIR$/maven-artifact/maven-artifact.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-artifact-ant/maven-artifact-ant.iml" filepath="$PROJECT_DIR$/maven-artifact-ant/maven-artifact-ant.iml" />
<module fileurl="file://$PROJECT_DIR$/maven-artifact-manager/maven-artifact-manager.iml" filepath="$PROJECT_DIR$/maven-artifact-manager/maven-artifact-manager.iml" />
<module fileurl="file://$PROJECT_DIR$/maven-artifact-test/maven-artifact-test.iml" filepath="$PROJECT_DIR$/maven-artifact-test/maven-artifact-test.iml" />
<module fileurl="file://$PROJECT_DIR$/maven-cli/maven-cli.iml" filepath="$PROJECT_DIR$/maven-cli/maven-cli.iml" />
@@ -281,7 +282,7 @@
<module fileurl="file://$PROJECT_DIR$/maven-tools/maven-tools.iml" filepath="$PROJECT_DIR$/maven-tools/maven-tools.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.4" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
<component name="ProjectRunConfigurationManager" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
Modified: maven/components/branches/maven.new/maven.iws
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven.iws?view=diff&rev=479253&r1=479252&r2=479253
==============================================================================
--- maven/components/branches/maven.new/maven.iws (original)
+++ maven/components/branches/maven.new/maven.iws Sat Nov 25 17:38:05 2006
@@ -19,20 +19,11 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-cli/pom.xml" afterPath="$PROJECT_DIR$/maven-cli/pom.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/maven.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java" afterPath="$PROJECT_DIR$/maven-core/src/test/java/org/apache/maven/MavenTestUtils.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/MavenEmbedderLoggerManager.java" afterPath="$PROJECT_DIR$/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java" afterPath="$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven.ipr" afterPath="$PROJECT_DIR$/maven.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven.iws" afterPath="$PROJECT_DIR$/maven.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-script/maven-script-ant/pom.xml" afterPath="$PROJECT_DIR$/maven-script/maven-script-ant/pom.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/maven.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java" afterPath="$PROJECT_DIR$/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.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/pom.xml" afterPath="$PROJECT_DIR$/maven-core/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java" afterPath="$PROJECT_DIR$/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.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-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java" afterPath="$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -250,19 +241,86 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="20" column="6" selection-start="748" selection-end="748" vertical-scroll-proportion="0.245827">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AbstractArtifactTask.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="373" column="0" selection-start="13036" selection-end="13036" vertical-scroll-proportion="0.2967359">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="InstallWagonProviderTask.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="119" column="16" selection-start="4436" selection-end="4436" vertical-scroll-proportion="0.6973294">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AntDownloadMonitor.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="44" column="19" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.48367953">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="AntResolutionListener.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="62" column="76" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.3323442">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Authentication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="27" column="13" selection-start="971" selection-end="971" vertical-scroll-proportion="0.462908">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <file leaf-file-name="DependenciesTask.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="124" column="0" selection-start="6932" selection-end="6932" vertical-scroll-proportion="0.018209409">
+ <state line="91" column="31" selection-start="3499" selection-end="3499" vertical-scroll-proportion="0.3323442">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="DeployTask.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="59" column="60" selection-start="2083" selection-end="2083" vertical-scroll-proportion="0.3323442">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="InstallTask.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="36" column="13" selection-start="1410" selection-end="1410" vertical-scroll-proportion="0.002967359">
<folding />
</state>
</provider>
@@ -309,16 +367,7 @@
<option name="LAST_EDITED_TAB_NAME" />
</component>
<component name="NamedScopeManager" />
- <component name="PackagesPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="maven.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </component>
+ <component name="PackagesPane" />
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
<option name="CLIENT" value="" />
@@ -399,9 +448,119 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="maven" />
+ <option name="myItemId" value="maven-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+ </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-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar!/org/codehaus" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar!/org/codehaus/plexus/classworlds" />
+ <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-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar!/org/codehaus" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar!/org/codehaus/classworlds" />
+ <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-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:/Users/jvanzyl/maven-repo-local/org/codehaus/plexus/plexus-classworlds/1.2-alpha-4-SNAPSHOT/plexus-classworlds-1.2-alpha-4-SNAPSHOT.jar" />
+ <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-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant" />
+ <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-artifact-ant" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -409,11 +568,27 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="maven" />
+ <option name="myItemId" value="maven-artifact-ant" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/maven-artifact-ant/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-artifact-ant/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-artifact-ant/src/main/java/org/apache/maven/artifact/ant" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -430,7 +605,7 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
+ <showStructure ProjectPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -486,6 +661,13 @@
<value defaultName="wholeProject" />
</option>
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -496,24 +678,8 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- </component>
- <component name="ScopeViewComponent">
- <subPane subId="Project">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
</component>
+ <component name="ScopeViewComponent" />
<component name="SelectInManager" />
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
@@ -579,36 +745,36 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="7" y="22" width="1440" height="821" extended-state="1" />
+ <frame x="0" y="22" width="1440" height="821" extended-state="6" />
<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="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<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="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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.33" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
- <window_info id="Dependency Cycles" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Dependency Cycles" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
- <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="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Clover" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<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.32918397" 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="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
+ <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<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" />
- <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
</layout>
@@ -695,16 +861,69 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <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="20" column="6" selection-start="748" selection-end="748" vertical-scroll-proportion="0.245827">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="44" column="19" selection-start="1369" selection-end="1369" vertical-scroll-proportion="0.48367953">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.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">
+ <state line="62" column="76" selection-start="1828" selection-end="1828" vertical-scroll-proportion="0.3323442">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/Authentication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="27" column="13" selection-start="971" selection-end="971" vertical-scroll-proportion="0.462908">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="91" column="31" selection-start="3499" selection-end="3499" vertical-scroll-proportion="0.3323442">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DeployTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="59" column="60" selection-start="2083" selection-end="2083" vertical-scroll-proportion="0.3323442">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="36" column="13" selection-start="1410" selection-end="1410" vertical-scroll-proportion="0.002967359">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="373" column="0" selection-start="13036" selection-end="13036" vertical-scroll-proportion="0.2967359">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="124" column="0" selection-start="6932" selection-end="6932" vertical-scroll-proportion="0.018209409">
+ <state line="119" column="16" selection-start="4436" selection-end="4436" vertical-scroll-proportion="0.6973294">
<folding />
</state>
</provider>
Modified: maven/components/branches/maven.new/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/pom.xml?view=diff&rev=479253&r1=479252&r2=479253
==============================================================================
--- maven/components/branches/maven.new/pom.xml (original)
+++ maven/components/branches/maven.new/pom.xml Sat Nov 25 17:38:05 2006
@@ -162,6 +162,11 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>1.2-alpha-4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>1.1</version>
</dependency>