Attachment 110630 Details for Bug 243303 – Updated patch for Project Plan.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch for Project Plan.

projectplantpatch.txt (text/plain), 17.22 KB, created by David Carver

on 2008-08-21 18:06:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Carver

Created: 2008-08-21 18:06:17 EDT

Size: 17.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.projects.website
>Index: project-plan-render.xsl
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/projects/project-plan-render.xsl,v
>retrieving revision 1.2
>diff -u -r1.2 project-plan-render.xsl
>--- project-plan-render.xsl	21 Aug 2008 20:09:40 -0000	1.2
>+++ project-plan-render.xsl	21 Aug 2008 22:04:02 -0000
>@@ -29,9 +29,11 @@
>     <xsl:include href="url-encode.xsl"/>
>     
>     <xsl:template match="/plan:plan">
>-    	<div id="rendered-plan">
>+        <html>
>+            <body>
>                 <xsl:apply-templates select="." mode="plan"/>
>-        </div>
>+            </body>
>+        </html>
>     </xsl:template>
>     
>     
>@@ -155,7 +157,17 @@
>         <xsl:variable name="url">https://bugs.eclipse.org/</xsl:variable>
>         <xsl:variable name="rdf"><xsl:text>&amp;ctype=rdf&amp;columnlist=bug_id,short_desc,target_milestone,bug_status</xsl:text></xsl:variable>
>         <xsl:variable name="actualurl">
>-            <xsl:value-of select="normalize-space(.)"/>
>+            <xsl:call-template name="replaceCharsInString">
>+                <xsl:with-param name="stringIn">
>+                    <xsl:call-template name="replaceCharsInString">
>+                        <xsl:with-param name="stringIn" select="normalize-space(.)"/>
>+                        <xsl:with-param name="charsIn">%5D</xsl:with-param>
>+                        <xsl:with-param name="charsOut">]</xsl:with-param>             
>+                    </xsl:call-template>
>+                </xsl:with-param>
>+                <xsl:with-param name="charsIn">%5B</xsl:with-param>
>+                <xsl:with-param name="charsOut">[</xsl:with-param>             
>+            </xsl:call-template>
>         </xsl:variable>
>         <xsl:variable name="test">
>             <xsl:value-of select="substring($actualurl, 1, 25)"/>
>@@ -184,9 +196,21 @@
>                 </xsl:when>
>                 <xsl:when test="substring($actualurl, 1, 24) = 'http://bugs.eclipse.org/'">
>                     <xsl:value-of select="$url"/>
>-                    <xsl:call-template name="url-encode">
>-                        <xsl:with-param name="str" select="substring($actualurl,25)"/>
>-                    </xsl:call-template>
>+                    <xsl:call-template name="replaceCharsInString">
>+                        <xsl:with-param name="stringIn">
>+                            <xsl:call-template name="replaceCharsInString">
>+                                <xsl:with-param name="stringIn">
>+                                    <xsl:call-template name="url-encode">
>+                                        <xsl:with-param name="str" select="substring($actualurl,25)"/>
>+                                    </xsl:call-template>
>+                                </xsl:with-param>
>+                                <xsl:with-param name="charsIn">%265B</xsl:with-param>
>+                                <xsl:with-param name="charsOut">[</xsl:with-param>             
>+                            </xsl:call-template>
>+                        </xsl:with-param>
>+                        <xsl:with-param name="charsIn">%265D</xsl:with-param>
>+                        <xsl:with-param name="charsOut">]</xsl:with-param>             
>+                    </xsl:call-template> 
>                     <xsl:value-of select="$rdf"/>
>                 </xsl:when>
>             </xsl:choose>
>Index: project-plan.php
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/projects/project-plan.php,v
>retrieving revision 1.85
>diff -u -r1.85 project-plan.php
>--- project-plan.php	19 Aug 2008 22:59:17 -0000	1.85
>+++ project-plan.php	21 Aug 2008 22:04:02 -0000
>@@ -165,12 +165,16 @@
> </div>
> <?php
> } else {
>+
>+
>+
> /*
>  * Load the XML file
>  */
>-$xml = @simplexml_load_file( $url );
>-if( $xml === false 
>- || !isset($xml->themes_and_priorities->theme) ) {
>+ xml = new DomDocument();
>+$xml->load($url);
>+ 
>+if( $xml === false) ) {
>  	$contents = @file_get_contents( $url );
>  	if( !$contents ) {
>  		show_error_page( 'the project meta-data "projectplanurl" (' . $url . ') points to an empty file.', $projectid );
>@@ -186,96 +190,17 @@
> 
> // ----------------------------------------------------------------------------
> // OUTPUT
>-?>
>-<div id="maincontent">
>-<div id="midcolumn">
>-
>-<h1>Project Plan for 
>-<a href="http://www.eclipse.org/projects/project_summary.php?projectid=<?= $projectid ?>"><span
>-style="font-size: 140%"><?= $projectname ?></span></a>, version <?= $xml->release->attributes()->version ?></h1>
>-<h2>Introduction</h2>
>-<?= $xml->introduction ?>
>-<h2>Release Deliverables</h2>
>-<?= $xml->release_deliverables ?>
>-<h2>Release Milestones</h2>
>-<p><?= $xml->release_milestones->preamble ?></p>
>-<table border="1" align="center">
>-<?php
>-foreach ($xml->release_milestones->milestone as $milestone ) {
>-	?><tr><td><b><?= $milestone->attributes()->milestone ?></b></td>
>-	 <td><?= $milestone->attributes()->date ?></td>
>-	 <td><?= $milestone ?></td></tr>
>-<?php
>-}
>-?>
>-</table>
>-<p><?= $xml->release_milestones->postamble ?></p>
>-<h2>Target Environments</h2>
>-<?= $xml->target_environments ?>
>-<h3>Internationalization</h3>
>-<?= $xml->target_environments->internationalization ?>
>-<h2>Compatibility With Previous Releases</h2>
>-<?= $xml->compatibility_with_previous_releases ?>
>+/* create the processor and import the stylesheet */
>+$xsl = new DomDocument();
>+$xsl->load("project-plan-render.xsl");
>+
>+$proc = new XsltProcessor();
>+$xsl = $proc->importStylesheet($xsl);
>+$proc->setParameter(null, "projectName", $projectname);
>+$proc->setParameter(nuul, "projectId", $projectid);
> 
>-<h2>Themes and Priorities</h2>
>-<p><?= $xml->themes_and_priorities->preamble ?></p>
>-<?php
>-$list = array();
>-for( $i = 0; isset($xml->themes_and_priorities->theme[$i]); $i++ ) {
>-	$list[] = $xml->themes_and_priorities->theme[$i];
>-}
>-foreach( $list as $plan_theme ) {
>-	?><h3><?= $plan_theme->attributes()->name ?></h3>
>-	<?php
>-	if( $plan_theme->description != null ) {
>-		?><p style="margin-top: -6px"><?= $plan_theme->description ?></p>
>-		<?php
>-	}
>-	?>
>-	<ul><?php 
>-	?><li><b>Committed</b><ul><?php echo "\n";
>-	if( $plan_theme->committed->attributes()->bugzilla != null ) {
>-		report_bugzillas( $plan_theme->committed->attributes()->bugzilla );
>-	} else {
>-		if( trim($plan_theme->committed) ) {
>-			echo $plan_theme->committed;
>-		} else {
>-			?><ul><li><em>no items</em></li></ul><?php
>-		}
>-	}
>-	?></ul></li><li><b>Proposed</b><ul><?php echo "\n";
>-	if( $plan_theme->proposed->attributes()->bugzilla != null ) {
>-		report_bugzillas( $plan_theme->proposed->attributes()->bugzilla );
>-	} else {
>-		if( trim($plan_theme->proposed) ) {
>-			echo $plan_theme->proposed;
>-		} else {
>-			?><ul><li><em>no items</em></li></ul><?php
>-		}
>-	}
>-	?></ul></li><li><b>Deferred</b><ul><?php echo "\n";
>-	if( $plan_theme->deferred->attributes()->bugzilla != null ) {
>-		report_bugzillas( $plan_theme->deferred->attributes()->bugzilla );
>-	} else {
>-		if( trim($plan_theme->deferred) ) {
>-			echo $plan_theme->deferred;
>-		} else {
>-			?><ul><li><em>no items</em></li></ul><?php
>-		}
>-	}
>-	?></ul></li></ul><?php  echo "\n";
>-}
>-
>-$idx = 0;
>-foreach( $xml->appendix as $appendix ) {
>-	$appidx = substr("ABCDEFGHIJKLMNOPQRSTUVWXYZ", $idx, 1);
>-	?><h2>Appendix <?= $appidx ?>. <?= $appendix->attributes()->name ?></h2>
>-	<?= $xml->appendix ?>
>-	<?php
>-}
>-?>
>-<?php
>-}// if( $xml === false )
>+/* transform and output the xml document */
>+$echo = $proc->transformToXML($xml);
> ?>
> <div style="float: right; text-align: right"><a href="?projectid=<?= $projectid ?>&raw=1">view raw xml of project plan</a><br>
> <a href="/projects/dev_process/project-status-infrastructure.php">from project meta-data key "projectplanurl"</a></div>
>Index: project-plan.xsl
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/projects/project-plan.xsl,v
>retrieving revision 1.3
>diff -u -r1.3 project-plan.xsl
>--- project-plan.xsl	10 Mar 2008 16:45:24 -0000	1.3
>+++ project-plan.xsl	21 Aug 2008 22:04:02 -0000
>@@ -1,34 +1,40 @@
> <?xml version="1.0" encoding="ISO-8859-1"?>
>-
> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
>-
>-<xsl:template match="/plan">
>-<html>
>-<body>
>-<div style="width: 600px">
>-<table width="100%" border="0" cellpadding="0" cellspacing="0">
>-<tr style="background-image: url(http://dash.eclipse.org/dash/commits/web-app/header_bg.gif);">
>-<td>
>-<a href="http://www.eclipse.org/"><img src="http://dash.eclipse.org/dash/commits/web-app/header_logo.gif" width="163" height="68" border="0" alt="Eclipse Logo" class="logo" /></a>
>-</td>
>-<td align="right" style="color: white; font-family: verdana,arial,helvetica; font-size: 1.25em; font-style: italic; padding-right: 10px"><b>Eclipse Project Plan </b> </td>
>-</tr>
>-</table>
>-<p style="font-family: arial,helvetica; ">
>-This Eclipse project plan for the <b><xsl:value-of select="release/@projectid"/> project</b>
>-is an XML document whose tags have 
>-<a href="http://wiki.eclipse.org/index.php/Development_Resources/Project_Plan">defined semantics</a>.
>-Please use the 
>-<a>
>- <xsl:attribute name="href">
>+    <xsl:template match="/plan">
>+        <html>
>+            <body>
>+                <div style="width: 600px">
>+                    <table width="100%" border="0" cellpadding="0" cellspacing="0">
>+                        <tr style="background-image: url(http://dash.eclipse.org/dash/commits/web-app/header_bg.gif);">
>+                            <td>
>+                                <a href="http://www.eclipse.org/">
>+                                    <img src="http://dash.eclipse.org/dash/commits/web-app/header_logo.gif" width="163" height="68" border="0" alt="Eclipse Logo" class="logo"/>
>+                                </a>
>+                            </td>
>+                            <td align="right" style="color: white; font-family: verdana,arial,helvetica; font-size: 1.25em; font-style: italic; padding-right: 10px">
>+                                <b>Eclipse Project Plan </b>
>+                            </td>
>+                        </tr>
>+                    </table>
>+                    <p style="font-family: arial,helvetica; ">
>+                        This Eclipse project plan for the
>+                        <b>
>+                            <xsl:value-of select="release/@projectid"/>
>+                            project
>+                        </b>
>+                        is an XML document whose tags have
>+                        <a href="http://wiki.eclipse.org/index.php/Development_Resources/Project_Plan">defined semantics</a>
>+                        . Please use the
>+                        <a>
>+                            <xsl:attribute name="href">
>    /projects/project-plan.php?projectid=<xsl:value-of select="release/@projectid"/>
>  </xsl:attribute>
>-project plan viewer
>-</a>
>-to properly interpret these semantics and fully display the plan
>-and all of its cross links and queries.
>-</p></div>
>-</body></html>
>-</xsl:template>
>-
>-</xsl:stylesheet>
>+                            project plan viewer
>+                        </a>
>+                        to properly interpret these semantics and fully display the plan and all of its cross links and queries.
>+                    </p>
>+                </div>
>+            </body>
>+        </html>
>+    </xsl:template>
>+</xsl:stylesheet>
>\ No newline at end of file
>Index: project-plan-bugzilla.xsl
>===================================================================
>RCS file: /cvsroot/org.eclipse/www/projects/project-plan-bugzilla.xsl,v
>retrieving revision 1.1
>diff -u -r1.1 project-plan-bugzilla.xsl
>--- project-plan-bugzilla.xsl	19 Aug 2008 17:20:34 -0000	1.1
>+++ project-plan-bugzilla.xsl	21 Aug 2008 22:04:02 -0000
>@@ -24,15 +24,15 @@
>      
> 	<xsl:template match="bz:bugs">
>         <xsl:choose>
>-            <xsl:when test="count(rdf:Seq/child::*) = 0">
>-                <p>
>-                    <xsl:text>No items.</xsl:text>
>-                </p>
>-            </xsl:when>
>-            <xsl:otherwise>
>+            <xsl:when test="rdf:Seq/rdf:li/bz:bug">
>                 <ul>
>                     <xsl:apply-templates select="rdf:Seq/rdf:li/bz:bug"/>
>                 </ul>            
>+            </xsl:when>
>+            <xsl:otherwise>
>+                <p>
>+                    <xsl:text>No items.</xsl:text>
>+                </p>
>             </xsl:otherwise>
>         </xsl:choose>
> 	</xsl:template>
>@@ -62,4 +62,4 @@
>        </li>            
>     </xsl:template>
>     
>-</xsl:stylesheet>
>+</xsl:stylesheet>
>\ No newline at end of file
>Index: projectplanNS.xsd
>===================================================================
>RCS file: projectplanNS.xsd
>diff -N projectplanNS.xsd
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ projectplanNS.xsd	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,113 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
>+	elementFormDefault="qualified" targetNamespace="http://www.eclipse.org/project/plan"
>+    xmlns="http://www.eclipse.org/project/plan">
>+	<xsd:element name="plan" type="ProjectPlanType">
>+		<xsd:annotation>
>+			<xsd:documentation>Project Plan Root Element</xsd:documentation>
>+		</xsd:annotation>
>+	</xsd:element>
>+	<xsd:complexType name="ProjectPlanType">
>+		<xsd:sequence>
>+			<xsd:element name="release" type="ReleaseType">
>+				<xsd:annotation>
>+					<xsd:documentation></xsd:documentation>
>+				</xsd:annotation>
>+			</xsd:element>
>+			<xsd:element name="introduction" type="XHTMLUserAreaType" minOccurs="1"/>
>+			<xsd:element name="release_deliverables" type="XHTMLUserAreaType" minOccurs="0"/>
>+			<xsd:element name="release_milestones" type="ReleaseMilestonesType" minOccurs="0"/>
>+			<xsd:element name="target_environments" type="TargetEnvironmentsType" minOccurs="0"/>
>+			<xsd:element name="compatibility_with_previous_releases" type="XHTMLUserAreaType" minOccurs="0"/>
>+			<xsd:element name="themes_and_priorities" type="ThemesAndPrioritiesType" minOccurs="0"/>
>+			<xsd:element name="appendix" type="AppendixType" minOccurs="0" maxOccurs="unbounded"/>
>+		</xsd:sequence>
>+        <xsd:attribute name="plan-format" type="planEnumeratedType"></xsd:attribute>
>+        <xsd:attribute name="name" type="xsd:token">
>+            <xsd:annotation>
>+                <xsd:documentation>
>+                    Project Plan Name
>+                </xsd:documentation>
>+            </xsd:annotation>
>+        </xsd:attribute>
>+	</xsd:complexType>
>+    
>+    <xsd:simpleType name="planEnumeratedType">
>+        <xsd:restriction base="xsd:token">
>+            <xsd:enumeration value="1.0"/>
>+        </xsd:restriction>
>+    </xsd:simpleType>
>+	
>+	<xsd:complexType name="ReleaseType">
>+		<xsd:attribute name="projectid" type="xsd:token"/>
>+		<xsd:attribute name="version" type="xsd:token"/>
>+	</xsd:complexType>
>+
>+	<xsd:complexType name="XHTMLUserAreaType">
>+        <xsd:sequence>
>+            <xsd:any namespace="http://www.w3.org/1999/xhtml" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
>+        </xsd:sequence>
>+	</xsd:complexType>
>+	
>+	<xsd:complexType name="TargetEnvironmentsType">
>+        <xsd:sequence>
>+            <xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
>+            <xsd:element name="internationalization" type="XHTMLUserAreaType" minOccurs="0" maxOccurs="unbounded"/>
>+        </xsd:sequence>
>+	</xsd:complexType>
>+	
>+	<xsd:complexType name="ReleaseMilestonesType">
>+		<xsd:sequence>
>+			<xsd:element name="preamble" type="XHTMLUserAreaType" minOccurs="0" maxOccurs="1"/>
>+			<xsd:element name="milestone" type="MilestoneUserAreaType" minOccurs="1" maxOccurs="unbounded"/>
>+			<xsd:element name="postamble" type="XHTMLUserAreaType" minOccurs="0" maxOccurs="1"/>
>+		</xsd:sequence>
>+	</xsd:complexType>
>+	
>+	<xsd:complexType name="MilestoneUserAreaType">
>+		<xsd:complexContent>
>+			<xsd:extension base="XHTMLUserAreaType">
>+				<xsd:attribute name="date" type="xsd:token"></xsd:attribute>
>+				<xsd:attribute name="milestone" type="xsd:token"/>
>+			</xsd:extension>
>+		</xsd:complexContent>
>+	</xsd:complexType>
>+	
>+	<xsd:complexType name="ThemesAndPrioritiesType">
>+		<xsd:sequence>
>+			<xsd:element name="preamble" type="XHTMLUserAreaType" minOccurs="0" maxOccurs="1"/>
>+			<xsd:element name="theme" type="ThemeType" minOccurs="1" maxOccurs="unbounded"/>
>+		</xsd:sequence>
>+	</xsd:complexType>
>+	
>+	<xsd:complexType name="ThemeType">
>+		<xsd:sequence>
>+            <xsd:element name="description" type="XHTMLUserAreaType" minOccurs="0" maxOccurs="unbounded"/>
>+			<xsd:element name="committed" type="BugzillaType" minOccurs="0" maxOccurs="1"/>
>+			<xsd:element name="proposed" type="BugzillaType" minOccurs="0" maxOccurs="1"/>
>+			<xsd:element name="deferred" type="BugzillaType" minOccurs="0" maxOccurs="1"/>
>+		</xsd:sequence>
>+        <xsd:attribute name="name" type="xsd:token" use="required"/>
>+	</xsd:complexType>
>+     
>+    <xsd:complexType name="BugzillaType">
>+        <xsd:complexContent>
>+            <xsd:extension base="XHTMLUserAreaType">
>+                <xsd:attribute name="bugzilla" type="xsd:anyURI" use="optional"/>
>+            </xsd:extension>
>+        </xsd:complexContent>
>+    </xsd:complexType>
>+    
>+	
>+	<xsd:complexType name="AppendixType">
>+		<xsd:complexContent>
>+			<xsd:extension base="XHTMLUserAreaType">
>+				<xsd:attribute name="name" type="xsd:token"/>
>+			</xsd:extension>
>+		</xsd:complexContent>
>+	</xsd:complexType>
>+</xsd:schema>

Actions: View | Diff

Attachments on bug 243303: 109320 | 109347 | 109487 | 109614 | 109615 | 109616 | 109719 | 110492 | 110603 | 110605 | 110610 | 110630 | 111907