[JENKINS-19823] Utilizing new activity parser

jenkinsci · Oct 1, 2013 · 77a7984 · 77a7984
1 parent 16b6554
commit 77a7984
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -445,14 +445,14 @@
         <dependency>
             <groupId>net.praqma</groupId>
             <artifactId>cool</artifactId>
-            <version>0.6.23</version>
+            <version>0.6.24-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>net.praqma</groupId>
             <artifactId>cool</artifactId>
-            <version>0.6.23</version>
+            <version>0.6.24-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/src/main/java/net/praqma/hudson/remoting/deliver/GetChanges.java b/src/main/java/net/praqma/hudson/remoting/deliver/GetChanges.java
@@ -3,6 +3,7 @@
 import hudson.FilePath;
 import hudson.model.BuildListener;
 import hudson.remoting.VirtualChannel;
+import net.praqma.clearcase.api.DiffBl;
 import net.praqma.clearcase.ucm.entities.Activity;
 import net.praqma.clearcase.ucm.entities.Baseline;
 import net.praqma.clearcase.ucm.entities.Stream;
@@ -46,7 +47,10 @@ public List<Activity> invoke( File workspace, VirtualChannel channel ) throws IO
         logger.fine( "Get changeset" );
 
         try {
-            List<Activity> activities = Version.getBaselineDiff( destinationStream, baseline, true, new File( viewPath ) );
+            DiffBl diffBl = new DiffBl( destinationStream, baseline ).setVersions( true ).setActivities( true );
+            Activity.Parser parser = new Activity.Parser( diffBl ).setActivityUserAsVersionUser( true ).setDirection( Activity.Parser.Direction.RIGHT );
+            List<Activity> activities = parser.parse().getActivities();
+            //List<Activity> activities = Version.getBaselineDiff( destinationStream, baseline, true, new File( viewPath ) );
             for( Activity activity : activities ) {
                 activity.load();
             }