[evolvis-commits] r17505: [#1589] merge revisions 17499,17501,17501,17502,17503 from trunk↵ to fix the Jenkins plugin

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Sep 2 11:09:29 CEST 2011


Author: mirabilos
Date: 2011-09-02 11:09:29 +0200 (Fri, 02 Sep 2011)
New Revision: 17505

Added:
   branches/ev48fixes/www/themes/gforge/images/ic/spinner.gif
Modified:
   branches/ev48fixes/debian/changelog
   branches/ev48fixes/plugins/jenkins/common/JenkinsPlugin.class.php
   branches/ev48fixes/plugins/jenkins/common/jenkinsAdminister.php
Log:
[#1589] merge revisions 17499,17501,17501,17502,17503 from trunk
to fix the Jenkins plugin


Modified: branches/ev48fixes/debian/changelog
===================================================================
--- branches/ev48fixes/debian/changelog	2011-09-02 09:02:00 UTC (rev 17504)
+++ branches/ev48fixes/debian/changelog	2011-09-02 09:09:29 UTC (rev 17505)
@@ -1,3 +1,10 @@
+gforge (4.8.3+evolvis36+fixes1) xunstable; urgency=low
+
+  [ Patrick Apel ]
+  * [#1589] Jenkins Plugin fixes
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 02 Sep 2011 11:09:06 +0200
+
 gforge (4.8.3+evolvis36) unstable; urgency=low
 
   * Evolvis theme: display Wiki link in Public Areas

Modified: branches/ev48fixes/plugins/jenkins/common/JenkinsPlugin.class.php
===================================================================
--- branches/ev48fixes/plugins/jenkins/common/JenkinsPlugin.class.php	2011-09-02 09:02:00 UTC (rev 17504)
+++ branches/ev48fixes/plugins/jenkins/common/JenkinsPlugin.class.php	2011-09-02 09:09:29 UTC (rev 17505)
@@ -397,6 +397,7 @@
 			$jsessionID = $this->loginToJenkins($protocolPrefix,
 			    $host, $port, $username, $password);
 
+
 			// Calls the methods to create a jenkins project
 			$showWarningFlag = false;
 			if (getStringFromRequest('btnJenkinsProject')) {
@@ -532,7 +533,6 @@
 				}
 			}
 
-//			echo '<hr size="1" />';
 			echo "</div>\n";
 			echo $HTML->boxBottom();
 
@@ -577,7 +577,7 @@
 		// 0 = Nor error Connection
 		// 111 = Connection refused
 
-		/*-
+		/*
 		 * 1 = blocking mode => too slow
 		 * 0 = non-blocking mode
 		 */
@@ -820,7 +820,7 @@
 		// 0 = Nor error Connection
 		// 111 = Connection refused
 
-		/*-
+		/*
 		 * 1 = blocking mode => too slow
 		 * 0 = non-blocking mode
 		 */
@@ -847,16 +847,16 @@
 				break;
 			}
 
-			if (strpos($result, "</jenkins>")) {
+			if (strpos($result, "</hudson>")) {
 				break;
 			}
 		}
 
-		$arrResult = split('<jenkins>', $result);
+		$arrResult = split('<hudson>', $result);
 
 		fclose($fp);
 
-		$xmlFile = trim('<jenkins>' . util_ifsetor($arrResult[1], ""));
+		$xmlFile = trim('<hudson>' . util_ifsetor($arrResult[1], ""));
 
 		$this->setCurrXmlTag('');
 		$this->setProjectFoundInXml(false);
@@ -1014,7 +1014,7 @@
 		if (strpos($text, "job")) {
 			$arrJob = split('/job/', $text);
 		}
-
+		
 		$job = str_replace('/', '', $arrJob[1]);
 
 		$projectList = array();
@@ -1026,11 +1026,14 @@
 
 		if ($text === $this->getGroup()->getUnixName()) {
 			$this->setProjectFoundInXml(true);
-		}
+		} 
 
+
 		if ($this->isProjectFoundInXml() &&
 		    $this->getCurrXmlTag() === 'color') {
+
 			if ($text==='disabled') {
+
 				/*
 				 * color would be "gray" for example if the
 				 * project is not "disabled" The color would be
@@ -1054,8 +1057,8 @@
 				 */
 
 				$this->setProjectDisabled(true);
-				$this->setProjectFoundInXml(false);
-			}
+			} 
+			$this->setProjectFoundInXml(false);
 		}
 
 		$this->setJenkinsProjectListAsArray($projectList);
