Author: chris.laprun(a)jboss.com Date: 2008-02-12 13:47:37 -0500 (Tue, 12 Feb 2008) New Revision: 9940 Removed: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/test/pom.xml modules/portlet/trunk/test/src/test/build.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp Log: - More work on packaging. Tomcat is getting better but portlets are not taken into account yet... - Removed mapping to simple as it's not possible to do it with Tomcat. Mapping will now be simple-portal. Adapted files accordingly. - Added JSTL dependencies for Tomcat. Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/build/pom.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -9,23 +9,24 @@ the property --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.jboss.portal</groupId> - <artifactId>jboss-portal-parent</artifactId> - <version>1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>module-parent</artifactId> - <version>2.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>JBoss Portal Portlet Module</name> - <url>http://www.jboss.com/products/jbossmc</url> - <description>JBoss Portal Portlet Module</description> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal</groupId> + <artifactId>jboss-portal-parent</artifactId> + <version>1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>module-parent</artifactId> + <version>2.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>JBoss Portal Portlet Module</name> + <url>http://www.jboss.com/products/jbossmc</url> + <description>JBoss Portal Portlet Module</description> <properties> <version.apache.portals.bridges>1.0.3</version.apache.portals.bridges> + <version.apache-taglibs>1.1.2</version.apache-taglibs> <version.activation>1.0.2</version.activation> <version.concurrent>1.3.4</version.concurrent> <version.javax.servlet>2.5</version.javax.servlet> @@ -79,7 +80,7 @@ </repositories> - <build> + <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -99,7 +100,7 @@ </plugin> </plugins> </pluginManagement> - </build> + </build> <pluginRepositories> <pluginRepository> @@ -131,16 +132,30 @@ <artifactId>portals-bridges-common</artifactId> <version>${version.apache.portals.bridges}</version> </dependency> + + <!-- JSTL for Tomcat --> <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>jstl</artifactId> + <version>${version.apache-taglibs}</version> + </dependency> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>standard</artifactId> + <version>${version.apache-taglibs}</version> + </dependency> + + + <dependency> <groupId>sun-jaxb</groupId> <artifactId>jaxb-api</artifactId> <version>${version.sun-jaxb}</version> </dependency> <!--<dependency>--> - <!--<artifactId>junit</artifactId>--> - <!--<groupId>junit</groupId>--> - <!--<version>${version.junit}</version>--> + <!--<artifactId>junit</artifactId>--> + <!--<groupId>junit</groupId>--> + <!--<version>${version.junit}</version>--> <!--</dependency>--> <dependency> <groupId>org.jboss.portal.common</groupId> @@ -178,9 +193,9 @@ <version>${version.javax.servlet.jsp}</version> </dependency> <!--<dependency>--> - <!--<groupId>apache-tomcat</groupId>--> - <!--<artifactId>catalina</artifactId>--> - <!--<version>${version.apache.tomcat}</version>--> + <!--<groupId>apache-tomcat</groupId>--> + <!--<artifactId>catalina</artifactId>--> + <!--<version>${version.apache.tomcat}</version>--> <!--</dependency>--> <dependency> @@ -344,39 +359,39 @@ <version>${version.jboss.aop}</version> </dependency> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-as4-deployer</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-as4-deployer</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-jdk50</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-jdk50</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-jdk50-client</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-aop-jdk50-client</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>pluggable-instrumentor</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> + <!--<groupId>jboss.aop</groupId>--> + <!--<artifactId>pluggable-instrumentor</artifactId>--> + <!--<version>${version.jboss.aop}</version>--> <!--</dependency>--> <dependency> <groupId>commons-logging</groupId> Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/pom.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -24,9 +24,6 @@ <artifactId>portlet-controller</artifactId> <version>${project.version}</version> </dependency> - - - <dependency> <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-portlet</artifactId> @@ -196,6 +193,15 @@ <artifactId>portlet-api</artifactId> </dependency> + <!-- JSTL for Tomcat --> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>jstl</artifactId> + </dependency> + <dependency> + <groupId>apache-taglibs</groupId> + <artifactId>standard</artifactId> + </dependency> </dependencies> <build> @@ -363,7 +369,7 @@ value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/> - <property name="dependency.portal-portlet-tests.test-jar" + <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/> <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/> @@ -371,11 +377,17 @@ <property name="dependency.jaxb-api.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <!-- JSTL for Tomcat --> + <property name="dependency.apache-jstl.jar" + value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> + <property name="dependency.apache-standard.jar" + value="${maven.dependency.apache-taglibs.standard.jar.path}"/> + <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> <target name="package-simple-portal"/> </ant> - + </tasks> </configuration> <goals> Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -698,6 +698,7 @@ <path location="${dependency.portal-portlet.jar}"/> <path location="${dependency.portal-web.jar}"/> <path location="${dependency.jsr168api.jar}"/> + <path refid="mc.portal-portlet-controller"/> </path> </copy> @@ -722,7 +723,7 @@ <jar jarfile="${target}/portlet-test-lib.jar"> - <fileset dir="${target}/classes"/> + <fileset dir="${target}/classes" excludes="org/jboss/portal/portlet/portal/**,org/jboss/portal/simple/**"/> </jar> <copy todir="${test.temp.dir}/simple-portal-war"> @@ -738,10 +739,9 @@ <path refid="mc.portal-common"/> - <path refid="mc.portal-portlet-controller"/> - <!-- MC 2.0.0.Beta4 --> <path refid="mc.trove"/> + <path refid="mc.xerces"/> <path refid="mc.javassist"/> <path refid="mc.jboss_common_logging_spi"/> <path refid="mc.jboss_common_logging_jdk"/> @@ -753,21 +753,31 @@ <path refid="mc.jboss_microcontainer"/> </copy> + <copy todir="${test.temp.dir}/simple-portal-war/WEB-INF/classes"> + <fileset dir="${target}/classes" includes="org/jboss/portal/simple/**"/> + </copy> + <!-- AS 4.2 --> <generic-package-simple-portal server="${simple.as42.dir}"/> <!-- Tomcat --> <generic-package-simple-portal server="${simple.tomcat.dir}"/> - <copy todir="${simple.tomcat.dir}/simple-portal/simple-portal.war/WEB-INF/lib" flatten="true"> + <copy todir="${simple.tomcat.dir}/simple-portal" flatten="true"> <path> <pathelement path="${dependency.log4j.jar}"/> <pathelement path="${dependency.activation.jar}"/> - <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.apache-jstl.jar}"/> + <pathelement path="${dependency.apache-standard.jar}"/> + <!--<pathelement path="${dependency.xercesImpl.jar}"/>--> </path> </copy> + <jar jarfile="${simple.tomcat.dir}/simple-portal.war"> + <fileset dir="${simple.tomcat.dir}/simple-portal/simple-portal.war"/> + </jar> + <delete dir="${simple.tomcat.dir}/simple-portal/simple-portal.war"/> <!-- AS 5 --> - <generic-package-simple-portal server="${simple.as5.dir}"/> + <!--<generic-package-simple-portal server="${simple.as5.dir}"/>--> <delete file="${target}/portlet-test-lib.jar"/> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF/context.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context path="/simple" privileged="true"/> \ No newline at end of file +<Context privileged="true"/> \ No newline at end of file Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/context.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context path="/simple" privileged="true"/> \ No newline at end of file +<Context privileged="true"/> \ No newline at end of file Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-web.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -1,26 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2008, 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> -<jboss-web> - <context-root>/simple</context-root> -</jboss-web> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 18:47:37 UTC (rev 9940) @@ -23,9 +23,9 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <web-app xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> <filter> <filter-name>ControllerFilter</filter-name> <filter-class>org.jboss.portal.portlet.test.jsp.ControllerFilter</filter-class> @@ -48,6 +48,6 @@ </servlet> <servlet-mapping> <servlet-name>PortalServlet</servlet-name> - <url-pattern>/simple</url-pattern> + <url-pattern>/simple-portal</url-pattern> </servlet-mapping> </web-app> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-12 18:47:37 UTC (rev 9940) @@ -82,10 +82,10 @@ } body, -div, -form, -ul, -li { + div, + form, + ul, + li { margin: 0; padding: 0; } @@ -130,7 +130,6 @@ padding: 0; } - /*-------------------------------Container Decoration*/ div#container>div.header { @@ -139,31 +138,31 @@ } div#container div.header div.logo { - background-image: url( /simple/images/logo-header.gif ); + background-image: url( /simple-portal/images/logo-header.gif ); background-repeat: no-repeat; background-position: top left; - height:40px; + height: 40px; } div#container div.header div.pc20 { - text-align: right; + text-align: right; } div#container div.header div.pc20 img { - margin: 5px 10px 0 0; + margin: 5px 10px 0 0; } div#container div.nav { - background-image: url( /simple/images/nav-bg.gif ); + background-image: url( /simple-portal/images/nav-bg.gif ); background-repeat: repeat-x; background-position: top left; border-top: 1px solid #878787; border-bottom: 1px solid #383838; - height:24px; + height: 24px; } div#container div.nav ul { - height:24px; + height: 24px; margin: 0 0 0 10px; } @@ -171,34 +170,32 @@ display: inline; float: left; text-align: center; - height: 24px; - /*border: 1px solid #929292;*/ + height: 24px; /*border: 1px solid #929292;*/ } div#container div.nav ul li a, -div#container div.nav ul li a:hover { + div#container div.nav ul li a:hover { display: block; - height:16px; + height: 16px; padding: 5px 14px 4px 14px; background-repeat: repeat-x; background-position: top left; - text-decoration:none; + text-decoration: none; font: bold 11px; } -div#container div.nav ul li a{ - color: #fff; - /*background-image: url( /simple/images/inactive-button-bg.gif );*/ +div#container div.nav ul li a { + color: #fff; /*background-image: url( /simple-portal/images/inactive-button-bg.gif );*/ } div#container div.nav ul li a:hover, -div#container div.nav ul li a.selected{ + div#container div.nav ul li a.selected { color: #fff; - background-image: url( /simple/images/active-button2-bg.gif ); + background-image: url( /simple-portal/images/active-button2-bg.gif ); } div#container div#content { - background-image: url( /simple/images/portal-bg.gif ); + background-image: url( /simple-portal/images/portal-bg.gif ); background-repeat: repeat-x; background-position: top left; min-height: 600px; @@ -207,46 +204,46 @@ /*-------------------------------Portlet Decoration*/ -div#container div#content div.portlet{ +div#container div#content div.portlet { border: 1px solid #969696; background-color: #e2e2e2; padding: 2px; - float:left; - margin:10px; + float: left; + margin: 10px; width: 95%; } -div#container div#content div.portlet-frame{ +div#container div#content div.portlet-frame { background-color: #fff; border: 1px solid #fff; } div#container div#content div.portlet div.header { - background-image: url( /simple/images/portlet-titlebg.gif ); + background-image: url( /simple-portal/images/portlet-titlebg.gif ); background-repeat: repeat-x; background-position: top left; - height:20px; + height: 20px; } div#container div#content div.portlet div.header div.header-layer { - background-image: url( /simple/images/portlet-title-rt-bg.gif ); + background-image: url( /simple-portal/images/portlet-title-rt-bg.gif ); background-repeat: no-repeat; background-position: top right; - height:20px; + height: 20px; } -div#container div#content div.portlet div.header div.header-layer div.title h2{ +div#container div#content div.portlet div.header div.header-layer div.title h2 { font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif; color: #fff; padding: 2px; } -div#container div#content div.portlet div.header div.header-layer div.controls{ +div#container div#content div.portlet div.header div.header-layer div.controls { text-align: right; padding: 3px 0 0 0; } -div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button{ +div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button { text-align: right; padding: 0 5px 0 0; } @@ -254,7 +251,7 @@ div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button a { color: #e1d77e; font: normal 11px; - text-decoration:none; + text-decoration: none; } /*----------------------------------Error portlet*/ @@ -285,7 +282,7 @@ color: #cc1100 } -div.exception code{ +div.exception code { color: #33ff00; } @@ -308,5 +305,5 @@ } div.remote-container ul li a { - color: #332299 + color: #332299 } Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp 2008-02-12 13:41:35 UTC (rev 9939) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp 2008-02-12 18:47:37 UTC (rev 9940) @@ -1,30 +1,32 @@ <%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> -<title>Portlet Container 2.0</title> -<link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/> -<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/shadowbox.css" /> -<script type="text/javascript" src="${pageContext.request.contextPath}/js/prototype.js"></script> -<script type="text/javascript" src="${pageContext.request.contextPath}/js/scriptaculous/scriptaculous.js?load=effects"></script> -<script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox-prototype.js"></script> -<script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox.js"></script> + <title>Portlet Container 2.0</title> + <link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/> + <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/shadowbox.css"/> + <script type="text/javascript" src="${pageContext.request.contextPath}/js/prototype.js"></script> + <script type="text/javascript" + src="${pageContext.request.contextPath}/js/scriptaculous/scriptaculous.js?load=effects"></script> + <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox-prototype.js"></script> + <script type="text/javascript" src="${pageContext.request.contextPath}/js/shadowbox.js"></script> <script type="text/javascript"> window.onload = function(){ - Shadowbox.init(); + Shadowbox.init(); }; </script> -<portal:headers/> + <portal:headers/> </head> <body> <div id="container" class="full-width"> <div class="header full-width"> <div class="float-left three-quarter-width logo"></div> - <div class="float-right quarter-width pc20"><img src="/simple/images/pc20.gif" alt="Portlet Container 2.0"/></div> + <div class="float-right quarter-width pc20"><img src="${pageContext.request.contextPath}/images/pc20.gif" + alt="Portlet Container 2.0"/></div> <br class="clear"/> </div> <%@ include file="nav/main.jsp" %>