Changeset 798

Timestamp:

02/27/09 12:42:28 (4 years ago)

Author:

cbalan

Message:

Continutrac: - preparation for >=continuum-1.2.2

File:

• trunk/forks/continutracplugin/continutrac/continuum.py (modified) (13 diffs)

trunk/forks/continutracplugin/continutrac/continuum.py

@@ -16 +16 @@
 
 def checkResult( map ):
-    if ( map.get( "result" ) == "ok" ):
-        return map
+    #if ( map.get( "result" ) == "ok" ):
+    from pprint import pprint
+    pprint(map)
+    return map
 
     ex = XmlRpcException( map.get( "method" ), 
@@ -78 +80 @@
         return self.__service 
          
-    def __init__( self, url, xmlrpc_handler = 'org.apache.maven.continuum.extras.xmlrpc.ContinuumExtrasService'):
+    def __init__( self, url, xmlrpc_handler = 'org.apache.maven.continuum.xmlrpc.ContinuumService'):
         self.server = xmlrpclib.Server(url, allow_none=True) 
         self.__handler = xmlrpc_handler
@@ -98 +100 @@
 
     def removeProject( self, projectId ):
-        checkResult( self._get_service().removeProject( projectId ) )
+        checkResult( self._get_service().removeProjectRPC( projectId ) )
 
     #def updateProject( projectId, name, scmUrl, nagEmailAddress, version, arguments ):
@@ -110 +112 @@
 
     def getProject( self, projectId ):
-        result = checkResult( self._get_service().getProject( projectId ) )
-
-        return self.makeProject( result[ "project" ] )
+        result = checkResult( self._get_service().getProjectSummaryRPC(int(projectId)))
+
+        return self.makeProject( result )
 
     def getProjects( self, projectGroupId ):
-        result = checkResult( self._get_service().getProjects(projectGroupId) )
+        result = checkResult( self._get_service().getProjectsRPC(projectGroupId) )
 
         projects = []
@@ -124 +126 @@
 
     def getAllProjectGroups( self ):
-        result = checkResult(self._get_service().getAllProjectGroups())
+        result = checkResult(self._get_service().getAllProjectGroupsRPC())
 
         projectGroups = []
-        for projectGroup in result[ "projectGroups" ]:
+        for projectGroup in result:
             projectGroups.append( ProjectGroup( projectGroup ) )
         
@@ -147 +149 @@
 
     def getBuild( self, projectId, buildId ):
-        result = checkResult( self._get_service().getBuildResult( projectId, buildId ) )
-
-        return Build( result[ "build" ] )
+        result = checkResult( self._get_service().getBuildResultRPC( projectId, buildId ) )
+
+        return Build( result )
 
     def getBuildsForProject( self, projectId ):
-        result = checkResult( self._get_service().getBuildResultsForProject( projectId ) )
+        result = checkResult( self._get_service().getBuildResultsForProjectRPC( projectId ) )
 
         builds = []
-        for build in result[ "builds" ]:
+        for build in result:
             builds.append( Build( build ) )
 
@@ -161 +163 @@
 
     def getBuildOutput( self, projectId, buildId ):
-        return checkResult( self._get_service().getBuildOutput( projectId, buildId ) )[ "buildOutput" ]
+        return checkResult( self._get_service().getBuildOutput( projectId, buildId ) )
 
     def getBuildDefinitionsForProject(self, projectId):
-        result = checkResult( self._get_service().getBuildDefinitionsForProject( projectId ) )
+        result = checkResult( self._get_service().getBuildDefinitionsForProjectRPC( projectId ) )
 
         buildDefinitions = []
-        for bd in result[ "buildDefinitions" ]:
+        for bd in result:
             buildDefinitions.append( BuildDefinition( bd ) )
         return buildDefinitions
@@ -173 +175 @@
     
     def getChangedFilesForBuild( self, buildId ):
-        result = checkResult( self._get_service().getBuild( buildId ) )
-        scmResult = ScmResult( result[ "scmResult" ] )
+        result = checkResult( self._get_service().getBuildRPC( buildId ) )
+        scmResult = ScmResult( result )
 
         return scmResult.changes
@@ -183 +185 @@
 
     def addMavenTwoProject( self, argument ):
-        result = checkResult( self._get_service().addMavenTwoProject( argument ) )
-
-        return result[ "projectIds" ]
+        result = checkResult( self._get_service().addMavenTwoProjectRPC( argument ) )
+
+        return result
 
     def updateMavenTwoProject( self, mavenTwoProject ):
-        checkResult( self._get_service().updateaddMavenTwoProject( mavenTwoProject ) )
+        checkResult( self._get_service().updateaddMavenTwoProjectRPC( mavenTwoProject ) )
 
     ####################################################################
@@ -195 +197 @@
 
     def addMavenOneProject( self, argument ):
-        result = checkResult( self._get_service().addMavenOneProject( argument ) )
-
-        return result[ "projectIds" ]
+        result = checkResult( self._get_service().addMavenOneProjectRPC( argument ) )
+
+        return result
 
     def updateMavenOneProject( self, mavenOneProject ):
-        checkResult( self._get_service().updateMavenOneProject( mavenOneProject ) )
+        checkResult( self._get_service().updateMavenOneProjectRPC( mavenOneProject ) )
 
     ####################################################################
@@ -207 +209 @@
 
     def addAntProject( self, antProject ):
-        result = checkResult( self._get_service().addAntProject( antProject ) )
-
-        return result[ "projectIds" ]
+        result = checkResult( self._get_service().addAntProjectRPC( antProject ) )
+
+        return result
 
     def updateAntProject( self, antProject ):
-        checkResult( self._get_service().updateAntProject( antProject ) )
+        checkResult( self._get_service().updateAntProjectRPC( antProject ) )
 
     ####################################################################
@@ -219 +221 @@
 
     def addShellProject( self, shellProject ):
-        result = checkResult( self._get_service().addShellProject( shellProject ) )
-
-        return result[ "projectIds" ]
+        result = checkResult( self._get_service().addShellProjectRPC( shellProject ) )
+
+        return result
 
     def updateShellProject( self, shellProject ):
-        checkResult( self._get_service().updateShellProject( shellProject ) )
+        checkResult( self._get_service().updateShellProjectRPC( shellProject ) )
 
     ####################################################################
@@ -550 +552 @@
 
         return value
+