JBoss Portal SVN: r10217 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-05 15:34:12 -0500 (Wed, 05 Mar 2008)
New Revision: 10217
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
Log:
- Use groupId for application name as it kind of means the same thing...
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-05 19:29:37 UTC (rev 10216)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-05 20:34:12 UTC (rev 10217)
@@ -126,7 +126,7 @@
public String getApplicationName()
{
- return null; // doesn't mean anything for remote portlet
+ return groupId;
}
public CapabilitiesInfo getCapabilities()
16 years, 3 months
JBoss Portal SVN: r10216 - in modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet: impl/jsr168/api and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 14:29:37 -0500 (Wed, 05 Mar 2008)
New Revision: 10216
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java
Log:
rename attributes to requestAttributes as it is confusing with the generic invocation attributes
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-03-05 19:29:25 UTC (rev 10215)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-03-05 19:29:37 UTC (rev 10216)
@@ -208,7 +208,7 @@
Conversation conversation,
PortletInvocation invocation) throws Exception, InvocationException
{
- invocation.setAttributes(conversation.getAttributes());
+ invocation.setRequestAttributes(conversation.getAttributes());
// Set the id parameter
ParametersStateString inNS = (ParametersStateString)invocation.getNavigationalState();
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-03-05 19:29:25 UTC (rev 10215)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2008-03-05 19:29:37 UTC (rev 10216)
@@ -150,9 +150,9 @@
//
PortletRequestAttributes attributes = new PortletRequestAttributes(invocation.getSecurityContext(), container, userContext, realReq);
- if (invocation.getAttributes() != null)
+ if (invocation.getRequestAttributes() != null)
{
- attributes.setAttributeMap(invocation.getAttributes());
+ attributes.setAttributeMap(invocation.getRequestAttributes());
}
//
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-03-05 19:29:25 UTC (rev 10215)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2008-03-05 19:29:37 UTC (rev 10216)
@@ -40,7 +40,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Set;
import java.util.Map;
/**
@@ -75,8 +74,8 @@
/** The target portlet. */
protected PortletContext target;
- /** . */
- protected Map<String, Object> attributes;
+ /** The portlet request attributes. */
+ protected Map<String, Object> requestAttributes;
/** The invocation context. */
protected PortletInvocationContext ctx;
@@ -290,13 +289,13 @@
this.windowContext = windowContext;
}
- public Map<String, Object> getAttributes()
+ public Map<String, Object> getRequestAttributes()
{
- return attributes;
+ return requestAttributes;
}
- public void setAttributes(Map<String, Object> attributes)
+ public void setRequestAttributes(Map<String, Object> requestAttributes)
{
- this.attributes = attributes;
+ this.requestAttributes = requestAttributes;
}
}
16 years, 3 months
JBoss Portal SVN: r10215 - modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-05 14:29:25 -0500 (Wed, 05 Mar 2008)
New Revision: 10215
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp
Log:
small change
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp 2008-03-05 18:24:26 UTC (rev 10214)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp 2008-03-05 19:29:25 UTC (rev 10215)
@@ -27,7 +27,7 @@
<div class="float-left three-quarter-width logo"></div>
<div class="float-right quarter-width pc20"><img src="${pageContext.request.contextPath}/images/pc20.gif"
alt="Portlet Container 2.0"/></div>
- <div class="float-right secondary-nav"><a href="${pageContext.request.contextPath}/admin/index.jsp">Admin</a></div>
+ <div class="float-right secondary-nav"><a href="${pageContext.request.contextPath}/demo/home.jsp">Home</a></div>
<br class="clear"/>
</div>
<%@ include file="nav/admin.jsp" %>
16 years, 3 months
JBoss Portal SVN: r10214 - in modules/portlet/trunk/portal/src/main/resources/simple-portal-war: css and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-05 13:24:26 -0500 (Wed, 05 Mar 2008)
New Revision: 10214
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp
Log:
admin changes
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp 2008-03-05 16:26:36 UTC (rev 10213)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp 2008-03-05 18:24:26 UTC (rev 10214)
@@ -4,7 +4,7 @@
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<%@ page isELIgnored="false" %>
-<%@ include file="/layouts/header.jsp" %>
+<%@ include file="/layouts/admin-header.jsp" %>
<portal:page>
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css 2008-03-05 16:26:36 UTC (rev 10213)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/css/master.css 2008-03-05 18:24:26 UTC (rev 10214)
@@ -155,6 +155,12 @@
text-align: right;
}
+div#container div.header div.secondary-nav {
+ font-size: 11px;
+ padding: 3px 5px 0 0;
+ text-align: right;
+}
+
div#container div.header div.pc20 img {
margin: 5px 10px 0 0;
}
Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp (from rev 10213, modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp)
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/admin-header.jsp 2008-03-05 18:24:26 UTC (rev 10214)
@@ -0,0 +1,34 @@
+<%@ 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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="testreplace">
+<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>
+ <script type="text/javascript">
+ window.onload = function(){
+ Shadowbox.init();
+ };
+ </script>
+ <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="${pageContext.request.contextPath}/images/pc20.gif"
+ alt="Portlet Container 2.0"/></div>
+ <div class="float-right secondary-nav"><a href="${pageContext.request.contextPath}/admin/index.jsp">Admin</a></div>
+ <br class="clear"/>
+ </div>
+ <%@ include file="nav/admin.jsp" %>
+ <div id="content">
\ No newline at end of file
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp 2008-03-05 16:26:36 UTC (rev 10213)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/header.jsp 2008-03-05 18:24:26 UTC (rev 10214)
@@ -27,6 +27,7 @@
<div class="float-left three-quarter-width logo"></div>
<div class="float-right quarter-width pc20"><img src="${pageContext.request.contextPath}/images/pc20.gif"
alt="Portlet Container 2.0"/></div>
+ <div class="float-right secondary-nav"><a href="${pageContext.request.contextPath}/admin/index.jsp">Admin</a></div>
<br class="clear"/>
</div>
<%@ include file="nav/main.jsp" %>
Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp (from rev 10213, modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp)
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/admin.jsp 2008-03-05 18:24:26 UTC (rev 10214)
@@ -0,0 +1,19 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<?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">
+
+ <div class="nav full-width">
+ <ul>
+ <li>
+ <a href="${pageContext.request.contextPath}/admin/index.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'admin/') == 'index.jsp' ? 'selected' : ''}">Portlet Manager</a>
+ </li>
+ </ul>
+ <br class="clear"/>
+ </div>
16 years, 3 months
JBoss Portal SVN: r10213 - modules/portlet/trunk/docs/user-guide/en/modules.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 11:26:36 -0500 (Wed, 05 Mar 2008)
New Revision: 10213
Modified:
modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml
Log:
doc placeholder
Modified: modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml
===================================================================
--- modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml 2008-03-05 16:19:10 UTC (rev 10212)
+++ modules/portlet/trunk/docs/user-guide/en/modules/simpleportal.xml 2008-03-05 16:26:36 UTC (rev 10213)
@@ -514,5 +514,13 @@
<sect1>
<title>Administration</title>
<para>todo</para>
+ <sect2>
+ <title>Admin portlet</title>
+ <para>todo</para>
+ </sect2>
+ <sect2>
+ <title>Logging configuration</title>
+ <para>todo</para>
+ </sect2>
</sect1>
</chapter>
16 years, 3 months
JBoss Portal SVN: r10212 - modules/portlet/trunk/build/distrib.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 11:19:10 -0500 (Wed, 05 Mar 2008)
New Revision: 10212
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
Log:
chmod +x *.sh and zip of distribs
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 15:59:48 UTC (rev 10211)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 16:19:10 UTC (rev 10212)
@@ -74,6 +74,7 @@
<unzip src="${JBOSS_4_2_PATH}" dest="${pc.build.bin.as42}">
<mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/>
</unzip>
+ <chmod dir="${pc.build.bin.as42}/bin" perm="ugo+rx" includes="**/*.sh"/>
<!-- -->
<antcall target="__package-binary">
@@ -92,18 +93,10 @@
<fileset dir="jboss-4.2"/>
</copy>
-
-<!--
- <tar destfile="output/${demo.release.name.jboss42}.tar.gz" compression="gzip">
- <tarfileset prefix="${demo.release.name.jboss42}" filemode="775" dir="output/${demo.release.name.jboss42}"/>
- </tar>
--->
-
-<!--
+ <!-- -->
<antcall target="__zip">
<param name="release.name" value="${demo.release.name.jboss42}"/>
</antcall>
--->
</target>
<!--
@@ -115,6 +108,7 @@
<unzip src="${TOMCAT_6_0_PATH}" dest="${pc.build.bin.tomcat6}">
<mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/>
</unzip>
+ <chmod dir="${pc.build.bin.tomcat6}/bin" perm="ugo+rx" includes="**/*.sh"/>
<!-- -->
<antcall target="__package-binary">
@@ -131,13 +125,10 @@
<fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/simple-portal.war" includes="**"/>
</jar>
-
- <!--
+ <!-- -->
<antcall target="__zip">
<param name="release.name" value="${demo.release.name.tomcat60}"/>
- <param name="server.path" value="${TOMCAT_6_0_PATH}"/>
</antcall>
--->
</target>
<!--
@@ -188,7 +179,7 @@
</target>
<target name="__zip" unless="no-zip">
- <tar destfile="output/${release.name}.tar.gz" compression="gzip">
+ <tar destfile="output/${release.name}.tar.gz" compression="gzip" longfile="gnu">
<tarfileset prefix="${release.name}" filemode="775" dir="output/${release.name}"/>
</tar>
<checksum file="output/${release.name}.tar.gz"/>
16 years, 3 months
JBoss Portal SVN: r10211 - in modules/portlet/trunk: portal and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 10:59:48 -0500 (Wed, 05 Mar 2008)
New Revision: 10211
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp
Removed:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
modules/portlet/trunk/portal/pom.xml
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
Log:
worked on the distrib building
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 13:41:55 UTC (rev 10210)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 15:59:48 UTC (rev 10211)
@@ -36,24 +36,15 @@
</target>
<!-- Build JBoss Portlet Container (currently only builds docs as maven build is assumed -->
- <target name="build" depends="doc.build"/>
+ <target name="build"/>
- <!-- Build JBoss Portlet Container documentation -->
- <target name="doc.build" unless="no-doc">
-<!--
- <sequential>
- <ant dir="${src.docs.dir}/user-guide" antfile="build.xml"/>
- </sequential>
--->
- </target>
-
<!-- Package the different distributions -->
<target name="package">
<!-- Create the output directory -->
<mkdir dir="output"/>
- <antcall target="package-src"/>
+ <!--<antcall target="package-src"/>-->
<antcall target="package-jboss42"/>
<antcall target="package-tomcat60"/>
</target>
@@ -77,45 +68,76 @@
<!--
| JBoss Portlet Container binary distribution for AS 4.2.x
-->
- <target name="package-jboss42" description="package AS binary" if="JBOSS_4_2_HOME">
- <copy todir="${pc.build.bin.as42}">
- <fileset dir="${JBOSS_4_2_HOME}" includes="**/*"/>
- </copy>
+ <target name="package-jboss42" description="package AS binary" if="JBOSS_4_2_PATH">
+
+ <!-- -->
+ <unzip src="${JBOSS_4_2_PATH}" dest="${pc.build.bin.as42}">
+ <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/>
+ </unzip>
+
+ <!-- -->
<antcall target="__package-binary">
<param name="bin.dir" value="${pc.build.bin.as42}"/>
<param name="deploy.dir" value="${pc.build.bin.as42}/server/default/deploy"/>
+ <param name="samples.dir" value="${pc.build.bin.as42}/server/default/deploy/samples"/>
</antcall>
+
+ <!-- Simple portal -->
<copy todir="${pc.build.bin.as42}/server/default/deploy/simple-portal">
<fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-jboss42.dir/simple-portal"/>
</copy>
+
+ <!-- Taglib integration -->
<copy todir="${pc.build.bin.as42}" overwrite="true">
<fileset dir="jboss-4.2"/>
</copy>
+
+
+<!--
+ <tar destfile="output/${demo.release.name.jboss42}.tar.gz" compression="gzip">
+ <tarfileset prefix="${demo.release.name.jboss42}" filemode="775" dir="output/${demo.release.name.jboss42}"/>
+ </tar>
+-->
+
+<!--
<antcall target="__zip">
<param name="release.name" value="${demo.release.name.jboss42}"/>
</antcall>
+-->
</target>
<!--
| JBoss Portlet Container binary distribution for Tomcat 6.x
-->
- <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_HOME">
- <copy todir="${pc.build.bin.tomcat6}">
- <fileset dir="${TOMCAT_6_0_HOME}" includes="**/*"/>
- </copy>
+ <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_PATH">
+
+ <!-- -->
+ <unzip src="${TOMCAT_6_0_PATH}" dest="${pc.build.bin.tomcat6}">
+ <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/>
+ </unzip>
+
+ <!-- -->
<antcall target="__package-binary">
<param name="bin.dir" value="${pc.build.bin.tomcat6}"/>
<param name="deploy.dir" value="${pc.build.bin.tomcat6}/webapps"/>
+ <param name="samples.dir" value="${pc.build.bin.tomcat6}/webapps"/>
</antcall>
+
+ <!-- -->
<copy todir="${pc.build.bin.tomcat6}/lib">
<fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/lib" includes="**/*.jar"/>
</copy>
<jar file="${pc.build.bin.tomcat6}/webapps/simple-portal.war">
<fileset dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/simple-portal.war" includes="**"/>
</jar>
+
+
+ <!--
<antcall target="__zip">
<param name="release.name" value="${demo.release.name.tomcat60}"/>
+ <param name="server.path" value="${TOMCAT_6_0_PATH}"/>
</antcall>
+-->
</target>
<!--
@@ -126,7 +148,6 @@
<param name="todir" value="${bin.dir}"/>
</antcall>
<antcall target="__package-bundled-binary">
- <param name="deploy.dir" value="${deploy.dir}"/>
</antcall>
</target>
@@ -141,7 +162,7 @@
</target>
<target name="__package-bundled-binary" unless="bin-alone">
- <copy todir="${bin.dir}/samples">
+ <copy todir="${samples.dir}">
<fileset dir="${source.dir}/samples/target" includes="*.war"/>
</copy>
</target>
@@ -155,15 +176,15 @@
</target>
<target name="__package-doc" unless="no-doc">
-<!--
<sequential>
- <mkdir dir="${todir}"/> sam
+ <mkdir dir="${todir}"/>
<mkdir dir="${todir}/user-guide"/>
<copy todir="${todir}/user-guide">
- <fileset dir="${src.docs.dir}/user-guide/build/en/"/>
+ <fileset dir="${src.docs.dir}/user-guide/target/docbook" includes="html_single/**"/>
+ <fileset dir="${src.docs.dir}/user-guide/target/docbook" includes="html/**"/>
+ <fileset dir="${src.docs.dir}/user-guide/target/docbook/pdf" includes="*.pdf"/>
</copy>
</sequential>
--->
</target>
<target name="__zip" unless="no-zip">
@@ -177,25 +198,25 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
- <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
+ <condition property="JBOSS_4_2_PATH" value="${env.JBOSS_4_2_PATH}">
<and>
- <isset property="env.JBOSS_4_2_HOME"/>
+ <isset property="env.JBOSS_4_2_PATH"/>
<not>
- <isset property="JBOSS_4_2_HOME"/>
+ <isset property="JBOSS_4_2_PATH"/>
</not>
</and>
</condition>
- <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
+ <condition property="TOMCAT_6_0_PATH" value="${env.TOMCAT_6_0_PATH}">
<and>
- <isset property="env.TOMCAT_6_0_HOME"/>
+ <isset property="env.TOMCAT_6_0_PATH"/>
<not>
- <isset property="TOMCAT_6_0_HOME"/>
+ <isset property="TOMCAT_6_0_PATH"/>
</not>
</and>
</condition>
- <echo message="Set JBOSS_4_2_HOME and/or TOMCAT_6_0_HOME variables for binary distributions:"/>
- <echo message="JBoss AS 4.2.x home: ${JBOSS_4_2_HOME}"/>
- <echo message="Tomcat 6.x home: ${TOMCAT_6_0_HOME}"/>
+ <echo message="Set JBOSS_4_2_PATH and/or TOMCAT_6_0_PATH variables for binary distributions:"/>
+ <echo message="JBoss AS 4.2.x path: ${JBOSS_4_2_PATH}"/>
+ <echo message="Tomcat 6.x path: ${TOMCAT_6_0_PATH}"/>
</target>
</project>
Modified: modules/portlet/trunk/portal/pom.xml
===================================================================
--- modules/portlet/trunk/portal/pom.xml 2008-03-05 13:41:55 UTC (rev 10210)
+++ modules/portlet/trunk/portal/pom.xml 2008-03-05 15:59:48 UTC (rev 10211)
@@ -196,6 +196,15 @@
<descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor>
</descriptors>
</configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp 2008-03-05 13:41:55 UTC (rev 10210)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp 2008-03-05 15:59:48 UTC (rev 10211)
@@ -1,14 +0,0 @@
-<%@ page contentType="text/html" %>
-<%@ page language="java" %>
-<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
-<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
-<%@ page isELIgnored="false" %>
-
-<%@ include file="/layouts/header.jsp" %>
-
-<portal:page>
-
- <jbp:portlet name="AdminPortlet" applicationName="simple-portal"/>
-
-</portal:page>
-<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp (from rev 10194, modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/admin.jsp)
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/admin/index.jsp 2008-03-05 15:59:48 UTC (rev 10211)
@@ -0,0 +1,14 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+
+<portal:page>
+
+ <jbp:portlet name="AdminPortlet" applicationName="simple-portal"/>
+
+</portal:page>
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp 2008-03-05 13:41:55 UTC (rev 10210)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/eventdebug.jsp 2008-03-05 15:59:48 UTC (rev 10211)
@@ -1,6 +1,6 @@
<%@ page contentType="text/html" %>
<%@ page language="java" %>
-<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %>
<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
<%@ page isELIgnored="false" %>
@@ -9,15 +9,15 @@
<portal:page>
- <jbp:layout1>
+ <xportal:2columns>
<jsp:attribute name="leftcol">
- <jbp:portlet name="portletA" applicationName="samples-eventdebug-portlet" id="portlet-A"/>
+ <xportal:portlet name="portletA" applicationName="samples-eventdebug-portlet" id="portlet-A"/>
</jsp:attribute>
<jsp:attribute name="rightcol">
- <jbp:portlet name="portletB" applicationName="samples-eventdebug-portlet" id="portlet-B"/>
- <jbp:portlet name="portletC" applicationName="samples-eventdebug-portlet" id="portlet-C"/>
+ <xportal:portlet name="portletB" applicationName="samples-eventdebug-portlet" id="portlet-B"/>
+ <xportal:portlet name="portletC" applicationName="samples-eventdebug-portlet" id="portlet-C"/>
</jsp:attribute>
- </jbp:layout1>
+ </xportal:2columns>
</portal:page>
<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-03-05 13:41:55 UTC (rev 10210)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2008-03-05 15:59:48 UTC (rev 10211)
@@ -12,11 +12,9 @@
<div class="nav full-width">
<ul>
<li>
-
<a href="${pageContext.request.contextPath}/demo/home.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'home.jsp' ? 'selected' : ''}">Home</a>
</li>
- <li>
-
+ <li>
<a href="${pageContext.request.contextPath}/demo/wikipedia.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'wikipedia.jsp' ? 'selected' : ''}">Wikipedia</a>
</li>
<li>
16 years, 3 months
JBoss Portal SVN: r10210 - modules/portlet/trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 08:41:55 -0500 (Wed, 05 Mar 2008)
New Revision: 10210
Modified:
modules/portlet/trunk/build/pom.xml
Log:
use common and web module 1.2.0.Beta2
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-03-05 13:36:14 UTC (rev 10209)
+++ modules/portlet/trunk/build/pom.xml 2008-03-05 13:41:55 UTC (rev 10210)
@@ -33,8 +33,8 @@
<version.jboss-logging>2.0.3.GA</version.jboss-logging>
<version.jbossxb>2.0.0.CR5</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
- <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
+ <version.jboss.portal.common>1.2.0.Beta2</version.jboss.portal.common>
+ <version.jboss.portal.web>1.2.0.Beta2</version.jboss.portal.web>
<version.jboss.unit>1.2.0.Beta2</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
16 years, 3 months
JBoss Portal SVN: r10209 - in modules/web/trunk: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 08:36:14 -0500 (Wed, 05 Mar 2008)
New Revision: 10209
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/pom.xml
modules/web/trunk/web/pom.xml
Log:
back to snapshot mode in web module
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-03-05 13:34:29 UTC (rev 10208)
+++ modules/web/trunk/build/pom.xml 2008-03-05 13:36:14 UTC (rev 10209)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.Beta2</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
Modified: modules/web/trunk/pom.xml
===================================================================
--- modules/web/trunk/pom.xml 2008-03-05 13:34:29 UTC (rev 10208)
+++ modules/web/trunk/pom.xml 2008-03-05 13:36:14 UTC (rev 10209)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Web Module</name>
- <version>1.2.0.Beta2</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-03-05 13:34:29 UTC (rev 10208)
+++ modules/web/trunk/web/pom.xml 2008-03-05 13:36:14 UTC (rev 10209)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.Beta2</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 3 months
JBoss Portal SVN: r10208 - modules/web/tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-05 08:34:29 -0500 (Wed, 05 Mar 2008)
New Revision: 10208
Added:
modules/web/tags/JBP_WEB_1_2_0_BETA2/
Log:
tagging web module 1.2.0.Beta2
Copied: modules/web/tags/JBP_WEB_1_2_0_BETA2 (from rev 10207, modules/web/trunk)
16 years, 3 months