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/25 21:44:06 UTC
svn commit: r479193 - in /maven/components/branches/maven.new: ./ maven-cli/
maven-core/ maven-core/src/main/java/org/apache/maven/plugin/
maven-core/src/test/java/org/apache/maven/
maven-embedder/src/main/java/org/apache/maven/embedder/ maven-plugin-d...
Author: jvanzyl
Date: Sat Nov 25 12:44:05 2006
New Revision: 479193
URL: http://svn.apache.org/viewvc?view=rev&rev=479193
Log:
o something for andy and i to play with
Added:
maven/components/branches/maven.new/
- copied from r478581, maven/components/trunk/
maven/components/branches/maven.new/README.txt
- copied unchanged from r478663, maven/components/trunk/README.txt
maven/components/branches/maven.new/maven.ipr
maven/components/branches/maven.new/maven.iws
Modified:
maven/components/branches/maven.new/build.xml
maven/components/branches/maven.new/maven-cli/pom.xml
maven/components/branches/maven.new/maven-core/pom.xml
maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
maven/components/branches/maven.new/maven-script/maven-script-ant/pom.xml
maven/components/branches/maven.new/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
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=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/build.xml (original)
+++ maven/components/branches/maven.new/build.xml Sat Nov 25 12:44:05 2006
@@ -14,6 +14,12 @@
local repository for the bootstrap process.
</description>
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement path="ant-contrib-1.0b2.jar"/>
+ </classpath>
+ </taskdef>
+
<target name="isMavenHomeSet">
<property environment="env"/>
<condition property="maven.home" value="${env.M2_HOME}">
@@ -88,17 +94,15 @@
</antcall>
</sequential>
</macrodef>
- <pull orgpath="org/codehaus/plexus/plexus-utils" version="1.1" name="plexus-utils"/>
- <pull orgpath="org/codehaus/plexus/plexus-container-default" version="1.0-alpha-9" name="plexus-container-default"/>
<pull orgpath="commons-cli/commons-cli" version="1.0" name="commons-cli"/>
- <pull orgpath="org/apache/maven/wagon/wagon-provider-api" version="1.0-beta-1" name="wagon-provider-api"/>
- <pull orgpath="classworlds/classworlds" version="1.1-alpha-2" name="classworlds"/>
+ <pull orgpath="org/codehaus/plexus/plexus-utils" version="1.1" name="plexus-utils"/>
+ <pull orgpath="org/codehaus/plexus/plexus-container-default" version="1.0-alpha-11-SNAPSHOT" name="plexus-container-default"/>
+ <pull orgpath="org/codehaus/plexus/plexus-component-api" version="1.0-alpha-11-SNAPSHOT" name="plexus-component-api"/>
+ <pull orgpath="org/codehaus/plexus/plexus-classworlds" version="1.2-alpha-4-SNAPSHOT" name="plexus-classworlds"/>
<pull orgpath="org/codehaus/plexus/plexus-interactivity-api" version="1.0-alpha-4" name="plexus-interactivity-api"/>
-
- <pull orgpath="org/codehaus/plexus/plexus-archiver" version="1.0-alpha-8-SNAPSHOT"
- name="plexus-archiver" repository="codehaus"/>
-
+ <pull orgpath="org/codehaus/plexus/plexus-archiver" version="1.0-alpha-8-SNAPSHOT" name="plexus-archiver" repository="codehaus"/>
<pull orgpath="org/apache/apache" version="3" name="apache" type="pom"/>
+ <pull orgpath="org/apache/maven/wagon/wagon-provider-api" version="1.0-beta-1" name="wagon-provider-api"/>
<pull orgpath="org/apache/maven/maven-parent" version="4" name="maven-parent" type="pom"/>
<pull orgpath="org/apache/maven/plugins/maven-plugins" version="4-SNAPSHOT" name="maven-plugins" type="pom"/>
<pull orgpath="org/apache/maven/wagon/wagon-file" version="1.0-alpha-7" name="wagon-file"/>
@@ -116,19 +120,20 @@
<target name="classpath-pre" depends="init,pull"
description="constructs a classpath reference containing our dependencies, and verifies that all files are present">
<path id="pre.classpath">
- <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.jar"/>
- <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <pathelement location="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar"/>
<pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.0/commons-cli-1.0.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"/>
- <pathelement location="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/>
+ <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-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"/>
<pathelement location="${maven.repo.local}/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-6/wagon-http-lightweight-1.0-alpha-6.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"/>
<pathelement location="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh-external/1.0-alpha-6/wagon-ssh-external-1.0-alpha-6.jar"/>
<pathelement location="${maven.repo.local}/org/apache/maven/wagon/wagon-ssh/1.0-alpha-7/wagon-ssh-1.0-alpha-7.jar"/>
<pathelement location="${maven.repo.local}/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9-SNAPSHOT/doxia-sink-api-1.0-alpha-9-SNAPSHOT.jar"/>
+ <pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
</path>
<!-- 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. -->
@@ -224,10 +229,10 @@
<arg value="-e"/>
<arg value="-B"/>
<arg value="-X"/>
-<!-- JDC: Commenting out offline mode until all plugins and their dependencies
- can be pre-resolved before this call.
- <arg value="-o"/>
- -->
+ <!-- JDC: Commenting out offline mode until all plugins and their dependencies
+ can be pre-resolved before this call.
+ <arg value="-o"/>
+ -->
<arg value="clean"/>
<arg value="install"/>
</java>
@@ -241,9 +246,9 @@
<arg value="-e"/>
<arg value="-B"/>
-<!-- JDC: Removing offline switch until we can pre-resolve all plugins, dependencies and associated POMs.
- <arg value="-o"/>
- -->
+ <!-- JDC: Removing offline switch until we can pre-resolve all plugins, dependencies and associated POMs.
+ <arg value="-o"/>
+ -->
<arg value="clean"/>
<arg value="assembly:assembly"/>
</java>
@@ -253,7 +258,8 @@
<available file="${maven.assembly}"/>
</not>
</condition>
- <fail if="build.failed" message="Assembly task seemed to succeed, but couldn't find assembly file: ${maven.assembly}"/>
+ <fail if="build.failed"
+ message="Assembly task seemed to succeed, but couldn't find assembly file: ${maven.assembly}"/>
</target>
<target name="extract-assembly" depends="init,maven-assembly"
@@ -340,21 +346,38 @@
<!-- Replace 'SNAPSHOT' with 'timestamp-buildnumber'. This is ugly but
ant doesn't allow updating of properties.
-->
- <xmlproperty file="${maven.repo.local}/${orgpath}/${version}/bootstrap-maven-metadata.xml"/>
- <echo file="deleteme.version.properties" message="${version}"/>
- <replaceregexp file="deleteme.version.properties"
- match="SNAPSHOT"
- replace="${metadata.versioning.snapshot.timestamp}-${metadata.versioning.snapshot.buildNumber}"
- byline="true"/>
- <loadfile srcFile="deleteme.version.properties" property="fileversion"/>
+
+ <condition property="localSnapshot" value="false">
+ <not>
+ <available file="${maven.repo.local}/${orgpath}/${version}/maven-metadata-local.xml"/>
+ </not>
+ </condition>
+
+ <if>
+ <equals arg1="${localSnapshot}" arg2="false"/>
+ <then>
+ <xmlproperty file="${maven.repo.local}/${orgpath}/${version}/bootstrap-maven-metadata.xml"/>
+ <echo file="deleteme.version.properties" message="${version}"/>
+ <replaceregexp file="deleteme.version.properties"
+ match="SNAPSHOT"
+ replace="${metadata.versioning.snapshot.timestamp}-${metadata.versioning.snapshot.buildNumber}"
+ byline="true"/>
+ <loadfile srcFile="deleteme.version.properties" property="fileversion"/>
+
+ <!-- download the final artifact -->
+ <get src="${repo}/${orgpath}/${version}/${name}-${fileversion}.${type}"
+ dest="${maven.repo.local}/${orgpath}/${version}/${name}-${version}.${type}" usetimestamp="true"
+ ignoreerrors="false"
+ />
+ </then>
+ <else>
+ <property name="fileversion" value="SNAPSHOT"/>
+ </else>
+ </if>
<echo>Resolved version ${fileversion} (given=${version})</echo>
- <!-- download the final artifact -->
- <get src="${repo}/${orgpath}/${version}/${name}-${fileversion}.${type}"
- dest="${maven.repo.local}/${orgpath}/${version}/${name}-${version}.${type}" usetimestamp="true"
- ignoreerrors="false"
- />
+
<condition property="build.failed">
<not>
<available file="${maven.repo.local}/${orgpath}/${version}/${name}-${version}.${type}"/>
Modified: maven/components/branches/maven.new/maven-cli/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-cli/pom.xml?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-cli/pom.xml (original)
+++ maven/components/branches/maven.new/maven-cli/pom.xml Sat Nov 25 12:44:05 2006
@@ -39,9 +39,8 @@
</build>
<dependencies>
<dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/components/branches/maven.new/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/pom.xml?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-core/pom.xml (original)
+++ maven/components/branches/maven.new/maven-core/pom.xml Sat Nov 25 12:44:05 2006
@@ -176,9 +176,8 @@
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1</version>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
</dependency>
</dependencies>
</project>
Modified: maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sat Nov 25 12:44:05 2006
@@ -411,8 +411,9 @@
try
{
- Thread.currentThread().setContextClassLoader(
- mojoDescriptor.getPluginDescriptor().getClassRealm().getClassLoader() );
+ // TODO - WE NEED TO TIDY THIS CLASSLOADER STUFF - NASTY CASTING
+ Thread.currentThread().setContextClassLoader( (ClassLoader)
+ mojoDescriptor.getPluginDescriptor().getClassRealm().getStrategy() );
plugin.execute();
Modified: maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java (original)
+++ maven/components/branches/maven.new/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginCollector.java Sat Nov 25 12:44:05 2006
@@ -70,6 +70,11 @@
}
}
+ public String getId()
+ {
+ return "maven-plugin-collector";
+ }
+
public PluginDescriptor getPluginDescriptor( Plugin plugin )
{
// TODO: include version, but can't do this in the plugin manager as it is not resolved to the right version
Modified: maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java (original)
+++ maven/components/branches/maven.new/maven-core/src/test/java/org/apache/maven/MavenTestUtils.java Sat Nov 25 12:44:05 2006
@@ -16,10 +16,11 @@
* limitations under the License.
*/
-import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.classworlds.realm.ClassRealm;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusContainerException;
import java.io.File;
@@ -36,6 +37,7 @@
}
public static PlexusContainer getContainerInstance()
+ throws PlexusContainerException
{
return new DefaultPlexusContainer();
}
Modified: maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sat Nov 25 12:44:05 2006
@@ -49,14 +49,15 @@
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.classworlds.ClassWorld;
-import org.codehaus.classworlds.DuplicateRealmException;
+import org.codehaus.classworlds.realm.DuplicateRealmException;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
-import org.codehaus.plexus.embed.Embedder;
+import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -85,7 +86,7 @@
// Embedder
// ----------------------------------------------------------------------
- private Embedder embedder;
+ private PlexusContainer container;
// ----------------------------------------------------------------------
// Components
@@ -444,7 +445,7 @@
checkStarted();
List phases = new ArrayList();
- ComponentDescriptor descriptor = embedder.getContainer().getComponentDescriptor( LifecycleExecutor.ROLE );
+ ComponentDescriptor descriptor = container.getComponentDescriptor( LifecycleExecutor.ROLE );
PlexusConfiguration configuration = descriptor.getConfiguration();
@@ -568,11 +569,18 @@
throw new IllegalStateException( "A classWorld or classloader must be specified using setClassLoader|World(ClassLoader)." );
}
- embedder = new Embedder();
+ try
+ {
+ container = new DefaultPlexusContainer( null, null, null, classWorld );
+ }
+ catch ( PlexusContainerException e )
+ {
+ throw new MavenEmbedderException( "Error starting Maven embedder.", e );
+ }
if ( logger != null )
{
- embedder.setLoggerManager( new MavenEmbedderLoggerManager( new PlexusLoggerAdapter( logger ) ) );
+ container.setLoggerManager( new MavenEmbedderLoggerManager( new PlexusLoggerAdapter( logger ) ) );
}
try
@@ -584,11 +592,12 @@
classWorld.newRealm( "plexus.core", classLoader );
}
- embedder.start( classWorld );
+// TODO verify that this is not needed...
+// embedder.start( classWorld );
if (req.getContainerCustomizer() != null)
{
- req.getContainerCustomizer().customize(embedder.getContainer());
+ req.getContainerCustomizer().customize(container);
}
// ----------------------------------------------------------------------
@@ -600,35 +609,35 @@
modelWriter = new MavenXpp3Writer();
- maven = (Maven) embedder.lookup( Maven.ROLE );
+ maven = (Maven) container.lookup( Maven.ROLE );
- mavenTools = (MavenTools) embedder.lookup( MavenTools.ROLE );
+ mavenTools = (MavenTools) container.lookup( MavenTools.ROLE );
pluginDescriptorBuilder = new PluginDescriptorBuilder();
- profileManager = new DefaultProfileManager( embedder.getContainer(), req.getSystemProperties() );
+ profileManager = new DefaultProfileManager( container, req.getSystemProperties() );
profileManager.explicitlyActivate(req.getActiveProfiles());
profileManager.explicitlyDeactivate(req.getInactiveProfiles());
- mavenProjectBuilder = (MavenProjectBuilder) embedder.lookup( MavenProjectBuilder.ROLE );
+ mavenProjectBuilder = (MavenProjectBuilder) container.lookup( MavenProjectBuilder.ROLE );
// ----------------------------------------------------------------------
// Artifact related components
// ----------------------------------------------------------------------
- artifactRepositoryFactory = (ArtifactRepositoryFactory) embedder.lookup( ArtifactRepositoryFactory.ROLE );
+ artifactRepositoryFactory = (ArtifactRepositoryFactory) container.lookup( ArtifactRepositoryFactory.ROLE );
- artifactFactory = (ArtifactFactory) embedder.lookup( ArtifactFactory.ROLE );
+ artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE );
- artifactResolver = (ArtifactResolver) embedder.lookup( ArtifactResolver.ROLE );
+ artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );
- defaultArtifactRepositoryLayout = (ArtifactRepositoryLayout) embedder.lookup( ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID );
+ defaultArtifactRepositoryLayout = (ArtifactRepositoryLayout) container.lookup( ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID );
- lifecycleExecutor = (LifecycleExecutor) embedder.lookup( LifecycleExecutor.ROLE );
+ lifecycleExecutor = (LifecycleExecutor) container.lookup( LifecycleExecutor.ROLE );
- wagonManager = (WagonManager) embedder.lookup( WagonManager.ROLE );
+ wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
settings = mavenTools.buildSettings( req.getUserSettingsFile(),
req.getGlobalSettingsFile(),
@@ -643,10 +652,6 @@
localRepository = createLocalRepository( settings );
}
- catch ( PlexusContainerException e )
- {
- throw new MavenEmbedderException( "Cannot start Plexus embedder.", e );
- }
catch ( DuplicateRealmException e )
{
throw new MavenEmbedderException( "Cannot create Classworld realm for the embedder.", e );
@@ -723,11 +728,11 @@
started = false;
try
{
- embedder.release( mavenProjectBuilder );
+ container.release( mavenProjectBuilder );
- embedder.release( artifactRepositoryFactory );
+ container.release( artifactRepositoryFactory );
- embedder.release( lifecycleExecutor );
+ container.release( lifecycleExecutor );
}
catch ( ComponentLifecycleException e )
{
Modified: maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java (original)
+++ maven/components/branches/maven.new/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java Sat Nov 25 12:44:05 2006
@@ -78,6 +78,13 @@
this.currentThreshold = currentThreshold;
}
+ public void setThresholds( int currentThreshold )
+ {
+ this.currentThreshold = currentThreshold;
+
+ logger.setThreshold( currentThreshold );
+ }
+
/**
* @return Returns the threshold.
*/
Modified: maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java (original)
+++ maven/components/branches/maven.new/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java Sat Nov 25 12:44:05 2006
@@ -21,7 +21,7 @@
import org.apache.maven.plugin.lifecycle.Lifecycle;
import org.apache.maven.plugin.lifecycle.LifecycleConfiguration;
import org.apache.maven.plugin.lifecycle.io.xpp3.LifecycleMappingsXpp3Reader;
-import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/components/branches/maven.new/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-script/maven-script-ant/pom.xml?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven.new/maven-script/maven-script-ant/pom.xml Sat Nov 25 12:44:05 2006
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-ant-factory</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
+ <version>1.0-alpha-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/components/branches/maven.new/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java (original)
+++ maven/components/branches/maven.new/maven-script/maven-script-ant/src/main/java/org/apache/maven/script/ant/AntMojoComponentFactory.java Sat Nov 25 12:44:05 2006
@@ -1,6 +1,6 @@
package org.apache.maven.script.ant;
-import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.factory.ComponentInstantiationException;
import org.codehaus.plexus.component.factory.ant.AntComponentFactory;
Added: maven/components/branches/maven.new/maven.ipr
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven.ipr?view=auto&rev=479193
==============================================================================
--- maven/components/branches/maven.new/maven.ipr (added)
+++ maven/components/branches/maven.new/maven.ipr Sat Nov 25 12:44:05 2006
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4" relativePaths="false">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ </component>
+ <component name="BuildJarProjectSettings">
+ <option name="BUILD_JARS_ON_MAKE" value="false" />
+ </component>
+ <component name="CodeStyleManager">
+ <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
+ <option name="CODE_STYLE_SCHEME" value="" />
+ </component>
+ <component name="CodeStyleProjectProfileManger">
+ <option name="PROJECT_PROFILE" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ </component>
+ <component name="CodeStyleSettingsManager">
+ <option name="PER_PROJECT_SETTINGS" />
+ <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+ </component>
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <option name="DEPLOY_AFTER_MAKE" value="0" />
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="!?*.java" />
+ </wildcardResourcePatterns>
+ </component>
+ <component name="DataSourceManager" />
+ <component name="DataSourceManagerImpl" />
+ <component name="DependenciesAnalyzeManager">
+ <option name="myForwardDirection" value="false" />
+ </component>
+ <component name="DependencyValidationManager" />
+ <component name="EclipseCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="EclipseEmbeddedCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="EntryPointsManager">
+ <entry_points />
+ </component>
+ <component name="ExportToHTMLSettings">
+ <option name="PRINT_LINE_NUMBERS" value="false" />
+ <option name="OPEN_IN_BROWSER" value="false" />
+ <option name="OUTPUT_DIRECTORY" />
+ </component>
+ <component name="GUI Designer component loader factory" />
+ <component name="IdProvider" IDEtalkID="5D491B529C391AE91671E59B9275B4AC" />
+ <component name="ImportConfiguration">
+ <option name="VENDOR" />
+ <option name="RELEASE_TAG" />
+ <option name="LOG_MESSAGE" />
+ <option name="CHECKOUT_AFTER_IMPORT" value="true" />
+ </component>
+ <component name="InspectionProjectProfileManager">
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ <scopes />
+ <profiles>
+ <profile version="1.0" is_locked="false">
+ <option name="myName" value="Project Default" />
+ <option name="myLocal" value="false" />
+ <used_levels>
+ <error>
+ <option name="myName" value="ERROR" />
+ <option name="myVal" value="400" />
+ </error>
+ <warning>
+ <option name="myName" value="WARNING" />
+ <option name="myVal" value="300" />
+ </warning>
+ <information>
+ <option name="myName" value="INFO" />
+ <option name="myVal" value="200" />
+ </information>
+ <server>
+ <option name="myName" value="SERVER PROBLEM" />
+ <option name="myVal" value="100" />
+ </server>
+ </used_levels>
+ </profile>
+ </profiles>
+ </component>
+ <component name="JUnitProjectSettings">
+ <option name="TEST_RUNNER" value="UI" />
+ </component>
+ <component name="JavacSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="DEPRECATION" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="JavadocGenerationManager">
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="OPTION_SCOPE" value="protected" />
+ <option name="OPTION_HIERARCHY" value="false" />
+ <option name="OPTION_NAVIGATOR" value="false" />
+ <option name="OPTION_INDEX" value="false" />
+ <option name="OPTION_SEPARATE_INDEX" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+ <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false" />
+ <option name="OPTION_DEPRECATED_LIST" value="false" />
+ <option name="OTHER_OPTIONS" />
+ <option name="HEAP_SIZE" />
+ <option name="LOCALE" />
+ <option name="OPEN_IN_BROWSER" value="false" />
+ </component>
+ <component name="JikesSettings">
+ <option name="JIKES_PATH" value="" />
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="DEPRECATION" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="IS_EMACS_ERRORS_MODE" value="true" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </component>
+ <component name="LogConsolePreferences">
+ <option name="FILTER_ERRORS" value="false" />
+ <option name="FILTER_WARNINGS" value="false" />
+ <option name="FILTER_INFO" value="true" />
+ <option name="CUSTOM_FILTER" />
+ </component>
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+ <component name="ProjectModuleManager">
+ <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-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" />
+ <module fileurl="file://$PROJECT_DIR$/maven-core/maven-core.iml" filepath="$PROJECT_DIR$/maven-core/maven-core.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-embedder/maven-embedder.iml" filepath="$PROJECT_DIR$/maven-embedder/maven-embedder.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-error-diagnostics/maven-error-diagnostics.iml" filepath="$PROJECT_DIR$/maven-error-diagnostics/maven-error-diagnostics.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-model/maven-model.iml" filepath="$PROJECT_DIR$/maven-model/maven-model.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-monitor/maven-monitor.iml" filepath="$PROJECT_DIR$/maven-monitor/maven-monitor.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-plugin-api/maven-plugin-api.iml" filepath="$PROJECT_DIR$/maven-plugin-api/maven-plugin-api.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-plugin-descriptor/maven-plugin-descriptor.iml" filepath="$PROJECT_DIR$/maven-plugin-descriptor/maven-plugin-descriptor.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-plugin-parameter-documenter/maven-plugin-parameter-documenter.iml" filepath="$PROJECT_DIR$/maven-plugin-parameter-documenter/maven-plugin-parameter-documenter.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-plugin-registry/maven-plugin-registry.iml" filepath="$PROJECT_DIR$/maven-plugin-registry/maven-plugin-registry.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-profile/maven-profile.iml" filepath="$PROJECT_DIR$/maven-profile/maven-profile.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-project/maven-project.iml" filepath="$PROJECT_DIR$/maven-project/maven-project.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-reporting/maven-reporting.iml" filepath="$PROJECT_DIR$/maven-reporting/maven-reporting.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-reporting/maven-reporting-api/maven-reporting-api.iml" filepath="$PROJECT_DIR$/maven-reporting/maven-reporting-api/maven-reporting-api.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-repository-metadata/maven-repository-metadata.iml" filepath="$PROJECT_DIR$/maven-repository-metadata/maven-repository-metadata.iml" />
+ <module fileurl="file://$PROJECT_DIR$/maven-script/maven-script.iml" filepath="$PROJECT_DIR$/maven-script/maven-script.iml" />
+ <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-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="ProjectRunConfigurationManager" />
+ <component name="RmicSettings">
+ <option name="IS_EANABLED" value="false" />
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="false" />
+ <option name="GENERATE_IIOP_STUBS" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ </component>
+ <component name="StarteamVcsAdapter" />
+ <component name="VssVcs" />
+ <component name="com.intellij.jsf.UserDefinedFacesConfigs">
+ <option name="USER_DEFINED_CONFIGS">
+ <value>
+ <list size="0" />
+ </value>
+ </option>
+ </component>
+ <component name="com.sixrr.metrics.MetricsReloaded">
+ <option name="selectedProfile" value="Default" />
+ <option name="autoscroll" value="false" />
+ <option name="calculateMetrics" value="true" />
+ <option name="includeTestClasses" value="false" />
+ <option name="flattenInnerClasses" value="true" />
+ <option name="cycleTableSpecificationString" value="" />
+ <option name="shortCycleTableSpecificationString" value="" />
+ </component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="2" />
+ </Base>
+ </component>
+ <component name="libraryTable" />
+ <component name="uidesigner-configuration">
+ <option name="INSTRUMENT_CLASSES" value="true" />
+ <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+ <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
+ </component>
+ <UsedPathMacros />
+</project>
+
Added: maven/components/branches/maven.new/maven.iws
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/maven.iws?view=auto&rev=479193
==============================================================================
--- maven/components/branches/maven.new/maven.iws (added)
+++ maven/components/branches/maven.new/maven.iws Sat Nov 25 12:44:05 2006
@@ -0,0 +1,715 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4" relativePaths="false">
+ <component name="AppServerRunManager" />
+ <component name="AspectsView" />
+ <component name="BookmarkManager" />
+ <component name="ChangeBrowserSettings">
+ <option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
+ <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
+ <option name="USE_DATE_BEFORE_FILTER" value="false" />
+ <option name="USE_DATE_AFTER_FILTER" value="false" />
+ <option name="USE_CHANGE_BEFORE_FILTER" value="false" />
+ <option name="USE_CHANGE_AFTER_FILTER" value="false" />
+ <option name="DATE_BEFORE" value="" />
+ <option name="DATE_AFTER" value="" />
+ <option name="CHANGE_BEFORE" value="" />
+ <option name="CHANGE_AFTER" value="" />
+ <option name="USE_USER_FILTER" value="false" />
+ <option name="USER" value="" />
+ </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$/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" />
+ </list>
+ </component>
+ <component name="ChangeListSynchronizer" />
+ <component name="ChangesViewManager" flattened_view="true" />
+ <component name="CheckinPanelState" />
+ <component name="CloverPlugin" class="com.cenqua.clover.idea6.config.IdeaCloverConfig">
+ <regexpContexts class="java.util.ArrayList" />
+ <flushInterval>5000</flushInterval>
+ <flattenPackages>false</flattenPackages>
+ <coveredHighlight null="true" />
+ <autoRefreshInterval>2000</autoRefreshInterval>
+ <excludes null="true" />
+ <showErrorMarks>true</showErrorMarks>
+ <showInline>true</showInline>
+ <contextFilter class="com.cenqua.clover.context.BlockContextFilter">
+ <filterMask>65535</filterMask>
+ </contextFilter>
+ <showTooltips>true</showTooltips>
+ <languageLevel>1.3</languageLevel>
+ <notCoveredHighlight>-341816</notCoveredHighlight>
+ <enabled>true</enabled>
+ <notCoveredStripe>-65536</notCoveredStripe>
+ <outOfDateStripe>-256</outOfDateStripe>
+ <instrumentTests>false</instrumentTests>
+ <showGutter>true</showGutter>
+ <manualInitString null="true" />
+ <includes null="true" />
+ <useGeneratedInitString>true</useGeneratedInitString>
+ <showSummaryInToolbar>true</showSummaryInToolbar>
+ <autoScroll>true</autoScroll>
+ <outOfDateHighlight>-32</outOfDateHighlight>
+ <showSummaryInToolwindow>true</showSummaryInToolwindow>
+ <relativeInitString>false</relativeInitString>
+ <span>0</span>
+ <flushPolicy>0</flushPolicy>
+ <autoScrollFromSource>false</autoScrollFromSource>
+ <coveredStripe>-16711936</coveredStripe>
+ <autoRefresh>false</autoRefresh>
+ </component>
+ <component name="Commander">
+ <leftPanel />
+ <rightPanel />
+ <splitter proportion="0.5" />
+ </component>
+ <component name="CompilerWorkspaceConfiguration">
+ <option name="COMPILE_IN_BACKGROUND" value="false" />
+ <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
+ <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
+ <option name="COMPILE_DEPENDENT_FILES" value="false" />
+ <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
+ <option name="ASSERT_NOT_NULL" value="true" />
+ </component>
+ <component name="CoverageDataManager" />
+ <component name="Cvs2Configuration">
+ <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
+ <option name="MERGING_MODE" value="0" />
+ <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" />
+ <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
+ <option name="RESET_STICKY" value="false" />
+ <option name="CREATE_NEW_DIRECTORIES" value="true" />
+ <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
+ <option name="PROCESS_UNKNOWN_FILES" value="false" />
+ <option name="PROCESS_DELETED_FILES" value="false" />
+ <option name="PROCESS_IGNORED_FILES" value="false" />
+ <option name="RESERVED_EDIT" value="false" />
+ <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
+ <value>
+ <option name="BRANCH" value="" />
+ <option name="DATE" value="" />
+ <option name="USE_BRANCH" value="false" />
+ <option name="USE_DATE" value="false" />
+ </value>
+ </option>
+ <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
+ <value>
+ <option name="BRANCH" value="" />
+ <option name="DATE" value="" />
+ <option name="USE_BRANCH" value="false" />
+ <option name="USE_DATE" value="false" />
+ </value>
+ </option>
+ <option name="SHOW_CHANGES_REVISION_SETTINGS">
+ <value>
+ <option name="BRANCH" value="" />
+ <option name="DATE" value="" />
+ <option name="USE_BRANCH" value="false" />
+ <option name="USE_DATE" value="false" />
+ </value>
+ </option>
+ <option name="SHOW_OUTPUT" value="false" />
+ <option name="ADD_WATCH_INDEX" value="0" />
+ <option name="REMOVE_WATCH_INDEX" value="0" />
+ <option name="UPDATE_KEYWORD_SUBSTITUTION" />
+ <option name="MAKE_NEW_FILES_READONLY" value="false" />
+ <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" />
+ <option name="TAG_AFTER_PROJECT_COMMIT" value="false" />
+ <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" />
+ <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" />
+ <option name="CLEAN_COPY" value="false" />
+ </component>
+ <component name="CvsTabbedWindow" />
+ <component name="DaemonCodeAnalyzer">
+ <disable_hints />
+ </component>
+ <component name="DebuggerManager">
+ <breakpoint_any>
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ </breakpoint_any>
+ <breakpoint_rules />
+ <ui_properties />
+ </component>
+ <component name="DebuggerSettings">
+ <option name="TRACING_FILTERS_ENABLED" value="true" />
+ <option name="TOSTRING_CLASSES_ENABLED" value="false" />
+ <option name="VALUE_LOOKUP_DELAY" value="700" />
+ <option name="DEBUGGER_TRANSPORT" value="0" />
+ <option name="FORCE_CLASSIC_VM" value="true" />
+ <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
+ <option name="SKIP_SYNTHETIC_METHODS" value="true" />
+ <option name="SKIP_CONSTRUCTORS" value="false" />
+ <option name="STEP_THREAD_SUSPEND_POLICY" value="SuspendThread" />
+ <default_breakpoint_settings>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="WATCH_MODIFICATION" value="true" />
+ <option name="WATCH_ACCESS" value="true" />
+ <option name="WATCH_ENTRY" value="true" />
+ <option name="WATCH_EXIT" value="true" />
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_VM" value="true" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CONDITION" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="LOG_MESSAGE" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INVERSE_CLASS_FILLTERS" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ </default_breakpoint_settings>
+ <filter>
+ <option name="PATTERN" value="com.sun.*" />
+ <option name="ENABLED" value="true" />
+ </filter>
+ <filter>
+ <option name="PATTERN" value="java.*" />
+ <option name="ENABLED" value="true" />
+ </filter>
+ <filter>
+ <option name="PATTERN" value="javax.*" />
+ <option name="ENABLED" value="true" />
+ </filter>
+ <filter>
+ <option name="PATTERN" value="org.omg.*" />
+ <option name="ENABLED" value="true" />
+ </filter>
+ <filter>
+ <option name="PATTERN" value="sun.*" />
+ <option name="ENABLED" value="true" />
+ </filter>
+ <filter>
+ <option name="PATTERN" value="junit.*" />
+ <option name="ENABLED" value="true" />
+ </filter>
+ </component>
+ <component name="EjbViewSettings">
+ <EjbView showMembers="false" autoscrollToSource="false" />
+ </component>
+ <component name="ErrorTreeViewConfiguration">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="HIDE_WARNINGS" value="false" />
+ </component>
+ <component name="FavoritesManager">
+ <favorites_list name="maven" />
+ </component>
+ <component name="FavoritesProjectViewPane">
+ <subPane subId="maven">
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <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">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="124" column="0" selection-start="6932" selection-end="6932" vertical-scroll-proportion="0.018209409">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="FindManager">
+ <FindUsagesManager>
+ <setting name="OPEN_NEW_TAB" value="false" />
+ </FindUsagesManager>
+ </component>
+ <component name="HierarchyBrowserManager">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="SORT_ALPHABETICALLY" value="false" />
+ <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
+ </component>
+ <component name="InspectionManager">
+ <option name="AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="SPLITTER_PROPORTION" value="0.5" />
+ <option name="GROUP_BY_SEVERITY" value="false" />
+ <option name="FILTER_RESOLVED_ITEMS" value="true" />
+ <option name="ANALYZE_TEST_SOURCES" value="true" />
+ <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
+ <option name="SCOPE_TYPE" value="1" />
+ <option name="CUSTOM_SCOPE_NAME" value="" />
+ <option name="SHOW_ONLY_DIFF" value="false" />
+ <option name="myCurrentProfileName" value="Default" />
+ </component>
+ <component name="J2EEProjectPane" />
+ <component name="JspContextManager" />
+ <component name="LvcsProjectConfiguration">
+ <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
+ <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
+ <option name="ADD_LABEL_ON_FILE_PACKAGE_COMPILATION" value="true" />
+ <option name="ADD_LABEL_ON_PROJECT_MAKE" value="true" />
+ <option name="ADD_LABEL_ON_RUNNING" value="true" />
+ <option name="ADD_LABEL_ON_DEBUGGING" value="true" />
+ <option name="ADD_LABEL_ON_UNIT_TEST_PASSED" value="true" />
+ <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
+ </component>
+ <component name="ModuleEditorState">
+ <option name="LAST_EDITED_MODULE_NAME" />
+ <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="PerforceChangeBrowserSettings">
+ <option name="USE_CLIENT_FILTER" value="true" />
+ <option name="CLIENT" value="" />
+ </component>
+ <component name="PerforceConfiguration">
+ <option name="PORT" value="magic:1666" />
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="CLIENT" value="" />
+ <option name="TRACE" value="false" />
+ <option name="PERFORCE_STATUS" value="true" />
+ <option name="CHANGELIST_OPTION" value="false" />
+ <option name="SYSTEMROOT" value="" />
+ <option name="P4_EXECUTABLE" value="p4" />
+ <option name="SHOW_BRANCH_HISTORY" value="false" />
+ <option name="GENERATE_COMMENT" value="false" />
+ <option name="SYNC_OPTION" value="Sync" />
+ <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
+ <option name="SHOW_CHECKIN_OPTIONS" value="true" />
+ <option name="FORCE_NON_EMPTY_COMMENT" value="true" />
+ <option name="LAST_COMMIT_MESSAGE" value="" />
+ <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
+ <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+ <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+ <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+ </component>
+ <component name="PerforceDirect.Settings">
+ <option name="useP4CONFIG" value="true" />
+ <option name="port" value="<perforce_server>:1666" />
+ <option name="client" value="" />
+ <option name="user" value="" />
+ <option name="passwd" value="" />
+ <option name="showCmds" value="false" />
+ <option name="useNativeApi" value="false" />
+ <option name="pathToExec" value="p4" />
+ <option name="useCustomPathToExec" value="false" />
+ <option name="SYNC_FORCE" value="false" />
+ <option name="SYNC_RUN_RESOLVE" value="true" />
+ <option name="REVERT_UNCHANGED_FILES" value="true" />
+ <option name="CHARSET" value="none" />
+ <option name="SHOW_BRANCHES_HISTORY" value="true" />
+ <option name="ENABLED" value="true" />
+ <option name="USE_LOGIN" value="false" />
+ <option name="LOGIN_SILENTLY" value="false" />
+ <option name="INTEGRATE_RUN_RESOLVE" value="true" />
+ <option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
+ <option name="SERVER_TIMEOUT" value="20000" />
+ </component>
+ <component name="ProjectLevelVcsManager">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkin" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <OptionsSetting value="true" id="Undo Check Out" />
+ <OptionsSetting value="true" id="Compare with SourceSafe Version" />
+ <OptionsSetting value="true" id="Get Latest Version" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="maven.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </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">
+ <option name="STATE" value="0" />
+ </component>
+ <component name="ProjectView">
+ <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5">
+ <flattenPackages />
+ <showMembers />
+ <showModules />
+ <showLibraryContents />
+ <hideEmptyPackages />
+ <abbreviatePackageNames />
+ <showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
+ <autoscrollToSource />
+ <autoscrollFromSource />
+ <sortByType />
+ </navigator>
+ </component>
+ <component name="ProjectViewSettings">
+ <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
+ <view id="ProjectPane">
+ <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+ </view>
+ <view id="SourcepathPane" />
+ <view id="ClasspathPane" />
+ </component>
+ <component name="PropertiesComponent">
+ <property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="GoToClass.includeLibraries" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
+ <property name="MemberChooser.sorted" value="false" />
+ <property name="GoToFile.includeJavaFiles" value="false" />
+ <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ </component>
+ <component name="ReadonlyStatusHandler">
+ <option name="SHOW_DIALOG" value="true" />
+ </component>
+ <component name="RecentsManager" />
+ <component name="RestoreUpdateTree" />
+ <component name="RunManager">
+ <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="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <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" />
+ <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="SelectInManager" />
+ <component name="StarteamConfiguration">
+ <option name="SERVER" value="" />
+ <option name="PORT" value="49201" />
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="PROJECT" value="" />
+ <option name="VIEW" value="" />
+ <option name="ALTERNATIVE_WORKING_PATH" value="" />
+ <option name="LOCK_ON_CHECKOUT" value="false" />
+ <option name="UNLOCK_ON_CHECKIN" value="false" />
+ </component>
+ <component name="StructuralSearchPlugin" />
+ <component name="StructureViewFactory">
+ <option name="AUTOSCROLL_MODE" value="true" />
+ <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
+ <option name="ACTIVE_ACTIONS" value="" />
+ </component>
+ <component name="Struts Assistant">
+ <option name="showInputs" value="true" />
+ <option name="resources">
+ <value>
+ <option name="strutsPath" />
+ <option name="strutsHelp" />
+ </value>
+ </option>
+ <option name="selectedTaglibs" />
+ <option name="selectedTaglibs" />
+ <option name="myStrutsValidationEnabled" value="true" />
+ <option name="myTilesValidationEnabled" value="true" />
+ <option name="myValidatorValidationEnabled" value="true" />
+ <option name="myReportErrorsAsWarnings" value="true" />
+ </component>
+ <component name="SvnChangesBrowserSettings">
+ <option name="USE_AUTHOR_FIELD" value="true" />
+ <option name="AUTHOR" value="" />
+ <option name="LOCATION" value="" />
+ <option name="USE_PROJECT_SETTINGS" value="true" />
+ <option name="USE_ALTERNATE_LOCATION" value="false" />
+ </component>
+ <component name="SvnConfiguration">
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="PROCESS_UNRESOLVED" value="false" />
+ <option name="LAST_MERGED_REVISION" />
+ <option name="UPDATE_RUN_STATUS" value="false" />
+ <option name="UPDATE_RECURSIVELY" value="true" />
+ <option name="MERGE_DRY_RUN" value="false" />
+ <configuration useDefault="true">/Users/jvanzyl/.subversion</configuration>
+ </component>
+ <component name="TodoView" selected-index="0">
+ <todo-panel id="selected-file">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ <todo-panel id="all">
+ <are-packages-shown value="true" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="7" y="22" width="1440" height="821" extended-state="1" />
+ <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="3" />
+ <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="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="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="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="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>
+ </component>
+ <component name="VCS.FileViewConfiguration">
+ <option name="SELECTED_STATUSES" value="DEFAULT" />
+ <option name="SELECTED_COLUMNS" value="DEFAULT" />
+ <option name="SHOW_FILTERS" value="true" />
+ <option name="CUSTOMIZE_VIEW" value="true" />
+ <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+ <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+ <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
+ <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
+ <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
+ <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+ <option name="LAST_COMMIT_MESSAGE" />
+ <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
+ <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+ <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+ <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+ <option name="ERROR_OCCURED" value="false" />
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+ <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+ <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+ </component>
+ <component name="VssConfiguration">
+ <option name="CLIENT_PATH" value="" />
+ <option name="SRCSAFEINI_PATH" value="" />
+ <option name="USER_NAME" value="" />
+ <option name="PWD" value="" />
+ <option name="VSS_IS_INITIALIZED" value="true" />
+ <CheckoutOptions>
+ <option name="COMMENT" value="" />
+ <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
+ <option name="REPLACE_WRITABLE" value="false" />
+ <option name="RECURSIVE" value="false" />
+ </CheckoutOptions>
+ <CheckinOptions>
+ <option name="COMMENT" value="" />
+ <option name="KEEP_CHECKED_OUT" value="false" />
+ <option name="RECURSIVE" value="false" />
+ </CheckinOptions>
+ <AddOptions>
+ <option name="COMMENT" value="" />
+ <option name="STORE_ONLY_LATEST_VERSION" value="false" />
+ <option name="CHECK_OUT_IMMEDIATELY" value="false" />
+ <option name="FILE_TYPE" value="0" />
+ </AddOptions>
+ <UndocheckoutOptions>
+ <option name="MAKE_WRITABLE" value="false" />
+ <option name="REPLACE_LOCAL_COPY" value="0" />
+ <option name="RECURSIVE" value="false" />
+ </UndocheckoutOptions>
+ <GetOptions>
+ <option name="REPLACE_WRITABLE" value="0" />
+ <option name="MAKE_WRITABLE" value="false" />
+ <option name="ANSWER_NEGATIVELY" value="false" />
+ <option name="ANSWER_POSITIVELY" value="false" />
+ <option name="RECURSIVE" value="false" />
+ </GetOptions>
+ </component>
+ <component name="WebViewSettings">
+ <webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
+ </component>
+ <component name="antWorkspaceConfiguration">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="FILTER_TARGETS" value="false" />
+ </component>
+ <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
+ <option name="myLastEditedConfigurable" />
+ </component>
+ <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="" version="1">
+ <option name="myPlainMode" value="false" />
+ <option name="myLastEditedConfigurable" />
+ </component>
+ <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
+ <option name="myLastEditedConfigurable" />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <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$/build.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="124" column="0" selection-start="6932" selection-end="6932" vertical-scroll-proportion="0.018209409">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </component>
+ <component name="editorManager" />
+</project>
+
Modified: maven/components/branches/maven.new/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven.new/pom.xml?view=diff&rev=479193&r1=478581&r2=479193
==============================================================================
--- maven/components/branches/maven.new/pom.xml (original)
+++ maven/components/branches/maven.new/pom.xml Sat Nov 25 12:44:05 2006
@@ -157,9 +157,13 @@
<dependencies>
<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-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-9</version>
+ <version>1.0-alpha-11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>