continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r982471 - in /continuum/trunk/continuum-xmlrpc: continuum-xmlrpc-api/ continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ continuum-xmlrpc-api/src/main/mdo/ continuum-xmlrpc-backup/ continuum-xmlrpc-client/src/main/java/or...
Date Thu, 05 Aug 2010 05:13:59 GMT
Author: ctan
Date: Thu Aug  5 05:13:58 2010
New Revision: 982471

URL: http://svn.apache.org/viewvc?rev=982471&view=rev
Log:
[CONTINUUM-2551] create new java bean of BuildTrigger for use in the xmlrpc

Modified:
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
    continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml Thu Aug  5 05:13:58 2010
@@ -27,13 +27,6 @@ under the License.
   <artifactId>continuum-xmlrpc-api</artifactId>
   <name>Continuum :: XMLRPC :: API</name>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.continuum</groupId>
-      <artifactId>continuum-api</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -53,7 +46,7 @@ under the License.
           </execution>
         </executions>
         <configuration>
-          <version>1.1.1</version>
+          <version>1.4.1</version>
           <packageWithVersion>false</packageWithVersion>
           <useJava5>true</useJava5>
         </configuration>

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
Thu Aug  5 05:13:58 2010
@@ -22,11 +22,11 @@ package org.apache.maven.continuum.xmlrp
 import java.util.List;
 import java.util.Map;
 
-import org.apache.continuum.utils.build.BuildTrigger;
 import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult;
 import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.xmlrpc.repository.LocalRepository;
 import org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration;
+import org.apache.continuum.xmlrpc.utils.BuildTrigger;
 import org.apache.maven.continuum.xmlrpc.project.AddingResult;
 import org.apache.maven.continuum.xmlrpc.project.BuildDefinition;
 import org.apache.maven.continuum.xmlrpc.project.BuildDefinitionTemplate;

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/mdo/continuum-service.xml
Thu Aug  5 05:13:58 2010
@@ -1407,5 +1407,22 @@
         </field>
       </fields>
     </class> 
+    <class>
+      <name>BuildTrigger</name>
+      <version>1.4.1+</version>
+      <packageName>org.apache.continuum.xmlrpc.utils</packageName>
+      <fields>
+        <field>
+          <name>trigger</name>
+          <version>1.4.1+</version>
+          <type>int</type>
+        </field>
+        <field>
+          <name>triggeredBy</name>
+          <version>1.4.1+</version>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
   </classes>
 </model>

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-backup/pom.xml Thu Aug  5 05:13:58 2010
@@ -31,12 +31,6 @@ under the License.
     <dependency>
       <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-xmlrpc-api</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.continuum</groupId>
-          <artifactId>continuum-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
Thu Aug  5 05:13:58 2010
@@ -24,11 +24,11 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.continuum.utils.build.BuildTrigger;
 import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult;
 import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.xmlrpc.repository.LocalRepository;
 import org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration;
+import org.apache.continuum.xmlrpc.utils.BuildTrigger;
 import org.apache.maven.continuum.xmlrpc.ContinuumService;
 import org.apache.maven.continuum.xmlrpc.project.AddingResult;
 import org.apache.maven.continuum.xmlrpc.project.BuildDefinition;

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml Thu Aug  5 05:13:58 2010
@@ -42,6 +42,10 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.continuum</groupId>
+      <artifactId>continuum-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.continuum</groupId>
       <artifactId>continuum-model</artifactId>
     </dependency>
     <dependency>

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
Thu Aug  5 05:13:58 2010
@@ -37,11 +37,11 @@ import org.apache.continuum.dao.SystemCo
 import org.apache.continuum.purge.ContinuumPurgeManagerException;
 import org.apache.continuum.purge.PurgeConfigurationServiceException;
 import org.apache.continuum.repository.RepositoryServiceException;
-import org.apache.continuum.utils.build.BuildTrigger;
 import org.apache.continuum.xmlrpc.release.ContinuumReleaseResult;
 import org.apache.continuum.xmlrpc.repository.DirectoryPurgeConfiguration;
 import org.apache.continuum.xmlrpc.repository.LocalRepository;
 import org.apache.continuum.xmlrpc.repository.RepositoryPurgeConfiguration;
+import org.apache.continuum.xmlrpc.utils.BuildTrigger;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException;
@@ -599,7 +599,8 @@ public class ContinuumServiceImpl
         ProjectSummary ps = getProjectSummary( projectId );
         checkBuildProjectInGroupAuthorization( ps.getProjectGroup().getName() );
 
