svn commit: r833728 [5/5] - in /maven/archetype/trunk: ./ archetype-common/ archetype-common/src/main/java/org/apache/maven/archetype/common/ archetype-common/src/main/java/org/apache/maven/archetype/exception/ archetype-common/src/main/mdo/ archetype-...

View: New views

1 Messages — Rating Filter: Alert me

svn commit: r833728 [5/5] - in /maven/archetype/trunk: ./ archetype-common/ archetype-common/src/main/java/org/apache/maven/archetype/common/ archetype-common/src/main/java/org/apache/maven/archetype/exception/ archetype-common/src/main/mdo/ archetype-...

by bentmann :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Modified: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java (original)
+++ maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java Sat Nov 7 18:28:39 2009
@@ -1,371 +1,371 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.maven.archetype.ui;
-
-import org.apache.maven.archetype.common.ArchetypeConfiguration;
-import org.apache.maven.archetype.common.ArchetypeDefinition;
-import org.apache.maven.archetype.common.Constants;
-import org.apache.maven.project.MavenProject;
-
-import org.codehaus.plexus.logging.AbstractLogEnabled;
-
-import java.util.Iterator;
-import java.util.Properties;
-
-/**
- * @plexus.component
- */
-public class DefaultArchetypeFactory
-extends AbstractLogEnabled
-implements ArchetypeFactory
-{
- public ArchetypeConfiguration createArchetypeConfiguration( ArchetypeDefinition archetypeDefinition,
- Properties properties )
- {
- ArchetypeConfiguration configuration = new ArchetypeConfiguration();
- getLogger().debug( "Creating ArchetypeConfiguration from ArchetypeDefinition and Properties" );
-
- configuration.setGroupId( archetypeDefinition.getGroupId() );
- configuration.setArtifactId( archetypeDefinition.getArtifactId() );
- configuration.setVersion( archetypeDefinition.getVersion() );
-
- Iterator propertiesIterator = properties.keySet().iterator();
- while ( propertiesIterator.hasNext() )
- {
- String property = (String) propertiesIterator.next();
- if ( !Constants.ARCHETYPE_GROUP_ID.equals( property ) && !Constants.ARCHETYPE_ARTIFACT_ID.equals( property )
- && !Constants.ARCHETYPE_VERSION.equals( property ) )
- {
- configuration.addRequiredProperty( property );
-
- getLogger().debug( "Adding requiredProperty " + property );
-
- configuration.setProperty( property, properties.getProperty( property ) );
-
- getLogger().debug( "Adding property " + property + "=" + properties.getProperty( property ) );
- }
- }
-
- return configuration;
- }
-
- public ArchetypeConfiguration createArchetypeConfiguration(
- org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor archetypeDescriptor, Properties properties )
- {
- ArchetypeConfiguration configuration = new ArchetypeConfiguration();
- getLogger().debug( "Creating ArchetypeConfiguration from legacy descriptor and Properties" );
-
- configuration.setGroupId( properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) );
- configuration.setArtifactId( properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) );
- configuration.setVersion( properties.getProperty( Constants.ARCHETYPE_VERSION, null ) );
-
- configuration.setName( archetypeDescriptor.getId() );
-
- configuration.addRequiredProperty( Constants.GROUP_ID );
- getLogger().debug( "Adding requiredProperty " + Constants.GROUP_ID );
- if ( null != properties.getProperty( Constants.GROUP_ID ) )
- {
- configuration.setProperty( Constants.GROUP_ID, properties.getProperty( Constants.GROUP_ID ) );
- configuration.setDefaultProperty( Constants.GROUP_ID, configuration.getProperty( Constants.GROUP_ID ) );
- }
- getLogger().debug( "Setting property " + Constants.GROUP_ID + "="
- + configuration.getProperty( Constants.GROUP_ID ) );
-
- configuration.addRequiredProperty( Constants.ARTIFACT_ID );
- getLogger().debug( "Adding requiredProperty " + Constants.ARTIFACT_ID );
- if ( null != properties.getProperty( Constants.ARTIFACT_ID ) )
- {
- configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );
- configuration.setDefaultProperty( Constants.ARTIFACT_ID,
- configuration.getProperty( Constants.ARTIFACT_ID ) );
- }
- getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="
- + configuration.getProperty( Constants.ARTIFACT_ID ) );
-
- configuration.addRequiredProperty( Constants.VERSION );
- getLogger().debug( "Adding requiredProperty " + Constants.VERSION );
- if ( null != properties.getProperty( Constants.VERSION ) )
- {
- configuration.setProperty( Constants.VERSION, properties.getProperty( Constants.VERSION ) );
- configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );
- }
- else
- {
- configuration.setDefaultProperty( Constants.VERSION, "1.0-SNAPSHOT" );
- }
- getLogger().debug( "Setting property " + Constants.VERSION + "="
- + configuration.getProperty( Constants.VERSION ) );
-
- configuration.addRequiredProperty( Constants.PACKAGE );
- getLogger().debug( "Adding requiredProperty " + Constants.PACKAGE );
- if ( null != properties.getProperty( Constants.PACKAGE ) )
- {
- configuration.setProperty( Constants.PACKAGE, properties.getProperty( Constants.PACKAGE ) );
- configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
- }
- else if ( null != configuration.getProperty( Constants.GROUP_ID ) )
- {
- configuration.setProperty( Constants.PACKAGE, configuration.getProperty( Constants.GROUP_ID ) );
- configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
- }
- getLogger().debug( "Setting property " + Constants.PACKAGE + "="
- + configuration.getProperty( Constants.PACKAGE ) );
-
- return configuration;
- }
-
- public ArchetypeConfiguration createArchetypeConfiguration(
- org.apache.maven.archetype.metadata.ArchetypeDescriptor archetypeDescriptor, Properties properties )
- {
- ArchetypeConfiguration configuration = new ArchetypeConfiguration();
- getLogger().debug( "Creating ArchetypeConfiguration from fileset descriptor and Properties" );
-
- configuration.setGroupId( properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) );
- configuration.setArtifactId( properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) );
- configuration.setVersion( properties.getProperty( Constants.ARCHETYPE_VERSION, null ) );
-
- configuration.setName( archetypeDescriptor.getName() );
-
- Iterator requiredProperties = archetypeDescriptor.getRequiredProperties().iterator();
-
- while ( requiredProperties.hasNext() )
- {
- org.apache.maven.archetype.metadata.RequiredProperty requiredProperty =
- (org.apache.maven.archetype.metadata.RequiredProperty) requiredProperties.next();
-
- configuration.addRequiredProperty( requiredProperty.getKey() );
- getLogger().debug( "Adding requiredProperty " + requiredProperty.getKey() );
-
- if ( null != properties.getProperty( requiredProperty.getKey(), requiredProperty.getDefaultValue() )
- && !containsInnerProperty(requiredProperty.getDefaultValue()) )
- {
- configuration.setProperty( requiredProperty.getKey(),
- properties.getProperty( requiredProperty.getKey(), requiredProperty.getDefaultValue() ) );
- getLogger().debug( "Setting property " + requiredProperty.getKey() + "="
- + configuration.getProperty( requiredProperty.getKey() ) );
- }
- if ( null != requiredProperty.getDefaultValue() )
- {
- configuration.setDefaultProperty( requiredProperty.getKey(), requiredProperty.getDefaultValue() );
- getLogger().debug( "Setting defaultProperty " + requiredProperty.getKey() + "="
- + configuration.getDefaultValue( requiredProperty.getKey() ) );
- }
- } // end while
-
- if ( !configuration.isConfigured( Constants.GROUP_ID )
- && null == configuration.getDefaultValue( Constants.GROUP_ID ) )
- {
- configuration.addRequiredProperty( Constants.GROUP_ID );
- getLogger().debug( "Adding requiredProperty " + Constants.GROUP_ID );
- if ( null
- != properties.getProperty( Constants.GROUP_ID, configuration.getDefaultValue( Constants.GROUP_ID ) )
- && !containsInnerProperty( configuration.getDefaultValue( Constants.GROUP_ID ) ) )
- {
- configuration.setProperty( Constants.GROUP_ID,
- properties.getProperty( Constants.GROUP_ID, configuration.getDefaultValue( Constants.GROUP_ID ) ) );
- configuration.setDefaultProperty( Constants.GROUP_ID, configuration.getProperty( Constants.GROUP_ID ) );
- }
- getLogger().debug( "Setting property " + Constants.GROUP_ID + "="
- + configuration.getProperty( Constants.GROUP_ID ) );
- }
- if ( !configuration.isConfigured( Constants.ARTIFACT_ID )
- && null == configuration.getDefaultValue( Constants.ARTIFACT_ID ) )
- {
- configuration.addRequiredProperty( Constants.ARTIFACT_ID );
- getLogger().debug( "Adding requiredProperty " + Constants.ARTIFACT_ID );
- if ( null
- != properties.getProperty( Constants.ARTIFACT_ID,
- configuration.getDefaultValue( Constants.ARTIFACT_ID ) )
- && !containsInnerProperty( configuration.getDefaultValue( Constants.ARTIFACT_ID ) ) )
- {
- configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );
- configuration.setDefaultProperty( Constants.ARTIFACT_ID,
- configuration.getProperty( Constants.ARTIFACT_ID ) );
- }
- getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="
- + configuration.getProperty( Constants.ARTIFACT_ID ) );
- }
- if ( !configuration.isConfigured( Constants.VERSION )
- && null == configuration.getDefaultValue( Constants.VERSION ) )
- {
- configuration.addRequiredProperty( Constants.VERSION );
- getLogger().debug( "Adding requiredProperty " + Constants.VERSION );
- if ( null != properties.getProperty( Constants.VERSION,
- configuration.getDefaultValue( Constants.VERSION ) )
- && !containsInnerProperty( configuration.getDefaultValue( Constants.VERSION ) ) )
- {
- configuration.setProperty( Constants.VERSION,
- properties.getProperty( Constants.VERSION, configuration.getDefaultValue( Constants.VERSION ) ) );
- configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );
- }
- else
- {
- configuration.setDefaultProperty( Constants.VERSION, "1.0-SNAPSHOT" );
- }
- getLogger().debug( "Setting property " + Constants.VERSION + "="
- + configuration.getProperty( Constants.VERSION ) );
- }
- if ( !configuration.isConfigured( Constants.PACKAGE )
- && null == configuration.getDefaultValue( Constants.PACKAGE ) )
- {
- configuration.addRequiredProperty( Constants.PACKAGE );
- getLogger().debug( "Adding requiredProperty " + Constants.PACKAGE );
- if ( null != properties.getProperty( Constants.PACKAGE,
- configuration.getDefaultValue( Constants.PACKAGE ) )
- && !containsInnerProperty(configuration.getDefaultValue( Constants.PACKAGE ) ) )
- {
- configuration.setProperty( Constants.PACKAGE,
- properties.getProperty( Constants.PACKAGE, configuration.getDefaultValue( Constants.PACKAGE ) ) );
- configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
- }
- else if ( null != configuration.getProperty( Constants.GROUP_ID )
- && !containsInnerProperty(configuration.getDefaultValue( Constants.PACKAGE ) ) )
- {
- configuration.setProperty( Constants.PACKAGE, configuration.getProperty( Constants.GROUP_ID ) );
- configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
- }
- getLogger().debug( "Setting property " + Constants.PACKAGE + "="
- + configuration.getProperty( Constants.PACKAGE ) );
- }
-
- if ( null != properties.getProperty( Constants.ARCHETYPE_POST_GENERATION_GOALS ) )
- {
- configuration.setProperty( Constants.ARCHETYPE_POST_GENERATION_GOALS,
- properties.getProperty( Constants.ARCHETYPE_POST_GENERATION_GOALS ) );
- }
-
- return configuration;
- }
-
- public ArchetypeConfiguration createArchetypeConfiguration( MavenProject project,
- ArchetypeDefinition archetypeDefinition, Properties properties )
- {
- ArchetypeConfiguration configuration = new ArchetypeConfiguration();
- getLogger().debug( "Creating ArchetypeConfiguration from ArchetypeDefinition, MavenProject and Properties" );
-
- configuration.setGroupId( properties.getProperty(Constants.ARCHETYPE_GROUP_ID) );
- configuration.setArtifactId( properties.getProperty(Constants.ARCHETYPE_ARTIFACT_ID) );
- configuration.setVersion( properties.getProperty(Constants.ARCHETYPE_VERSION) );
-
- Iterator requiredProperties = properties.keySet().iterator();
-
- while ( requiredProperties.hasNext() )
- {
- String requiredProperty = (String) requiredProperties.next();
-
- if ( requiredProperty.indexOf( "." ) < 0 )
- {
- configuration.addRequiredProperty( requiredProperty );
- getLogger().debug( "Adding requiredProperty " + requiredProperty );
- configuration.setProperty( requiredProperty, properties.getProperty( requiredProperty ) );
- getLogger().debug( "Setting property " + requiredProperty + "="
- + configuration.getProperty( requiredProperty ) );
- }
- }
-
- configuration.addRequiredProperty( Constants.GROUP_ID );
- getLogger().debug( "Adding requiredProperty " + Constants.GROUP_ID );
- configuration.setDefaultProperty( Constants.GROUP_ID, project.getGroupId() );
- if ( null != properties.getProperty( Constants.GROUP_ID, null ) )
- {
- configuration.setProperty( Constants.GROUP_ID, properties.getProperty( Constants.GROUP_ID ) );
- getLogger().debug( "Setting property " + Constants.GROUP_ID + "="
- + configuration.getProperty( Constants.GROUP_ID ) );
- }
-
- configuration.addRequiredProperty( Constants.ARTIFACT_ID );
- getLogger().debug( "Adding requiredProperty " + Constants.ARTIFACT_ID );
- configuration.setDefaultProperty( Constants.ARTIFACT_ID, project.getArtifactId() );
- if ( null != properties.getProperty( Constants.ARTIFACT_ID, null ) )
- {
- configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );
- getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="
- + configuration.getProperty( Constants.ARTIFACT_ID ) );
- }
-
- configuration.addRequiredProperty( Constants.VERSION );
- getLogger().debug( "Adding requiredProperty " + Constants.VERSION );
- configuration.setDefaultProperty( Constants.VERSION, project.getVersion() );
- if ( null != properties.getProperty( Constants.VERSION, null ) )
- {
- configuration.setProperty( Constants.VERSION, properties.getProperty( Constants.VERSION ) );
- getLogger().debug( "Setting property " + Constants.VERSION + "="
- + configuration.getProperty( Constants.VERSION ) );
- }
-
- configuration.addRequiredProperty( Constants.PACKAGE );
- getLogger().debug( "Adding requiredProperty " + Constants.PACKAGE );
- if ( null != properties.getProperty( Constants.PACKAGE ) )
- {
- configuration.setProperty( Constants.PACKAGE, properties.getProperty( Constants.PACKAGE ) );
-
- getLogger().debug( "Setting property " + Constants.PACKAGE + "="
- + configuration.getProperty( Constants.PACKAGE ) );
- }
-
- if ( null != properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) )
- {
- configuration.setProperty( Constants.ARCHETYPE_GROUP_ID, properties.getProperty( Constants.ARCHETYPE_GROUP_ID ) );
- }
-
- if ( null != properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) )
- {
- configuration.setProperty( Constants.ARCHETYPE_ARTIFACT_ID, properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID ) );
- }
-
- if ( null != properties.getProperty( Constants.ARCHETYPE_VERSION, null ) )
- {
- configuration.setProperty( Constants.ARCHETYPE_VERSION, properties.getProperty( Constants.ARCHETYPE_VERSION ) );
- }
- return configuration;
- }
-
- public ArchetypeDefinition createArchetypeDefinition( Properties properties )
- {
- ArchetypeDefinition definition = new ArchetypeDefinition();
-
- definition.setGroupId( properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) );
-
- definition.setArtifactId( properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) );
-
- definition.setVersion( properties.getProperty( Constants.ARCHETYPE_VERSION, null ) );
-
- definition.setRepository( properties.getProperty( Constants.ARCHETYPE_REPOSITORY, null ) );
-
- return definition;
- }
-
- public void updateArchetypeConfiguration( ArchetypeConfiguration archetypeConfiguration,
- ArchetypeDefinition archetypeDefinition )
- {
- archetypeConfiguration.setGroupId( archetypeDefinition.getGroupId() );
- archetypeConfiguration.setArtifactId( archetypeDefinition.getArtifactId() );
- archetypeConfiguration.setVersion( archetypeDefinition.getVersion() );
- }
-
- private boolean containsInnerProperty(String defaultValue)
- {
- if ( null == defaultValue )
- {
- return false;
- }
- return ( defaultValue.indexOf( "${" ) >= 0 ) && ( defaultValue.indexOf( "}" ) >= 0 );
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.archetype.ui;
+
+import org.apache.maven.archetype.common.ArchetypeConfiguration;
+import org.apache.maven.archetype.common.ArchetypeDefinition;
+import org.apache.maven.archetype.common.Constants;
+import org.apache.maven.project.MavenProject;
+
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+import java.util.Iterator;
+import java.util.Properties;
+
+/**
+ * @plexus.component
+ */
+public class DefaultArchetypeFactory
+extends AbstractLogEnabled
+implements ArchetypeFactory
+{
+ public ArchetypeConfiguration createArchetypeConfiguration( ArchetypeDefinition archetypeDefinition,
+ Properties properties )
+ {
+ ArchetypeConfiguration configuration = new ArchetypeConfiguration();
+ getLogger().debug( "Creating ArchetypeConfiguration from ArchetypeDefinition and Properties" );
+
+ configuration.setGroupId( archetypeDefinition.getGroupId() );
+ configuration.setArtifactId( archetypeDefinition.getArtifactId() );
+ configuration.setVersion( archetypeDefinition.getVersion() );
+
+ Iterator propertiesIterator = properties.keySet().iterator();
+ while ( propertiesIterator.hasNext() )
+ {
+ String property = (String) propertiesIterator.next();
+ if ( !Constants.ARCHETYPE_GROUP_ID.equals( property ) && !Constants.ARCHETYPE_ARTIFACT_ID.equals( property )
+ && !Constants.ARCHETYPE_VERSION.equals( property ) )
+ {
+ configuration.addRequiredProperty( property );
+
+ getLogger().debug( "Adding requiredProperty " + property );
+
+ configuration.setProperty( property, properties.getProperty( property ) );
+
+ getLogger().debug( "Adding property " + property + "=" + properties.getProperty( property ) );
+ }
+ }
+
+ return configuration;
+ }
+
+ public ArchetypeConfiguration createArchetypeConfiguration(
+ org.apache.maven.archetype.old.descriptor.ArchetypeDescriptor archetypeDescriptor, Properties properties )
+ {
+ ArchetypeConfiguration configuration = new ArchetypeConfiguration();
+ getLogger().debug( "Creating ArchetypeConfiguration from legacy descriptor and Properties" );
+
+ configuration.setGroupId( properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) );
+ configuration.setArtifactId( properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) );
+ configuration.setVersion( properties.getProperty( Constants.ARCHETYPE_VERSION, null ) );
+
+ configuration.setName( archetypeDescriptor.getId() );
+
+ configuration.addRequiredProperty( Constants.GROUP_ID );
+ getLogger().debug( "Adding requiredProperty " + Constants.GROUP_ID );
+ if ( null != properties.getProperty( Constants.GROUP_ID ) )
+ {
+ configuration.setProperty( Constants.GROUP_ID, properties.getProperty( Constants.GROUP_ID ) );
+ configuration.setDefaultProperty( Constants.GROUP_ID, configuration.getProperty( Constants.GROUP_ID ) );
+ }
+ getLogger().debug( "Setting property " + Constants.GROUP_ID + "="
+ + configuration.getProperty( Constants.GROUP_ID ) );
+
+ configuration.addRequiredProperty( Constants.ARTIFACT_ID );
+ getLogger().debug( "Adding requiredProperty " + Constants.ARTIFACT_ID );
+ if ( null != properties.getProperty( Constants.ARTIFACT_ID ) )
+ {
+ configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );
+ configuration.setDefaultProperty( Constants.ARTIFACT_ID,
+ configuration.getProperty( Constants.ARTIFACT_ID ) );
+ }
+ getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="
+ + configuration.getProperty( Constants.ARTIFACT_ID ) );
+
+ configuration.addRequiredProperty( Constants.VERSION );
+ getLogger().debug( "Adding requiredProperty " + Constants.VERSION );
+ if ( null != properties.getProperty( Constants.VERSION ) )
+ {
+ configuration.setProperty( Constants.VERSION, properties.getProperty( Constants.VERSION ) );
+ configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );
+ }
+ else
+ {
+ configuration.setDefaultProperty( Constants.VERSION, "1.0-SNAPSHOT" );
+ }
+ getLogger().debug( "Setting property " + Constants.VERSION + "="
+ + configuration.getProperty( Constants.VERSION ) );
+
+ configuration.addRequiredProperty( Constants.PACKAGE );
+ getLogger().debug( "Adding requiredProperty " + Constants.PACKAGE );
+ if ( null != properties.getProperty( Constants.PACKAGE ) )
+ {
+ configuration.setProperty( Constants.PACKAGE, properties.getProperty( Constants.PACKAGE ) );
+ configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
+ }
+ else if ( null != configuration.getProperty( Constants.GROUP_ID ) )
+ {
+ configuration.setProperty( Constants.PACKAGE, configuration.getProperty( Constants.GROUP_ID ) );
+ configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
+ }
+ getLogger().debug( "Setting property " + Constants.PACKAGE + "="
+ + configuration.getProperty( Constants.PACKAGE ) );
+
+ return configuration;
+ }
+
+ public ArchetypeConfiguration createArchetypeConfiguration(
+ org.apache.maven.archetype.metadata.ArchetypeDescriptor archetypeDescriptor, Properties properties )
+ {
+ ArchetypeConfiguration configuration = new ArchetypeConfiguration();
+ getLogger().debug( "Creating ArchetypeConfiguration from fileset descriptor and Properties" );
+
+ configuration.setGroupId( properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) );
+ configuration.setArtifactId( properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) );
+ configuration.setVersion( properties.getProperty( Constants.ARCHETYPE_VERSION, null ) );
+
+ configuration.setName( archetypeDescriptor.getName() );
+
+ Iterator requiredProperties = archetypeDescriptor.getRequiredProperties().iterator();
+
+ while ( requiredProperties.hasNext() )
+ {
+ org.apache.maven.archetype.metadata.RequiredProperty requiredProperty =
+ (org.apache.maven.archetype.metadata.RequiredProperty) requiredProperties.next();
+
+ configuration.addRequiredProperty( requiredProperty.getKey() );
+ getLogger().debug( "Adding requiredProperty " + requiredProperty.getKey() );
+
+ if ( null != properties.getProperty( requiredProperty.getKey(), requiredProperty.getDefaultValue() )
+ && !containsInnerProperty(requiredProperty.getDefaultValue()) )
+ {
+ configuration.setProperty( requiredProperty.getKey(),
+ properties.getProperty( requiredProperty.getKey(), requiredProperty.getDefaultValue() ) );
+ getLogger().debug( "Setting property " + requiredProperty.getKey() + "="
+ + configuration.getProperty( requiredProperty.getKey() ) );
+ }
+ if ( null != requiredProperty.getDefaultValue() )
+ {
+ configuration.setDefaultProperty( requiredProperty.getKey(), requiredProperty.getDefaultValue() );
+ getLogger().debug( "Setting defaultProperty " + requiredProperty.getKey() + "="
+ + configuration.getDefaultValue( requiredProperty.getKey() ) );
+ }
+ } // end while
+
+ if ( !configuration.isConfigured( Constants.GROUP_ID )
+ && null == configuration.getDefaultValue( Constants.GROUP_ID ) )
+ {
+ configuration.addRequiredProperty( Constants.GROUP_ID );
+ getLogger().debug( "Adding requiredProperty " + Constants.GROUP_ID );
+ if ( null
+ != properties.getProperty( Constants.GROUP_ID, configuration.getDefaultValue( Constants.GROUP_ID ) )
+ && !containsInnerProperty( configuration.getDefaultValue( Constants.GROUP_ID ) ) )
+ {
+ configuration.setProperty( Constants.GROUP_ID,
+ properties.getProperty( Constants.GROUP_ID, configuration.getDefaultValue( Constants.GROUP_ID ) ) );
+ configuration.setDefaultProperty( Constants.GROUP_ID, configuration.getProperty( Constants.GROUP_ID ) );
+ }
+ getLogger().debug( "Setting property " + Constants.GROUP_ID + "="
+ + configuration.getProperty( Constants.GROUP_ID ) );
+ }
+ if ( !configuration.isConfigured( Constants.ARTIFACT_ID )
+ && null == configuration.getDefaultValue( Constants.ARTIFACT_ID ) )
+ {
+ configuration.addRequiredProperty( Constants.ARTIFACT_ID );
+ getLogger().debug( "Adding requiredProperty " + Constants.ARTIFACT_ID );
+ if ( null
+ != properties.getProperty( Constants.ARTIFACT_ID,
+ configuration.getDefaultValue( Constants.ARTIFACT_ID ) )
+ && !containsInnerProperty( configuration.getDefaultValue( Constants.ARTIFACT_ID ) ) )
+ {
+ configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );
+ configuration.setDefaultProperty( Constants.ARTIFACT_ID,
+ configuration.getProperty( Constants.ARTIFACT_ID ) );
+ }
+ getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="
+ + configuration.getProperty( Constants.ARTIFACT_ID ) );
+ }
+ if ( !configuration.isConfigured( Constants.VERSION )
+ && null == configuration.getDefaultValue( Constants.VERSION ) )
+ {
+ configuration.addRequiredProperty( Constants.VERSION );
+ getLogger().debug( "Adding requiredProperty " + Constants.VERSION );
+ if ( null != properties.getProperty( Constants.VERSION,
+ configuration.getDefaultValue( Constants.VERSION ) )
+ && !containsInnerProperty( configuration.getDefaultValue( Constants.VERSION ) ) )
+ {
+ configuration.setProperty( Constants.VERSION,
+ properties.getProperty( Constants.VERSION, configuration.getDefaultValue( Constants.VERSION ) ) );
+ configuration.setDefaultProperty( Constants.VERSION, configuration.getProperty( Constants.VERSION ) );
+ }
+ else
+ {
+ configuration.setDefaultProperty( Constants.VERSION, "1.0-SNAPSHOT" );
+ }
+ getLogger().debug( "Setting property " + Constants.VERSION + "="
+ + configuration.getProperty( Constants.VERSION ) );
+ }
+ if ( !configuration.isConfigured( Constants.PACKAGE )
+ && null == configuration.getDefaultValue( Constants.PACKAGE ) )
+ {
+ configuration.addRequiredProperty( Constants.PACKAGE );
+ getLogger().debug( "Adding requiredProperty " + Constants.PACKAGE );
+ if ( null != properties.getProperty( Constants.PACKAGE,
+ configuration.getDefaultValue( Constants.PACKAGE ) )
+ && !containsInnerProperty(configuration.getDefaultValue( Constants.PACKAGE ) ) )
+ {
+ configuration.setProperty( Constants.PACKAGE,
+ properties.getProperty( Constants.PACKAGE, configuration.getDefaultValue( Constants.PACKAGE ) ) );
+ configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
+ }
+ else if ( null != configuration.getProperty( Constants.GROUP_ID )
+ && !containsInnerProperty(configuration.getDefaultValue( Constants.PACKAGE ) ) )
+ {
+ configuration.setProperty( Constants.PACKAGE, configuration.getProperty( Constants.GROUP_ID ) );
+ configuration.setDefaultProperty( Constants.PACKAGE, configuration.getProperty( Constants.PACKAGE ) );
+ }
+ getLogger().debug( "Setting property " + Constants.PACKAGE + "="
+ + configuration.getProperty( Constants.PACKAGE ) );
+ }
+
+ if ( null != properties.getProperty( Constants.ARCHETYPE_POST_GENERATION_GOALS ) )
+ {
+ configuration.setProperty( Constants.ARCHETYPE_POST_GENERATION_GOALS,
+ properties.getProperty( Constants.ARCHETYPE_POST_GENERATION_GOALS ) );
+ }
+
+ return configuration;
+ }
+
+ public ArchetypeConfiguration createArchetypeConfiguration( MavenProject project,
+ ArchetypeDefinition archetypeDefinition, Properties properties )
+ {
+ ArchetypeConfiguration configuration = new ArchetypeConfiguration();
+ getLogger().debug( "Creating ArchetypeConfiguration from ArchetypeDefinition, MavenProject and Properties" );
+
+ configuration.setGroupId( properties.getProperty(Constants.ARCHETYPE_GROUP_ID) );
+ configuration.setArtifactId( properties.getProperty(Constants.ARCHETYPE_ARTIFACT_ID) );
+ configuration.setVersion( properties.getProperty(Constants.ARCHETYPE_VERSION) );
+
+ Iterator requiredProperties = properties.keySet().iterator();
+
+ while ( requiredProperties.hasNext() )
+ {
+ String requiredProperty = (String) requiredProperties.next();
+
+ if ( requiredProperty.indexOf( "." ) < 0 )
+ {
+ configuration.addRequiredProperty( requiredProperty );
+ getLogger().debug( "Adding requiredProperty " + requiredProperty );
+ configuration.setProperty( requiredProperty, properties.getProperty( requiredProperty ) );
+ getLogger().debug( "Setting property " + requiredProperty + "="
+ + configuration.getProperty( requiredProperty ) );
+ }
+ }
+
+ configuration.addRequiredProperty( Constants.GROUP_ID );
+ getLogger().debug( "Adding requiredProperty " + Constants.GROUP_ID );
+ configuration.setDefaultProperty( Constants.GROUP_ID, project.getGroupId() );
+ if ( null != properties.getProperty( Constants.GROUP_ID, null ) )
+ {
+ configuration.setProperty( Constants.GROUP_ID, properties.getProperty( Constants.GROUP_ID ) );
+ getLogger().debug( "Setting property " + Constants.GROUP_ID + "="
+ + configuration.getProperty( Constants.GROUP_ID ) );
+ }
+
+ configuration.addRequiredProperty( Constants.ARTIFACT_ID );
+ getLogger().debug( "Adding requiredProperty " + Constants.ARTIFACT_ID );
+ configuration.setDefaultProperty( Constants.ARTIFACT_ID, project.getArtifactId() );
+ if ( null != properties.getProperty( Constants.ARTIFACT_ID, null ) )
+ {
+ configuration.setProperty( Constants.ARTIFACT_ID, properties.getProperty( Constants.ARTIFACT_ID ) );
+ getLogger().debug( "Setting property " + Constants.ARTIFACT_ID + "="
+ + configuration.getProperty( Constants.ARTIFACT_ID ) );
+ }
+
+ configuration.addRequiredProperty( Constants.VERSION );
+ getLogger().debug( "Adding requiredProperty " + Constants.VERSION );
+ configuration.setDefaultProperty( Constants.VERSION, project.getVersion() );
+ if ( null != properties.getProperty( Constants.VERSION, null ) )
+ {
+ configuration.setProperty( Constants.VERSION, properties.getProperty( Constants.VERSION ) );
+ getLogger().debug( "Setting property " + Constants.VERSION + "="
+ + configuration.getProperty( Constants.VERSION ) );
+ }
+
+ configuration.addRequiredProperty( Constants.PACKAGE );
+ getLogger().debug( "Adding requiredProperty " + Constants.PACKAGE );
+ if ( null != properties.getProperty( Constants.PACKAGE ) )
+ {
+ configuration.setProperty( Constants.PACKAGE, properties.getProperty( Constants.PACKAGE ) );
+
+ getLogger().debug( "Setting property " + Constants.PACKAGE + "="
+ + configuration.getProperty( Constants.PACKAGE ) );
+ }
+
+ if ( null != properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) )
+ {
+ configuration.setProperty( Constants.ARCHETYPE_GROUP_ID, properties.getProperty( Constants.ARCHETYPE_GROUP_ID ) );
+ }
+
+ if ( null != properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) )
+ {
+ configuration.setProperty( Constants.ARCHETYPE_ARTIFACT_ID, properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID ) );
+ }
+
+ if ( null != properties.getProperty( Constants.ARCHETYPE_VERSION, null ) )
+ {
+ configuration.setProperty( Constants.ARCHETYPE_VERSION, properties.getProperty( Constants.ARCHETYPE_VERSION ) );
+ }
+ return configuration;
+ }
+
+ public ArchetypeDefinition createArchetypeDefinition( Properties properties )
+ {
+ ArchetypeDefinition definition = new ArchetypeDefinition();
+
+ definition.setGroupId( properties.getProperty( Constants.ARCHETYPE_GROUP_ID, null ) );
+
+ definition.setArtifactId( properties.getProperty( Constants.ARCHETYPE_ARTIFACT_ID, null ) );
+
+ definition.setVersion( properties.getProperty( Constants.ARCHETYPE_VERSION, null ) );
+
+ definition.setRepository( properties.getProperty( Constants.ARCHETYPE_REPOSITORY, null ) );
+
+ return definition;
+ }
+
+ public void updateArchetypeConfiguration( ArchetypeConfiguration archetypeConfiguration,
+ ArchetypeDefinition archetypeDefinition )
+ {
+ archetypeConfiguration.setGroupId( archetypeDefinition.getGroupId() );
+ archetypeConfiguration.setArtifactId( archetypeDefinition.getArtifactId() );
+ archetypeConfiguration.setVersion( archetypeDefinition.getVersion() );
+ }
+
+ private boolean containsInnerProperty(String defaultValue)
+ {
+ if ( null == defaultValue )
+ {
+ return false;
+ }
+ return ( defaultValue.indexOf( "${" ) >= 0 ) && ( defaultValue.indexOf( "}" ) >= 0 );
+ }
+}

