[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Michael Clarke commented on JENKINS-15525 ProjectSet parser isnt working The following fixes for this issue have been included in cvs-2.7: FIXED JENKINS-15525 Change projectset regular _expression_ parser 1. Support periods in hostname/IP Address of CVS Root 2. Allow no port to be specified in CVS Root with colon still being present 2. Allow slashes in remote module name This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira -- You received this message because you are subscribed to the Google Groups Jenkins Issues group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
SCM/JIRA link daemon commented on JENKINS-15525 ProjectSet parser isnt working Code changed in jenkins User: mc1arke Path: src/main/java/hudson/scm/CvsProjectset.java http://jenkins-ci.org/commit/cvs-plugin/d2c7f2614f98b5814e4dfec5d5bc32ca81dcdeb4 Log: FIXED JENKINS-15525 Allow dashes in module names Add support for modules with dashes in their names for the projectset parse This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
SCM/JIRA link daemon resolved JENKINS-15525 as Fixed ProjectSet parser isnt working Change By: SCM/JIRA link daemon (16/Nov/12 1:10 PM) Status: Reopened Resolved Resolution: Fixed This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Ralf Eisele
reopened JENKINS-15525
ProjectSet parser isnt working
If the cvs module name contains a "-" then the regexp pattern fails. The following pattern corrects this:
private static final Pattern PSF_PATTERN = Pattern.compile("project reference=\"^,+,((:a-z+(a-z|A-Z|0-9|\\.+)" +
"(0-9+)?)?(/|a-z|A-Z|_|0-9+)),(/|A-Z|a-z|0-9|_|\\-|\\.+),(A-Z|a-z|0-9|_|\\-|\\.+)(,(.*?)){0,1}\"/");
Change By:
Ralf Eisele
(15/Nov/12 8:01 PM)
Resolution:
Fixed
Status:
Resolved
Reopened
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Ralf Eisele
edited a comment on JENKINS-15525
ProjectSet parser isnt working
If the cvs module name contains a "-" then the regexp pattern fails. The following pattern corrects this:
private static final Pattern PSF_PATTERN = Pattern.compile("project reference=\"[^,]+,((:[a-z]+:)([a-z|A-Z|0-9|\\.]+)" +
"(:([0-9]+)?)?([/|a-z|A-Z|_|0-9]+)),([/|A-Z|a-z|0-9|_|\\-|\\.]+),([A-Z|a-z|0-9|_|\\-|\\.]+)(,(.*?)){0,1}\"/");
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Félix velasco commented on JENKINS-15525 ProjectSet parser isnt working Regarding your points: 1. I thought that colon was mandatory, not optional. That's why I took it out of the optional part 2. My bad, I put the slash in the wrong place (most embarrassingly, since I need that slash in the middle of the remote module name). However, I honestly believe regexp is way too complicated, error-prone and hard to maintain for this job. Just a couple of StringTokenizers, first using commas, then colons for the cvsroot, should be enough. Just my two cents. Anyway, the committed change works perfectly for my psfs. Thank you! This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Félix velasco
created JENKINS-15525
ProjectSet parser isnt working
Issue Type:
Bug
Affects Versions:
current
Assignee:
Unassigned
Components:
cvs
Created:
15/Oct/12 12:51 PM
Description:
ProjectSet files support added in the 2.6 version of the CVS plugin parses incorrectly the psf file. The current regular _expression_ has some shortcomings:
If the name of the server contains dots, (cvs.example.org, 192.168.0.24), the parsing fails.
If the port is not explicitly set, it also fails, since the colon after the hostname is mandatory, and the _expression_ only acknowledges it before a port (:pserver:host:/cvsroot vs :pserver:host:2401/cvsroot)
The module remote name does not support nested folders, since it does not allow slashes (:pserver:host:/cvsroot,CORE/com.example.project,com.example.project)
The following _expression_ solves these problems while keeping the groups, so the rest of the code doesn't need changes:
private static final Pattern PSF_PATTERN = Pattern.compile("project reference=\"[^,]+,((:[a-z]+:)([a-z|A-Z|0-9|\\.]+)"
+ "(:([0-9]+)?)([/|a-z|A-Z|_|0-9]+)),(/|[A-Z|a-z|0-9|_|\\.]+),([A-Z|a-z|0-9|_|\\.]+)(,(.*?)){0,1}\"/");
Project:
Jenkins
Priority:
Major
Reporter:
Félix velasco
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Michael Clarke started work on JENKINS-15525 ProjectSet parser isnt working Change By: Michael Clarke (15/Oct/12 4:17 PM) Status: Open InProgress This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Michael Clarke assigned JENKINS-15525 to Michael Clarke ProjectSet parser isnt working Change By: Michael Clarke (15/Oct/12 4:17 PM) Assignee: MichaelClarke This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
Michael Clarke
commented on JENKINS-15525
ProjectSet parser isnt working
A slight tweak to your regular _expression_ based on the following rules:
1. CVSRoot allows a colon before the path on the server without a port number being specified. I'm assuming projectset uses the same format.
2. The slash in the module name could be repeated anywhere in the path so I've moved that to inside the repeated character selection.
This gives the following regexp:
private static final Pattern PSF_PATTERN = Pattern.compile("project reference=\"[^,]+,((:[a-z]+:)([a-z|A-Z|0-9|\\.]+)" +
"(:([0-9]+)?)?([/|a-z|A-Z|_|0-9]+)),([/|A-Z|a-z|0-9|_|\\.]+),([A-Z|a-z|0-9|_|\\.]+)(,(.*?)){0,1}\"/");
Let me know if you disagree with my logic or this regexp doesn't work for you, in the meantime I'll apply this change to the code.
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
SCM/JIRA link daemon commented on JENKINS-15525 ProjectSet parser isnt working Code changed in jenkins User: Michael Clarke Path: src/main/java/hudson/scm/CvsProjectset.java http://jenkins-ci.org/commit/cvs-plugin/d413566ddba3090571fa98aea3177f36f47eddf5 Log: FIXED JENKINS-15525 Change projectset regular _expression_ parser 1. Support periods in hostname/IP Address of CVS Root 2. Allow no port to be specified in CVS Root with colon still being present 2. Allow slashes in remote module name This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
[JIRA] (JENKINS-15525) ProjectSet parser isn't working
SCM/JIRA link daemon resolved JENKINS-15525 as Fixed ProjectSet parser isnt working Change By: SCM/JIRA link daemon (15/Oct/12 8:27 PM) Status: InProgress Resolved Resolution: Fixed This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira
