You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2005/12/16 22:05:16 UTC
svn commit: r357230 - in
/maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira: ./
src/main/java/org/apache/maven/issue/jira/project/
src/test/java/org/apache/maven/issue/jira/
src/test/java/org/apache/maven/issue/jira/project/
Author: jvanzyl
Date: Fri Dec 16 13:05:10 2005
New Revision: 357230
URL: http://svn.apache.org/viewcvs?rev=357230&view=rev
Log:
o adding test for csv file project record source
o adding simple property interpolatation to csv project record source
o modify projects.txt which will be used to create the new plugin projects
Modified:
maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/projects.txt
maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/main/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSource.java
maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/JiraSoapClientTest.java
maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSourceTest.java
Modified: maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/projects.txt
URL: http://svn.apache.org/viewcvs/maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/projects.txt?rev=357230&r1=357229&r2=357230&view=diff
==============================================================================
--- maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/projects.txt (original)
+++ maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/projects.txt Fri Dec 16 13:05:10 2005
@@ -1,3 +1,9 @@
# Project to insert into JIRA
+
+psid = 10010
+nsid = 10001
+baseKey = MNGP
+nameSuffix = Maven Plugin
+
# projectKey,name,description,leadId,permissionSchemeId,notificationSchemeId
-MPCLOVER,Clover Maven Plugin,Description,jason,0,0
+${baseKey}CLOVER,Clover ${nameSuffix},Description,jason,${psid},${nsid}
Modified: maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/main/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSource.java
URL: http://svn.apache.org/viewcvs/maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/main/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSource.java?rev=357230&r1=357229&r2=357230&view=diff
==============================================================================
--- maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/main/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSource.java (original)
+++ maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/main/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSource.java Fri Dec 16 13:05:10 2005
@@ -8,19 +8,25 @@
import java.io.FileReader;
import java.io.IOException;
import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
/**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @author Jason van Zyl
+ * @version $Id$
*/
public class CsvFileProjectRecordSource
implements ProjectRecordSource
{
private File source;
+ private Map variables;
+
public CsvFileProjectRecordSource( File source )
{
this.source = source;
+
+ variables = new HashMap();
}
public Iterator getRecords()
@@ -55,10 +61,24 @@
{
while ( ( line = reader.readLine() ) != null )
{
- if ( !line.startsWith( "#" ) )
+ if ( line.indexOf( "=" ) > 0 )
{
- break;
+ String[] s = StringUtils.split( line, "=" );
+
+ String key = s[0].trim();
+
+ String value = s[1].trim();
+
+ variables.put( key, value );
+
+ continue;
+ }
+ else if ( line.startsWith( "#" ) || line.trim().length() == 0 )
+ {
+ continue;
}
+
+ break;
}
}
catch ( IOException e )
@@ -76,7 +96,7 @@
public Object next()
{
- String[] s = StringUtils.split( line, "," );
+ String[] s = StringUtils.split( StringUtils.interpolate( line, variables ), "," );
return new ProjectRecord( s[0], s[1], s[2], s[3], s[4], s[5] );
}
Modified: maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/JiraSoapClientTest.java
URL: http://svn.apache.org/viewcvs/maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/JiraSoapClientTest.java?rev=357230&r1=357229&r2=357230&view=diff
==============================================================================
--- maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/JiraSoapClientTest.java (original)
+++ maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/JiraSoapClientTest.java Fri Dec 16 13:05:10 2005
@@ -32,7 +32,7 @@
client.initialize();
}
- public void xtestIssueCreationWithAttachment()
+ public void testIssueCreationWithAttachment()
throws Exception
{
File pom = new File( basedir, "pom.xml" );
@@ -42,7 +42,7 @@
client.addComment( issue.getKey(), "patch: http://www.codehaus.org/foo.diff" );
}
- public void testProjectCreation()
+ public void xtestProjectCreation()
throws Exception
{
String key = client.createProject( "AAA", "jason", "AAA", "This project is rockin!" );
Modified: maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSourceTest.java
URL: http://svn.apache.org/viewcvs/maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSourceTest.java?rev=357230&r1=357229&r2=357230&view=diff
==============================================================================
--- maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSourceTest.java (original)
+++ maven/sandbox/issue/maven-issue-providers/maven-issue-provider-jira/src/test/java/org/apache/maven/issue/jira/project/CsvFileProjectRecordSourceTest.java Fri Dec 16 13:05:10 2005
@@ -7,7 +7,7 @@
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
*/
public class CsvFileProjectRecordSourceTest
extends TestCase
@@ -32,7 +32,7 @@
fail( "Unable to capture line from file based project record source." );
}
- assertEquals( "MPCLOVER", record.getKey() );
+ assertEquals( "MNGPCLOVER", record.getKey() );
assertEquals( "jason", record.getLeadId() );
@@ -40,8 +40,8 @@
assertEquals( "Description", record.getDescription() );
- assertEquals( "0", record.getPermissionSchemeId() );
+ assertEquals( "10010", record.getPermissionSchemeId() );
- assertEquals( "0", record.getNotificationSchemeId() );
+ assertEquals( "10001", record.getNotificationSchemeId() );
}
}