Propchange: maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeFactory.java
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.archetype.test.a</groupId>
- <artifactId>deep-inheritence-test-a</artifactId>
- <version>1-SNAPSHOT</version>
- </parent>
- <artifactId>deep-inheritence-test-b</artifactId>
- <packaging>pom</packaging>
- <name>Inheritence B</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.archetype.test.a</groupId>
+ <artifactId>deep-inheritence-test-a</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <artifactId>deep-inheritence-test-b</artifactId>
+ <packaging>pom</packaging>
+ <name>Inheritence B</name>
+
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>deep-inheritence-test</artifactId>
- <groupId>org.apache.maven.archetype.test</groupId>
- <version>1-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.maven.archetype.test.a</groupId>
- <artifactId>deep-inheritence-test-a</artifactId>
- <packaging>pom</packaging>
- <name>Inheritence A</name>
-
- <modules>
- <module>b</module>
- </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>deep-inheritence-test</artifactId>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.maven.archetype.test.a</groupId>
+ <artifactId>deep-inheritence-test-a</artifactId>
+ <packaging>pom</packaging>
+ <name>Inheritence A</name>
+
+ <modules>
+ <module>b</module>
+ </modules>
+
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-parent</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>6</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.maven.archetype.test</groupId>
- <artifactId>deep-inheritence-test</artifactId>
- <packaging>pom</packaging>
- <name>Maven Archetype - Test - Deep Inheritence</name>
- <version>1-SNAPSHOT</version>
-
-
- <modules>
- <module>a</module>
- </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>maven-parent</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>6</version>
+ <relativePath>../pom/maven/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <artifactId>deep-inheritence-test</artifactId>
+ <packaging>pom</packaging>
+ <name>Maven Archetype - Test - Deep Inheritence</name>
+ <version>1-SNAPSHOT</version>
+
+
+ <modules>
+ <module>a</module>
+ </modules>
+
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/deep-inheritence/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>sibling-dependency-test</artifactId>
- <groupId>org.apache.maven.archetype.test</groupId>
- <version>1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sibling-dependency-test-a</artifactId>
- <packaging>jar</packaging>
- <name>Sibling Dependency A</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>sibling-dependency-test</artifactId>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>sibling-dependency-test-a</artifactId>
+ <packaging>jar</packaging>
+ <name>Sibling Dependency A</name>
+
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>sibling-dependency-test</artifactId>
- <groupId>org.apache.maven.archetype.test</groupId>
- <version>1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sibling-dependency-test-b</artifactId>
- <packaging>jar</packaging>
- <name>Sibling Dependency B</name>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.archetype.test</groupId>
- <artifactId>sibling-dependency-test-a</artifactId>
- <version>1-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>sibling-dependency-test</artifactId>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>sibling-dependency-test-b</artifactId>
+ <packaging>jar</packaging>
+ <name>Sibling Dependency B</name>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <artifactId>sibling-dependency-test-a</artifactId>
+ <version>1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-parent</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>6</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.maven.archetype.test</groupId>
- <artifactId>sibling-dependency-test</artifactId>
- <packaging>pom</packaging>
- <name>Maven Archetype - Test - Sibling Dependencies</name>
- <version>1-SNAPSHOT</version>
-
-
- <modules>
- <module>a</module>
- <module>b</module>
- </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>maven-parent</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>6</version>
+ <relativePath>../pom/maven/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <artifactId>sibling-dependency-test</artifactId>
+ <packaging>pom</packaging>
+ <name>Maven Archetype - Test - Sibling Dependencies</name>
+ <version>1-SNAPSHOT</version>
+
+
+ <modules>
+ <module>a</module>
+ <module>b</module>
+ </modules>
+
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/sibling-dependency/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>mojo</artifactId>
- <version>16</version>
- 
- </parent>
-
- <artifactId>enforcer-rules</artifactId>
- <packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <name>Enforcer Rules</name>
- <description>This component contains the standard Enforcer Rules</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.0.7</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <scope>test</scope>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>mojo</artifactId>
+ <version>16</version>
+ 
+ </parent>
+
+ <artifactId>enforcer-rules</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Enforcer Rules</name>
+ <description>This component contains the standard Enforcer Rules</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Modified: maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/pom.xml
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/pom.xml?rev=833728&r1=833727&r2=833728&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/pom.xml (original)
+++ maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/pom.xml Sat Nov 7 18:28:39 2009
@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-parent</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>6</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.maven.archetype.test</groupId>
- <artifactId>inheritence-test</artifactId>
- <packaging>pom</packaging>
- <name>Maven archetype - Test - Simple Inheritence</name>
- <version>1-SNAPSHOT</version>
- <description>Enforcer is a build rule execution framework.</description>
- <url>http://maven.apache.org/enforcer</url>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MENFORCER</url>
- </issueManagement>
- <inceptionYear>2006</inceptionYear>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>brianf</id>
- <name>Brian Fox</name>
- <email>brianf@...</email>
- <roles>
- <role>Lead Developer</role>
- </roles>
- <timezone>5</timezone>
- </developer>
- </developers>
- <mailingLists>
- <mailingList>
- <name>Maven User List</name>
- <subscribe>users-subscribe@...</subscribe>
- <unsubscribe>users-unsubscribe@...</unsubscribe>
- <post>users@...</post>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/users@.../</otherArchive>
- <otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive>
- </otherArchives>
- </mailingList>
- </mailingLists>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk</url>
- </scm>
-
- <build>
- <resources>
- 
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/maven/enforcer/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/enforcer/</url>
- </site>
- </distributionManagement>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <id>codehaus.snapshots</id>
- <name>Codehaus Snapshot Development Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- </repository>
- </repositories>
-
- <modules>
- <module>enforcer-rules</module>
- </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>maven-parent</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>6</version>
+ <relativePath>../pom/maven/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.maven.archetype.test</groupId>
+ <artifactId>inheritence-test</artifactId>
+ <packaging>pom</packaging>
+ <name>Maven archetype - Test - Simple Inheritence</name>
+ <version>1-SNAPSHOT</version>
+ <description>Enforcer is a build rule execution framework.</description>
+ <url>http://maven.apache.org/enforcer</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MENFORCER</url>
+ </issueManagement>
+ <inceptionYear>2006</inceptionYear>
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>brianf</id>
+ <name>Brian Fox</name>
+ <email>brianf@...</email>
+ <roles>
+ <role>Lead Developer</role>
+ </roles>
+ <timezone>5</timezone>
+ </developer>
+ </developers>
+ <mailingLists>
+ <mailingList>
+ <name>Maven User List</name>
+ <subscribe>users-subscribe@...</subscribe>
+ <unsubscribe>users-unsubscribe@...</unsubscribe>
+ <post>users@...</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/users@.../</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk</url>
+ </scm>
+
+ <build>
+ <resources>
+ 
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/maven/enforcer/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/enforcer/</url>
+ </site>
+ </distributionManagement>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>codehaus.snapshots</id>
+ <name>Codehaus Snapshot Development Repository</name>
+ <url>http://snapshots.repository.codehaus.org</url>
+ </repository>
+ </repositories>
+
+ <modules>
+ <module>enforcer-rules</module>
+ </modules>
+
+</project>

Propchange: maven/archetype/trunk/archetype-plugin/src/test/projects/simple-inheritence/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: maven/archetype/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native