From 370eb1a0b89c3545f8dbad6001c73fd225e340f8 Mon Sep 17 00:00:00 2001
From: Frederic Gurr <frederic.gurr@eclipse-foundation.org>
Date: Mon, 15 Jan 2018 15:13:13 +0100
Subject: [PATCH] Fix Git SCM URL

---
 src/main/resources/xsl/config.job.xsl         |  29 ++---
 .../cbi/hipp2jipp/XslTransformerTest.java     |   8 ++
 .../config.job.hudson-collections.xml         | 118 ++++++++++++++++++
 ...dson-collections.transformed_reference.xml |  43 +++++++
 4 files changed, 182 insertions(+), 16 deletions(-)
 create mode 100644 xml/original/config.job.hudson-collections.xml
 create mode 100644 xml/reference/config.job.hudson-collections.transformed_reference.xml

diff --git a/src/main/resources/xsl/config.job.xsl b/src/main/resources/xsl/config.job.xsl
index 03adbfe..39514e5 100644
--- a/src/main/resources/xsl/config.job.xsl
+++ b/src/main/resources/xsl/config.job.xsl
@@ -485,22 +485,19 @@
               </xsl:choose>
             </refspec>
             <url>
-              <xsl:choose>
-                <xsl:when test="uris/org.eclipse.jgit.transport.URIish [not(scheme)]">
-                  <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/path/text()" />
-                </xsl:when>
-                <xsl:otherwise>
-                  <!-- TODO: concatenate strings? -->
-                  <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/scheme/text()" />
-                  <xsl:text>://</xsl:text>
-                  <xsl:if test="uris/org.eclipse.jgit.transport.URIish/user [text() != '']">
-                    <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/user/text()" />
-                    <xsl:text>@</xsl:text>
-                  </xsl:if>
-                  <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/host/text()" />
-                  <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/path/text()" />
-                </xsl:otherwise>
-              </xsl:choose>
+              <xsl:if test="uris/org.eclipse.jgit.transport.URIish/scheme">
+                <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/scheme/text()" />
+                <xsl:text>://</xsl:text>
+              </xsl:if>
+              <xsl:if test="uris/org.eclipse.jgit.transport.URIish/user [text() != '']">
+                <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/user/text()" />
+                <xsl:text>@</xsl:text>
+              </xsl:if>
+              <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/host/text()" />
+              <xsl:if test="uris/org.eclipse.jgit.transport.URIish/path [substring(text(),1,1) != '/']">
+                  <xsl:text>:</xsl:text>
+              </xsl:if>
+              <xsl:value-of select="uris/org.eclipse.jgit.transport.URIish/path/text()" />
             </url>
           </xsl:element>
         </xsl:for-each>
diff --git a/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java b/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java
index afffabc..7129cb9 100644
--- a/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java
+++ b/src/test/java/org/eclipse/cbi/hipp2jipp/XslTransformerTest.java
@@ -343,6 +343,14 @@ public void configJobTest_recommenders2() {
         transformAndCompare("recommenders2", "config.job.hudson", "matrix-project");
     }
 
