From 780599c222c2149f828df21613a583e5886bc92d Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Mon, 07 Mar 2011 15:51:04 +0000
Subject: [PATCH] functional tests update logo and paths
---
opends/tests/staf-tests/shared/resource/opendj_logo.png | 0
opends/tests/staf-tests/shared/xsl/gen-logs.xsl | 3 ++-
opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl | 6 +++---
opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl | 7 ++++---
opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl | 6 +++---
opends/tests/staf-tests/shared/functions/environment.xml | 5 +++--
opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl | 7 ++++---
opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl | 9 +++++----
opends/tests/staf-tests/shared/xsl/id.xsl | 7 ++++---
9 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/environment.xml b/opends/tests/staf-tests/shared/functions/environment.xml
index ce4fa87..f17371d 100755
--- a/opends/tests/staf-tests/shared/functions/environment.xml
+++ b/opends/tests/staf-tests/shared/functions/environment.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<stax>
@@ -527,8 +528,8 @@
</call>
<call function="'copyFile'">
{
- 'srcfile' : '%s/opends_logo_sm.png' % TESTS_RESOURCE_DIR,
- 'destfile' : '%s/opends_logo_sm.png' % logs.reports
+ 'srcfile' : '%s/opendj_logo.png' % TESTS_RESOURCE_DIR,
+ 'destfile' : '%s/opendj_logo.png' % logs.reports
}
</call>
diff --git a/opends/tests/staf-tests/shared/resource/opendj_logo.png b/opends/tests/staf-tests/shared/resource/opendj_logo.png
new file mode 100644
index 0000000..37d7d3c
--- /dev/null
+++ b/opends/tests/staf-tests/shared/resource/opendj_logo.png
Binary files differ
diff --git a/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl b/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
index 5f40848..05b4f84 100644
--- a/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
+++ b/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
@@ -25,6 +25,7 @@
! CDDL HEADER END
!
! Copyright 2008-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<xsl:output method="html" version="4.0" encoding="iso-8859-1" indent="yes"/>
@@ -92,7 +93,7 @@
<link rel="stylesheet" href="./opends.css" type="text/css" />
<xsl:element name="title">
- <xsl:value-of select="concat('Test Groups Report for ',$productname,' ',$version)"/>
+ <xsl:value-of select="concat('Test Groups Report for ',$version)"/>
</xsl:element>
</xsl:element>
@@ -108,8 +109,8 @@
<table class="tertmasttable" width="100%" cellspacing="0">
<tbody>
<tr>
- <td><div class="collectionheader"><xsl:value-of select="concat('Test Groups Report for ',$productname,' ',$version)"/></div></td>
- <td width="10%"><a href="https://opends.dev.java.net/"><img src="./opends_logo_sm.png" alt="OpenDS Logo" width="104" height="33" border="0" align="middle" /></a> </td>
+ <td><div class="collectionheader"><xsl:value-of select="concat('Test Groups Report for ',$version)"/></div></td>
+ <td width="10%"><a href="http://www.forgerock.com/"><img src="./opendj_logo.png" alt="OpenDJ Logo" width="104" height="33" border="0" align="middle" /></a> </td>
</tr>
<tr>
<td><xsl:value-of select="concat(' ',$original-archive)"/></td>
diff --git a/opends/tests/staf-tests/shared/xsl/gen-logs.xsl b/opends/tests/staf-tests/shared/xsl/gen-logs.xsl
index 9e6adb8..6815009 100644
--- a/opends/tests/staf-tests/shared/xsl/gen-logs.xsl
+++ b/opends/tests/staf-tests/shared/xsl/gen-logs.xsl
@@ -25,6 +25,7 @@
! CDDL HEADER END
!
! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<xsl:output method="html" version="4.0" encoding="iso-8859-1" indent="yes"/>
@@ -85,7 +86,7 @@
<tbody>
<tr>
<td><div class="collectionheader"><xsl:value-of select="concat('Logs for ', $suite, ' test suite')"/></div></td>
- <td width="10%"><a href="https://opends.dev.java.net/"><img src="../../reports/opends_logo_sm.png" alt="OpenDS Logo" width="104" height="33" border="0" align="middle" /></a> </td>
+ <td width="10%"><a href="http://www.forgerock.com"><img src="../../reports/opendj_logo.png" alt="OpenDJ Logo" width="104" height="33" border="0" align="middle" /></a> </td>
</tr>
</tbody>
</table>
diff --git a/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl b/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
index 5af58f9..3ac9890 100644
--- a/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
+++ b/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
@@ -25,6 +25,7 @@
! CDDL HEADER END
!
! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<xsl:output method="html" version="4.0" encoding="iso-8859-1" indent="yes"/>
@@ -94,7 +95,7 @@
<link rel="stylesheet" href="../../reports/opends.css" type="text/css" />
<xsl:element name="title">
- <xsl:value-of select="concat('Test Suites Report for ',$productname,' ',$version)"/>
+ <xsl:value-of select="concat('Test Suites Report for ',$version)"/>
</xsl:element>
</xsl:element>
@@ -110,8 +111,8 @@
<table class="tertmasttable" width="100%" cellspacing="0">
<tbody>
<tr>
- <td><div class="collectionheader"><xsl:value-of select="concat('Test Suites Report for ',$productname,' ',$version)"/></div></td>
- <td width="10%"><a href="https://opends.dev.java.net/"><img src="../../reports/opends_logo_sm.png" alt="OpenDS Logo" width="104" height="33" border="0" align="middle" /></a> </td>
+ <td><div class="collectionheader"><xsl:value-of select="concat('Test Suites Report for ',$version)"/></div></td>
+ <td width="10%"><a href="https://www.forgerock.com/"><img src="../../reports/opendj_logo.png" alt="OpenDJ Logo" width="104" height="33" border="0" align="middle" /></a> </td>
</tr>
</tbody>
</table>
diff --git a/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl b/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
index a252c78..6bcd1da 100644
--- a/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
+++ b/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
@@ -110,7 +110,7 @@
<link rel="stylesheet" href="../../reports/opends.css" type="text/css" />
<xsl:element name="title">
- <xsl:value-of select="concat('Test Cases Report for ',$productname,' ',$version)"/>
+ <xsl:value-of select="concat('Test Cases Report for ',$version)"/>
</xsl:element>
</xsl:element>
@@ -126,8 +126,8 @@
<table class="tertmasttable" width="100%" cellspacing="0">
<tbody>
<tr>
- <td><div class="collectionheader"><xsl:value-of select="concat('Test Cases Report for ',$productname,' ',$version)"/></div></td>
- <td width="10%"><a href="https://opends.dev.java.net/"><img src="../../reports/opends_logo_sm.png" alt="OpenDS Logo" width="104" height="33" border="0" align="middle" /></a> </td>
+ <td><div class="collectionheader"><xsl:value-of select="concat('Test Cases Report for ',$version)"/></div></td>
+ <td width="10%"><a href="http://www.forgerock.com/"><img src="../../reports/opendj_logo.png" alt="OpenDJ Logo" width="104" height="33" border="0" align="middle" /></a> </td>
</tr>
</tbody>
</table>
diff --git a/opends/tests/staf-tests/shared/xsl/id.xsl b/opends/tests/staf-tests/shared/xsl/id.xsl
index 80c66ec..ac8597c 100644
--- a/opends/tests/staf-tests/shared/xsl/id.xsl
+++ b/opends/tests/staf-tests/shared/xsl/id.xsl
@@ -25,6 +25,7 @@
! CDDL HEADER END
!
! Copyright 2008-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<xsl:output method="html" version="4.0" encoding="iso-8859-1" indent="yes"/>
@@ -78,7 +79,7 @@
<link rel="stylesheet" href="./opends.css" type="text/css" />
<xsl:element name="title">
- <xsl:value-of select="concat('Identification for ',$productname,' ',$version)"/>
+ <xsl:value-of select="concat('Identification for ',$version)"/>
</xsl:element>
</xsl:element>
@@ -94,8 +95,8 @@
<table class="tertmasttable" width="100%" cellspacing="0">
<tbody>
<tr>
- <td><div class="collectionheader"><xsl:value-of select="concat('Identification for ',$productname,' ',$version)"/></div></td>
- <td width="10%"><a href="https://opends.dev.java.net/"><img src="./opends_logo_sm.png" alt="OpenDS Logo" width="104" height="33" border="0" align="middle" /></a> </td>
+ <td><div class="collectionheader"><xsl:value-of select="concat('Identification for ',$version)"/></div></td>
+ <td width="10%"><a href="http://www.forgerock.com/"><img src="./opendj_logo.png" alt="OpenDJ Logo" width="104" height="33" border="0" align="middle" /></a> </td>
</tr>
</tbody>
</table>
diff --git a/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl b/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl
index f6959b4..494b01d 100644
--- a/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl
+++ b/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl
@@ -25,6 +25,7 @@
! CDDL HEADER END
!
! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS
! -->
<xsl:output method="html"/>
@@ -33,9 +34,9 @@
<xsl:element name="html">
- <xsl:variable name="opends-url" select="'https://opends.dev.java.net/'"/>
+ <xsl:variable name="opends-url" select="'http://www.forgerock.com/'"/>
<xsl:variable name="opends-images" select="concat($opends-url,'public/images/')"/>
- <xsl:variable name="opends-logo" select="concat($opends-images,'opends_logo_sm.png')"/>
+ <xsl:variable name="opends-logo" select="concat($opends-images,'opendj_logo.png')"/>
<link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print"/>
@@ -68,7 +69,7 @@
<xsl:attribute name="class">
<xsl:value-of select="'collectionheader'"/>
</xsl:attribute>
- <xsl:value-of select="'Test Specifications for OpenDS'"/>
+ <xsl:value-of select="'Test Specifications for OpenDJ'"/>
</xsl:element>
</xsl:element>
<xsl:element name="td">
@@ -84,7 +85,7 @@
<xsl:value-of select="$opends-logo"/>
</xsl:attribute>
<xsl:attribute name="alt">
- <xsl:value-of select="'OpenDS Logo'"/>
+ <xsl:value-of select="'OpenDJ Logo'"/>
</xsl:attribute>
<xsl:attribute name="align">
<xsl:value-of select="'middle'"/>
diff --git a/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl b/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl
index 8de24cb..c513334 100644
--- a/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl
+++ b/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl
@@ -34,9 +34,9 @@
<xsl:element name="html">
- <xsl:variable name="opends-url" select="'https://opends.dev.java.net/'"/>
+ <xsl:variable name="opends-url" select="'http://www.forgerock.com/'"/>
<xsl:variable name="opends-images" select="concat($opends-url,'public/images/')"/>
- <xsl:variable name="opends-logo" select="concat($opends-images,'opends_logo_sm.png')"/>
+ <xsl:variable name="opends-logo" select="concat($opends-images,'opendj_logo.png')"/>
<link rel="stylesheet" type="text/css" href="/branding/css/print.css" media="print"/>
@@ -89,7 +89,7 @@
<xsl:value-of select="$opends-logo"/>
</xsl:attribute>
<xsl:attribute name="alt">
- <xsl:value-of select="'OpenDS Logo'"/>
+ <xsl:value-of select="'OpenDJ Logo'"/>
</xsl:attribute>
<xsl:attribute name="align">
<xsl:value-of select="'middle'"/>
--
Gitblit v1.10.0