-        continuum.buildProject( projectId, new BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
+        continuum.buildProject( projectId, 
+                                new org.apache.continuum.utils.build.BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
         return 0;
     }
 
@@ -610,7 +611,8 @@ public class ContinuumServiceImpl
         ProjectSummary ps = getProjectSummary( projectId );
         checkBuildProjectInGroupAuthorization( ps.getProjectGroup().getName() );
 
-        continuum.buildProject( projectId, buildDefinitionId, new BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
+        continuum.buildProject( projectId, buildDefinitionId, 
+                                new org.apache.continuum.utils.build.BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
         return 0;
     }
 
@@ -620,7 +622,8 @@ public class ContinuumServiceImpl
         ProjectSummary ps = getProjectSummary( projectId );
         checkBuildProjectInGroupAuthorization( ps.getProjectGroup().getName() );
 
-        continuum.buildProject( projectId, new BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
+        continuum.buildProject( projectId, 
+                                new org.apache.continuum.utils.build.BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
         return 0;
     }
 
@@ -630,7 +633,8 @@ public class ContinuumServiceImpl
         ProjectSummary ps = getProjectSummary( projectId );
         checkBuildProjectInGroupAuthorization( ps.getProjectGroup().getName() );
 
-        continuum.buildProjectWithBuildDefinition( projectId, buildDefintionId, new BuildTrigger(
ContinuumProjectState.TRIGGER_SCHEDULED, "" ) );
+        continuum.buildProjectWithBuildDefinition( projectId, buildDefintionId, 
+                                                   new org.apache.continuum.utils.build.BuildTrigger(
ContinuumProjectState.TRIGGER_SCHEDULED, "" ) );
         return 0;
     }
 
@@ -640,7 +644,9 @@ public class ContinuumServiceImpl
         ProjectSummary ps = getProjectSummary( projectId );
         checkBuildProjectInGroupAuthorization( ps.getProjectGroup().getName() );
 
-        continuum.buildProject( projectId, buildTrigger );
+        org.apache.continuum.utils.build.BuildTrigger bd = populateBuildTrigger( buildTrigger
);
+
+        continuum.buildProject( projectId, bd );
         return 0;
     }
 
@@ -650,7 +656,8 @@ public class ContinuumServiceImpl
         ProjectGroupSummary pg = getProjectGroupSummary( projectGroupId );
         checkBuildProjectInGroupAuthorization( pg.getName() );
 
-        continuum.buildProjectGroup( projectGroupId, new BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
+        continuum.buildProjectGroup( projectGroupId, 
+                                     new org.apache.continuum.utils.build.BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED,
"" ) );
 
         return 0;
     }
@@ -661,7 +668,8 @@ public class ContinuumServiceImpl
         ProjectGroupSummary pg = getProjectGroupSummary( projectGroupId );
         checkBuildProjectInGroupAuthorization( pg.getName() );
 
-        continuum.buildProjectGroupWithBuildDefinition( projectGroupId, buildDefintionId,
new BuildTrigger( ContinuumProjectState.TRIGGER_SCHEDULED, "" ) );
+        continuum.buildProjectGroupWithBuildDefinition( projectGroupId, buildDefintionId,

+                                                        new org.apache.continuum.utils.build.BuildTrigger(
ContinuumProjectState.TRIGGER_SCHEDULED, "" ) );
 
         return 0;
     }
@@ -1912,6 +1920,17 @@ public class ContinuumServiceImpl
         return repo;
     }
 
+    private org.apache.continuum.utils.build.BuildTrigger populateBuildTrigger( BuildTrigger
buildTrigger )
+    {
+        if ( buildTrigger == null )
+        {
+            return null;
+        }
+
+        return new org.apache.continuum.utils.build.BuildTrigger( buildTrigger.getTrigger(),
+                                                                  buildTrigger.getTriggeredBy()
);
+    }
+
     private Map<String, Object> serializeObject( Object o, final String... ignore )
     {
         if ( o != null )

Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml?rev=982471&r1=982470&r2=982471&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml
(original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/resources/dozerBeanMapping.xml
Thu Aug  5 05:13:58 2010
@@ -256,4 +256,9 @@
       <b-hint>org.apache.maven.continuum.model.project.Project</b-hint>
     </field>
   </mapping>
+
+  <mapping>
+    <class-a>org.apache.continuum.xmlrpc.utils.BuildTrigger</class-a>
+    <class-b>org.apache.continuum.utils.build.BuildTrigger</class-b>
+  </mapping>
 </mappings>



Mime
View raw message