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/04/13 05:19:31 UTC
cvs commit: maven-components/maven-project/src/test/java/org/apache/maven/project/helpers ModelTestHelper.java ProjectTestHelper.java
jvanzyl 2004/04/12 20:19:31
Modified: maven-project/src/main/java/org/apache/maven/project
DefaultModelInheritanceAssembler.java
MavenProject.java
maven-project/src/test/java/org/apache/maven/project
fully-populated-child.xml project.xml
maven-project/src/test/java/org/apache/maven/project/helpers
ModelTestHelper.java ProjectTestHelper.java
Log:
o adjust for change in model from <repository/> to <scm/>.
Revision Changes Path
1.2 +4 -4 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java
Index: DefaultModelInheritanceAssembler.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultModelInheritanceAssembler.java 2 Apr 2004 20:41:21 -0000 1.1
+++ DefaultModelInheritanceAssembler.java 13 Apr 2004 03:19:31 -0000 1.2
@@ -101,10 +101,10 @@
child.setOrganization( parent.getOrganization() );
}
- // Build
- if ( child.getRepository() == null )
+ // Scm
+ if ( child.getScm() == null )
{
- child.setRepository( parent.getRepository() );
+ child.setScm( parent.getScm() );
}
// developers
1.3 +12 -12 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenProject.java 22 Mar 2004 00:11:15 -0000 1.2
+++ MavenProject.java 13 Apr 2004 03:19:31 -0000 1.3
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.model.Branch;
import org.apache.maven.model.Build;
import org.apache.maven.model.Contributor;
@@ -25,18 +26,17 @@
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
-import org.apache.maven.model.Repository;
-import org.apache.maven.model.Version;
import org.apache.maven.model.Resource;
-import org.apache.maven.artifact.MavenArtifact;
+import org.apache.maven.model.Scm;
+import org.apache.maven.model.Version;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Iterator;
/**
* The concern of the project is provide runtime values based on the model.
@@ -154,12 +154,12 @@
}
// ----------------------------------------------------------------------
- // Repository Support
+ // Scm Support
// ----------------------------------------------------------------------
- public boolean hasRepository()
+ public boolean hasScm()
{
- return ( model.getRepository() != null );
+ return ( model.getScm() != null );
}
// ----------------------------------------------------------------------
@@ -554,14 +554,14 @@
return getModel().getOrganization();
}
- public void setRepository( Repository repository )
+ public void setScm( Scm scm )
{
- getModel().setRepository( repository );
+ getModel().setScm( scm );
}
- public Repository getRepository()
+ public Scm getScm()
{
- return getModel().getRepository();
+ return getModel().getScm();
}
public void setMailingLists( List mailingLists )
1.3 +2 -2 maven-components/maven-project/src/test/java/org/apache/maven/project/fully-populated-child.xml
Index: fully-populated-child.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/fully-populated-child.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fully-populated-child.xml 12 Apr 2004 14:41:31 -0000 1.2
+++ fully-populated-child.xml 13 Apr 2004 03:19:31 -0000 1.3
@@ -28,11 +28,11 @@
<logo>/images/jakarta-logo-blue.gif</logo>
</organization>
- <repository>
+ <scm>
<connection>anon-connection</connection>
<developerConnection>developer-connection</developerConnection>
<url>repository-url</url>
- </repository>
+ </scm>
<versions>
<version>
1.3 +2 -2 maven-components/maven-project/src/test/java/org/apache/maven/project/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 12 Apr 2004 14:41:31 -0000 1.2
+++ project.xml 13 Apr 2004 03:19:31 -0000 1.3
@@ -22,11 +22,11 @@
<logo>/images/jakarta-logo-blue.gif</logo>
</organization>
- <repository>
+ <scm>
<connection>anon-connection</connection>
<developerConnection>developer-connection</developerConnection>
<url>repository-url</url>
- </repository>
+ </scm>
<versions>
<version>
1.3 +4 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ModelTestHelper.java 22 Mar 2004 00:11:15 -0000 1.2
+++ ModelTestHelper.java 13 Apr 2004 03:19:31 -0000 1.3
@@ -84,11 +84,11 @@
// Repository
// ----------------------------------------------------------------------
- assertEquals( "anon-connection", model.getRepository().getConnection() );
+ assertEquals( "anon-connection", model.getScm().getConnection() );
- assertEquals( "developer-connection", model.getRepository().getDeveloperConnection() );
+ assertEquals( "developer-connection", model.getScm().getDeveloperConnection() );
- assertEquals( "repository-url", model.getRepository().getUrl() );
+ assertEquals( "repository-url", model.getScm().getUrl() );
// ----------------------------------------------------------------------
// Versions
1.3 +4 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectTestHelper.java 22 Mar 2004 00:11:15 -0000 1.2
+++ ProjectTestHelper.java 13 Apr 2004 03:19:31 -0000 1.3
@@ -84,11 +84,11 @@
// Repository
// ----------------------------------------------------------------------
- assertEquals( "anon-connection", project.getRepository().getConnection() );
+ assertEquals( "anon-connection", project.getScm().getConnection() );
- assertEquals( "developer-connection", project.getRepository().getDeveloperConnection() );
+ assertEquals( "developer-connection", project.getScm().getDeveloperConnection() );
- assertEquals( "repository-url", project.getRepository().getUrl() );
+ assertEquals( "repository-url", project.getScm().getUrl() );
// ----------------------------------------------------------------------
// Versions
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org