October 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8577 - in docs/trunk: docbook-support/styles/en and 1 other directory.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-10-09 14:59:45 -0400 (Tue, 09 Oct 2007) New Revision: 8577 Added: docs/trunk/common/en/images/forward.png docs/trunk/common/en/images/messagebox_info.png docs/trunk/common/en/images/messagebox_warning.png docs/trunk/common/en/images/previous.png Modified: docs/trunk/docbook-support/styles/en/renaissance.css Log: renaissance style for docs enhanced Added: docs/trunk/common/en/images/forward.png =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/forward.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/messagebox_info.png =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/messagebox_info.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/messagebox_warning.png =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/messagebox_warning.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/previous.png =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/previous.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: docs/trunk/docbook-support/styles/en/renaissance.css =================================================================== --- docs/trunk/docbook-support/styles/en/renaissance.css 2007-10-09 14:56:21 UTC (rev 8576) +++ docs/trunk/docbook-support/styles/en/renaissance.css 2007-10-09 18:59:45 UTC (rev 8577) @@ -8,18 +8,58 @@ color: #5078AA; } +p { + padding: 0; + margin: 5px 0 5px 0; +} + hr { line-height: 0; height: 0; background-color: #fff; } -div.book div.titlepage h1.title{ +div.navheader table, +div.navheader table tr td{ + padding: 0; + margin:0; + vertical-align:top; +} + +div.navheader td { + padding: 0; + margin:0; + vertical-align:top; +} + +div.navheader td[align=right] a, +div.navfooter td[align=right] a{ + background-image: url( '../images/forward.png' ); + background-repeat: no-repeat; + background-position: center right; + padding: 8px 35px 5px 0; + margin:0; +} + +div.navheader td[align=left] a, +div.navfooter td[align=left] a{ + background-image: url( '../images/previous.png' ); + background-repeat: no-repeat; + background-position: center left; + padding: 8px 0 5px 35px; + margin:0; +} + +div.toc dl { + padding: 0 0 0 15px; +} + +div.book div.titlepage h1.title { margin: 0; padding: 10px; width: 100%; height: 65px; - background-image: url('../images/renaissance/header_bg.gif'); + background-image: url( '../images/renaissance/header_bg.gif' ); background-repeat: repeat-x; color: #fff; font-size: 15px; @@ -27,32 +67,104 @@ } div.book div.titlepage h2.subtitle, -div.toc b, -h2.title{ - margin: 0; + div.toc b, + h2.title { + margin: 15px 0 5px 0; padding: 3px; display: block; width: 100%; font-size: 15px; font-weight: bold; - background-image: url('../images/renaissance/pathBackground.png'); + background-image: url( '../images/renaissance/pathBackground.png' ); background-repeat: repeat-x; color: #333333; border: 1px solid #BBB; } +div.book div.titlepage div div { + clear: both; +} + div.book div.titlepage div.author, -div.book div.titlepage h3.author, -div.book div.titlepage h3.author span, -div.book div.titlepage tt, -div.book div.titlepage tt a{ + div.book div.titlepage h3.author, + div.book div.titlepage h3.author span, + div.book div.titlepage tt, + div.book div.titlepage tt .email { margin: 0; padding: 3px; - width: 100%; font-size: 11px; font-weight: bold; + float: left; } +div.book div.titlepage div.author tt.email, + div.book div.titlepage div.author a { + font-size: 10px; +} + +div.book div.titlepage div.author tt.email { + padding: 5px 0 0 0; +} + div.book div.titlepage h3.author { -} \ No newline at end of file +} + +div.chapter div.titlepage { + padding: 0 0 15px 0; +} + +div.chapter * div.titlepage { + padding: 0 0 0 0; +} + +div.chapter * h3.title { + background-color: #EBF2F5; + border-top: 1px solid #999; + color: #656565; + margin: 15px 0 5px 0; +} + +div.chapter * h4.title { + background-color: #5986B3; + border: 1px solid #54708C; + color: #FFFFFF; + font-size: 11px; + font-weight: bold; + margin: 0pt; + padding: 2px 2px 2px 4px; +} + +div.chapter div.note h3.title { + color: #003399; + font-weight: bold; + margin-top: 10px; + padding-top: 5px; + background-color: transparent; + border: 0; +} + +div.chapter div.note { + padding: 3px 0 3px 65px; + background-image: url( '../images/messagebox_info.png' ); + background-repeat: no-repeat; + background-position: 5 5; + margin: 10px 0 10px 0; +} + +div.chapter div.warning h3.title { + color: #003399; + font-weight: bold; + margin-top: 10px; + padding-top: 5px; + background-color: transparent; + border: 0; +} + +div.chapter div.warning { + padding: 3px 0 3px 65px; + background-image: url( '../images/messagebox_warning.png' ); + background-repeat: no-repeat; + background-position: 5 5; + margin: 10px 0 10px 0; +}

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8576 - docs/trunk/userGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-10-09 10:56:21 -0400 (Tue, 09 Oct 2007) New Revision: 8576 Modified: docs/trunk/userGuide/en/modules/intro.xml Log: Typo Modified: docs/trunk/userGuide/en/modules/intro.xml =================================================================== --- docs/trunk/userGuide/en/modules/intro.xml 2007-10-09 14:55:38 UTC (rev 8575) +++ docs/trunk/userGuide/en/modules/intro.xml 2007-10-09 14:56:21 UTC (rev 8576) @@ -20,7 +20,7 @@ </para> <sect2> <title>Portal Instances</title> - <para>JBoss Portal supports mutliple portal instances running within one container. A portal instance can be + <para>JBoss Portal supports multiple portal instances running within one container. A portal instance can be viewed as a 'bucket', containing portal objects such as, Portal Pages, Themes, Layouts, and Portlet Windows. It also manages the relationship between the user and the portal itself. The hierarchy of portal objects is depicted as follows:

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8575 - docs/trunk/quickstartuser/en.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-10-09 10:55:38 -0400 (Tue, 09 Oct 2007) New Revision: 8575 Modified: docs/trunk/quickstartuser/en/master.xml Log: Overview is part of 'common' Modified: docs/trunk/quickstartuser/en/master.xml =================================================================== --- docs/trunk/quickstartuser/en/master.xml 2007-10-09 14:47:42 UTC (rev 8574) +++ docs/trunk/quickstartuser/en/master.xml 2007-10-09 14:55:38 UTC (rev 8575) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "../../docbook-support/support/docbook-dtd/docbookx.dtd" [ -<!ENTITY overview SYSTEM "modules/overview.xml"> +<!ENTITY overview SYSTEM "../../common/en/modules/overview.xml"> <!ENTITY forward SYSTEM "modules/forward.xml"> <!ENTITY installation SYSTEM "modules/installation.xml"> <!ENTITY portalterminology SYSTEM "modules/portalterminology.xml">

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8574 - in docs/trunk: common/en/images/renaissance and 2 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-10-09 10:47:42 -0400 (Tue, 09 Oct 2007) New Revision: 8574 Added: docs/trunk/common/en/images/renaissance/ docs/trunk/common/en/images/renaissance/actionIcon_Add.gif docs/trunk/common/en/images/renaissance/actionIcon_CreateInstance.gif docs/trunk/common/en/images/renaissance/actionIcon_Delete.gif docs/trunk/common/en/images/renaissance/actionIcon_Details.gif docs/trunk/common/en/images/renaissance/actionIcon_IsDefault.gif docs/trunk/common/en/images/renaissance/actionIcon_Layout.gif docs/trunk/common/en/images/renaissance/actionIcon_MakeDefault.gif docs/trunk/common/en/images/renaissance/actionIcon_MoveDown.gif docs/trunk/common/en/images/renaissance/actionIcon_MoveUp.gif docs/trunk/common/en/images/renaissance/actionIcon_Properties.gif docs/trunk/common/en/images/renaissance/actionIcon_Rename.gif docs/trunk/common/en/images/renaissance/actionIcon_Security.gif docs/trunk/common/en/images/renaissance/actionIcon_Theme.gif docs/trunk/common/en/images/renaissance/animated_favicon1.gif docs/trunk/common/en/images/renaissance/favicon.ico docs/trunk/common/en/images/renaissance/header_bg.gif docs/trunk/common/en/images/renaissance/homeimg_cornerelement.gif docs/trunk/common/en/images/renaissance/ico_16_help.gif docs/trunk/common/en/images/renaissance/ico_16_maximize.gif docs/trunk/common/en/images/renaissance/ico_16_minimize.gif docs/trunk/common/en/images/renaissance/ico_16_normal.gif docs/trunk/common/en/images/renaissance/ico_16_reload.gif docs/trunk/common/en/images/renaissance/ico_16_remove.gif docs/trunk/common/en/images/renaissance/ico_16_swizzleclosed.gif docs/trunk/common/en/images/renaissance/ico_16_swizzleopen.gif docs/trunk/common/en/images/renaissance/ico_addcontent.gif docs/trunk/common/en/images/renaissance/ico_admin.gif docs/trunk/common/en/images/renaissance/ico_arrow_blue_left.gif docs/trunk/common/en/images/renaissance/ico_arrow_blue_right.gif docs/trunk/common/en/images/renaissance/ico_arrow_grey_left.gif docs/trunk/common/en/images/renaissance/ico_arrow_grey_right.gif docs/trunk/common/en/images/renaissance/ico_cancel.gif docs/trunk/common/en/images/renaissance/ico_edit.gif docs/trunk/common/en/images/renaissance/ico_listelement.gif docs/trunk/common/en/images/renaissance/logo.gif docs/trunk/common/en/images/renaissance/msgIcon_Warning.gif docs/trunk/common/en/images/renaissance/objectPath_Arrow.gif docs/trunk/common/en/images/renaissance/pathBackground.png docs/trunk/common/en/images/renaissance/pathSeparator.png docs/trunk/common/en/images/renaissance/portlet-bottom-left.gif docs/trunk/common/en/images/renaissance/portlet-bottom-middle.gif docs/trunk/common/en/images/renaissance/portlet-bottom-right.gif docs/trunk/common/en/images/renaissance/portlet-left-vertical.gif docs/trunk/common/en/images/renaissance/portlet-right-vertical.gif docs/trunk/common/en/images/renaissance/portlet-top-left.gif docs/trunk/common/en/images/renaissance/portlet-top-middle.gif docs/trunk/common/en/images/renaissance/portlet-top-right.gif docs/trunk/common/en/images/renaissance/spacer.gif docs/trunk/common/en/images/renaissance/tab_left.gif docs/trunk/common/en/images/renaissance/tab_left_admin.gif docs/trunk/common/en/images/renaissance/tab_left_current.gif docs/trunk/common/en/images/renaissance/tab_left_hover2.gif docs/trunk/common/en/images/renaissance/tab_right.gif docs/trunk/common/en/images/renaissance/tab_right_admin.gif docs/trunk/common/en/images/renaissance/tab_right_current.gif docs/trunk/common/en/images/renaissance/tab_right_hover2.gif docs/trunk/common/en/images/renaissance/tab_swizzle.gif docs/trunk/docbook-support/styles/en/renaissance.css docs/trunk/quickstartuser/en/modules/overview.xml Modified: docs/trunk/docbook-support/styles/en/html.xsl docs/trunk/docbook-support/styles/en/html_chunk.xsl Log: renaissance style for docs Added: docs/trunk/common/en/images/renaissance/actionIcon_Add.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Add.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_CreateInstance.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_CreateInstance.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Delete.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Delete.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Details.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Details.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_IsDefault.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_IsDefault.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Layout.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Layout.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_MakeDefault.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_MakeDefault.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_MoveDown.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_MoveDown.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_MoveUp.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_MoveUp.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Properties.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Properties.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Rename.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Rename.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Security.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Security.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/actionIcon_Theme.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/actionIcon_Theme.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/animated_favicon1.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/animated_favicon1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/favicon.ico =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/header_bg.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/header_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/homeimg_cornerelement.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/homeimg_cornerelement.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_help.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_help.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_maximize.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_maximize.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_minimize.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_minimize.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_normal.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_normal.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_reload.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_reload.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_remove.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_remove.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_swizzleclosed.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_swizzleclosed.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_16_swizzleopen.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_16_swizzleopen.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_addcontent.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_addcontent.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_admin.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_admin.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_arrow_blue_left.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_arrow_blue_left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_arrow_blue_right.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_arrow_blue_right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_arrow_grey_left.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_arrow_grey_left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_arrow_grey_right.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_arrow_grey_right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_cancel.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_cancel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_edit.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_edit.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/ico_listelement.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/ico_listelement.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/logo.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/msgIcon_Warning.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/msgIcon_Warning.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/objectPath_Arrow.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/objectPath_Arrow.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/pathBackground.png =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/pathBackground.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/pathSeparator.png =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/pathSeparator.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-bottom-left.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-bottom-left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-bottom-middle.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-bottom-middle.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-bottom-right.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-bottom-right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-left-vertical.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-left-vertical.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-right-vertical.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-right-vertical.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-top-left.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-top-left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-top-middle.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-top-middle.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/portlet-top-right.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/portlet-top-right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/spacer.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/spacer.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_left.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_left.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_left_admin.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_left_admin.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_left_current.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_left_current.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_left_hover2.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_left_hover2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_right.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_right.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_right_admin.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_right_admin.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_right_current.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_right_current.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_right_hover2.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_right_hover2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: docs/trunk/common/en/images/renaissance/tab_swizzle.gif =================================================================== (Binary files differ) Property changes on: docs/trunk/common/en/images/renaissance/tab_swizzle.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: docs/trunk/docbook-support/styles/en/html.xsl =================================================================== --- docs/trunk/docbook-support/styles/en/html.xsl 2007-10-09 12:36:31 UTC (rev 8573) +++ docs/trunk/docbook-support/styles/en/html.xsl 2007-10-09 14:47:42 UTC (rev 8574) @@ -29,7 +29,7 @@ HTML Settings ################################################### --> - <xsl:param name="html.stylesheet">css/html.css</xsl:param> + <xsl:param name="html.stylesheet">css/html.css css/renaissance.css</xsl:param>  <xsl:param name="use.extensions">1</xsl:param> Modified: docs/trunk/docbook-support/styles/en/html_chunk.xsl =================================================================== --- docs/trunk/docbook-support/styles/en/html_chunk.xsl 2007-10-09 12:36:31 UTC (rev 8573) +++ docs/trunk/docbook-support/styles/en/html_chunk.xsl 2007-10-09 14:47:42 UTC (rev 8574) @@ -31,7 +31,7 @@ <xsl:param name="chunk.section.depth">'5'</xsl:param> <xsl:param name="use.id.as.filename">'1'</xsl:param> - <xsl:param name="html.stylesheet">css/html.css</xsl:param> + <xsl:param name="html.stylesheet">css/html.css css/renaissance.css</xsl:param>  <xsl:param name="use.extensions">1</xsl:param> Added: docs/trunk/docbook-support/styles/en/renaissance.css =================================================================== --- docs/trunk/docbook-support/styles/en/renaissance.css (rev 0) +++ docs/trunk/docbook-support/styles/en/renaissance.css 2007-10-09 14:47:42 UTC (rev 8574) @@ -0,0 +1,58 @@ +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + margin: 0; + padding: 0; +} + +a { + color: #5078AA; +} + +hr { + line-height: 0; + height: 0; + background-color: #fff; +} + +div.book div.titlepage h1.title{ + margin: 0; + padding: 10px; + width: 100%; + height: 65px; + background-image: url('../images/renaissance/header_bg.gif'); + background-repeat: repeat-x; + color: #fff; + font-size: 15px; + font-weight: bold; +} + +div.book div.titlepage h2.subtitle, +div.toc b, +h2.title{ + margin: 0; + padding: 3px; + display: block; + width: 100%; + font-size: 15px; + font-weight: bold; + background-image: url('../images/renaissance/pathBackground.png'); + background-repeat: repeat-x; + color: #333333; + border: 1px solid #BBB; +} + +div.book div.titlepage div.author, +div.book div.titlepage h3.author, +div.book div.titlepage h3.author span, +div.book div.titlepage tt, +div.book div.titlepage tt a{ + margin: 0; + padding: 3px; + width: 100%; + font-size: 11px; + font-weight: bold; +} + +div.book div.titlepage h3.author { + +} \ No newline at end of file Copied: docs/trunk/quickstartuser/en/modules/overview.xml (from rev 8567, docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/modules/overview.xml) =================================================================== --- docs/trunk/quickstartuser/en/modules/overview.xml (rev 0) +++ docs/trunk/quickstartuser/en/modules/overview.xml 2007-10-09 14:47:42 UTC (rev 8574) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<preface id="overview"> + <title>JBoss Portal - Overview</title> + + <para> + <imageobject> + <imagedata align="center" fileref="images/image002.png" format="PNG" + valign="middle" /> + </imageobject> + </para> + + <para>Many IT organizations look to achieve a competitive advantage for the + enterprise by improving business productivity and reducing costs. Today's + top enterprises are realizing this goal by deploying enterprise portals + within their IT infrastructure. Enterprise portals simplify access to + information by providing a single source of interaction with corporate + information. Although today's packaged portal frameworks help enterprises + launch portals more quickly, only JBoss Portal can deliver the benefits of a + zero-cost open source license combined with a flexible and scalable + underlying platform.</para> + + <para>JBoss Portal provides an open source and standards-based environment + for hosting and serving a portal's Web interface, publishing and managing + its content, and customizing its experience. It is entirely standards-based + and supports the JSR-168 portlet specification, which allows you to easily + plug-in standards-compliant portlets to meet your specific portal needs. + JBoss Portal is available through the business-friendly <ulink + url="http://www.jboss.org/opensource/lgpl/faq">LGPL</ulink> open source + license and is supported by <ulink + url="http://www.jboss.com/services/index">Red Hat</ulink>. Red Hat support + services are available to assist you in designing, developing, deploying, + and ultimately managing your portal environment. JBoss Portal is currently + developed by Red Hat, Inc. developers, and community contributors. </para> + + <para>The JBoss Portal framework and architecture includes the portal + container and supports a wide range of features including standard portlets, + single sign-on, clustering and internationalization. Portal themes and + layouts are configurable. Users have the ability to fully customize thier + own personal portal pages. Fine-grained security administration down to + portlet permissions rounds out the security model. JBoss Portal includes a + rich content management system with approval cycle support.</para> + + <para> + <emphasis role="bold">JBoss Portal Resources:</emphasis> + + <orderedlist> + <listitem> + <para> + <ulink url="http://www.jboss.org/products/jbossportal">JBoss Portal + Project Home Page</ulink> + </para> + </listitem> + + <listitem> + <para> + <ulink + url="http://labs.jboss.com/jbossportal/download/index.html">Downloads</ulink> + </para> + </listitem> + + <listitem> + <para> + <ulink + url="http://labs.jboss.com/jbossportal/docs/index.html">Documentation</ulink> + </para> + </listitem> + + <listitem> + <para>Forums: <ulink + url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">User</ulink> + | <ulink + url="http://www.jboss.org/index.html?module=bb&op=main&c=14">Developer</ulink> + | <ulink + url="http://jboss.org/index.html?module=bb&op=viewforum&f=239">Eclipse + Portlet Plugin</ulink> </para> + </listitem> + + <listitem> + <para> + <ulink + url="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal">Wiki</ulink> + </para> + </listitem> + + <listitem> + <para> + <ulink url="http://www.portletswap.com">PortletSwap.com portlet + exchange</ulink> + </para> + </listitem> + + <listitem> + <para> + <ulink + url="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plug...">Our + Roadmap</ulink> + </para> + </listitem> + </orderedlist> + </para> + + <para>The JBoss Portal team encourages you to use this guide to install and + configure JBoss Portal. If you encounter any configuration issues or simply + want to take part in our community, we would love to hear from you in our + forums.</para> +</preface>

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8573 - docs/trunk/referenceGuide/en/modules and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-10-09 08:36:31 -0400 (Tue, 09 Oct 2007) New Revision: 8573 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd docs/trunk/referenceGuide/en/modules/xmldescriptors.xml Log: Documenting the icon metadata description Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-10-09 12:24:48 UTC (rev 8572) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-10-09 12:36:31 UTC (rev 8573) @@ -94,12 +94,31 @@ --> <!ELEMENT partial-refresh (#PCDATA)> + <!ELEMENT portlet-info (icon?)> + <!ELEMENT icon (small-icon?, large-icon?)> + <!ELEMENT small-icon (#PCDATA)> + <!ELEMENT large-icon (#PCDATA)> <!-- Modified: docs/trunk/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/trunk/referenceGuide/en/modules/xmldescriptors.xml 2007-10-09 12:24:48 UTC (rev 8572) +++ docs/trunk/referenceGuide/en/modules/xmldescriptors.xml 2007-10-09 12:36:31 UTC (rev 8573) @@ -953,6 +953,28 @@ </para> </sect3> <sect3> + <title>Defining extra portlet information</title> + <para>Since JBoss Portal 2.6.3, icons can be defined for a portlet. + <programlisting><![CDATA[ +<?xml version="1.0" standalone="yes"?> +<!DOCTYPE portlet-app PUBLIC + "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> +<portlet-app> + <portlet> + <portlet-name>ManagementPortlet</portlet-name> + <portlet-info> + <icon> + <small-icon>/myPortetAppContext/images/smallIcon.png</small-icon> + <large-icon>/myPortetAppContext/images/largeIcon.png</small-icon> + </icon> + </portlet-info> + </portlet> +</portlet-app>]]></programlisting> + Those icons can be used by different part of the portal User Interface. + </para> + </sect3> + <sect3> <title>Portlet Session Replication in a Clustered Environment</title> </sect3> <para>See

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8572 - in branches/JBoss_Portal_Branch_2_6/core/src: main/org/jboss/portal/core/impl/portlet/info and 5 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-10-09 08:24:48 -0400 (Tue, 09 Oct 2007) New Revision: 8572 Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java Removed: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml Log: Align with something closer to web.xml syntax Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -28,6 +28,7 @@ import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.ElementMetaData; import org.jboss.portal.core.metadata.portlet.AjaxMetaData; +import org.jboss.portal.core.metadata.portlet.PortletIconMetaData; import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -78,6 +79,13 @@ child = new PortletInfoMetaData(); } } + else if (object instanceof PortletInfoMetaData) + { + if ("icon".equals(localName)) + { + child = new PortletIconMetaData(); + } + } else if (object instanceof HeaderContentMetaData) { if ("link".equalsIgnoreCase(localName)) @@ -141,6 +149,12 @@ JBossPortletMetaData portlet = (JBossPortletMetaData)parent; portlet.setPortletInfo(portletInfo); } + else if (child instanceof PortletIconMetaData) + { + PortletIconMetaData portletIcon = (PortletIconMetaData)child; + PortletInfoMetaData portletInfo = (PortletInfoMetaData)parent; + portletInfo.setPortletIcon(portletIcon); + } else if (child instanceof ElementMetaData) { ElementMetaData element = (ElementMetaData)child; @@ -188,23 +202,18 @@ ajax.setPartialRefresh(Boolean.valueOf(value)); } } - else if (object instanceof PortletInfoMetaData) + else if (object instanceof PortletIconMetaData) { - if ("small-icon-location".equals(localName)) + if ("small-icon".equals(localName)) { - PortletInfoMetaData portletInfo = (PortletInfoMetaData)object; - portletInfo.setIconLocation(value, PortletInfoMetaData.SMALL); + PortletIconMetaData portletIcon = (PortletIconMetaData)object; + portletIcon.setIconLocation(value, PortletIconMetaData.SMALL); } - else if ("medium-icon-location".equals(localName)) + else if ("large-icon".equals(localName)) { - PortletInfoMetaData portletInfo = (PortletInfoMetaData)object; - portletInfo.setIconLocation(value, PortletInfoMetaData.MEDIUM); + PortletIconMetaData portletIcon = (PortletIconMetaData)object; + portletIcon.setIconLocation(value, PortletIconMetaData.LARGE); } - else if ("large-icon-location".equals(localName)) - { - PortletInfoMetaData portletInfo = (PortletInfoMetaData)object; - portletInfo.setIconLocation(value, PortletInfoMetaData.LARGE); - } } else { Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -0,0 +1,51 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.impl.portlet.info; + +import java.util.Map; + +import org.jboss.portal.core.metadata.portlet.PortletIconMetaData; +import org.jboss.portal.core.portlet.info.PortletIconInfo; +import org.jboss.portal.core.portlet.info.PortletInfoInfo; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PortletIconInfoImpl implements PortletIconInfo +{ + /** . */ + private Map icons; + + public PortletIconInfoImpl(PortletIconMetaData portletIconMetaData) + { + icons = portletIconMetaData.getIcons(); + } + + public String getIconLocation(String size) + { + return (String)icons.get(size); + } + +} + Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -22,9 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; -import java.util.Map; - import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; +import org.jboss.portal.core.portlet.info.PortletIconInfo; import org.jboss.portal.core.portlet.info.PortletInfoInfo; /** @@ -34,16 +33,16 @@ public class PortletInfoInfoImpl implements PortletInfoInfo { /** . */ - private Map icons; + private PortletInfoMetaData portletInfoMetaData; public PortletInfoInfoImpl(PortletInfoMetaData portletInfoMetaData) { - icons = portletInfoMetaData.getIcons(); + this.portletInfoMetaData = portletInfoMetaData; } - public String getIconLocation(String size) + public PortletIconInfo getPortletIconInfo() { - return (String)icons.get(size); + return new PortletIconInfoImpl(portletInfoMetaData.getPortletIcon()); } } Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -0,0 +1,65 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.metadata.portlet; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PortletIconMetaData +{ + + /** . */ + public static final String SMALL = "small"; + + /** . */ + public static final String LARGE = "large"; + + /** . */ + private Map icons; + + public PortletIconMetaData() + { + icons = new HashMap(); + } + + public void setIconLocation(String iconLocation, String size) + { + icons.put(size, iconLocation); + } + + public String getIconLocation(String size) + { + return (String)icons.get(size); + } + + public Map getIcons() + { + return Collections.unmodifiableMap(icons); + } +} + Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -22,10 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.metadata.portlet; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -34,35 +30,17 @@ { /** . */ - public static final String SMALL = "small"; - - /** . */ - public static final String MEDIUM = "medium"; + private PortletIconMetaData portletIconMD; - /** . */ - public static final String LARGE = "large"; - - /** . */ - private Map icons; - - public PortletInfoMetaData() + public PortletIconMetaData getPortletIcon() { - icons = new HashMap(); + return portletIconMD; } - public void setIconLocation(String iconLocation, String size) + public void setPortletIcon(PortletIconMetaData portletIconMD) { - icons.put(size, iconLocation); + this.portletIconMD = portletIconMD; } - public String getIconLocation(String size) - { - return (String)icons.get(size); - } - - public Map getIcons() - { - return Collections.unmodifiableMap(icons); - } } Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -0,0 +1,39 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.portlet.info; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public interface PortletIconInfo +{ + /** . */ + public static final String SMALL = "small"; + + /** . */ + public static final String LARGE = "large"; + + String getIconLocation(String size); +} + Deleted: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -1,42 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.core.portlet.info; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ - */ -public interface PortletInfoInfo -{ - /** . */ - public static final String SMALL = "small"; - - /** . */ - public static final String MEDIUM = "medium"; - - /** . */ - public static final String LARGE = "large"; - - String getIconLocation(String size); -} - Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.portlet.info; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public interface PortletInfoInfo +{ + + PortletIconInfo getPortletIconInfo(); +} + Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java 2007-10-09 12:24:48 UTC (rev 8572) @@ -31,6 +31,7 @@ import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.LinkElementMetaData; import org.jboss.portal.core.metadata.portlet.NamedMetaElementMetaData; +import org.jboss.portal.core.metadata.portlet.PortletIconMetaData; import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.core.metadata.portlet.ScriptElementMetaData; import org.jboss.xb.binding.Unmarshaller; @@ -157,7 +158,8 @@ assertEquals("Portlet4", portlet.getName()); PortletInfoMetaData portletInfo = (PortletInfoMetaData)portlet.getPortletInfo(); - assertEquals("/tmp/toto.png", portletInfo.getIconLocation(PortletInfoMetaData.SMALL)); + System.out.println(">>>" + portletInfo.getPortletIcon()); + assertEquals("/tmp/toto.png", portletInfo.getPortletIcon().getIconLocation(PortletIconMetaData.SMALL)); } Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-10-09 12:24:48 UTC (rev 8572) @@ -94,12 +94,14 @@ --> <!ELEMENT partial-refresh (#PCDATA)> -<!ELEMENT portlet-info (small-icon-location?, medium-icon-location?, large-icon-location?)> +<!ELEMENT portlet-info (icon?)> -<!ELEMENT small-icon-location (#PCDATA)> -<!ELEMENT medium-icon-location (#PCDATA)> -<!ELEMENT large-icon-location (#PCDATA)> +<!ELEMENT icon (small-icon?, large-icon?)> +<!ELEMENT small-icon (#PCDATA)> + +<!ELEMENT large-icon (#PCDATA)> + <!-- This element configure the portlet session of the portlet. Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml 2007-10-09 10:00:46 UTC (rev 8571) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml 2007-10-09 12:24:48 UTC (rev 8572) @@ -46,7 +46,9 @@ <link rel="stylesheet" type="text/css" href="test.css" media="screen" title="foo"/> </header-content> <portlet-info> - <small-icon-location>/tmp/toto.png</small-icon-location> + <icon> + <small-icon>/tmp/toto.png</small-icon> + </icon> </portlet-info> </portlet> </portlet-app> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8571 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/impl/portlet/info and 6 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-10-09 06:00:46 -0400 (Tue, 09 Oct 2007) New Revision: 8571 Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml Log: JBPORTAL-1735: Added metadata to include portlet's icons Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -28,6 +28,7 @@ import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.ElementMetaData; import org.jboss.portal.core.metadata.portlet.AjaxMetaData; +import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -72,6 +73,10 @@ { child = new AjaxMetaData(); } + else if ("portlet-info".equals(localName)) + { + child = new PortletInfoMetaData(); + } } else if (object instanceof HeaderContentMetaData) { @@ -130,6 +135,12 @@ JBossPortletMetaData portlet = (JBossPortletMetaData)parent; portlet.setAjax(ajax); } + else if (child instanceof PortletInfoMetaData) + { + PortletInfoMetaData portletInfo = (PortletInfoMetaData)child; + JBossPortletMetaData portlet = (JBossPortletMetaData)parent; + portlet.setPortletInfo(portletInfo); + } else if (child instanceof ElementMetaData) { ElementMetaData element = (ElementMetaData)child; @@ -177,6 +188,24 @@ ajax.setPartialRefresh(Boolean.valueOf(value)); } } + else if (object instanceof PortletInfoMetaData) + { + if ("small-icon-location".equals(localName)) + { + PortletInfoMetaData portletInfo = (PortletInfoMetaData)object; + portletInfo.setIconLocation(value, PortletInfoMetaData.SMALL); + } + else if ("medium-icon-location".equals(localName)) + { + PortletInfoMetaData portletInfo = (PortletInfoMetaData)object; + portletInfo.setIconLocation(value, PortletInfoMetaData.MEDIUM); + } + else if ("large-icon-location".equals(localName)) + { + PortletInfoMetaData portletInfo = (PortletInfoMetaData)object; + portletInfo.setIconLocation(value, PortletInfoMetaData.LARGE); + } + } else { super.setValue(object, nav, nsURI, localName, value); Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -25,9 +25,11 @@ import org.jboss.portal.core.portlet.info.CorePortletInfo; import org.jboss.portal.core.portlet.info.AjaxInfo; import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; +import org.jboss.portal.core.portlet.info.PortletInfoInfo; import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.AjaxMetaData; import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; +import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.portlet.impl.jsr168.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.common.i18n.ResourceBundleManager; @@ -49,6 +51,9 @@ /** . */ private final MarkupHeaderInfoImpl markupHeader; + /** . */ + private final PortletInfoInfoImpl portletInfo; + public CorePortletInfoImpl(PortletMetaData portletMD, org.jboss.portal.portlet.metadata.JBossPortletMetaData jbossPortletMD, ResourceBundleManager bundleMgr) { super(portletMD, jbossPortletMD, bundleMgr); @@ -56,11 +61,13 @@ // AjaxMetaData ajaxMD = ((JBossPortletMetaData)jbossPortletMD).getAjax(); HeaderContentMetaData headerContentMD = ((JBossPortletMetaData)jbossPortletMD).getHeaderContent(); + PortletInfoMetaData portletInfoMD = ((JBossPortletMetaData)jbossPortletMD).getPortletInfo(); // this.txType = jbossPortletMD.getTxType(); this.ajax = ajaxMD != null ? new AjaxInfoImpl(ajaxMD) : null; this.markupHeader = headerContentMD != null ? new MarkupHeaderInfoImpl(headerContentMD) : null; + this.portletInfo = portletInfoMD != null ? new PortletInfoInfoImpl(portletInfoMD) : null; } public Transactions.Type getTxType() @@ -77,4 +84,9 @@ { return markupHeader; } + + public PortletInfoInfo getPortletInfo() + { + return portletInfo; + } } Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -0,0 +1,50 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.impl.portlet.info; + +import java.util.Map; + +import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; +import org.jboss.portal.core.portlet.info.PortletInfoInfo; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PortletInfoInfoImpl implements PortletInfoInfo +{ + /** . */ + private Map icons; + + public PortletInfoInfoImpl(PortletInfoMetaData portletInfoMetaData) + { + icons = portletInfoMetaData.getIcons(); + } + + public String getIconLocation(String size) + { + return (String)icons.get(size); + } + +} + Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -34,6 +34,9 @@ /** . */ private AjaxMetaData ajax; + + /** . */ + private PortletInfoMetaData portletInfo; public HeaderContentMetaData getHeaderContent() { @@ -44,7 +47,7 @@ { this.headerContent = headerContent; } - + public AjaxMetaData getAjax() { return ajax; @@ -54,7 +57,17 @@ { this.ajax = ajax; } + + public PortletInfoMetaData getPortletInfo() + { + return portletInfo; + } + public void setPortletInfo(PortletInfoMetaData portletInfo) + { + this.portletInfo = portletInfo; + } + public void merge(org.jboss.portal.portlet.metadata.JBossPortletMetaData portlet) { super.merge(portlet); Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -0,0 +1,68 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.metadata.portlet; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PortletInfoMetaData +{ + + /** . */ + public static final String SMALL = "small"; + + /** . */ + public static final String MEDIUM = "medium"; + + /** . */ + public static final String LARGE = "large"; + + /** . */ + private Map icons; + + public PortletInfoMetaData() + { + icons = new HashMap(); + } + + public void setIconLocation(String iconLocation, String size) + { + icons.put(size, iconLocation); + } + + public String getIconLocation(String size) + { + return (String)icons.get(size); + } + + public Map getIcons() + { + return Collections.unmodifiableMap(icons); + } +} + Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -47,4 +47,6 @@ * @return */ MarkupHeaderInfo getMarkupHeader(); + + PortletInfoInfo getPortletInfo(); } Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -0,0 +1,42 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.core.portlet.info; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public interface PortletInfoInfo +{ + /** . */ + public static final String SMALL = "small"; + + /** . */ + public static final String MEDIUM = "medium"; + + /** . */ + public static final String LARGE = "large"; + + String getIconLocation(String size); +} + Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java 2007-10-09 10:00:46 UTC (rev 8571) @@ -31,6 +31,7 @@ import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; import org.jboss.portal.core.metadata.portlet.LinkElementMetaData; import org.jboss.portal.core.metadata.portlet.NamedMetaElementMetaData; +import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.core.metadata.portlet.ScriptElementMetaData; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; @@ -65,7 +66,7 @@ // assertNotNull(app.getPortlets()); - assertEquals(3, app.getPortlets().size()); + assertEquals(4, app.getPortlets().size()); // JBossPortletMetaData portlet = (JBossPortletMetaData)app.getPortlets().get("Portlet1"); @@ -132,5 +133,32 @@ assertEquals("foo", link.getTitleAttribute()); } + + public void testPortletInfoMetadata() throws Exception + { + URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); + assertTrue(URLTools.exists(jbossPortletXML)); + // + JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory(); + + // + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + + // + Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null); + assertNotNull(o); + assertTrue(o instanceof JBossApplicationMetaData); + JBossApplicationMetaData app = (JBossApplicationMetaData)o; + + // + JBossPortletMetaData portlet = (JBossPortletMetaData)app.getPortlets().get("Portlet4"); + assertNotNull(portlet); + assertEquals("Portlet4", portlet.getName()); + + PortletInfoMetaData portletInfo = (PortletInfoMetaData)portlet.getPortletInfo(); + assertEquals("/tmp/toto.png", portletInfo.getIconLocation(PortletInfoMetaData.SMALL)); + + } + } Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd 2007-10-09 10:00:46 UTC (rev 8571) @@ -68,7 +68,7 @@ </portlet> --> -<!ELEMENT portlet (portlet-name,remotable?,ajax?,session-config?,transaction?,header-content?)> +<!ELEMENT portlet (portlet-name,remotable?,ajax?,session-config?,transaction?,header-content?,portlet-info?)>  <!ELEMENT partial-refresh (#PCDATA)> +<!ELEMENT portlet-info (small-icon-location?, medium-icon-location?, large-icon-location?)> + +<!ELEMENT small-icon-location (#PCDATA)> +<!ELEMENT medium-icon-location (#PCDATA)> +<!ELEMENT large-icon-location (#PCDATA)> + <!-- This element configure the portlet session of the portlet. Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml 2007-10-09 10:00:46 UTC (rev 8571) @@ -40,4 +40,13 @@ <link rel="stylesheet" type="text/css" href="test.css" media="screen" title="foo"/> </header-content> </portlet> + <portlet> + <portlet-name>Portlet4</portlet-name> + <header-content> + <link rel="stylesheet" type="text/css" href="test.css" media="screen" title="foo"/> + </header-content> + <portlet-info> + <small-icon-location>/tmp/toto.png</small-icon-location> + </portlet-info> + </portlet> </portlet-app> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-10-08 21:54:32 UTC (rev 8570) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-10-09 10:00:46 UTC (rev 8571) @@ -42,6 +42,7 @@ <tr class="#{portlet.context.id == portletmgr.selectedPortlet.context.id ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> <td> + <img src="#{portlet.iconLocation}" width="30px" height="30px" align="middle"/> <h:commandLink action="#{portletmgr.selectPortlet}" title="#{portlet.context.id}">

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8570 - modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-10-08 17:54:32 -0400 (Mon, 08 Oct 2007) New Revision: 8570 Modified: modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd Log: better indentation of schema Modified: modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd =================================================================== --- modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd 2007-10-08 20:52:02 UTC (rev 8569) +++ modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd 2007-10-08 21:54:32 UTC (rev 8570) @@ -51,8 +51,7 @@ <xsd:complexType name="pojo_classType"> <xsd:annotation><xsd:documentation>Defines a tested class. A tested class can contain any number of case. If the class element contains no case then all test cases returned by the class meta data will be executed. The - name attribute is the full qualified name of the class. -</xsd:documentation></xsd:annotation> + name attribute is the full qualified name of the class.</xsd:documentation></xsd:annotation> <xsd:sequence> <xsd:element name="case" type="pojo_caseType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -68,8 +67,7 @@ <xsd:complexType name="pojo_testType"> <xsd:annotation><xsd:documentation>A test element specifies a test to execute. It either can contain an anonymous nested class element or it can refer to an existing test definition. The nested parameters are used to parameterize - the test configuration, they override any existing parameter defined at the pojo level. -</xsd:documentation></xsd:annotation> + the test configuration, they override any existing parameter defined at the pojo level.</xsd:documentation></xsd:annotation> <xsd:sequence> <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="class" type="pojo_classType" minOccurs="0" maxOccurs="1"/> @@ -91,4 +89,4 @@ <xsd:attribute name="value" type="xsd:string"/> </xsd:complexType> -</xsd:schema> \ No newline at end of file +</xsd:schema>

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8569 - modules/test/trunk/unit/src/main/org/jboss/unit/runner/model.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-10-08 16:52:02 -0400 (Mon, 08 Oct 2007) New Revision: 8569 Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java Log: avoid to parse and build the jboss unit schema everytime a parse action is done Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java 2007-10-08 20:49:44 UTC (rev 8568) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java 2007-10-08 20:52:02 UTC (rev 8569) @@ -35,7 +35,6 @@ import org.jboss.unit.runner.model.composite.CompositeTestSuiteDef; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.xml.sax.EntityResolver; import org.xml.sax.SAXParseException; import javax.xml.parsers.DocumentBuilderFactory; @@ -63,21 +62,22 @@ private final Element rootElt; /** . */ - private static final EntityResolver resolver = new EntityResolver() + private static final Schema schema; + + static { - public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException + try { - if (Constants.JBOSS_UNIT_SYSTEM_ID.equals(systemId)) - { - InputStream in = ModelBuilder.class.getResourceAsStream(Constants.RELATIVE_RESOURCE_NAME); - if (in != null) - { - return new InputSource(in); - } - } - return null; + SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + InputStream in = ModelBuilder.class.getResourceAsStream(Constants.RELATIVE_RESOURCE_NAME); + StreamSource ss = new StreamSource(in); + schema = schemaFactory.newSchema(ss); } - }; + catch (SAXException e) + { + throw new Error("Could not load jboss unit schema for validation", e); + } + } public ModelBuilder(InputSource source) throws ParserConfigurationException, IOException, SAXException { @@ -90,21 +90,9 @@ try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setNamespaceAware(true); - - SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - InputStream in = ModelBuilder.class.getResourceAsStream(Constants.RELATIVE_RESOURCE_NAME); - StreamSource ss = new StreamSource(in); - Schema schema = schemaFactory.newSchema(ss); - - - factory.setSchema(schema); - - DocumentBuilder builder = factory.newDocumentBuilder(); -// builder.setEntityResolver(resolver); Document doc = builder.parse(source); //

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8568 - in modules/test/trunk: remote/src/main/org/jboss/unit/remote/driver and 10 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-10-08 16:49:44 -0400 (Mon, 08 Oct 2007) New Revision: 8568 Added: modules/test/trunk/unit/src/main/org/jboss/unit/runner/ParametrizationSet.java modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd Removed: modules/test/trunk/unit/src/main/org/jboss/unit/runner/Parametrization.java modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit.dtd Modified: modules/test/trunk/remote/build.xml modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/TestConversation.java modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/deployer/DeployerHandler.java modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/http/HTTPConversation.java modules/test/trunk/tooling/src/resources/test/bobo-tests.xml modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/ParametrizationTests.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/Constants.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ParametersDef.java modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/blah/f1.xml modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f1.xml Log: replaced jboss-unit dtd by an xsd Modified: modules/test/trunk/remote/build.xml =================================================================== --- modules/test/trunk/remote/build.xml 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/remote/build.xml 2007-10-08 20:49:44 UTC (rev 8568) @@ -146,21 +146,13 @@ <mkdir dir="${build.lib}"/> - - </target>  Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java =================================================================== --- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.unit.remote.driver; -import org.jboss.unit.remote.server.NodeId; -import org.jboss.unit.remote.server.NodeManager; -import org.jboss.unit.remote.server.Node; import org.jboss.unit.driver.TestDriver; import org.jboss.unit.driver.DriverCommand; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.info.TestInfo; import org.jboss.unit.TestId; +import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.portal.test.framework.server.Node; +import org.jboss.portal.test.framework.server.NodeManager; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -43,9 +43,6 @@ /** . */ private NodeId initialNodeId; - /** . */ - private String archivePath; - // Services /** . */ @@ -54,9 +51,6 @@ /** . */ private ProtocolHandler protocolHandler; - /** . */ -// private Deployer deployer; - public NodeId getInitialNodeId() { return initialNodeId; @@ -67,16 +61,6 @@ this.initialNodeId = initialNodeId; } - public String getArchivePath() - { - return archivePath; - } - - public void setArchivePath(String archivePath) - { - this.archivePath = archivePath; - } - public NodeManager getNodeManager() { return nodeManager; @@ -97,16 +81,6 @@ this.protocolHandler = protocolHandler; } -// public Deployer getDeployer() -// { -// return deployer; -// } -// -// public void setDeployer(Deployer deployer) -// { -// this.deployer = deployer; -// } - public RemoteTestDriver getServer(Node node) { return (RemoteTestDriver)node.lookupService(RemoteTestDriver.SERVICE_ID); @@ -119,7 +93,7 @@ return server.getInfo(); } - public DriverResponse invoke(TestId testId, DriverCommand command) // throws TestDriverException + public DriverResponse invoke(TestId testId, DriverCommand command) { try { @@ -133,7 +107,6 @@ } catch (Exception e) { -// throw new TestDriverException(e); throw new Error(e); } } Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/TestConversation.java =================================================================== --- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/TestConversation.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/TestConversation.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -25,10 +25,10 @@ import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.DriverCommand; import org.jboss.unit.driver.response.EndTestResponse; -import org.jboss.unit.remote.server.Node; import org.jboss.unit.remote.RequestContext; import org.jboss.unit.remote.ResponseContext; import org.jboss.unit.TestId; +import org.jboss.portal.test.framework.server.Node; import java.util.Map; import java.util.HashMap; Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/deployer/DeployerHandler.java =================================================================== --- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/deployer/DeployerHandler.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/deployer/DeployerHandler.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -30,6 +30,7 @@ import org.jboss.unit.remote.driver.handler.deployer.response.DeployResponse; import org.jboss.unit.driver.DriverResponse; import org.jboss.portal.test.framework.deployment.Deployer; +import org.jboss.portal.test.framework.server.Node; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -85,8 +86,17 @@ { DeployResponse deploy = (DeployResponse)response; + Node node = testConversation.getNode(); + // -// deployer.deploy(archivePath, deploy.getId(), node); + try + { + deployer.deploy(archivePath, deploy.getId(), node); + } + catch (Exception e) + { + throw new Error(e); + } // return new RemoteDriverCommandContext(responseContext.getCommandContext()); @@ -96,8 +106,14 @@ UndeployResponse undeploy = (UndeployResponse)response; // -// Deployer deployer = driver.getDeployer(); -// deployer.undeploy(driver.getArchivePath(), undeploy.getId()); + try + { + deployer.undeploy(archivePath, undeploy.getId()); + } + catch (Exception e) + { + throw new Error(e); + } // return new RemoteDriverCommandContext(responseContext.getCommandContext()); Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/http/HTTPConversation.java =================================================================== --- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/http/HTTPConversation.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/handler/http/HTTPConversation.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -38,13 +38,13 @@ import org.jboss.portal.common.http.HttpRequest; import org.jboss.portal.common.http.HttpHeaders; import org.jboss.portal.common.http.HttpHeader; +import org.jboss.portal.test.framework.server.Node; import org.jboss.unit.remote.driver.handler.http.command.DoMethodCommand; import org.jboss.unit.remote.driver.handler.http.command.DoPostCommand; import org.jboss.unit.remote.driver.handler.http.command.DoGetCommand; import org.jboss.unit.remote.driver.TestConversation; import org.jboss.unit.remote.driver.RemoteDriverCommandContext; import org.jboss.unit.remote.driver.RemoteDriverResponseContext; -import org.jboss.unit.remote.server.Node; import org.jboss.unit.remote.ResponseContext; import org.jboss.unit.driver.DriverCommand; import org.jboss.unit.driver.DriverResponse; Modified: modules/test/trunk/tooling/src/resources/test/bobo-tests.xml =================================================================== --- modules/test/trunk/tooling/src/resources/test/bobo-tests.xml 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/tooling/src/resources/test/bobo-tests.xml 2007-10-08 20:49:44 UTC (rev 8568) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-unit PUBLIC - "-//JBoss Portal//JBoss Unit 1.0//EN" - "http://www.jboss.org/portal/dtd/jboss-unit.dtd"> -<jboss-unit> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> <pojo> <test-def id="bobo"> <class name="org.jboss.test.unit.tooling.bobo.BoboTest1"/> Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/ParametrizationTests.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/ParametrizationTests.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/ParametrizationTests.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -23,7 +23,7 @@ package org.jboss.test.unit.runner; import static org.jboss.unit.api.Assert.assertEquals; -import org.jboss.unit.runner.Parametrization; +import org.jboss.unit.runner.ParametrizationSet; import org.jboss.unit.util.CollectionTools; import java.util.HashMap; @@ -50,7 +50,7 @@ private static void test1() { Map<String,String[]> map = new HashMap<String,String[]>(); - Parametrization def = new Parametrization(map); + ParametrizationSet def = new ParametrizationSet(map); // Set<String> contraints = CollectionTools.set(); @@ -63,7 +63,7 @@ { Map<String,String[]> map = new HashMap<String,String[]>(); map.put("a", new String[]{"b"}); - Parametrization def = new Parametrization(map); + ParametrizationSet def = new ParametrizationSet(map); // Set<String> contraints1= CollectionTools.set(); @@ -90,7 +90,7 @@ { Map<String,String[]> map = new HashMap<String,String[]>(); map.put("a", new String[]{"b","c"}); - Parametrization def = new Parametrization(map); + ParametrizationSet def = new ParametrizationSet(map); // Set<String> contraints1= CollectionTools.set(); @@ -121,7 +121,7 @@ Map<String,String[]> map = new HashMap<String,String[]>(); map.put("a", new String[]{"b","c"}); map.put("d", new String[]{"e"}); - Parametrization def = new Parametrization(map); + ParametrizationSet def = new ParametrizationSet(map); // Set<String> contraints1= CollectionTools.set(); @@ -167,7 +167,7 @@ Map<String,String[]> map = new HashMap<String,String[]>(); map.put("a", new String[]{"b","c"}); map.put("d", new String[]{"e","f"}); - Parametrization def = new Parametrization(map); + ParametrizationSet def = new ParametrizationSet(map); // Set<String> contraints1= CollectionTools.set(); Deleted: modules/test/trunk/unit/src/main/org/jboss/unit/runner/Parametrization.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/Parametrization.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/Parametrization.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -1,115 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.unit.runner; - -import java.util.Map; -import java.util.HashMap; -import java.util.List; -import java.util.Set; -import java.util.HashSet; -import java.util.ArrayList; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class Parametrization implements Cloneable -{ - - /** . */ - private Map<String,String[]> map; - - public Parametrization(Map<String, String[]> map) - { - this.map = map; - } - - public Parametrization() - { - this.map = new HashMap<String, String[]>(); - } - - public void merge(Parametrization other) - { - for (Map.Entry<String,String[]> entry : other.map.entrySet()) - { - if (!map.containsKey(entry.getKey())) - { - map.put(entry.getKey(), entry.getValue().clone()); - } - } - } - - public Parametrization clone() - { - try - { - return (Parametrization)super.clone(); - } - catch (CloneNotSupportedException e) - { - throw new Error(e); - } - } - - public List<Map<String,String>> enumerate(Set<String> expectedParameters) - { - // Clone so we can modify it safely - expectedParameters = expectedParameters != null ? new HashSet<String>(expectedParameters) : null; - - // - List<Map<String,String>> enumeration = new ArrayList<Map<String, String>>(); - - // - enumeration.add(new HashMap<String, String>()); - - // - for (Map.Entry<String, String[]> entry : map.entrySet()) - { - String parameterName = entry.getKey(); - - // - if (expectedParameters == null || expectedParameters.remove(parameterName)) - { - - List<Map<String,String>> tmp = new ArrayList<Map<String, String>>(); - - for (String occurrence : entry.getValue()) - { - for (Map<String,String> blah : enumeration) - { - Map<String,String> copy = new HashMap<String,String>(blah); - copy.put(parameterName, occurrence); - tmp.add(copy); - } - } - - enumeration = tmp; - } - } - - // - return enumeration; - } - -} Copied: modules/test/trunk/unit/src/main/org/jboss/unit/runner/ParametrizationSet.java (from rev 8565, modules/test/trunk/unit/src/main/org/jboss/unit/runner/Parametrization.java) =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/ParametrizationSet.java (rev 0) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/ParametrizationSet.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -0,0 +1,121 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.unit.runner; + +import java.util.Map; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.HashSet; +import java.util.ArrayList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class ParametrizationSet implements Cloneable +{ + + /** . */ + private Map<String,String[]> map; + + public ParametrizationSet(Map<String, String[]> map) + { + this.map = map; + } + + public ParametrizationSet() + { + this.map = new HashMap<String, String[]>(); + } + + public void merge(ParametrizationSet other) + { + for (Map.Entry<String,String[]> entry : other.map.entrySet()) + { + if (!map.containsKey(entry.getKey())) + { + map.put(entry.getKey(), entry.getValue().clone()); + } + } + } + + public ParametrizationSet clone() + { + try + { + return (ParametrizationSet)super.clone(); + } + catch (CloneNotSupportedException e) + { + throw new Error(e); + } + } + + /** + * Enumerate the list of parametrization generated by this set. + * + * @param expectedParameters a filter to retain a sub set of the parameters + * @return a list of parametrizations + */ + public List<Map<String,String>> enumerate(Set<String> expectedParameters) + { + // Clone so we can modify it safely + expectedParameters = expectedParameters != null ? new HashSet<String>(expectedParameters) : null; + + // + List<Map<String,String>> enumeration = new ArrayList<Map<String, String>>(); + + // + enumeration.add(new HashMap<String, String>()); + + // + for (Map.Entry<String, String[]> entry : map.entrySet()) + { + String parameterName = entry.getKey(); + + // + if (expectedParameters == null || expectedParameters.remove(parameterName)) + { + + List<Map<String,String>> tmp = new ArrayList<Map<String, String>>(); + + for (String occurrence : entry.getValue()) + { + for (Map<String,String> blah : enumeration) + { + Map<String,String> copy = new HashMap<String,String>(blah); + copy.put(parameterName, occurrence); + tmp.add(copy); + } + } + + enumeration = tmp; + } + } + + // + return enumeration; + } + +} Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -24,7 +24,7 @@ import org.jboss.unit.runner.AbstractTestRunner; import org.jboss.unit.runner.TestFilter; -import org.jboss.unit.runner.Parametrization; +import org.jboss.unit.runner.ParametrizationSet; import org.jboss.unit.runner.impl.driver.TestDriverRunner; import org.jboss.unit.runner.event.RunnerFailureEvent; import org.jboss.unit.runner.event.TestRunnerLifeCycleFilter; @@ -105,8 +105,8 @@ // Create parametrization - Parametrization parametrization = suite.getParameters().getParametrization(); - parametrization.merge(test.getParameters().getParametrization()); + ParametrizationSet parametrizations = suite.getParameters().getParametrization(); + parametrizations.merge(test.getParameters().getParametrization()); // Map<String,Iterable<String>> generator = new HashMap<String, Iterable<String>>(); @@ -117,7 +117,7 @@ TestCaseInfo testCaseInfo = (TestCaseInfo)testSuiteInfo.findTest(testCaseId); - for (Map<String,String> blah : parametrization.enumerate(testCaseInfo.getParameters().keySet())) + for (Map<String,String> blah : parametrizations.enumerate(testCaseInfo.getParameters().keySet())) { TestDriverRunner runner = new TestDriverRunner(driver, blah, testCaseId); runner.addListener(lifeCycleFilter); Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/Constants.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/Constants.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/Constants.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -31,7 +31,8 @@ public static final String JBOSS_UNIT_SYSTEM_ID = "http://www.jboss.org/portal/dtd/jboss-unit.dtd"; - public static final String RELATIVE_RESOURCE_NAME = "jboss-unit.dtd"; +// public static final String RELATIVE_RESOURCE_NAME = "jboss-unit.dtd"; + public static final String RELATIVE_RESOURCE_NAME = "jboss-unit_1_0.xsd"; } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ModelBuilder.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -32,9 +32,6 @@ import org.jboss.unit.runner.model.pojo.POJOTestSuiteDef; import org.jboss.unit.runner.model.pojo.TestClassDef; import org.jboss.unit.runner.model.pojo.TestCaseDef; -import org.jboss.unit.runner.model.TestDef; -import org.jboss.unit.runner.model.ParametersDef; -import org.jboss.unit.runner.model.TestSuiteDef; import org.jboss.unit.runner.model.composite.CompositeTestSuiteDef; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -44,6 +41,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.DocumentBuilder; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.XMLConstants; +import javax.xml.transform.stream.StreamSource; import java.util.List; import java.util.ArrayList; import java.io.IOException; @@ -89,9 +90,21 @@ try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setValidating(true); + + factory.setNamespaceAware(true); + + SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + InputStream in = ModelBuilder.class.getResourceAsStream(Constants.RELATIVE_RESOURCE_NAME); + StreamSource ss = new StreamSource(in); + Schema schema = schemaFactory.newSchema(ss); + + + + factory.setSchema(schema); + + DocumentBuilder builder = factory.newDocumentBuilder(); - builder.setEntityResolver(resolver); +// builder.setEntityResolver(resolver); Document doc = builder.parse(source); // Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ParametersDef.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ParametersDef.java 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/model/ParametersDef.java 2007-10-08 20:49:44 UTC (rev 8568) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.unit.runner.model; -import org.jboss.unit.runner.Parametrization; +import org.jboss.unit.runner.ParametrizationSet; import java.util.Map; import java.util.HashMap; @@ -82,13 +82,13 @@ return map.keySet(); } - public Parametrization getParametrization() + public ParametrizationSet getParametrization() { Map<String,String[]> tmp = new HashMap<String,String[]>(); for (Map.Entry<String,ParameterValueDef> entry : map.entrySet()) { tmp.put(entry.getKey(), entry.getValue().list().toArray(new String[0])); } - return new Parametrization(tmp); + return new ParametrizationSet(tmp); } } Deleted: modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit.dtd =================================================================== --- modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit.dtd 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit.dtd 2007-10-08 20:49:44 UTC (rev 8568) @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - - -<!ELEMENT jboss-unit (pojo|suite)*> - - -<!ELEMENT suite (pojo)*> - - -<!ELEMENT pojo (parameter|test-def|test)*> - - -<!ELEMENT test-def (class)> -<!ATTLIST test-def id CDATA #REQUIRED> - - -<!ELEMENT class (case)*> -<!ATTLIST class name CDATA #REQUIRED> - - -<!ELEMENT case (#PCDATA)> -<!ATTLIST case name CDATA #REQUIRED> - - -<!ELEMENT test ((class,parameter*)|(parameter*,class,parameter*)|(parameter*,class)|parameter*)> -<!ATTLIST test refid CDATA #IMPLIED> - - -<!ELEMENT parameter (value|null)*> -<!ATTLIST parameter - name CDATA #REQUIRED - value CDATA #IMPLIED> - -<!ELEMENT null (#PCDATA)> -<!ELEMENT value (#PCDATA)> - - Added: modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd =================================================================== --- modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd (rev 0) +++ modules/test/trunk/unit/src/resources/jboss-unit-jar/org/jboss/unit/runner/model/jboss-unit_1_0.xsd 2007-10-08 20:49:44 UTC (rev 8568) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema + targetNamespace="urn:jboss:jboss-unit:1.0" + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xsd:element + name="jboss-unit" + type="jbossUnitType"> + <xsd:annotation><xsd:documentation>A jboss-unit is the top container element.</xsd:documentation></xsd:annotation> + </xsd:element> + + <xsd:complexType name="jbossUnitType"> + <xsd:annotation><xsd:documentation>The root type is like a suite.</xsd:documentation></xsd:annotation> + <xsd:complexContent> + <xsd:extension base="suiteType"> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="suiteType"> + <xsd:annotation><xsd:documentation>A suite elements define a test suite and contain nested suites.</xsd:documentation></xsd:annotation> + <xsd:sequence> + <xsd:element name="suite" type="suiteType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="pojo" type="pojoType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="pojoType"> + <xsd:annotation><xsd:documentation>The pojo element defines a test suite for plain old java objects. It contains a global parameter set, + a set of test definitions and a set of tests to execute.</xsd:documentation></xsd:annotation> + <xsd:sequence> + <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="test-def" type="pojo_testDefType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="test" type="pojo_testType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="pojo_testDefType"> + <xsd:annotation><xsd:documentation>Defines a pojo test with a mandatory id attribute. The id attribute is used by + test elements which can refer to it.</xsd:documentation></xsd:annotation> + <xsd:sequence> + <xsd:element name="class" type="pojo_classType" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="id" use="required"/> + </xsd:complexType> + + <xsd:complexType name="pojo_classType"> + <xsd:annotation><xsd:documentation>Defines a tested class. A tested class can contain any number of case. + If the class element contains no case then all test cases returned by the class meta data will be executed. The + name attribute is the full qualified name of the class. +</xsd:documentation></xsd:annotation> + <xsd:sequence> + <xsd:element name="case" type="pojo_caseType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" use="required"/> + </xsd:complexType> + + <xsd:complexType name="pojo_caseType"> + <xsd:annotation><xsd:documentation>A case element specifies a particular test case on a test class. The name attribute + in the name of the test case.</xsd:documentation></xsd:annotation> + <xsd:attribute name="name" use="required"/> + </xsd:complexType> + + <xsd:complexType name="pojo_testType"> + <xsd:annotation><xsd:documentation>A test element specifies a test to execute. It either can contain an anonymous + nested class element or it can refer to an existing test definition. The nested parameters are used to parameterize + the test configuration, they override any existing parameter defined at the pojo level. +</xsd:documentation></xsd:annotation> + <xsd:sequence> + <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="class" type="pojo_classType" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="refid" type="xsd:string"/> + </xsd:complexType> + + <xsd:complexType name="parameterType"> + <xsd:annotation><xsd:documentation>A parameter element.</xsd:documentation></xsd:annotation> + <xsd:sequence> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="value" type="xsd:string"/> + <xsd:element name="null"> + <xsd:complexType/> + </xsd:element> + </xsd:choice> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="value" type="xsd:string"/> + </xsd:complexType> + +</xsd:schema> \ No newline at end of file Modified: modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/blah/f1.xml =================================================================== --- modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/blah/f1.xml 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/blah/f1.xml 2007-10-08 20:49:44 UTC (rev 8568) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-unit PUBLIC - "-//JBoss Portal//JBoss Unit 1.0//EN" - "http://www.jboss.org/portal/dtd/jboss-unit.dtd"> -<jboss-unit> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> <pojo> <test-def id="blahblah"> <class name="org.jboss.test.unit.blah.TestedClass1"/> Modified: modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f1.xml =================================================================== --- modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f1.xml 2007-10-08 16:16:09 UTC (rev 8567) +++ modules/test/trunk/unit/src/resources/test/org/jboss/test/unit/runner/model/f1.xml 2007-10-08 20:49:44 UTC (rev 8568) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE jboss-unit PUBLIC - "-//JBoss Portal//JBoss Unit 1.0//EN" - "http://www.jboss.org/portal/dtd/jboss-unit.dtd"> -<jboss-unit> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> <pojo> <parameter name="red" value="blue"/> @@ -30,8 +30,8 @@ </test> <test> + <parameter name="foo" value="bar"/> <class name="org.foo.bar.OtherTest"/> - <parameter name="foo" value="bar"/> </test> <!--

16 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits October 2007