Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-15092] Adding headline to changes
  • Loading branch information
wolfgarnet committed Sep 10, 2012
1 parent 0415727 commit 468b01a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 6 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Expand Up @@ -5,4 +5,8 @@ src/main/java/net/praqma/hudson/test/
work/
target
#Log files
.log
.log
.idea
bin
stuff
*.iml
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -214,14 +214,14 @@
<dependency>
<groupId>net.praqma</groupId>
<artifactId>cool</artifactId>
<version>0.6.1</version>
<version>0.6.2-SNAPSHOT</version>
<type>jar</type>
</dependency>

<dependency>
<groupId>net.praqma</groupId>
<artifactId>cool</artifactId>
<version>0.6.1</version>
<version>0.6.2-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/praqma/hudson/Util.java
Expand Up @@ -78,6 +78,7 @@ public static String createChangelog( List<Activity> changes, Baseline bl ) {
act.load();
buffer.append( "<activity>" );
buffer.append( ( "<actName>" + act.getShortname() + "</actName>" ) );
buffer.append( ( "<actHeadline>" + act.getHeadline() + "</actHeadline>" ) );
buffer.append( ( "<author>" + act.getUser() + "</author>" ) );
//List<Version> versions = act.changeset.versions;
VersionList versions = new VersionList( act.changeset.versions ).getLatest();
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/net/praqma/hudson/notifier/CCUCMNotifier.java
Expand Up @@ -357,8 +357,6 @@ private void processBuild( AbstractBuild<?, ?> build, Launcher launcher, BuildLi
if( action != null ) {
action.setCreatedBaseline( targetbaseline );
}

out.println( targetbaseline );
} catch( Exception e ) {
ExceptionUtils.print( e, out, false );
logger.warning( "Failed to create baseline on stream", id );
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/net/praqma/hudson/scm/ChangeLogEntryImpl.java
Expand Up @@ -20,6 +20,7 @@ public class ChangeLogEntryImpl extends Entry {

private ChangeLogSetImpl parent;
private String actName;
private String actHeadline;
private String msg;
private String author;
private String date;
Expand Down Expand Up @@ -77,5 +78,13 @@ public String getMsg() {
public void setActName( String actName ) {
this.actName = actName;
}

public void setActHeadline( String actHeadline ) {
this.actHeadline = actHeadline;
}

public String getActHeadline() {
return actHeadline;
}

}
Expand Up @@ -39,6 +39,7 @@ public ChangeLogSet<? extends Entry> parse( AbstractBuild build, File changelogF
digester.addSetProperties( "*/entry/activity" );
digester.addBeanPropertySetter( "*/entry/activity/file", "nextFilepath" );
digester.addBeanPropertySetter( "*/entry/activity/actName" );
digester.addBeanPropertySetter( "*/entry/activity/actHeadline" );
digester.addBeanPropertySetter( "*/entry/activity/author", "myAuthor" );
digester.addSetNext( "*/entry/activity", "add" );
FileReader reader = new FileReader( changelogFile );
Expand Down
Expand Up @@ -10,7 +10,7 @@
<j:forEach var="cs" items="${it.entries}" varStatus="loop">
<tr class="pane">
<td colspan="2" class="changeset">
<b>Activity: ${cs.msg}</b> by ${cs.author}<br />
<b>Activity: ${cs.msg} "${cs.actHeadline}"</b> by ${cs.author}<br />
<j:forEach var="file" items="${cs.affectedPaths}" varStatus="loop">
${file}<br />
</j:forEach>
Expand Down

0 comments on commit 468b01a

Please sign in to comment.