[jboss-svn-commits] JBoss Portal SVN: r5300 - in trunk/theme: . src/resources src/resources/test src/resources/test/theme-test-sar src/resources/test/theme-test-sar/META-INF src/resources/test/theme-test-sar/conf src/resources/test/theme-test-war src/resources/test/theme-test-war/WEB-INF src/resources/test/theme-test-war/WEB-INF/layout
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 29 20:02:19 EDT 2006
Author: julien at jboss.com
Date: 2006-09-29 20:02:11 -0400 (Fri, 29 Sep 2006)
New Revision: 5300
Added:
trunk/theme/src/resources/test/
trunk/theme/src/resources/test/theme-test-sar/
trunk/theme/src/resources/test/theme-test-sar/META-INF/
trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml
trunk/theme/src/resources/test/theme-test-sar/conf/
trunk/theme/src/resources/test/theme-test-sar/conf/config.xml
trunk/theme/src/resources/test/theme-test-war/
trunk/theme/src/resources/test/theme-test-war/WEB-INF/
trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/
trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml
trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml
trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml
trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml
trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld
trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
Modified:
trunk/theme/build.xml
Log:
added theme-test.sar that contains the bare minimum to deploy theme objects in order to implement more robust theme testing
Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/build.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -203,8 +203,23 @@
<!-- Packages all the test related artifacts. Note that compilation should have be-->
<target name="package-tests" depends="package-ajax-test"
description="Packages all the test-related artifacts. Does NOT compile classes so this should be done before
- calling this task."/>
+ calling this task.">
+ <jar jarfile="${build.lib}/theme-test.war">
+ <fileset dir="${source.bin}/portal-ajax-war" includes="js"/>
+ <fileset dir="${build.resources}/test/theme-test-war"/>
+ </jar>
+ <jar jarfile="${build.lib}/theme-test.sar">
+ <fileset dir="${build.lib}" includes="theme-test.war"/>
+ <fileset dir="${build.resources}/test/theme-test-sar"/>
+ <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+ <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
+ <fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/>
+ </jar>
+ </target>
+
<!-- AJAX tests -->
<target name="package-ajax-test" description="Generate the AJAX test artifacts" depends="init">
Added: trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,121 @@
+<server>
+
+ <!-- Theme and layout services -->
+ <mbean
+ code="org.jboss.portal.theme.impl.ThemeServiceImpl"
+ name="portal:service=ThemeService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.theme.impl.LayoutServiceImpl"
+ name="portal:service=LayoutService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.theme.impl.page.PageServiceImpl"
+ name="portal:service=PageService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService</depends>
+ <depends
+ optional-attribute-name="ThemeService"
+ proxy-type="attribute">portal:service=ThemeService</depends>
+ </mbean>
+
+ <!-- Server configuration service -->
+ <mbean
+ code="org.jboss.portal.server.config.ServerConfigService"
+ name="portal:service=ServerConfig"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="ConfigLocation">conf/config.xml</attribute>
+ </mbean>
+
+ <!-- Server -->
+ <mbean
+ code="org.jboss.portal.server.impl.ServerImpl"
+ name="portal:service=Server"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends>
+ </mbean>
+
+ <!-- Server deployer -->
+ <mbean
+ code="org.jboss.portal.server.deployment.jboss.ServerDeployer"
+ name="portal:deployer=PortalWebApp">
+ <depends>jboss.system:service=MainDeployer</depends>
+ <depends optional-attribute-name="PortalServer" proxy-type="attribute">portal:service=Server</depends>
+ </mbean>
+
+ <!-- Adapt the web app to the server deployer -->
+ <mbean
+ code="org.jboss.portal.server.deployment.WebAppAdapter"
+ name="portal:deployer=Adapter"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+ </mbean>
+
+ <!-- Web app enhancer -->
+ <mbean
+ code="org.jboss.portal.server.deployment.WebAppEnhancer"
+ name="portal:service=Deployer,type=Enhancer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="InterceptedDeployer">jboss.web:service=WebServer</depends>
+ </mbean>
+
+ <!-- Various deployment factories used by the theme engine -->
+ <mbean
+ code="org.jboss.portal.theme.deployment.jboss.LayoutDeploymentFactory"
+ name="portal:deploymentFactory=Layout"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.theme.deployment.jboss.LayoutFeaturesDeploymentFactory"
+ name="portal:deploymentFactory=LayoutFeatures"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="LayoutService"
+ proxy-type="attribute">portal:service=LayoutService</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.theme.deployment.jboss.ThemeDeploymentFactory"
+ name="portal:deploymentFactory=Theme"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Deployer"
+ proxy-type="attribute">portal:deployer=PortalWebApp</depends>
+ <depends
+ optional-attribute-name="ThemeService"
+ proxy-type="attribute">portal:service=ThemeService</depends>
+ </mbean>
+</server>
\ No newline at end of file
Added: trunk/theme/src/resources/test/theme-test-sar/conf/config.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-sar/conf/config.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-sar/conf/config.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,2 @@
+<properties>
+</properties>
Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portal-renderSet>
+ <renderSet name="divRenderer">
+ <set content-type="text/html">
+ <ajax-enabled>true</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
+ </set>
+ </renderSet>
+ <renderSet name="emptyRenderer">
+ <set content-type="text/html">
+ <ajax-enabled>true</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
+ </set>
+ </renderSet>
+</portal-renderSet>
Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portal-strategies>
+ <set name="maximizedRegion">
+ <strategy content-type="text/html">
+ <implementation>org.jboss.portal.theme.impl.strategy.MaximizingStrategyImpl</implementation>
+ </strategy>
+ </set>
+</portal-strategies>
Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layouts>
+<!--
+ <layout>
+ <name>nodesk</name>
+ <uri>/nodesk/index.jsp</uri>
+ <uri state="maximized">/nodesk/index.jsp</uri>
+ <regions>
+ <region name="left"/>
+ <region name="center"/>
+ </regions>
+ </layout>
+ <layout>
+ <name>phalanx</name>
+ <uri>/phalanx/index.jsp</uri>
+ <uri state="maximized">/phalanx/index.jsp</uri>
+ <regions>
+ <region name="left"/>
+ <region name="center"/>
+ </regions>
+ </layout>
+ <layout>
+ <name>generic</name>
+ <uri>/layouts/generic/index.jsp</uri>
+ <uri state="maximized">/layouts/generic/maximized.jsp</uri>
+ <regions>
+ <region name="left"/>
+ <region name="center"/>
+ <region name="navigation"/>
+ </regions>
+ </layout>
+-->
+</layouts>
Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<themes>
+<!--
+ <theme>
+ <name>industrial</name>
+ <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css" type="text/css" />
+ <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico" />
+ </theme>
+ <theme>
+ <name>Nphalanx</name>
+ <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css" />
+ <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico" />
+ </theme>
+ <theme>
+ <name>mission-critical</name>
+ <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css" />
+ <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico" />
+ </theme>
+ <theme>
+ <name>Maple</name>
+ <link rel="stylesheet" id="main_css" href="/themes/maple/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/maple/images/favicon.ico"/>
+ </theme>
+ <theme>
+ <name>renaissance</name>
+ <link rel="stylesheet" id="main_css" href="/themes/renaissance/portal_style.css" type="text/css"/>
+ <link rel="shortcut icon" href="/themes/renaissance/images/favicon.ico"/>
+ <link rel="icon" href="/themes/renaissance/images/animated_favicon1.gif" type="image/gif"/>
+ </theme>
+-->
+</themes>
\ No newline at end of file
Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,45 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <tlib-version>1.1</tlib-version>
+ <short-name>Theme_basic_tags</short-name>
+ <tag>
+ <name>ifRegionIsEmpty</name>
+ <tag-class>org.jboss.portal.theme.tag.basic.IfRegionIsEmptyTag</tag-class>
+ <attribute>
+ <name>region</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>ifRegionExists</name>
+ <tag-class>org.jboss.portal.theme.tag.basic.IfRegionExistsTag</tag-class>
+ <attribute>
+ <name>region</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>forEachWindowInRegion</name>
+ <tag-class>org.jboss.portal.theme.tag.basic.ForEachWindowInRegionTag</tag-class>
+ <tei-class>org.jboss.portal.theme.tag.basic.ForEachWindowInRegionTEI</tei-class>
+ <attribute>
+ <name>region</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+ <tag>
+ <name>forEachActionInWindow</name>
+ <tag-class>org.jboss.portal.theme.tag.basic.ForEachActionInWindowTag</tag-class>
+ <tei-class>org.jboss.portal.theme.tag.basic.ForEachActionInWindowTEI</tei-class>
+ <attribute>
+ <name>family</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+</taglib>
Added: trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2006-09-29 23:45:48 UTC (rev 5299)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml 2006-09-30 00:02:11 UTC (rev 5300)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<web-app
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+</web-app>
More information about the jboss-svn-commits
mailing list