You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/10/29 05:16:22 UTC
svn commit: r708765 [7/7] - in
/continuum/branches/continuum-transient-state: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/configuration/
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache...
Modified: continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml Tue Oct 28 21:16:12 2008
@@ -5,6 +5,12 @@
<mapping>
<class-a>org.apache.maven.continuum.xmlrpc.project.ProjectGroupSummary</class-a>
<class-b>org.apache.maven.continuum.model.project.ProjectGroup</class-b>
+ <field>
+ <a>localRepository</a>
+ <b>localRepository</b>
+ <a-hint>org.apache.continuum.xmlrpc.repository.LocalRepository</a-hint>
+ <b-hint>org.apache.continuum.model.repository.LocalRepository</b-hint>
+ </field>
</mapping>
<mapping>
@@ -199,5 +205,55 @@
<mapping>
<class-a>org.apache.maven.continuum.buildqueue.BuildProjectTask</class-a>
<class-b>org.apache.maven.continuum.xmlrpc.project.BuildProjectTask</class-b>
- </mapping>
+ </mapping>
+
+ <mapping>
+ <class-a>org.apache.continuum.xmlrpc.repository.LocalRepository</class-a>
+ <class-b>org.apache.continuum.model.repository.LocalRepository</class-b>
+ </mapping>
+
+ <mapping>
+ <class-a>org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration</class-a>
+ <class-b>org.apache.continuum.model.repository.RepositoryPurgeConfiguration</class-b>
+ <field>
+ <a>repository</a>
+ <b>repository</b>
+ <a-hint>org.apache.continuum.xmlrpc.repository.LocalRepository</a-hint>
+ <b-hint>org.apache.continuum.model.repository.LocalRepository</b-hint>
+ </field>
+ <field>
+ <a>schedule</a>
+ <b>schedule</b>
+ <a-hint>org.apache.maven.continuum.xmlrpc.project.Schedule</a-hint>
+ <b-hint>org.apache.maven.continuum.model.project.Schedule</b-hint>
+ </field>
+ </mapping>
+
+ <mapping>
+ <class-a>org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration</class-a>
+ <class-b>org.apache.continuum.model.repository.DirectoryPurgeConfiguration</class-b>
+ <field>
+ <a>schedule</a>
+ <b>schedule</b>
+ <a-hint>org.apache.maven.continuum.xmlrpc.project.Schedule</a-hint>
+ <b-hint>org.apache.maven.continuum.model.project.Schedule</b-hint>
+ </field>
+ </mapping>
+
+ <mapping>
+ <class-a>org.apache.continuum.xmlrpc.release.ContinuumReleaseResult</class-a>
+ <class-b>org.apache.continuum.model.release.ContinuumReleaseResult</class-b>
+ <field>
+ <a>projectGroup</a>
+ <b>projectGroup</b>
+ <a-hint>org.apache.maven.continuum.xmlrpc.project.ProjectGroup</a-hint>
+ <b-hint>org.apache.maven.continuum.model.project.ProjectGroup</b-hint>
+ </field>
+ <field>
+ <a>project</a>
+ <b>project</b>
+ <a-hint>org.apache.maven.continuum.xmlrpc.project.Project</a-hint>
+ <b-hint>org.apache.maven.continuum.model.project.Project</b-hint>
+ </field>
+ </mapping>
</mappings>
Modified: continuum/branches/continuum-transient-state/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-xmlrpc/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-xmlrpc/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-xmlrpc/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,7 +21,7 @@
<parent>
<artifactId>continuum</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>continuum-xmlrpc</artifactId>
Modified: continuum/branches/continuum-transient-state/maven-continuum-plugin/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/maven-continuum-plugin/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/maven-continuum-plugin/pom.xml (original)
+++ continuum/branches/continuum-transient-state/maven-continuum-plugin/pom.xml Tue Oct 28 21:16:12 2008
@@ -21,13 +21,12 @@
<parent>
<artifactId>continuum</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-continuum-plugin</artifactId>
+ <artifactId>continuum-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Maven Continuum Plugin</name>
+ <name>Continuum :: Maven Plugin</name>
<dependencies>
<dependency>
<groupId>org.apache.continuum</groupId>
Modified: continuum/branches/continuum-transient-state/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddMavenTwoProject.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddMavenTwoProject.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddMavenTwoProject.java (original)
+++ continuum/branches/continuum-transient-state/maven-continuum-plugin/src/main/java/org/apache/maven/continuum/plugin/AddMavenTwoProject.java Tue Oct 28 21:16:12 2008
@@ -34,6 +34,14 @@
extends AbstractContinuumMojo
{
/**
+ * POM file name.
+ *
+ * @parameter expression="${pomFilename}" default-value="pom.xml"
+ * @required
+ */
+ private String pomFilename;
+
+ /**
* POM Url.
*
* @parameter expression="${projectUrl}" default-value="${project.scm.url}"
@@ -54,7 +62,16 @@
AddingResult addingResult = null;
try
{
+ if ( !projectUrl.endsWith( pomFilename ) )
+ {
+ if ( !projectUrl.endsWith( "/" ) )
+ {
+ projectUrl += "/";
+ }
+ projectUrl += pomFilename;
+ }
+ getLog().info( "Adding M2 project from " + projectUrl );
if ( projectGroupId != null && projectGroupId.length() > 0 )
{
addingResult = getClient().addMavenTwoProject( projectUrl, Integer.parseInt( projectGroupId ) );
@@ -68,6 +85,8 @@
getLog().error( "fail to add mavenTwo project " + addingResult.getErrorsAsString() );
throw new MojoExecutionException( "fail to add mavenTwo project " + addingResult.getErrorsAsString() );
}
+ //TODO: print projects/project groups added
+ //addingResult.getProjects();
}
catch ( MojoExecutionException e )
{
Modified: continuum/branches/continuum-transient-state/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/pom.xml (original)
+++ continuum/branches/continuum-transient-state/pom.xml Tue Oct 28 21:16:12 2008
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<name>Continuum :: Project</name>
<url>http://continuum.apache.org</url>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
<prerequisites>
<maven>2.0.7</maven>
@@ -150,23 +150,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -945,6 +928,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
@@ -1007,6 +995,35 @@
<module>continuum-webapp-test</module>
</modules>
</profile>
+ <profile>
+ <id>buildnumber</id>
+ <activation>
+ <file>
+ <exists>.svn</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<properties>
@@ -1015,7 +1032,7 @@
<spring.version>2.5.4</spring.version>
<wagon.version>1.0-beta-2</wagon.version>
<maven-scm.version>1.1</maven-scm.version>
- <redback.version>1.1-SNAPSHOT</redback.version>
+ <redback.version>1.1.2-SNAPSHOT</redback.version>
<mail-sender.version>1.0-alpha-7</mail-sender.version>
<archiva.version>1.1</archiva.version>
</properties>