@@ -1128,7 +1131,7 @@
 		case 'description':
 			$xmlWriter->text($projectInfo['description']);
 			break;
-		case 'jenkins.security.AuthorizationMatrixProperty':
+		case 'hudson.security.AuthorizationMatrixProperty':
 			$groupUnixName = $this->getGroup()->getUnixName();
 			/*
 			 * Only groups have to be specified in the project
@@ -1137,31 +1140,31 @@
 			 */
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Item.Read:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Item.Read:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Item.Build:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Item.Build:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Item.Workspace:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Item.Workspace:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Item.Configure:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Item.Configure:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Item.Delete:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Item.Delete:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Run.Delete:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Run.Delete:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 			$xmlWriter->startElement('permisson');
-			$xmlWriter->text('jenkins.model.Run.Update:'.$groupUnixName);
+			$xmlWriter->text('hudson.model.Run.Update:'.$groupUnixName);
 			$xmlWriter->endElement();
 
 
@@ -1198,65 +1201,65 @@
 				switch($memberRoleName) {
 				case 'Admin':
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Read:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Read:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Build:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Build:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Workspace:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Workspace:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Configure:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Configure:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Delete:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Delete:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Run.Delete:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Run.Delete:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Run.Update:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Run.Update:'.$memberUnixName);
 					$xmlWriter->endElement();
 					break;
 
 				case 'Senior Developer':
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Read:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Read:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Build:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Build:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Workspace:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Workspace:'.$memberUnixName);
 					$xmlWriter->endElement();
 					break;
 
 				case 'Junior Developer':
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Read:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Read:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Build:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Build:'.$memberUnixName);
 					$xmlWriter->endElement();
 
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Workspace:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Workspace:'.$memberUnixName);
 					$xmlWriter->endElement();
 					break;
 
 				default:
 					$xmlWriter->startElement('permisson');
-					$xmlWriter->text('jenkins.model.Item.Read:'.$memberUnixName);
+					$xmlWriter->text('hudson.model.Item.Read:'.$memberUnixName);
 					$xmlWriter->endElement();
 					break;
 				}
@@ -1325,7 +1328,7 @@
 		 * $param = disable => disables the jenkins project
 		 * $param = enable => enables the jenkins project
 		 */
-
+		
 		$objRefJenkinsInfo = $this->getObjRefJenkinsInfo();
 
 		$jenkinsProtocolPrefix = $protocolPrefix;
@@ -1344,7 +1347,7 @@
 		// 0 = Nor error Connection
 		// 111 = Connection refused
 
-		/*-
+		/*
 		 * 1 = blocking mode => too slow
 		 * 0 = non-blocking mode
 		 */
@@ -1373,7 +1376,7 @@
 			    _('An error occurred on deleting, disabling or enabling the project.'));
 			if ($flag[0] || $flag[1]) {
 				break;
-			}
+			} 
 		}
 
 		fclose($fp);

Modified: branches/ev48fixes/plugins/jenkins/common/jenkinsAdminister.php
===================================================================
--- branches/ev48fixes/plugins/jenkins/common/jenkinsAdminister.php	2011-09-02 09:02:00 UTC (rev 17504)
+++ branches/ev48fixes/plugins/jenkins/common/jenkinsAdminister.php	2011-09-02 09:09:29 UTC (rev 17505)
@@ -72,7 +72,7 @@
 	echo '<td style="height:35px;">'.'<a href="' .
 	    $this->getJenkinsProtocol().'://'.$this->getJenkinsHost() .
 	   ':'.$this->getJenkinsPort().'/job/'.$group->getUnixName() .
-	   '/build?token=TOKEN" target="_self">' .
+	   '/build?token=TOKEN" target="_blank">' .
 	   _('Start new jenkins project build').'</a> (' .
 	   _('This link will start a project build immediately without notification.').')</td>';
 } else {

Copied: branches/ev48fixes/www/themes/gforge/images/ic/spinner.gif (from rev 17502, trunk/gforge_base/evolvisforge/gforge/www/themes/gforge/images/ic/spinner.gif)
===================================================================
(Binary files differ)



More information about the evolvis-commits mailing list