You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2004/03/22 01:11:15 UTC
cvs commit: maven-components/maven-project/src/test/java/org/apache/maven/project/helpers ModelTestHelper.java ProjectTestHelper.java
jvanzyl 2004/03/21 16:11:15
Modified: maven-project/src/main/java/org/apache/maven/artifact
AbstractMavenArtifact.java
GenericMavenArtifact.java MavenArtifact.java
maven-project/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java MavenProject.java
MavenProjectBuilder.java
maven-project/src/main/resources/META-INF/plexus
components.xml
maven-project/src/test/java/org/apache/maven/project/helpers
ModelTestHelper.java ProjectTestHelper.java
Added: maven-project/src/main/java/org/apache/maven/artifact/factory
DefaultMavenArtifactory.java MavenArtifactory.java
Removed: maven-project/src/main/java/org/apache/maven/artifact
DefaultMavenArtifactFactory.java
DefaultMavenArtifactory.java MavenArtifactory.java
Log:
o doing the 2.0 license thing
o separating the artifact factory into its own package, preparing for the
integration of Wagon
Revision Changes Path
1.2 +13 -113 maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java
Index: AbstractMavenArtifact.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractMavenArtifact.java 19 Mar 2004 17:11:06 -0000 1.1
+++ AbstractMavenArtifact.java 22 Mar 2004 00:11:14 -0000 1.2
@@ -1,59 +1,19 @@
package org.apache.maven.artifact;
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Maven" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Maven", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * ====================================================================
+ * Licensed 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.
*/
import org.apache.maven.model.Dependency;
@@ -62,52 +22,35 @@
import java.io.IOException;
import java.io.FileInputStream;
-/**
- * Base class from which all artifact subclasses are derived.
- *
- * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
- * @version $Id$
- */
public abstract class AbstractMavenArtifact
implements MavenArtifact
{
- /** Platform specific file separator used for file system operations. */
protected static final String ps = File.separator;
- /** Dependency this artifact is based on. */
private Dependency dependency;
- /** Path to artifact. */
private String path;
- /**
- * Default constructor.
- * @param dependency the dependency the artifact is based on
- */
public AbstractMavenArtifact( Dependency dependency )
{
this.dependency = dependency;
}
- /** @see MavenArtifact#setDependency */
public void setDependency( Dependency dependency )
{
this.dependency = dependency;
}
- /** @see MavenArtifact#getDependency */
public Dependency getDependency()
{
return dependency;
}
- /** @see MavenArtifact#setPath */
public void setPath( String path )
{
this.path = path;
}
- /** @see MavenArtifact#getPath */
public String getPath()
{
if ( path == null )
@@ -118,7 +61,6 @@
return path;
}
- /** @see MavenArtifact#generatePath */
public String generatePath()
{
return "/" + getArtifactDirectory( getDependency() )
@@ -136,7 +78,6 @@
return dependency.getArtifactId() + "-" + dependency.getVersion() + "." + dependency.getType();
}
- /** @see MavenArtifact#getUrlPath */
public String getUrlPath()
{
return "/" + getArtifactDirectory( getDependency() )
@@ -144,7 +85,6 @@
+ "/" + getArtifact( getDependency() );
}
- /** @see MavenArtifact#getChecksumUrl */
public String getChecksumUrl()
{
return "/" + getArtifactDirectory( getDependency() )
@@ -153,12 +93,6 @@
+ ".md5";
}
- /**
- * Get the directory to place the artifact in. If the groupId has been
- * set then use that, otherwise use the id.
- *
- * @return The artifact directory.
- */
public String getArtifactDirectory( Dependency d )
{
if ( isValid( d.getGroupId() ) )
@@ -180,58 +114,24 @@
return false;
}
- /**
- * Get the name of the artifact from the underlying dependency.
- *
- * @return The name of the underlying dependency.
- */
public String getName()
{
return getDependency().getArtifact();
}
- /** @see MavenArtifact#exists */
public boolean exists()
{
return getFile().exists();
}
- /** @see MavenArtifact#isSnapshot */
public boolean isSnapshot()
{
return getDependency().getArtifact().indexOf( "SNAPSHOT" ) > 0;
}
- /** @see MavenArtifact#getFile */
public File getFile()
{
return new File( getPath() );
- }
-
- /**
- * Reads the contents of a file.
- *
- * @param file The name of the file to read.
- * @return The file contents or null if read failed.
- * @throws IOException if there is an error reading the file
- */
- String fileRead( File file )
- throws IOException
- {
- StringBuffer buf = new StringBuffer();
-
- FileInputStream in = new FileInputStream( file );
-
- int count;
- byte[] b = new byte[512];
- while ( ( count = in.read( b ) ) > 0 ) // blocking read
- {
- buf.append( new String( b, 0, count ) );
- }
-
- in.close();
-
- return buf.toString();
}
public String getExtension()
1.2 +15 -68 maven-components/maven-project/src/main/java/org/apache/maven/artifact/GenericMavenArtifact.java
Index: GenericMavenArtifact.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/GenericMavenArtifact.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericMavenArtifact.java 19 Mar 2004 17:11:06 -0000 1.1
+++ GenericMavenArtifact.java 22 Mar 2004 00:11:14 -0000 1.2
@@ -1,79 +1,26 @@
package org.apache.maven.artifact;
-import org.apache.maven.model.Dependency;
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Maven" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
*
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Maven", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * ====================================================================
+ * Licensed 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.
*/
-/**
- * Generic artifact that builds its path and url information based on its
- * associated dependency. URLs are of the form "id/type/artifact".
- *
- * @author <a href="mailto:jason@zenplex.org">Jason van Zyl</a>
- *
- * @version $Id$
- */
+import org.apache.maven.model.Dependency;
+
public class GenericMavenArtifact
extends AbstractMavenArtifact
{
- /**
- * Constructor for the GenericArtifact object
- *
- * @param dependency Project dependency.
- */
public GenericMavenArtifact( Dependency dependency )
{
super( dependency );
1.2 +13 -53 maven-components/maven-project/src/main/java/org/apache/maven/artifact/MavenArtifact.java
Index: MavenArtifact.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/MavenArtifact.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenArtifact.java 19 Mar 2004 17:11:06 -0000 1.1
+++ MavenArtifact.java 22 Mar 2004 00:11:14 -0000 1.2
@@ -1,59 +1,19 @@
package org.apache.maven.artifact;
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Maven" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Maven", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * ====================================================================
+ * Licensed 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.
*/
import org.apache.maven.model.Dependency;
1.1 maven-components/maven-project/src/main/java/org/apache/maven/artifact/factory/DefaultMavenArtifactory.java
Index: DefaultMavenArtifactory.java
===================================================================
package org.apache.maven.artifact.factory;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
import org.apache.maven.artifact.GenericMavenArtifact;
import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class DefaultMavenArtifactory
implements MavenArtifactory
{
public List createArtifacts( MavenProject project )
{
List projectArtifacts = new ArrayList();
String mavenRepoLocal = project.getProperty( "maven.repo.local" );
boolean mavenJarOverride = project.getBooleanProperty( "maven.jar.override" );
for ( Iterator i = project.getDependencies().iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();
String mavenJarProperty = project.getProperty( "maven.jar." + MavenProject.standardToLegacyId( d.getId() ) );
MavenArtifact artifact = createArtifact( d );
if ( mavenJarOverride && StringUtils.isNotEmpty(mavenJarProperty) )
{
// The jar override option has been set and we have a property
// for the this dependency so override the path with the user
// specified value.
if ( Character.isDigit( mavenJarProperty.charAt( 0 ) ) )
{
// User is requesting a specific version of a dependency
// be used.
d.setVersion( mavenJarProperty );
artifact.setPath( mavenRepoLocal + artifact.generatePath() );
}
else
{
// User is requesting a specific path to a dependency
// be used.
artifact.setPath( new File( mavenJarProperty ).getAbsolutePath() );
}
}
else
{
artifact.setPath( mavenRepoLocal + artifact.generatePath() );
}
project.setDependencyPath( artifact.getDependency().getArtifactId(), artifact.getPath() );
projectArtifacts.add( artifact );
}
return projectArtifacts;
}
private MavenArtifact createArtifact( Dependency dependency )
{
if ( dependency.getType() == null
|| dependency.getType().trim().length() == 0
|| dependency.getType().equals( "jar" )
|| dependency.getType().equals( "test" ) )
{
dependency.setType( "jar" );
return new GenericMavenArtifact( dependency );
}
else
{
return new GenericMavenArtifact( dependency );
}
}
}
1.1 maven-components/maven-project/src/main/java/org/apache/maven/artifact/factory/MavenArtifactory.java
Index: MavenArtifactory.java
===================================================================
package org.apache.maven.artifact.factory;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
import org.apache.maven.project.MavenProject;
import java.util.List;
public interface MavenArtifactory
{
static String ROLE = MavenArtifactory.class.getName();
List createArtifacts( MavenProject project );
}
1.6 +17 -4 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultMavenProjectBuilder.java 21 Mar 2004 23:39:32 -0000 1.5
+++ DefaultMavenProjectBuilder.java 22 Mar 2004 00:11:15 -0000 1.6
@@ -1,6 +1,22 @@
package org.apache.maven.project;
-import org.apache.maven.artifact.MavenArtifactory;
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.apache.maven.artifact.factory.MavenArtifactory;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -25,9 +41,6 @@
import java.util.Map;
import java.util.Properties;
-/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- */
public class DefaultMavenProjectBuilder
extends AbstractLogEnabled
implements MavenProjectBuilder
1.2 +17 -1 maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenProject.java 19 Mar 2004 17:11:06 -0000 1.1
+++ MavenProject.java 22 Mar 2004 00:11:15 -0000 1.2
@@ -1,5 +1,21 @@
package org.apache.maven.project;
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
import org.apache.maven.model.Branch;
import org.apache.maven.model.Build;
import org.apache.maven.model.Contributor;
1.3 +16 -0 maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Index: MavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenProjectBuilder.java 20 Mar 2004 04:22:47 -0000 1.2
+++ MavenProjectBuilder.java 22 Mar 2004 00:11:15 -0000 1.3
@@ -1,5 +1,21 @@
package org.apache.maven.project;
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
import java.io.File;
import java.util.List;
1.2 +3 -3 maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- components.xml 19 Mar 2004 17:11:06 -0000 1.1
+++ components.xml 22 Mar 2004 00:11:15 -0000 1.2
@@ -11,13 +11,13 @@
<role>org.apache.maven.model.io.xpp3.MavenXpp3Writer</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.MavenArtifactory</role>
+ <role>org.apache.maven.artifact.factory.MavenArtifactory</role>
</requirement>
</requirements>
</component>
<component>
- <role>org.apache.maven.artifact.MavenArtifactory</role>
- <implementation>org.apache.maven.artifact.DefaultMavenArtifactory</implementation>
+ <role>org.apache.maven.artifact.factory.MavenArtifactory</role>
+ <implementation>org.apache.maven.artifact.factory.DefaultMavenArtifactory</implementation>
</component>
</components>
</component-set>
1.2 +17 -1 maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ModelTestHelper.java
Index: ModelTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ModelTestHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelTestHelper.java 21 Mar 2004 21:40:43 -0000 1.1
+++ ModelTestHelper.java 22 Mar 2004 00:11:15 -0000 1.2
@@ -1,5 +1,21 @@
package org.apache.maven.project.helpers;
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
import org.apache.maven.model.Model;
import org.apache.maven.model.Version;
import org.apache.maven.model.MailingList;
1.2 +17 -1 maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
Index: ProjectTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectTestHelper.java 21 Mar 2004 21:40:43 -0000 1.1
+++ ProjectTestHelper.java 22 Mar 2004 00:11:15 -0000 1.2
@@ -1,5 +1,21 @@
package org.apache.maven.project.helpers;
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
import org.apache.maven.model.Version;
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Developer;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org