JBoss Portal SVN: r7146 - in docs/trunk/referenceGuide/en: modules and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-30 07:39:50 -0400 (Mon, 30 Apr 2007)
New Revision: 7146
Added:
docs/trunk/referenceGuide/en/images/portalapi/PortalNodeEvent.png
docs/trunk/referenceGuide/en/images/portalapi/PortalNodeEventContext.png
docs/trunk/referenceGuide/en/images/portalapi/PortalSessionEvent.png
docs/trunk/referenceGuide/en/images/portalapi/eventpropagation.png
docs/trunk/referenceGuide/en/images/portalapi/user.event.png
Modified:
docs/trunk/referenceGuide/en/modules/portalapi.xml
Log:
more work on portalapi chatper
Added: docs/trunk/referenceGuide/en/images/portalapi/PortalNodeEvent.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/referenceGuide/en/images/portalapi/PortalNodeEvent.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/referenceGuide/en/images/portalapi/PortalNodeEventContext.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/referenceGuide/en/images/portalapi/PortalNodeEventContext.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/referenceGuide/en/images/portalapi/PortalSessionEvent.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/referenceGuide/en/images/portalapi/PortalSessionEvent.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/referenceGuide/en/images/portalapi/eventpropagation.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/referenceGuide/en/images/portalapi/eventpropagation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/trunk/referenceGuide/en/images/portalapi/user.event.png
===================================================================
(Binary files differ)
Property changes on: docs/trunk/referenceGuide/en/images/portalapi/user.event.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: docs/trunk/referenceGuide/en/modules/portalapi.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/portalapi.xml 2007-04-30 11:20:53 UTC (rev 7145)
+++ docs/trunk/referenceGuide/en/modules/portalapi.xml 2007-04-30 11:39:50 UTC (rev 7146)
@@ -9,10 +9,12 @@
<title>Portal API</title>
<sect1>
<title>Introduction</title>
+
<para>JBoss Portal provides an Application Programming Interface (API) which allows to write code
that interacts with the portal. The life time and validity of the API is tied to the major version which means
that no changes should be required when code is written against the API provided by the JBoss Portal
2.x versions and used in a later version of JBoss Portal 2.x.</para>
+
<para>The Portal API package prefix is <emphasis>org.jboss.portal.api</emphasis> and all the classes
part of the API are prefixed with that package except for two of them which are the <emphasis>org.jboss.portal.Mode</emphasis>
and <emphasis>org.jboss.portal.WindowState</emphasis> classes, the main reason being that twose two classes were defined
@@ -21,6 +23,7 @@
are <emphasis>javax.portlet.PortletMode</emphasis> and <emphasis>javax.portlet.WindowState</emphasis>. Likewise
the Portal API defines similar classes named <emphasis>org.jboss.portal.Mode</emphasis> and
<emphasis>org.jboss.portal.WindowState</emphasis> which offer comparable characteristics, the main differences are:</para>
+
<itemizedlist>
<listitem>Usage of factory methods to obtain instances.</listitem>
<listitem>Classes implements the <emphasis>java.io.Serializable</emphasis> interface.</listitem>
@@ -218,8 +221,12 @@
class can implement in order to receive portal event notifications. It contains the method
<emphasis>void onEvent(PortalEvent event)</emphasis> called by the portal framework.
</para>
+ <para>
+ Listeners declaration requires a service to be deployed in JBoss that will instantiate the service implementation
+ and register it with the service registry. We will see how to achieve that in the example section of this chapter.
+ </para>
<important>
- The event propagation model is to use one instance of a listener class to receive all portal events that
+ The event propagation model uses one instance of a listener class to receive all portal events that
may be routed to that class when appropriate. Therefore implementors needs to be aware of that model
and must provide implementations that are thread safe.
</important>
@@ -228,17 +235,100 @@
<para>Portal node events extends the abstract portal event framework in order to provide notifications
about user interface events happening at runtime. For instance when the portal renders a page or a window,
a corresponding event will be fired.</para>
- <sect3>Portal node event propagation model</sect3>
- <para>
- A portal node event is fired when an event of interest happens to a portal node of the portal tree. The
- notification model is comparable to the <ulink url="http://en.wikipedia.org/wiki/DOM_Events#Event_flow">bubbling propagation model </ulink>
- defined by the DOM specification. When an event is fired, the event is propagated in the hierarchy from the most
- inner node where the event happens to the root node of the tree.
- </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata width="40em" align="center" fileref="images/portalapi/PortalNodeEvent.png" format="png"/>
+ </imageobject>
+ <caption>
+ <para>The portal node event class hierarchy</para>
+ </caption>
+ </mediaobject>
+ <para>The <emphasis>org.jboss.portal.api.node.event.PortalNodeEvent</emphasis> class extends the
+ <emphasis>org.jboss.portal.api.node.PortalEvent</emphasis> class and is the base class for all events
+ of portal nodes. It defines a single method <emphasis>PortalNode getNode()</emphasis> which can be
+ used to retrieve the node targetted by the event.</para>
+ <para>The <emphasis>org.jboss.portal.api.node.event.WindowEvent</emphasis> is an extension for portal nodes
+ of type window. It provides access to the mode and window state of the window. It has 3 subclasses which
+ represent different kind of event that can target windows.</para>
+ <para>The <emphasis>org.jboss.portal.api.node.event.WindowNavigationEvent</emphasis> is fired when the
+ window navigational state changes. For a portlet it means that the window is targetted by an URL of type
+ render.</para>
+ <para>The <emphasis>org.jboss.portal.api.node.event.WindowActionEvent</emphasis> is fired when the
+ window is targetted by an action. For a portlet it means that the window is targetted by an URL of type
+ action.</para>
+ <para>The <emphasis>org.jboss.portal.api.node.event.WindowRenderEvent</emphasis> is fired when the
+ window is going to be rendered by the portal.</para>
+ <para>The <emphasis>org.jboss.portal.api.node.event.PageEvent</emphasis> is an extension for portal nodes
+ of type page.</para>
+ <para>The <emphasis>org.jboss.portal.api.node.event.PageRenderEvent</emphasis> is fired when the
+ page is going to be rendered by the portal.</para>
+ <sect3>
+ <title>Portal node event propagation model</title>
+ <para>
+ A portal node event is fired when an event of interest happens to a portal node of the portal tree. The
+ notification model is comparable to the <ulink url="http://en.wikipedia.org/wiki/DOM_Events#Event_flow">bubbling propagation model </ulink>
+ defined by the DOM specification. When an event is fired, the event is propagated in the hierarchy from the most
+ inner node where the event happens to the root node of the tree.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata width="40em" align="center" fileref="images/portalapi/eventpropagation.png" format="png"/>
+ </imageobject>
+ <caption>
+ <para>The portal node event propagation model</para>
+ </caption>
+ </mediaobject>
+ </sect3>
+ <sect3>
+ <title>Portal node event listener</title>
+ <para>The <emphasis>org.jboss.portal.api.node.event.PortalNodeEventListener</emphasis> interface should
+ be used instead of the too generic <emphasis>org.jboss.portal.api.event.PortalEventListener</emphasis> when
+ it comes down of listening portal node events. Actually it does not replace it, the <emphasis>PortalEventListener</emphasis>
+ interface semantic allows only traditional event delivering. The <emphasis>PortalNodeEventListener</emphasis>
+ interface is designed to match the bubbling effect during an event delivery.</para>
+ <para>The <emphasis>PortalNodeEvent onEvent(PortalNodeEventContext context, PortalNodeEvent event)</emphasis>
+ declare a <emphasis>PortalNodeEvent</emphasis> as return type. In normal circumstances it will return the
+ null value, however if the method call returns an event then this event should be considered by the portal
+ as behavior replacing the current one.
+ </para>
+ </sect3>
+ <sect3>
+ <title>Portal node event context</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata width="28em" align="center" fileref="images/portalapi/PortalNodeEventContext.png" format="png"/>
+ </imageobject>
+ <caption>
+ <para>The PortalNodeEventContext interface</para>
+ </caption>
+ </mediaobject>
+ <para>The <emphasis>org.jboss.portal.api.node.event.PortalNodeEventContext</emphasis> interface extends
+ the <emphasis>PortalEventContext</emphasis> interface and plays an important role
+ in the event delivery model explained in the previous section. That interface gives full control over the
+ delivery of the event to ascendant nodes in the hierarchy, even more it gives the possiblity to replace
+ the current event being delivered by a new event that will be transformed into the corresponding portal
+ behavior. However there are no guarantees that the portal will turn the returned event into a portal
+ behavior, here the portal provides a best effort policy, indeed sometime it is not possible to achieve
+ the substitution of one event by another.</para>
+ <para>Here the simplest implementation of a listener that does nothing except than correctly passing
+ the control to a parent event listener if there is one.</para>
+ <programlisting><![CDATA[
+public PortalNodeEvent onEvent(PortalNodeEventContext context, PortalNodeEvent event)
+{
+ return context.dispatch();
+}
+]]></programlisting>
+ <para>The method <emphasis>PortalNode getNode()</emphasis> returns the current node being selected
+ during the event bubbler dispatching mechanism.</para>
+ </sect3>
</sect2>
<sect2>
+ <title>Portal session events</title>
+ <para>The life cycle of the session of the portal associated with the user can also raise events.</para>
+ </sect2>
+ <sect2>
<title>Portal user events</title>
- <para>The life cycle of the user can also raise events such as .</para>
+ <para>The life cycle of the user can also raise events such as its authentication.</para>
</sect2>
</sect1>
<sect1>
17 years
JBoss Portal SVN: r7145 - docs/trunk/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2007-04-30 07:20:53 -0400 (Mon, 30 Apr 2007)
New Revision: 7145
Modified:
docs/trunk/referenceGuide/en/modules/configuration.xml
docs/trunk/referenceGuide/en/modules/migration.xml
docs/trunk/referenceGuide/en/modules/tutorials.xml
Log:
corrected formating messed in pdf version
Modified: docs/trunk/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/configuration.xml 2007-04-30 10:52:14 UTC (rev 7144)
+++ docs/trunk/referenceGuide/en/modules/configuration.xml 2007-04-30 11:20:53 UTC (rev 7145)
@@ -145,26 +145,26 @@
</ulink>
.
<programlisting><![CDATA[
- <?xml version='1.0' encoding='utf-8'?>
- <!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
- <hibernate-configuration>
- <session-factory>
- <property name="connection.datasource">java:PortalDS</property>
- <property name="show_sql">false</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
- <property name="cache.use_query_cache">true</property>
-
- <!-- Force the dialect instead of using autodetection -->
- <!--
- <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
- -->
-
- <!-- Mapping files -->
- <mapping resource="conf/hibernate/user/domain.hbm.xml"/>
- </session-factory>
- </hibernate-configuration>
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-configuration PUBLIC
+"-//Hibernate/Hibernate Configuration DTD//EN"
+"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+<session-factory>
+<property name="connection.datasource">java:PortalDS</property>
+<property name="show_sql">false</property>
+<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+<property name="cache.use_query_cache">true</property>
+
+<!-- Force the dialect instead of using autodetection -->
+<!--
+<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+-->
+
+<!-- Mapping files -->
+<mapping resource="conf/hibernate/user/domain.hbm.xml"/>
+</session-factory>
+</hibernate-configuration>
]]></programlisting>
</para>
</sect2>
Modified: docs/trunk/referenceGuide/en/modules/migration.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/migration.xml 2007-04-30 10:52:14 UTC (rev 7144)
+++ docs/trunk/referenceGuide/en/modules/migration.xml 2007-04-30 11:20:53 UTC (rev 7145)
@@ -129,15 +129,15 @@
you will find following configuration:
<programlisting>
<![CDATA[
- <window>
- <window-name>CMSWindow</window-name>
- <content>
- <content-type>cms</content-type>
- <content-uri>/default/index.html</content-uri>
- </content>
- <region>center</region>
- <height>0</height>
- </window>
+<window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/index.html</content-uri>
+ </content>
+ <region>center</region>
+ <height>0</height>
+</window>
]]>
</programlisting>
</para>
Modified: docs/trunk/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/tutorials.xml 2007-04-30 10:52:14 UTC (rev 7144)
+++ docs/trunk/referenceGuide/en/modules/tutorials.xml 2007-04-30 11:20:53 UTC (rev 7145)
@@ -124,7 +124,8 @@
public class HelloWorldPortlet extends GenericPortlet
{
- protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
+ protected void doView(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException
{
rResponse.setContentType("text/html");
PrintWriter writer = rResponse.getWriter();
@@ -194,7 +195,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
+ http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0">
<portlet>
<portlet-name>HelloWorldPortlet</portlet-name>
@@ -459,8 +461,10 @@
<emphasis>hot-deploy</emphasis>
:
<programlisting><![CDATA[
-18:25:56,366 INFO [Server] JBoss (MX MicroKernel) [4.0.3SP1 (build: CVSTag=JBoss_4_0_3_SP1 date=200510231054)] Started in 1m:3s:688ms
-18:26:21,147 INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet, warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]></programlisting>
+18:25:56,366 INFO [Server] JBoss (MX MicroKernel) [4.0.3SP1 (build:
+ CVSTag=JBoss_4_0_3_SP1 date=200510231054)] Started in 1m:3s:688ms
+18:26:21,147 INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet,
+ warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]></programlisting>
Pointing your browser to
<ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>
, should yield a view of our HelloWorldPortlet:
@@ -529,7 +533,8 @@
public class HelloWorldJSPPortlet extends GenericPortlet
{
- protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
+ protected void doView(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException
{
rResponse.setContentType("text/html");
@@ -538,17 +543,20 @@
if(sYourName != null)
{
rRequest.setAttribute("yourname", sYourName);
- PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/view2.jsp");
+ PortletRequestDispatcher prd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/view2.jsp");
prd.include(rRequest, rResponse);
}
else
{
- PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/view.jsp");
+ PortletRequestDispatcher prd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/view.jsp");
prd.include(rRequest, rResponse);
}
}
- public void processAction(ActionRequest aRequest, ActionResponse aResponse) throws PortletException, IOException, UnavailableException
+ public void processAction(ActionRequest aRequest, ActionResponse aResponse)
+ throws PortletException, IOException, UnavailableException
{
String sYourname = (String) aRequest.getParameter("yourname");
@@ -557,17 +565,21 @@
aResponse.setRenderParameter("yourname", sYourname);
}
- protected void doHelp(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
+ protected void doHelp(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException
{
rResponse.setContentType("text/html");
- PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/help.jsp");
+ PortletRequestDispatcher prd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/help.jsp");
prd.include(rRequest, rResponse);
}
- protected void doEdit(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
+ protected void doEdit(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException
{
rResponse.setContentType("text/html");
- PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/edit.jsp");
+ PortletRequestDispatcher prd = getPortletContext()
+ .getRequestDispatcher("/WEB-INF/jsp/edit.jsp");
prd.include(rRequest, rResponse);
}
}]]>
@@ -590,7 +602,8 @@
<listitem>
<para>
<programlisting><![CDATA[
-public void processAction(ActionRequest aRequest, ActionResponse aResponse) throws PortletException, IOException, UnavailableException
+public void processAction(ActionRequest aRequest, ActionResponse aResponse)
+ throws PortletException, IOException, UnavailableException
{
String sYourname = (String) aRequest.getParameter("yourname");
@@ -613,7 +626,8 @@
<listitem>
<para>
<programlisting><![CDATA[
-protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
+protected void doView(RenderRequest rRequest, RenderResponse rResponse)
+ throws PortletException, IOException, UnavailableException
]]></programlisting>
In this case, our doView, is responsible for dispatching to the appropriate jsp
<emphasis>view.jsp</emphasis>
@@ -655,7 +669,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
+ http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0">
<portlet>
<portlet-name>HelloWorldJSPPortlet</portlet-name>
@@ -717,17 +732,19 @@
<portlet:defineObjects/>
<div align="center">
- This is a simple HelloWorld JSP Portlet. Type in a name and it will dispatch to the view2.jsp to print out your name.
+ This is a simple HelloWorld JSP Portlet. Type in a name and it will dispatch
+ to the view2.jsp to print out your name.
<br/>
- <form action="<portlet:actionURL><portlet:param name="page" value="mainview"/></portlet:actionURL>"
- method="POST">
+ <form action="<portlet:actionURL><portlet:param name="page" value="mainview"/>
+ </portlet:actionURL>" method="POST">
Name:<br/>
<input type="text" name="yourname"/>
</form>
<br/>
You can also link to other pages, using a renderURL, like <a
- href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo"></portlet:param></portlet:renderURL>">this</a>.
+ href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo">
+ </portlet:param></portlet:renderURL>">this</a>.
</div>]]></programlisting>
<itemizedlist>
<listitem>
@@ -749,7 +766,10 @@
</listitem>
<listitem>
<para>
- <programlisting><![CDATA[<form action="<portlet:actionURL><portlet:param name="page" value="mainview"/></portlet:actionURL>" method="POST">]]></programlisting>
+ <programlisting><![CDATA[
+<form action="<portlet:actionURL><portlet:param name="page" value="mainview"/>
+ </portlet:actionURL>" method="POST">]]>
+ </programlisting>
We create an HTML form, but generate the URL it will post to, using the portlet tag library. In
this case, notice how we are creating an
<emphasis>actionURL</emphasis>
@@ -761,7 +781,9 @@
<listitem>
<para>
<programlisting><![CDATA[
-<a href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo"></portlet:param></portlet:renderURL>">]]></programlisting>
+<a href="<portlet:renderURL><portlet:param name="yourname" value="Roy Russo">
+</portlet:param></portlet:renderURL>">]]>
+ </programlisting>
Likewise, we are able to create a link to our
<emphasis>doView</emphasis>
, by simply creating it with a
@@ -832,8 +854,11 @@
<emphasis>hot-deploy</emphasis>
:
<programlisting><![CDATA[
-15:54:34,234 INFO [Server] JBoss (MX MicroKernel) [4.0.4.CR2 (build: CVSTag=JBoss_4_0_4_CR2 date=200603311500)] Started in 1m:9s:766ms
-15:55:04,062 INFO [TomcatDeployer] deploy, ctxPath=/helloworldjspportlet, warUrl=.../tmp/deploy/tmp57782helloworldjspportlet-exp.war/]]></programlisting>
+15:54:34,234 INFO [Server] JBoss (MX MicroKernel) [4.0.4.CR2 (build:
+ CVSTag=JBoss_4_0_4_CR2 date=200603311500)]
+ Started in 1m:9s:766ms
+15:55:04,062 INFO [TomcatDeployer] deploy, ctxPath=/helloworldjspportlet,
+ warUrl=.../tmp/deploy/tmp57782helloworldjspportlet-exp.war/]]></programlisting>
Pointing your browser to
<ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>
, should yield a view of our HelloWorldPortlet:
@@ -913,7 +938,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
+ http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0">
<portlet>
<portlet-name>HelloWorldJSFPortlet</portlet-name>
@@ -1051,13 +1077,22 @@
<emphasis>hot-deploy</emphasis>
:
<programlisting><![CDATA[
-22:30:03,093 INFO [TomcatDeployer] deploy, ctxPath=/helloworldjsfportlet, warUrl=.../tmp/deploy/tmp5571helloworldjsfportlet-exp.war/
-22:30:03,312 INFO [FacesConfigurator] Reading standard config org/apache/myfaces/resource/standard-faces-config.xml
-22:30:03,390 INFO [FacesConfigurator] Reading config jar:file:/C:/jboss-4.0.4.CR2/server/default/tmp/deploy/tmp5504jboss-portal.sar-contents/lib/jsf-facelets.jar!/META-INF/faces-config.xml
-22:30:03,406 INFO [FacesConfigurator] Reading config jar:file:/C:/jboss-4.0.4.CR2/server/default/tmp/deploy/tmp5504jboss-portal.sar-contents/lib/tomahawk.jar!/META-INF/faces-config.xml
+22:30:03,093 INFO [TomcatDeployer] deploy, ctxPath=/helloworldjsfportlet,
+ warUrl=.../tmp/deploy/tmp5571helloworldjsfportlet-exp.war/
+22:30:03,312 INFO [FacesConfigurator] Reading standard config
+ org/apache/myfaces/resource/standard-faces-config.xml
+22:30:03,390 INFO [FacesConfigurator] Reading config
+ jar:file:/C:/jboss-4.0.4.CR2/server/default/tmp/deploy/
+ tmp5504jboss-portal.sar-contents/lib/jsf-facelets.jar!/
+ META-INF/faces-config.xml
+22:30:03,406 INFO [FacesConfigurator] Reading config jar:file:/C:/jboss-4.0.4.CR2/
+ server/default/tmp/deploy/tmp5504jboss-portal.sar-contents/
+ lib/tomahawk.jar!/META-INF/faces-config.xml
22:30:03,468 INFO [FacesConfigurator] Reading config /WEB-INF/faces-config.xml
22:30:03,484 ERROR [LocaleUtils] Locale name null or empty, ignoring
-22:30:03,640 INFO [MyFacesGenericPortlet] PortletContext 'C:\jboss-4.0.4.CR2\server\default\.\tmp\deploy\tmp5571helloworldjsfportlet-exp.war\' initialized.]]></programlisting>
+22:30:03,640 INFO [MyFacesGenericPortlet] PortletContext 'C:\jboss-4.0.4.CR2\server\
+ default\.\tmp\deploy\tmp5571helloworldjsfportlet-exp.war\'
+ initialized.]]></programlisting>
Pointing your browser to
<ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>
, should yield a view of our HelloWorldJSFPortlet:
17 years
JBoss Portal SVN: r7144 - docs/trunk/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-30 06:52:14 -0400 (Mon, 30 Apr 2007)
New Revision: 7144
Modified:
docs/trunk/referenceGuide/en/modules/acknowledgements.xml
Log:
Update
Modified: docs/trunk/referenceGuide/en/modules/acknowledgements.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/acknowledgements.xml 2007-04-30 10:45:43 UTC (rev 7143)
+++ docs/trunk/referenceGuide/en/modules/acknowledgements.xml 2007-04-30 10:52:14 UTC (rev 7144)
@@ -1,21 +1,15 @@
<preface id="acknowledgements">
<title>Acknowledgements</title>
- <para>We would like to thank
- <emphasis role="bold">all</emphasis>
- the developers that participate
- in the JBoss Portal project effort.
- </para>
+ <para>We would like to thank the developers that participate in the JBoss Portal project effort.</para>
<para>Specifically,</para>
<para>
- <orderedlist>
- <listitem>Thomas Heute, for his help on the first-ever version of JBoss Portal and the corresponding
- documentation. ;-)</listitem>
+ <itemizedlist>
<listitem>
- Remy for his help with Tomcat configuration.
+ Antoine Herzog for his feedback, for writing Wikis and helping in the forums.
</listitem>
<listitem>
Mark Fernandes and Paul Tamaro from Novell, for their hard work in supplying the
- portal project with usable and attractive themes and layouts.
+ portal project with usable and attractive themes and layouts in the 2.4 version of JBoss Portal
</listitem>
<listitem>
Kev "kevs3d" Roast for supplying us with two working portlets that integrate existing
@@ -25,14 +19,21 @@
Swarn "sdhaliwal" Dhaliwal for supplying us with the Struts-Bridge, that will allow
for existing struts applications to work with the Portal.
</listitem>
- <listitem>Julien Viet for creating a scalable and flexible architecture... and putting up with all of my crazy
- ideas.</listitem>
- </orderedlist>
+ <listitem>
+ A few Red Hat employees, Remy Maucherat for Tomcat configuration, Magesh Kumar Bojan and Martin Putz always there to help our customers,
+ Prabhat Jha for making sure that JBoss Portal runs great everywhere. Noel Rocher for his early feedback on JBoss Portal 2.6
+ and contributions.
+ </listitem>
+ <listitem>
+ The JBoss Labs (http://www.JBoss.org) team for building a great infrastructure on top of JBoss Portal 2.6, providing very useful feedback and
+ giving us the initial Drag and Drop implementation.
+ </listitem>
+ <listitem>
+ Everyone participating in the forums and Wiki in general.
+ </listitem>
+ </itemizedlist>
</para>
<para>Contributions of any kind are always welcome, you can contribute by providing ideas,
filling bug reports, producing some code, designing a theme, writing some documentation,
- etc... To report a bug please use our
- <ulink url="http://jira.jboss.com/jira/browse/JBPORTAL">Jira system</ulink>
- .
- </para>
+ etc... If you think your name is missing from this page, please let us know.</para>
</preface>
\ No newline at end of file
17 years
JBoss Portal SVN: r7143 - docs/trunk/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2007-04-30 06:45:43 -0400 (Mon, 30 Apr 2007)
New Revision: 7143
Modified:
docs/trunk/referenceGuide/en/modules/authentication.xml
docs/trunk/referenceGuide/en/modules/identity.xml
docs/trunk/referenceGuide/en/modules/ldap.xml
Log:
corrected code listing wrappings in identity docs
Modified: docs/trunk/referenceGuide/en/modules/authentication.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/authentication.xml 2007-04-30 10:00:03 UTC (rev 7142)
+++ docs/trunk/referenceGuide/en/modules/authentication.xml 2007-04-30 10:45:43 UTC (rev 7143)
@@ -94,7 +94,7 @@
file must be comparably hashed.
</listitem>
<listitem>
- <emphasis role="bold">hashEncoding</emphasis> - The string format for the hashed pass and must be either "base64" or "hex". Base64 is the default.
+ <emphasis role="bold">hashEncoding</emphasis> - The string format for the hashed pass and st be either "base64" or "hex". Base64 is the default.
</listitem>
<listitem>
<emphasis role="bold">additionalRole</emphasis> - additional user <emphasis>Principal</emphasis> that will be added to user <emphasis>Subject</emphasis>.
@@ -105,14 +105,21 @@
Configuration using portal database will look like this:
<programlisting>
<![CDATA[
- <login-module code = "org.jboss.portal.identity.auth.DBIdentityLoginModule" flag="sufficient">
- <module-option name="dsJndiName">java:/PortalDS</module-option>
- <module-option name="principalsQuery">SELECT jbp_password FROM jbp_users WHERE jbp_uname=?</module-option>
- <module-option name="rolesQuery">SELECT jbp_roles.jbp_name, 'Roles' FROM jbp_role_membership INNER JOIN jbp_roles ON jbp_role_membership.jbp_rid = jbp_roles.jbp_rid INNER JOIN jbp_users ON jbp_role_membership.jbp_uid = jbp_users.jbp_uid WHERE jbp_users.jbp_uname=?</module-option>
- <module-option name="hashAlgorithm">MD5</module-option>
- <module-option name="hashEncoding">HEX</module-option>
- <module-option name="additionalRole">Authenticated</module-option>
- </login-module>
+<login-module code = "org.jboss.portal.identity.auth.DBIdentityLoginModule"
+ flag="sufficient">
+ <module-option name="dsJndiName">java:/PortalDS</module-option>
+ <module-option name="principalsQuery">
+ SELECT jbp_password FROM jbp_users WHERE jbp_uname=?
+ </module-option
+ <module-option name="rolesQuery">
+ SELECT jbp_roles.jbp_name, 'Roles' FROM jbp_role_membership INNER JOIN
+ jbp_roles ON jbp_role_membership.jbp_rid = jbp_roles.jbp_rid INNER JOIN jbp_users ON
+ jbp_role_membership.jbp_uid = jbp_users.jbp_uid WHERE jbp_users.jbp_uname=?
+ </module-option>
+ <module-option name="hashAlgorithm">MD5</module-option>
+ <module-option name="hashEncoding">HEX</module-option>
+ <module-option name="additionalRole">Authenticated</module-option>
+</login-module>
]]>
</programlisting>
</para>
@@ -170,17 +177,22 @@
made around <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=LdapExtLoginModule">LdapExtLoginModule</ulink> from JBossSX.
Sample configuration can look like this:</para>
<programlisting><![CDATA[
- <login-module code="org.jboss.portal.identity.auth.SynchronizingLDAPExtLoginModule" flag="required">
+ <login-module code="org.jboss.portal.identity.auth.SynchronizingLDAPExtLoginModule"
+ flag="required">
<module-option name="synchronizeIdentity">true</module-option>
<module-option name="synchronizeRoles">true</module-option>
<module-option name="additionalRole">Authenticated</module-option>
<module-option name="defaultAssignedRole">User</module-option>
<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
- <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
- <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
- <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
- <module-option name="java.naming.provider.url">ldap://example.com:10389/</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule
+ </module-option>
+ <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule
+ </module-option>
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory
+ </module-option>
+ <module-option name="java.naming.provider.url">ldap://example.com:10389/
+ </module-option>
<module-option name="java.naming.security.authentication">simple</module-option>
<module-option name="bindDN">cn=Directory Manager</module-option>
<module-option name="bindCredential">secret</module-option>
Modified: docs/trunk/referenceGuide/en/modules/identity.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/identity.xml 2007-04-30 10:00:03 UTC (rev 7142)
+++ docs/trunk/referenceGuide/en/modules/identity.xml 2007-04-30 10:45:43 UTC (rev 7143)
@@ -6,7 +6,7 @@
<email>boleslaw dot dawidowicz at redhat dot com</email>
</author>
</chapterinfo>
- <title>JBoss Portal Identity management</title>
+ <title>JBoss Portal Identity Management</title>
<para>This chapter addresses identity management in JBoss Portal 2.6</para>
<sect1 id="management_api">
<title>Identity management API</title>
@@ -80,25 +80,32 @@
</para>
<programlisting><![CDATA[
/**Retrieve a user by its name.*/
-User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException;
+User findUserByUserName(String userName)
+ throws IdentityException, IllegalArgumentException, NoSuchUserException;
/**Retrieve a user by its id.*/
-User findUserById(Object id) throws IdentityException, IllegalArgumentException, NoSuchUserException;
+User findUserById(Object id)
+ throws IdentityException, IllegalArgumentException, NoSuchUserException;
/**Retrieve a user by its id.*/
-User findUserById(String id) throws IdentityException, IllegalArgumentException, NoSuchUserException;
+User findUserById(String id)
+ throws IdentityException, IllegalArgumentException, NoSuchUserException;
/** Creates a new user with the specified name.*/
-User createUser(String userName, String password) throws IdentityException, IllegalArgumentException;
+User createUser(String userName, String password)
+ throws IdentityException, IllegalArgumentException;
/** Remove a user.*/
-void removeUser(Object id) throws IdentityException, IllegalArgumentException;
+void removeUser(Object id)
+ throws IdentityException, IllegalArgumentException;
/** Get a range of users.*/
-Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException;
+Set findUsers(int offset, int limit)
+ throws IdentityException, IllegalArgumentException;
/** Get a range of users.*/
-Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException;
+Set findUsersFilteredByUserName(String filter, int offset, int limit)
+ throws IdentityException, IllegalArgumentException;
/**Returns the number of users.*/
int getUserCount() throws IdentityException, IllegalArgumentException;
@@ -111,47 +118,62 @@
</para>
<programlisting><![CDATA[
/** Retrieves a role by its name*/
-Role findRoleByName(String name) throws IdentityException, IllegalArgumentException;
+Role findRoleByName(String name)
+ throws IdentityException, IllegalArgumentException;
/**Retrieve a collection of role from the role names.*/
-Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException;
+Set findRolesByNames(String[] names)
+ throws IdentityException, IllegalArgumentException;
/** Retrieves a role by its id.*/
-Role findRoleById(Object id) throws IdentityException, IllegalArgumentException;
+Role findRoleById(Object id)
+ throws IdentityException, IllegalArgumentException;
/** Retrieves a role by its id.*/
-Role findRoleById(String id) throws IdentityException, IllegalArgumentException;
+Role findRoleById(String id)
+ throws IdentityException, IllegalArgumentException;
/** Create a new role with the specified name.*/
-Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException;
+Role createRole(String name, String displayName)
+ throws IdentityException, IllegalArgumentException;
/** Remove a role.*/
-void removeRole(Object id) throws IdentityException, IllegalArgumentException;
+void removeRole(Object id)
+ throws IdentityException, IllegalArgumentException;
/** Returns the number of roles. */
-int getRolesCount() throws IdentityException;
+int getRolesCount()
+ throws IdentityException;
/** Get all the roles */
-Set findRoles() throws IdentityException;/** Retrieves a role by its name*/
-Role findRoleByName(String name) throws IdentityException, IllegalArgumentException;
+Set findRoles()
+ throws IdentityException;/** Retrieves a role by its name*/
+Role findRoleByName(String name)
+ throws IdentityException, IllegalArgumentException;
/**Retrieve a collection of role from the role names.*/
-Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException;
+Set findRolesByNames(String[] names)
+ throws IdentityException, IllegalArgumentException;
/** Retrieves a role by its id.*/
-Role findRoleById(Object id) throws IdentityException, IllegalArgumentException;
+Role findRoleById(Object id)
+ throws IdentityException, IllegalArgumentException;
/** Retrieves a role by its id.*/
-Role findRoleById(String id) throws IdentityException, IllegalArgumentException;
+Role findRoleById(String id)
+ throws IdentityException, IllegalArgumentException;
/** Create a new role with the specified name.*/
-Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException;
+Role createRole(String name, String displayName)
+ throws IdentityException, IllegalArgumentException;
/** Remove a role.*/
-void removeRole(Object id) throws IdentityException, IllegalArgumentException;
+void removeRole(Object id)
+ throws IdentityException, IllegalArgumentException;
/** Returns the number of roles. */
-int getRolesCount() throws IdentityException;
+int getRolesCount()
+ throws IdentityException;
/** Get all the roles */
Set findRoles() throws IdentityException;
@@ -172,14 +194,18 @@
Set getUsers(Role role) throws IdentityException, IllegalArgumentException;
-/** Creates a relationship beetween a role and set of users. Other roles that have assotiontions with those users remain unaffected.*/
+/** Creates a relationship beetween a role and set of users. Other roles that have
+ assotiontions with those users remain unaffected.*/
void assignUsers(Role role, Set users) throws IdentityException, IllegalArgumentException;
-/** Creates a relationship beetween a user and set of roles. This operation will erase any other assotientions beetween the user and roles not specified in the provided set.*/
+/** Creates a relationship beetween a user and set of roles. This operation will erase any
+ other assotientions beetween the user and roles not specified in the provided set.*/
void assignRoles(User user, Set roles) throws IdentityException, IllegalArgumentException;
-/** Returns role members based on rolename - depreciated method ethod here only for compatibility with old RoleModule interface */
-Set findRoleMembers(String roleName, int offset, int limit, String userNameFilter) throws IdentityException, IllegalArgumentException;
+/** Returns role members based on rolename - depreciated method ethod here only
+ for compatibility with old RoleModule interface */
+Set findRoleMembers(String roleName, int offset, int limit, String userNameFilter)
+ throws IdentityException, IllegalArgumentException;
]]></programlisting>
</listitem>
<listitem>
@@ -188,13 +214,17 @@
interface exposes operations to access and manage informations stored in User profile:
</para>
<programlisting><![CDATA[
-public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException;
+public Object getProperty(User user, String propertyName)
+ throws IdentityException, IllegalArgumentException;
-public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException;
+public void setProperty(User user, String name, Object property)
+ throws IdentityException, IllegalArgumentException;
-public Map getProperties(User user) throws IdentityException, IllegalArgumentException;
+public Map getProperties(User user)
+ throws IdentityException, IllegalArgumentException;
-public ProfileInfo getProfileInfo() throws IdentityException;
+public ProfileInfo getProfileInfo()
+ throws IdentityException;
]]></programlisting>
<warning>
UserProfileModule.getProperty() method returns an Object.
@@ -277,7 +307,10 @@
get the <emphasis role="bold">IdentityServiceController</emphasis>
mbean. You may want to inject it into your services like this:
</para>
- <programlisting><![CDATA[<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends>]]></programlisting>
+ <programlisting><![CDATA[
+<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">
+ portal:service=Module,type=IdentityServiceController
+</depends>]]></programlisting>
<para>
or simply obtain in your code by doing a lookup using
the <emphasis role="bold">portal:service=Module,type=IdentityServiceController</emphasis>
@@ -286,11 +319,19 @@
</para>
<programlisting>
-(UserModule)identityServiceController.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE);
-(RoleModule)identityServiceController.getIdentityContext().getObject(IdentityContext.TYPE_ROLE_MODULE);
-(MembershipModule)identityServiceController.getIdentityContext().getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
-(UserProfileModule)identityServiceController.getIdentityContext().getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);</programlisting>
+(UserModule)identityServiceController.getIdentityContext()
+ .getObject(IdentityContext.TYPE_USER_MODULE);
+(RoleModule)identityServiceController.getIdentityContext()
+ .getObject(IdentityContext.TYPE_ROLE_MODULE);
+
+(MembershipModule)identityServiceController.getIdentityContext()
+ .getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
+
+(UserProfileModule)identityServiceController.getIdentityContext()
+ .getObject(IdentityContext.TYPE_USER_PROFILE_MODULE);
+ </programlisting>
+
</sect2>
<sect2>
<title>API changes since 2.4</title>
@@ -317,7 +358,8 @@
// Instead of: user.setEnabled(value)
userProfileModule.setProperty(user, User.INFO_USER_ENABLED, value);
-// In a similar way you should change rest of methods that are missing in User interface in 2.6 by the call to the UserProfileModule
+// In a similar way you should change rest of methods that are missing in User interface
+// in 2.6 by the call to the UserProfileModule
// Instead of: user.getProperties()
userProfileModule.getProperties(user);
@@ -355,8 +397,10 @@
</para>
<programlisting><![CDATA[
// Instead of
-// RoleModule.findRoleMembers(String roleName, int offset, int limit, String userNameFilter) throws IdentityException;
-membershipModule.findRoleMembers(String roleName, int offset, int limit, String userNameFilter)
+// RoleModule.findRoleMembers(String roleName, int offset, int limit, String userNameFilter)
+// throws IdentityException;
+membershipModule.findRoleMembers(String roleName, int offset, int limit,
+ String userNameFilter)
// Instead of
// RoleModule.setRoles(User user, Set roles) throws IdentityException;
@@ -406,7 +450,6 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
- <!--<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>-->
<attribute name="JndiName">java:/portal/IdentityServiceController</attribute>
<attribute name="RegisterMBeans">true</attribute>
<attribute name="ConfigFile">conf/identity/identity-config.xml</attribute>
@@ -777,7 +820,7 @@
</sect1>
<sect1>
<title>Identity modules implementations</title>
- <note>Identity modules implementations related to LDAP are described in this <link linkend="ldap.ldap_identity_modules">section</link></note>
+ <note>Identity modules implementations related to LDAP are described in <link linkend="ldap.ldap_identity_modules">LDAP</link> chapter</note>
<sect2>
<title>Database modules</title>
<para>JBoss portal comes with a set of database related identity modules implementations done using Hibernate - those are configured
Modified: docs/trunk/referenceGuide/en/modules/ldap.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/ldap.xml 2007-04-30 10:00:03 UTC (rev 7142)
+++ docs/trunk/referenceGuide/en/modules/ldap.xml 2007-04-30 10:45:43 UTC (rev 7143)
@@ -29,7 +29,6 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>portal:service=Hibernate</depends>
- <!--<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>-->
<attribute name="JndiName">java:/portal/IdentityServiceController</attribute>
<attribute name="RegisterMBeans">true</attribute>
<attribute name="ConfigFile">conf/identity/identity-config.xml</attribute>
@@ -476,11 +475,12 @@
<note>In <emphasis>UserModule</emphasis> there are two methods that handle offset/limit (pagination) behaviour.
<programlisting>
<![CDATA[
- /** Get a range of users.*/
- Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException;
+/** Get a range of users.*/
+Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException;
- /** Get a range of users.*/
- Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException;
+/** Get a range of users.*/
+Set findUsersFilteredByUserName(String filter, int offset, int limit)
+ throws IdentityException, IllegalArgumentException;
]]>
</programlisting>
Pagination support is not widely implemented in LDAP servers. Because <emphasis>UserModule</emphasis>
@@ -1035,7 +1035,8 @@
<!-- For the JCR CMS -->
<application-policy name="cms">
<authentication>
- <login-module code="org.apache.jackrabbit.core.security.SimpleLoginModule" flag="required"/>
+ <login-module code="org.apache.jackrabbit.core.security.SimpleLoginModule"
+ flag="required"/>
</authentication>
</application-policy>
@@ -1043,8 +1044,10 @@
<authentication>
<login-module code="org.jboss.security.auth.spi.LdapExtLoginModule" flag="required">
- <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
- <module-option name="java.naming.provider.url">ldap://example.com:10389/</module-option>
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory
+ </module-option>
+ <module-option name="java.naming.provider.url">ldap://example.com:10389/
+ </module-option>
<module-option name="java.naming.security.authentication">simple</module-option>
<module-option name="bindDN">cn=Directory Manager</module-option>
<module-option name="bindCredential">lolo</module-option>
@@ -1059,15 +1062,18 @@
<module-option name="allowEmptyPasswords">false</module-option>
</login-module>
- <login-module code="org.jboss.portal.identity.auth.SynchronizingLoginModule" flag="optional">
+ <login-module code="org.jboss.portal.identity.auth.SynchronizingLoginModule"
+ flag="optional">
<module-option name="synchronizeIdentity">true</module-option>
<module-option name="synchronizeRoles">true</module-option>
<module-option name="additionalRole">Authenticated</module-option>
<module-option name="defaultAssignedRole">User</module-option>
<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
- <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
- <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule
+ </module-option>
+ <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule
+ </module-option>
</login-module>
</authentication>
@@ -1169,7 +1175,7 @@
<entry align="center"><emphasis>Not Supported</emphasis></entry>
<entry align="center"><emphasis>Supported</emphasis></entry>
</row>
- <row>
+ <!--<row>
<entry>Microsoft Active Directory</entry>
<entry align="center">?</entry>
<entry align="center">?</entry>
@@ -1198,7 +1204,7 @@
<entry align="center">?</entry>
<entry align="center">?</entry>
<entry align="center">?</entry>
- </row>
+ </row>-->
</tbody>
</tgroup>
</table>
17 years
JBoss Portal SVN: r7142 - docs/trunk/referenceGuide/en.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2007-04-30 06:00:03 -0400 (Mon, 30 Apr 2007)
New Revision: 7142
Modified:
docs/trunk/referenceGuide/en/master.xml
Log:
update docs title to 2.6CR2
Modified: docs/trunk/referenceGuide/en/master.xml
===================================================================
--- docs/trunk/referenceGuide/en/master.xml 2007-04-30 09:33:21 UTC (rev 7141)
+++ docs/trunk/referenceGuide/en/master.xml 2007-04-30 10:00:03 UTC (rev 7142)
@@ -30,9 +30,9 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6CR1</title>
+ <title>JBoss Portal 2.6CR2</title>
<subtitle>Reference Guide</subtitle>
- <releaseinfo>Release 2.6CR1 "Ninja"</releaseinfo>
+ <releaseinfo>Release 2.6CR2 "Ninja"</releaseinfo>
<releaseinfo>April 2007</releaseinfo>
<author>
<firstname>Thomas</firstname>
17 years
JBoss Portal SVN: r7141 - docs/trunk/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-30 05:33:21 -0400 (Mon, 30 Apr 2007)
New Revision: 7141
Modified:
docs/trunk/referenceGuide/en/modules/portalapi.xml
Log:
Typo
Modified: docs/trunk/referenceGuide/en/modules/portalapi.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/portalapi.xml 2007-04-30 09:31:30 UTC (rev 7140)
+++ docs/trunk/referenceGuide/en/modules/portalapi.xml 2007-04-30 09:33:21 UTC (rev 7141)
@@ -160,7 +160,7 @@
]]></programlisting>
</sect1>
<sect1>
- <title>Portal navitational state</title>
+ <title>Portal navigational state</title>
<para>The navigational state is a state managed by the portal that associates to each user the state triggered
by its navigation. A well known part of the navigational state are the render parameters provided at runtime
during the call of the method <emphasis>void render(RenderRequest req, RenderResponse resp)</emphasis>. The portal
17 years
JBoss Portal SVN: r7140 - in trunk/core/src: resources/portal-server-war/WEB-INF and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-30 05:31:30 -0400 (Mon, 30 Apr 2007)
New Revision: 7140
Added:
trunk/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java
Removed:
trunk/core/src/main/org/jboss/portal/core/impl/api/event/EventBridge.java
Modified:
trunk/core/src/resources/portal-server-war/WEB-INF/web.xml
Log:
renamed EventBridge to ServletEventBridge as we bridge servlet events to portal events
Deleted: trunk/core/src/main/org/jboss/portal/core/impl/api/event/EventBridge.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/api/event/EventBridge.java 2007-04-30 09:25:49 UTC (rev 7139)
+++ trunk/core/src/main/org/jboss/portal/core/impl/api/event/EventBridge.java 2007-04-30 09:31:30 UTC (rev 7140)
@@ -1,145 +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.impl.api.event;
-
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.portal.api.event.PortalEvent;
-import org.jboss.portal.api.event.PortalEventContext;
-import org.jboss.portal.api.event.PortalEventListener;
-import org.jboss.portal.api.user.event.UserAuthenticationEvent;
-import org.jboss.portal.api.session.event.PortalSessionEvent;
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
-import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl;
-import org.jboss.portal.core.impl.api.event.PortalEventContextImpl;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpSessionAttributeListener;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-import java.util.Iterator;
-
-/**
- * Bridge
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class EventBridge implements HttpSessionListener, ServletContextListener, HttpSessionAttributeListener
-{
-
- /** . */
- private PortalEventListenerRegistry listenerRegistry;
-
- // ServletContextListener implementation ****************************************************************************
-
- public void contextInitialized(ServletContextEvent event)
- {
- try
- {
- listenerRegistry = (PortalEventListenerRegistry)MBeanProxy.get(PortalEventListenerRegistry.class, ObjectNameFactory.create("portal:service=ListenerRegistry"), MBeanServerLocator.locateJBoss());
- }
- catch (MBeanProxyCreationException e)
- {
- e.printStackTrace();
- }
- }
-
- public void contextDestroyed(ServletContextEvent event)
- {
- listenerRegistry = null;
- }
-
- // HttpSessionListener implementation *******************************************************************************
-
- public void sessionCreated(HttpSessionEvent event)
- {
- PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession());
- PortalEventContextImpl uec = new PortalEventContextImpl(rt);
- PortalSessionEvent use = new PortalSessionEvent(PortalSessionEvent.SESSION_CREATED);
- fireEvent(uec, use);
- }
-
- public void sessionDestroyed(HttpSessionEvent event)
- {
- PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession());
- PortalEventContextImpl uec = new PortalEventContextImpl(rt);
- PortalSessionEvent use = new PortalSessionEvent(PortalSessionEvent.SESSION_DESTROYED);
- fireEvent(uec, use);
- }
-
- // HttpSessionAttributeListener implementation **********************************************************************
-
-
- public void attributeAdded(HttpSessionBindingEvent event)
- {
- if ("PRINCIPAL_TOKEN".equals(event.getName()))
- {
- String userId = (String)event.getValue();
- PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession(), userId);
- PortalEventContextImpl uec = new PortalEventContextImpl(rt);
- UserAuthenticationEvent uae = new UserAuthenticationEvent(userId, UserAuthenticationEvent.SIGN_IN);
- fireEvent(uec, uae);
- }
- }
-
- public void attributeRemoved(HttpSessionBindingEvent event)
- {
- if ("PRINCIPAL_TOKEN".equals(event.getName()))
- {
- String userId = (String)event.getValue();
- PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession(), userId);
- PortalEventContextImpl uec = new PortalEventContextImpl(rt);
- UserAuthenticationEvent uae = new UserAuthenticationEvent(userId, UserAuthenticationEvent.SIGN_OUT);
- fireEvent(uec, uae);
- }
- }
-
- public void attributeReplaced(HttpSessionBindingEvent event)
- {
- }
-
- private void fireEvent(PortalEventContext eventContext, PortalEvent event)
- {
- for (Iterator i = listenerRegistry.getListeners().iterator(); i.hasNext();)
- {
- Object o = i.next();
- if (o instanceof PortalEventListener)
- {
- PortalEventListener listener = (PortalEventListener)o;
- try
- {
- listener.onEvent(eventContext, event);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
- }
- }
-}
Copied: trunk/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java (from rev 7134, trunk/core/src/main/org/jboss/portal/core/impl/api/event/EventBridge.java)
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java (rev 0)
+++ trunk/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java 2007-04-30 09:31:30 UTC (rev 7140)
@@ -0,0 +1,145 @@
+/******************************************************************************
+ * 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.api.event;
+
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.ObjectNameFactory;
+import org.jboss.portal.api.event.PortalEvent;
+import org.jboss.portal.api.event.PortalEventContext;
+import org.jboss.portal.api.event.PortalEventListener;
+import org.jboss.portal.api.user.event.UserAuthenticationEvent;
+import org.jboss.portal.api.session.event.PortalSessionEvent;
+import org.jboss.portal.core.event.PortalEventListenerRegistry;
+import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl;
+import org.jboss.portal.core.impl.api.event.PortalEventContextImpl;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.http.HttpSessionAttributeListener;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+import java.util.Iterator;
+
+/**
+ * Bridge servlet event to portal events.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class ServletEventBridge implements HttpSessionListener, ServletContextListener, HttpSessionAttributeListener
+{
+
+ /** . */
+ private PortalEventListenerRegistry listenerRegistry;
+
+ // ServletContextListener implementation ****************************************************************************
+
+ public void contextInitialized(ServletContextEvent event)
+ {
+ try
+ {
+ listenerRegistry = (PortalEventListenerRegistry)MBeanProxy.get(PortalEventListenerRegistry.class, ObjectNameFactory.create("portal:service=ListenerRegistry"), MBeanServerLocator.locateJBoss());
+ }
+ catch (MBeanProxyCreationException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public void contextDestroyed(ServletContextEvent event)
+ {
+ listenerRegistry = null;
+ }
+
+ // HttpSessionListener implementation *******************************************************************************
+
+ public void sessionCreated(HttpSessionEvent event)
+ {
+ PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession());
+ PortalEventContextImpl uec = new PortalEventContextImpl(rt);
+ PortalSessionEvent use = new PortalSessionEvent(PortalSessionEvent.SESSION_CREATED);
+ fireEvent(uec, use);
+ }
+
+ public void sessionDestroyed(HttpSessionEvent event)
+ {
+ PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession());
+ PortalEventContextImpl uec = new PortalEventContextImpl(rt);
+ PortalSessionEvent use = new PortalSessionEvent(PortalSessionEvent.SESSION_DESTROYED);
+ fireEvent(uec, use);
+ }
+
+ // HttpSessionAttributeListener implementation **********************************************************************
+
+
+ public void attributeAdded(HttpSessionBindingEvent event)
+ {
+ if ("PRINCIPAL_TOKEN".equals(event.getName()))
+ {
+ String userId = (String)event.getValue();
+ PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession(), userId);
+ PortalEventContextImpl uec = new PortalEventContextImpl(rt);
+ UserAuthenticationEvent uae = new UserAuthenticationEvent(userId, UserAuthenticationEvent.SIGN_IN);
+ fireEvent(uec, uae);
+ }
+ }
+
+ public void attributeRemoved(HttpSessionBindingEvent event)
+ {
+ if ("PRINCIPAL_TOKEN".equals(event.getName()))
+ {
+ String userId = (String)event.getValue();
+ PortalRuntimeContextImpl rt = new PortalRuntimeContextImpl(event.getSession(), userId);
+ PortalEventContextImpl uec = new PortalEventContextImpl(rt);
+ UserAuthenticationEvent uae = new UserAuthenticationEvent(userId, UserAuthenticationEvent.SIGN_OUT);
+ fireEvent(uec, uae);
+ }
+ }
+
+ public void attributeReplaced(HttpSessionBindingEvent event)
+ {
+ }
+
+ private void fireEvent(PortalEventContext eventContext, PortalEvent event)
+ {
+ for (Iterator i = listenerRegistry.getListeners().iterator(); i.hasNext();)
+ {
+ Object o = i.next();
+ if (o instanceof PortalEventListener)
+ {
+ PortalEventListener listener = (PortalEventListener)o;
+ try
+ {
+ listener.onEvent(eventContext, event);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+}
Modified: trunk/core/src/resources/portal-server-war/WEB-INF/web.xml
===================================================================
--- trunk/core/src/resources/portal-server-war/WEB-INF/web.xml 2007-04-30 09:25:49 UTC (rev 7139)
+++ trunk/core/src/resources/portal-server-war/WEB-INF/web.xml 2007-04-30 09:31:30 UTC (rev 7140)
@@ -33,7 +33,7 @@
<!-- Bridge portal user events -->
<listener>
- <listener-class>org.jboss.portal.core.impl.api.event.EventBridge</listener-class>
+ <listener-class>org.jboss.portal.core.impl.api.event.ServletEventBridgetBridge</listener-class>
</listener>
<!-- The portal servlet is the main entrance point -->
17 years
JBoss Portal SVN: r7139 - in trunk: identity/src/main/org/jboss/portal/identity/ldap and 5 other directories.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2007-04-30 05:25:49 -0400 (Mon, 30 Apr 2007)
New Revision: 7139
Added:
trunk/identity/src/resources/test/config/staticgroup/
trunk/identity/src/resources/test/config/staticgroup/rhds-config-nonDNMember.xml
trunk/identity/src/resources/test/config/staticrole/rhds-config-nonDNMember.xml
trunk/test/src/etc/ldap/ldif/initial-tests-qa-nonDNMember.ldif
Modified:
trunk/identity/build.xml
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java
trunk/test/src/etc/directories-staticgroupmembership.xml
trunk/test/src/etc/directories-staticrolemembership.xml
Log:
- [JBPORTAL-1366] LDAP membership not handled properly for member attribute not as DN. Bug fix + test cases
Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml 2007-04-30 09:06:19 UTC (rev 7138)
+++ trunk/identity/build.xml 2007-04-30 09:25:49 UTC (rev 7139)
@@ -456,12 +456,12 @@
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.db.DBIdentityTestCase"/>-->
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPIdentityTestCase"/>-->
<!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTestCase"/>-->
- <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPSimpleRoleModuleTestCase"/>-->
<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticGroupMembershipModuleTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>-->
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtUserModuleTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/>
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPStaticRoleMembershipModuleTestCase"/>-->
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPUserProfileModuleTestCase"/>-->
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtUserModuleTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.identity.ldap.LDAPExtRoleModuleTestCase"/>-->
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-identity-lib.jar"/>
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2007-04-30 09:06:19 UTC (rev 7138)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticGroupMembershipModuleImpl.java 2007-04-30 09:25:49 UTC (rev 7139)
@@ -79,7 +79,7 @@
String memberName = "";
- if (isUidAttributeIsDN())
+ if (isUidAttributeIsDN())
{
memberName = ldapUser.getDn();
}
@@ -175,14 +175,13 @@
try
{
//if user is pointed as DN get only it's name
- if (!isUidAttributeIsDN())
+ if (isUidAttributeIsDN())
{
- name = LDAPTools.stripDnToName(name);
- users.add(getUserModule().findUserByUserName(name));
+ users.add(getUserModule().findUserByDN(name));
}
else
{
- users.add(getUserModule().findUserByDN(name));
+ users.add(getUserModule().findUserByUserName(name));
}
}
catch(IdentityException ie)
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java 2007-04-30 09:06:19 UTC (rev 7138)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPStaticRoleMembershipModuleImpl.java 2007-04-30 09:25:49 UTC (rev 7139)
@@ -108,14 +108,13 @@
try
{
//if user is pointed as DN get only it's name
- if (!isUidAttributeIsDN())
+ if (isUidAttributeIsDN())
{
- name = LDAPTools.stripDnToName(name);
- roles.add(getRoleModule().findRoleByName(name));
+ roles.add(getRoleModule().findRoleByDN(name));
}
else
{
- roles.add(getRoleModule().findRoleByDN(name));
+ roles.add(getRoleModule().findRoleByName(name));
}
}
catch(IdentityException ie)
Added: trunk/identity/src/resources/test/config/staticgroup/rhds-config-nonDNMember.xml
===================================================================
--- trunk/identity/src/resources/test/config/staticgroup/rhds-config-nonDNMember.xml (rev 0)
+++ trunk/identity/src/resources/test/config/staticgroup/rhds-config-nonDNMember.xml 2007-04-30 09:25:49 UTC (rev 7139)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+ <!--<!DOCTYPE identity-configuration PUBLIC
+ "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN"
+ "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">-->
+
+<identity-configuration>
+ <datasources>
+ <datasource>
+ <name>LDAP</name>
+ <config>
+ <option>
+ <name>host</name>
+ <value>dev39.qa.atl.jboss.com</value>
+ </option>
+ <option>
+ <name>port</name>
+ <value>10389</value>
+ </option>
+ <option>
+ <name>adminDN</name>
+ <value>cn=Directory Manager</value>
+ </option>
+ <option>
+ <name>adminPassword</name>
+ <value>qpq123qpq</value>
+ </option>
+ </config>
+ </datasource>
+ </datasources>
+ <modules>
+ <module>
+ <!--type used to correctly map in IdentityContext registry-->
+ <type>User</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>Role</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>Membership</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+
+ <module>
+ <type>UserProfile</type>
+ <implementation>DELEGATING</implementation>
+ <config>
+ <option>
+ <name>profileConfigFile</name>
+ <value>test/config/profile-config.xml</value>
+ </option>
+ <option>
+ <name>ldapModuleJNDIName</name>
+ <value>java:/portal/LDAPUserProfileModule</value>
+ </option>
+ </config>
+ </module>
+ <module>
+ <type>DBDelegateUserProfile</type>
+ <implementation>DB</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>LDAPDelegateUserProfile</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+ </modules>
+
+ <options>
+ <option-group>
+ <group-name>common</group-name>
+ <option>
+ <name>userCtxDN</name>
+ <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ </option>
+ <option>
+ <name>roleCtxDN</name>
+ <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ </option>
+ <option>
+ <name>membershipAttributeIsDN</name>
+ <value>false</value>
+ </option>
+ </option-group>
+ <option-group>
+ <group-name>userCreateAttibutes</group-name>
+ <option>
+ <name>objectClass</name>
+ <!--This objectclasses should work with Red Hat Directory-->
+ <value>top</value>
+ <value>person</value>
+ <value>inetOrgPerson</value>
+ </option>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <option>
+ <name>sn</name>
+ <value>none</value>
+ </option>
+ </option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <!--Some directory servers require this attribute to be valid DN-->
+ <!--For safety reasons point to the admin user here-->
+ <option>
+ <name>member</name>
+ <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value>
+ </option>
+ </option-group>
+ </options>
+</identity-configuration>
\ No newline at end of file
Added: trunk/identity/src/resources/test/config/staticrole/rhds-config-nonDNMember.xml
===================================================================
--- trunk/identity/src/resources/test/config/staticrole/rhds-config-nonDNMember.xml (rev 0)
+++ trunk/identity/src/resources/test/config/staticrole/rhds-config-nonDNMember.xml 2007-04-30 09:25:49 UTC (rev 7139)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+ <!--<!DOCTYPE identity-configuration PUBLIC
+ "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN"
+ "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">-->
+
+<identity-configuration>
+ <datasources>
+ <datasource>
+ <name>LDAP</name>
+ <config>
+ <option>
+ <name>host</name>
+ <value>dev39.qa.atl.jboss.com</value>
+ </option>
+ <option>
+ <name>port</name>
+ <value>10389</value>
+ </option>
+ <option>
+ <name>adminDN</name>
+ <value>cn=Directory Manager</value>
+ </option>
+ <option>
+ <name>adminPassword</name>
+ <value>qpq123qpq</value>
+ </option>
+ </config>
+ </datasource>
+ </datasources>
+ <modules>
+ <module>
+ <!--type used to correctly map in IdentityContext registry-->
+ <type>User</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>Role</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>Membership</type>
+ <implementation>LDAP</implementation>
+ <class>org.jboss.portal.identity.ldap.LDAPStaticRoleMembershipModuleImpl</class>
+ <config/>
+ </module>
+
+ <module>
+ <type>UserProfile</type>
+ <implementation>DELEGATING</implementation>
+ <config>
+ <option>
+ <name>profileConfigFile</name>
+ <value>test/config/profile-config.xml</value>
+ </option>
+ <option>
+ <name>ldapModuleJNDIName</name>
+ <value>java:/portal/LDAPUserProfileModule</value>
+ </option>
+ </config>
+ </module>
+ <module>
+ <type>DBDelegateUserProfile</type>
+ <implementation>DB</implementation>
+ <config/>
+ </module>
+ <module>
+ <type>LDAPDelegateUserProfile</type>
+ <implementation>LDAP</implementation>
+ <config/>
+ </module>
+ </modules>
+
+ <options>
+ <option-group>
+ <group-name>common</group-name>
+ <option>
+ <name>userCtxDN</name>
+ <value>ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ </option>
+ <option>
+ <name>roleCtxDN</name>
+ <value>ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value>
+ </option>
+ <option>
+ <name>membershipAttributeID</name>
+ <value>memberOf</value>
+ </option>
+ <option>
+ <name>membershipAttributeIsDN</name>
+ <value>false</value>
+ </option>
+ </option-group>
+ <option-group>
+ <group-name>userCreateAttibutes</group-name>
+ <option>
+ <name>objectClass</name>
+ <!--This objectclasses should work with Red Hat Directory-->
+ <value>top</value>
+ <value>person</value>
+ <value>inetOrgPerson</value>
+ <value>inetUser</value>
+ </option>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <option>
+ <name>sn</name>
+ <value>none</value>
+ </option>
+ </option-group>
+ <option-group>
+ <group-name>roleCreateAttibutes</group-name>
+ <!--Schema requires those to have initial value-->
+ <option>
+ <name>cn</name>
+ <value>none</value>
+ </option>
+ <option>
+ <name>objectClass</name>
+ <value>top</value>
+ <value>organizationalRole</value>
+ </option>
+ </option-group>
+ </options>
+</identity-configuration>
\ No newline at end of file
Modified: trunk/test/src/etc/directories-staticgroupmembership.xml
===================================================================
--- trunk/test/src/etc/directories-staticgroupmembership.xml 2007-04-30 09:06:19 UTC (rev 7138)
+++ trunk/test/src/etc/directories-staticgroupmembership.xml 2007-04-30 09:25:49 UTC (rev 7139)
@@ -53,6 +53,21 @@
<cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
</directory>
<directory>
+ <directory-name>RedHatDS</directory-name>
+ <description>RedHat Directory in QA Labs (need vpn access)</description>
+
+ <config-file>test/config/staticgroup/rhds-config-nonDNMember.xml</config-file>
+ <host>dev39.qa.atl.jboss.com</host>
+ <port>10389</port>
+ <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
+ <admin-dn>cn=Directory Manager</admin-dn>
+ <admin-password>qpq123qpq</admin-password>
+
+ <populate-ldif>ldap/ldif/initial-tests-qa-nonDNMember.ldif</populate-ldif>
+
+ <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
+ </directory>
+ <directory>
<directory-name>OpenLDAP</directory-name>
<description>OpenLDAP Directory in QA Labs (need vpn access)</description>
Modified: trunk/test/src/etc/directories-staticrolemembership.xml
===================================================================
--- trunk/test/src/etc/directories-staticrolemembership.xml 2007-04-30 09:06:19 UTC (rev 7138)
+++ trunk/test/src/etc/directories-staticrolemembership.xml 2007-04-30 09:25:49 UTC (rev 7139)
@@ -52,6 +52,21 @@
<cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
</directory>
+ <directory>
+ <directory-name>RedHatDS</directory-name>
+ <description>RedHat Directory in QA Labs (need vpn access)</description>
+
+ <config-file>test/config/staticrole/rhds-config-nonDNMember.xml</config-file>
+ <host>dev39.qa.atl.jboss.com</host>
+ <port>10389</port>
+ <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory>
+ <admin-dn>cn=Directory Manager</admin-dn>
+ <admin-password>qpq123qpq</admin-password>
+
+ <populate-ldif>ldap/ldif/initial-tests-qa-nonDNMember.ldif</populate-ldif>
+
+ <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn>
+ </directory>
<!--<directory>
<directory-name>OpenLDAP</directory-name>
<description>OpenLDAP Directory in QA Labs (need vpn access)</description>
Added: trunk/test/src/etc/ldap/ldif/initial-tests-qa-nonDNMember.ldif
===================================================================
--- trunk/test/src/etc/ldap/ldif/initial-tests-qa-nonDNMember.ldif (rev 0)
+++ trunk/test/src/etc/ldap/ldif/initial-tests-qa-nonDNMember.ldif 2007-04-30 09:25:49 UTC (rev 7139)
@@ -0,0 +1,194 @@
+dn: dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: dcObject
+objectclass: organization
+dc: testsuite
+o: testsuite
+
+dn: ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: People
+
+dn: uid=jduke,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke
+cn: Java Duke
+sn: Duke
+userPassword: theduke
+mail: email(a)email.com
+
+dn: uid=jduke1,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke1
+cn: Java Duke1
+sn: Duke1
+userPassword: theduke
+mail: email(a)email.com
+
+
+dn: uid=jduke2,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke2
+cn: Java Duke2
+sn: Duke2
+userPassword: theduke
+mail: email(a)email.com
+
+dn: uid=jduke3,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke3
+cn: Java Duke3
+sn: Duke3
+userPassword: theduke
+mail: email(a)email.com
+
+dn: uid=jduke4,ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: person
+uid: jduke4
+cn: Java Duke4
+sn: Duke4
+userPassword: theduke
+mail: email(a)email.com
+
+dn: ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: Roles
+
+dn: cn=Echo,ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: groupOfNames
+cn: Echo
+description: the JBossAdmin group
+member: jduke1
+member: jduke3
+member: jduke4
+
+dn: cn=Echo1,ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: groupOfNames
+cn: Echo1
+description: the JBossAdmin group 2
+member: duke2
+member: jduke3
+member: jduke5
+
+dn: cn=TheDuke,ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: groupOfNames
+objectClass: top
+cn: TheDuke
+description: TheDuke role context
+member: jduke
+
+
+# tree2
+dn: o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: organization
+o: example2
+
+dn: ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: People
+
+dn: uid=jduke,ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: inetUser
+uid: jduke
+cn: Java Duke
+sn: Duke
+userPassword: theduke
+mail: email(a)email.com
+memberOf: Echo
+
+dn: uid=jduke1,ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: inetUser
+uid: jduke1
+cn: Java Duke1
+sn: Duke1
+userPassword: theduke
+mail: email(a)email.com
+memberOf: Echo
+memberOf: Echo1
+
+
+dn: uid=jduke2,ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: inetUser
+uid: jduke2
+cn: Java Duke2
+sn: Duke2
+userPassword: theduke
+mail: email(a)email.com
+memberOf: Echo
+memberOf: Echo1
+memberOf: TheDuke
+
+
+dn: uid=jduke3,ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: inetUser
+uid: jduke3
+cn: Java Duke3
+sn: Duke3
+userPassword: theduke
+mail: email(a)email.com
+
+dn: uid=jduke4,ou=People,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: inetOrgPerson
+objectclass: inetUser
+uid: jduke4
+cn: Java Duke4
+sn: Duke4
+userPassword: theduke
+mail: email(a)email.com
+
+dn: ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectclass: top
+objectclass: organizationalUnit
+ou: Roles
+
+dn: cn=Echo,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: organizationalRole
+cn: Echo
+description: the JBossAdmin group
+
+dn: cn=Echo1,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: organizationalRole
+cn: Echo1
+description: the JBossAdmin group 2
+
+
+dn: cn=TheDuke,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: organizationalRole
+cn: TheDuke
+description: TheDuke role context
+
+dn: cn=EmptyRole,ou=Roles,o=example2,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com
+objectClass: top
+objectClass: organizationalRole
+cn: EmptyRole
+description: EmptyRole role context
+
+
17 years
JBoss Portal SVN: r7138 - trunk/core/src/resources/portal-core-war/WEB-INF/classes.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-30 05:06:19 -0400 (Mon, 30 Apr 2007)
New Revision: 7138
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
Log:
minor changes, contribution from Luca Stancapiano
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2007-04-30 08:51:25 UTC (rev 7137)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2007-04-30 09:06:19 UTC (rev 7138)
@@ -180,9 +180,9 @@
MODIFIED_PROFILE=Il tuo profilo e' stato modificato, il portale lavorera' con il vecchio profilo finche' non ti ricolleghi.
# Registration
-REGISTER_NOT_LOGGED_IN=You are currently not logged in.
-REGISTER_REGISTER=Non hai ancora un account? Puoi
-REGISTER_REGISTER_LINK=crearlo
+REGISTER_NOT_LOGGED_IN=Non sei al momento loggato.
+REGISTER_REGISTER=Puoi creare un account
+REGISTER_REGISTER_LINK=Creane uno
REGISTER_REGISTER_ADMIN_LINK=Crea un account
REGISTER_TY=Grazie per la registrazione.
REGISTER_BASICINFO=Informazioni base sull'utente
17 years
JBoss Portal SVN: r7137 - in trunk/core/src: bin/portal-core-war/layouts/3columns and 1 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-30 04:51:25 -0400 (Mon, 30 Apr 2007)
New Revision: 7137
Added:
trunk/core/src/bin/portal-core-war/layouts/3columns/
trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp
trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
Modified:
trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
Log:
Adding a 3 columns layout.
Added: trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp (rev 0)
+++ trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2007-04-30 08:51:25 UTC (rev 7137)
@@ -0,0 +1,66 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
+<!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">
+<head>
+ <title><%= PortalConstants.VERSION.toString() %></title>
+ <meta http-equiv="Content-Type" content="text/html;"/>
+ <!-- to correct the unsightly Flash of Unstyled Content. -->
+ <script type="text/javascript"></script>
+ <!-- inject the theme, default to the Renaissance theme if nothing is selected for the portal or the page -->
+ <p:theme themeName="renaissance"/>
+ <!-- insert header content that was possibly set by portlets on the page -->
+ <p:headerContent/>
+</head>
+
+<body id="body">
+<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
+<div id="portal-container">
+ <div id="sizer">
+ <div id="expander">
+ <div id="logoName"></div>
+ <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+ <tr>
+ <td align="center" valign="top" id="header">
+
+ <!-- Utility controls -->
+ <p:region regionName='dashboardnav' regionID='dashboardnav'/>
+
+ <!-- navigation tabs and such -->
+ <p:region regionName='navigation' regionID='navigation'/>
+ <div id="spacer"></div>
+ </td>
+ </tr>
+ </table>
+ <div id="content-container">
+ <table>
+ <tr>
+ <td valign="top">
+ <!-- insert the content of the 'left' region of the page, and assign the css selector id 'regionA' -->
+ <p:region regionName='left' regionID='left'/>
+ </td>
+ <td valign="top">
+ <!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionB' -->
+ <p:region regionName='center' regionID='center'/>
+ </td>
+ <td valign="top">
+ <!-- insert the content of the 'center' region of the page, and assign the css selector id 'regionC' -->
+ <p:region regionName='right' regionID='right'/>
+ </td>
+ <hr class="cleaner"/>
+ </div>
+ </div>
+ </div>
+</div>
+
+<!-- TODO: Fix the auto jump in this tag -->
+<!-- <div id="footer-container" class="portal-copyright">Powered by
+<a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/>
+</div>
+-->
+
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+
+</body>
+</html>
Property changes on: trunk/core/src/bin/portal-core-war/layouts/3columns/index.jsp
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
===================================================================
--- trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp (rev 0)
+++ trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp 2007-04-30 08:51:25 UTC (rev 7137)
@@ -0,0 +1,50 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
+<!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">
+<head>
+ <title><%= PortalConstants.VERSION.toString() %></title>
+ <meta http-equiv="Content-Type" content="text/html;"/>
+ <!-- to correct the unsightly Flash of Unstyled Content. -->
+ <script type="text/javascript"></script>
+ <!-- use the renaissance theme if nothing else was defined for the portal or the page -->
+ <p:theme themeName="renaissance"/>
+ <!-- inject header content that was generated by the portlets on the requested page -->
+ <p:headerContent/>
+</head>
+
+<body id="body">
+<p:region regionName='AJAXScripts' regionID='AJAXScripts'/>
+<div id="portal-container">
+ <div id="sizer">
+ <div id="expander">
+ <div id="logoName"></div>
+ <table border="0" cellpadding="0" cellspacing="0" id="header-container">
+ <tr>
+ <td align="center" valign="top" id="header">
+ <p:region regionName='dashboardnav' regionID='dashboardnav'/>
+
+ <p:region regionName='navigation' regionID='navigation'/>
+ <div id="spacer"></div>
+ </td>
+ </tr>
+ </table>
+ <div id="content-container">
+ <!-- Note: this construct assumes that the 'maximizedRegion' layout strategy was chosen for the layout, page or portal -->
+ <!-- the 'maximizedRegion' strategy assigns the maximized portlet to the 'maximized' region -->
+ <p:region regionName='maximized' regionID='regionMaximized'/>
+ <hr class="cleaner"/>
+
+ <div id="footer-container" class="portal-copyright">Powered by
+ <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br>
+ <span id="ThemeBy"></span>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<p:region regionName='AJAXFooter' regionID='AJAXFooter'/>
+</body>
+</html>
Property changes on: trunk/core/src/bin/portal-core-war/layouts/3columns/maximized.jsp
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-04-29 22:12:17 UTC (rev 7136)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml 2007-04-30 08:51:25 UTC (rev 7137)
@@ -51,4 +51,15 @@
<region name="navigation"/>
</regions>
</layout>
+ <layout>
+ <name>3columns</name>
+ <uri>/layouts/3columns/index.jsp</uri>
+ <uri state="maximized">/layouts/3columns/maximized.jsp</uri>
+ <regions>
+ <region name="left"/>
+ <region name="center"/>
+ <region name="right"/>
+ <region name="navigation"/>
+ </regions>
+ </layout>
</layouts>
17 years