+    /**
+     * Tests Git SCM URL is transformed correctly 
+     */
+    @Test
+    public void configJobTest_collections() {
+        transformAndCompareFreestyleJob("collections");
+    }
+
     @Test
     public void copyViewsTest_positive() {
         testCopyViews("config.main.jenkins-cbi.xml", "config.main.hudson-cbi.xml");
diff --git a/xml/original/config.job.hudson-collections.xml b/xml/original/config.job.hudson-collections.xml
new file mode 100644
index 0000000..debb731
--- /dev/null
+++ b/xml/original/config.job.hudson-collections.xml
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <project-properties class="concurrent-hash-map">
+    <entry>
+      <string>hudson-plugins-disk_usage-DiskUsageProperty</string>
+      <base-property>
+        <originalValue class="hudson.plugins.disk_usage.DiskUsageProperty"/>
+        <propertyOverridden>false</propertyOverridden>
+      </base-property>
+    </entry>
+    <entry>
+      <string>builders</string>
+      <describable-list-property>
+        <originalValue class="hudson.util.DescribableList">
+          <hudson.tasks.Shell>
+            <disabled>false</disabled>
+            <description>Run gradle build and upload zip/tar files to download site.</description>
+            <command>export GRADLE_OPTS=&quot;-Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -Dhttps.proxyHost=proxy.eclipse.org -Dhttps.proxyPort=9898 -DhttpnonProxyHosts=*.eclipse.org -DhttpsnonProxyHosts=*.eclipse.org -Dftp.proxyHost=proxy.eclipse.org -Dftp.proxyPort=9898 -DftpnonProxyHosts=*.eclipse.org&quot;
+
+./gradlew clean build
+cp build/distributions/gsc-ec-converter-*.zip /home/data/httpd/download.eclipse.org/collections/
+cp build/distributions/gsc-ec-converter-*.tar /home/data/httpd/download.eclipse.org/collections/
+</command>
+          </hudson.tasks.Shell>
+        </originalValue>
+        <propertyOverridden>false</propertyOverridden>
+      </describable-list-property>
+    </entry>
+    <entry>
+      <string>jdk</string>
+      <string-property>
+        <originalValue class="string">jdk1.8.0-latest</originalValue>
+        <propertyOverridden>false</propertyOverridden>
+      </string-property>
+    </entry>
+    <entry>
+      <string>scm</string>
+      <scm-property>
+        <originalValue class="hudson.plugins.git.GitSCM">
+          <configVersion>1</configVersion>
+          <remoteRepositories>
+            <RemoteConfig>
+              <name>origin</name>
+              <uris>
+                <org.eclipse.jgit.transport.URIish>
+                  <path>eclipse/gsc-ec-converter.git</path>
+                  <rawPath>eclipse/gsc-ec-converter.git</rawPath>
+                  <user>git</user>
+                  <port>-1</port>
+                  <host>github.com</host>
+                </org.eclipse.jgit.transport.URIish>
+              </uris>
+              <pushURIs/>
+              <fetch>
+                <org.eclipse.jgit.transport.RefSpec>
+                  <force>true</force>
+                  <wildcard>true</wildcard>
+                  <srcName>refs/heads/*</srcName>
+                  <dstName>refs/remotes/origin/*</dstName>
+                </org.eclipse.jgit.transport.RefSpec>
+              </fetch>
+              <push/>
+              <uploadpack>git-upload-pack</uploadpack>
+              <receivepack>git-receive-pack</receivepack>
+              <tagopt>AUTO_FOLLOW</tagopt>
+              <mirror>false</mirror>
+              <timeout>0</timeout>
+              <relativeTargetDir></relativeTargetDir>
+            </RemoteConfig>
+          </remoteRepositories>
+          <branches>
+            <hudson.plugins.git.BranchSpec>
+              <name>master</name>
+            </hudson.plugins.git.BranchSpec>
+          </branches>
+          <mergeOptions/>
+          <recursiveSubmodules>false</recursiveSubmodules>
+          <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+          <authorOrCommitter>false</authorOrCommitter>
+          <clean>false</clean>
+          <wipeOutWorkspace>false</wipeOutWorkspace>
+          <pruneBranches>false</pruneBranches>
+          <remotePoll>false</remotePoll>
+          <ignoreNotifyCommit>false</ignoreNotifyCommit>
+          <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+          <gitTool>Default</gitTool>
+          <submoduleCfg class="list"/>
+          <includedRegions></includedRegions>
+          <excludedRegions></excludedRegions>
+          <excludedUsers></excludedUsers>
+          <excludedCommits/>
+          <gitConfigName></gitConfigName>
+          <gitConfigEmail></gitConfigEmail>
+          <skipTag>false</skipTag>
+          <useCgitClone>true</useCgitClone>
+        </originalValue>
+        <propertyOverridden>false</propertyOverridden>
+      </scm-property>
+    </entry>
+  </project-properties>
+  <keepDependencies>false</keepDependencies>
+  <createdBy>someone@somewhere.com</createdBy>
+  <creationTime>1458807353072</creationTime>
+  <properties/>
+  <cascadingChildrenNames class="java.util.concurrent.CopyOnWriteArraySet"/>
+  <cascading-job-properties class="java.util.concurrent.CopyOnWriteArraySet">
+    <string>hudson-plugins-disk_usage-DiskUsageProperty</string>
+  </cascading-job-properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <cleanWorkspaceRequired>false</cleanWorkspaceRequired>
+</project>
\ No newline at end of file
diff --git a/xml/reference/config.job.hudson-collections.transformed_reference.xml b/xml/reference/config.job.hudson-collections.transformed_reference.xml
new file mode 100644
index 0000000..603e490
--- /dev/null
+++ b/xml/reference/config.job.hudson-collections.transformed_reference.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.plugins.disk__usage.DiskUsageProperty/>
+  </properties>
+  <scm class="hudson.plugins.git.GitSCM">
+    <userRemoteConfigs>
+      <hudson.plugins.git.UserRemoteConfig>
+        <name>origin</name>
+        <refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
+        <url>git@github.com:eclipse/gsc-ec-converter.git</url>
+      </hudson.plugins.git.UserRemoteConfig>
+    </userRemoteConfigs>
+    <branches>
+            <hudson.plugins.git.BranchSpec>
+              <name>master</name>
+            </hudson.plugins.git.BranchSpec>
+          </branches>
+    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+    <submoduleCfg class="list"/>
+    <extensions/>
+  </scm>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <jdk>jdk1.8.0-latest</jdk>
+  <triggers/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>export GRADLE_OPTS="-Dhttp.proxyHost=proxy.eclipse.org -Dhttp.proxyPort=9898 -Dhttps.proxyHost=proxy.eclipse.org -Dhttps.proxyPort=9898 -DhttpnonProxyHosts=*.eclipse.org -DhttpsnonProxyHosts=*.eclipse.org -Dftp.proxyHost=proxy.eclipse.org -Dftp.proxyPort=9898 -DftpnonProxyHosts=*.eclipse.org"
+
+./gradlew clean build
+cp build/distributions/gsc-ec-converter-*.zip /home/data/httpd/download.eclipse.org/collections/
+cp build/distributions/gsc-ec-converter-*.tar /home/data/httpd/download.eclipse.org/collections/
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>