gatein SVN: r7958 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/form and 1 other directory.
by do-not-reply@jboss.org
Author: phuong_vu
Date: 2011-11-03 10:45:59 -0400 (Thu, 03 Nov 2011)
New Revision: 7958
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java
Log:
GTNPORTAL-2250 Sites Management porlet flickers when editing node's
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-11-03 14:03:18 UTC (rev 7957)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-11-03 14:45:59 UTC (rev 7958)
@@ -78,7 +78,8 @@
@EventConfig(listeners = UIPageNodeForm.SwitchPublicationDateActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm.SwitchVisibleActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm.ClearPageActionListener.class, phase = Phase.DECODE),
- @EventConfig(listeners = UIPageNodeForm.CreatePageActionListener.class, phase = Phase.DECODE)}),
+ @EventConfig(listeners = UIPageNodeForm.CreatePageActionListener.class, phase = Phase.DECODE),
+ @EventConfig(listeners = UIPageNodeForm.SelectTabActionListener.class, phase = Phase.DECODE)}),
@ComponentConfig(type = UIPopupWindow.class, template = "system:/groovy/webui/core/UIPopupWindow.gtmpl",
events = @EventConfig(listeners = UIGroupNavigationManagement.CloseActionListener.class, name = "ClosePopup"))})
public class UIGroupNavigationManagement extends UIContainer
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java 2011-11-03 14:03:18 UTC (rev 7957)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIPageNodeForm.java 2011-11-03 14:45:59 UTC (rev 7958)
@@ -19,6 +19,20 @@
package org.exoplatform.navigation.webui.component;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.navigation.webui.TreeNode;
@@ -27,7 +41,6 @@
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.model.ModelObject;
import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.mop.Described;
import org.exoplatform.portal.mop.SiteType;
import org.exoplatform.portal.mop.Visibility;
@@ -51,7 +64,6 @@
import org.exoplatform.webui.event.Event.Phase;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.exception.MessageException;
-import org.exoplatform.webui.form.UIFormCheckBoxInput;
import org.exoplatform.webui.form.UIFormDateTimeInput;
import org.exoplatform.webui.form.UIFormInputBase;
import org.exoplatform.webui.form.UIFormInputIconSelector;
@@ -59,26 +71,13 @@
import org.exoplatform.webui.form.UIFormSelectBox;
import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.UIFormTabPane;
+import org.exoplatform.webui.form.input.UICheckBoxInput;
import org.exoplatform.webui.form.validator.DateTimeValidator;
import org.exoplatform.webui.form.validator.IdentifierValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
import org.exoplatform.webui.form.validator.StringLengthValidator;
import org.exoplatform.webui.form.validator.Validator;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
/**
* Author : Dang Van Minh, Pham Tuan minhdv81(a)yahoo.com Jun 14, 2006
*/
@@ -121,13 +120,12 @@
public UIPageNodeForm() throws Exception
{
super("UIPageNodeForm");
+ UIFormInputSet uiSettingSet = new UIFormInputSet("PageNodeSetting");
+ UICheckBoxInput uiDateInputCheck =
+ new UICheckBoxInput(SHOW_PUBLICATION_DATE, null, false);
+ UICheckBoxInput uiVisibleCheck = new UICheckBoxInput(VISIBLE, null, true);
+ UICheckBoxInput uiSwitchLabelMode = new UICheckBoxInput(SWITCH_MODE, null, true);
- UIFormInputSet uiSettingSet = new UIFormInputSet("PageNodeSetting");
- UIFormCheckBoxInput<Boolean> uiDateInputCheck =
- new UIFormCheckBoxInput<Boolean>(SHOW_PUBLICATION_DATE, null, false);
- UIFormCheckBoxInput<Boolean> uiVisibleCheck = new UIFormCheckBoxInput<Boolean>(VISIBLE, null, true);
- UIFormCheckBoxInput<Boolean> uiSwitchLabelMode = new UIFormCheckBoxInput<Boolean>(SWITCH_MODE, null, true);
-
uiDateInputCheck.setOnChange("SwitchPublicationDate");
uiVisibleCheck.setOnChange("SwitchVisible");
uiSwitchLabelMode.setOnChange(SWITCH_MODE_ONCHANGE);
@@ -307,8 +305,8 @@
{
Visibility visibility = pageNode.getVisibility();
boolean isVisible = visibility == null || EnumSet.of(Visibility.DISPLAYED, Visibility.TEMPORAL).contains(visibility);
- getUIFormCheckBoxInput(VISIBLE).setChecked(isVisible);
- getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(Visibility.TEMPORAL.equals(visibility));
+ getUICheckBoxInput(VISIBLE).setChecked(isVisible);
+ getUICheckBoxInput(SHOW_PUBLICATION_DATE).setChecked(Visibility.TEMPORAL.equals(visibility));
setShowCheckPublicationDate(isVisible);
Calendar cal = Calendar.getInstance();
if (pageNode.getStartPublicationTime() != -1)
@@ -333,7 +331,7 @@
isExtendedMode = false;
}
- getUIFormCheckBoxInput(SWITCH_MODE).setChecked(isExtendedMode);
+ getUICheckBoxInput(SWITCH_MODE).setChecked(isExtendedMode);
this.switchLabelMode(isExtendedMode);
}
@@ -345,9 +343,9 @@
if (node.getVisibility() != Visibility.SYSTEM)
{
Visibility visibility;
- if (getUIFormCheckBoxInput(VISIBLE).isChecked())
+ if (getUICheckBoxInput(VISIBLE).isChecked())
{
- UIFormCheckBoxInput showPubDate = getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE);
+ UICheckBoxInput showPubDate = getUICheckBoxInput(SHOW_PUBLICATION_DATE);
visibility = showPubDate.isChecked() ? Visibility.TEMPORAL : Visibility.DISPLAYED;
}
else
@@ -393,7 +391,7 @@
node.setI18nizedLabels(labels);
- if (getUIFormCheckBoxInput(SWITCH_MODE).getValue().toString().equals("true"))
+ if (getUICheckBoxInput(SWITCH_MODE).getValue().toString().equals("true"))
node.setLabel(null);
else if (node.getLabel() == null)
node.setLabel(node.getName());
@@ -401,8 +399,8 @@
public void setShowCheckPublicationDate(boolean show)
{
- getUIFormCheckBoxInput(VISIBLE).setChecked(show);
- UIFormCheckBoxInput<Boolean> uiForm = getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE);
+ getUICheckBoxInput(VISIBLE).setChecked(show);
+ UICheckBoxInput uiForm = getUICheckBoxInput(SHOW_PUBLICATION_DATE);
uiForm.setRendered(show);
setShowPublicationDate(show && uiForm.isChecked());
}
@@ -466,7 +464,7 @@
TreeNode pageNode = uiPageNodeForm.getPageNode();
if (pageNode == null || (pageNode.getVisibility() != Visibility.SYSTEM &&
- uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked()))
+ uiPageNodeForm.getUICheckBoxInput(SHOW_PUBLICATION_DATE).isChecked()))
{
Calendar currentCalendar = Calendar.getInstance();
currentCalendar.set(currentCalendar.get(Calendar.YEAR), currentCalendar.get(Calendar.MONTH), currentCalendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
@@ -572,6 +570,7 @@
uiForm.setSelectedLocale(languageSelection.getValue());
label.setValue(uiForm.getLabelOnLocale(uiForm.getSelectedLocale()));
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
}
@@ -590,7 +589,6 @@
cachedLabels.put(locale, new Described.State(label, null));
}
-
public void setSelectedLocale(String selectedLocale)
{
this.selectedLocale = selectedLocale;
@@ -606,7 +604,7 @@
public void execute(Event<UIPageNodeForm> event) throws Exception
{
UIPageNodeForm uiForm = event.getSource();
- boolean isCheck = uiForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked();
+ boolean isCheck = uiForm.getUICheckBoxInput(SHOW_PUBLICATION_DATE).isChecked();
uiForm.setShowPublicationDate(isCheck);
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
@@ -618,7 +616,7 @@
public void execute(Event<UIPageNodeForm> event) throws Exception
{
UIPageNodeForm uiForm = event.getSource();
- boolean isCheck = uiForm.getUIFormCheckBoxInput(VISIBLE).isChecked();
+ boolean isCheck = uiForm.getUICheckBoxInput(VISIBLE).isChecked();
uiForm.setShowCheckPublicationDate(isCheck);
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
@@ -630,7 +628,7 @@
public void execute(Event<UIPageNodeForm> event) throws Exception
{
UIPageNodeForm uiForm = event.getSource();
- boolean isExtendedMode = uiForm.getUIFormCheckBoxInput(SWITCH_MODE).isChecked();
+ boolean isExtendedMode = uiForm.getUICheckBoxInput(SWITCH_MODE).isChecked();
uiForm.switchLabelMode(isExtendedMode);
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
@@ -654,7 +652,6 @@
UIPageNodeForm uiForm = event.getSource();
UIPageSelector pageSelector = uiForm.findFirstComponentOfType(UIPageSelector.class);
- PortalRequestContext pcontext = Util.getPortalRequestContext();
UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
UIFormInputSet uiInputSet = pageSelector.getChild(UIFormInputSet.class);
@@ -735,11 +732,21 @@
uiPortalApp.addMessage(new ApplicationMessage("UIPageForm.msg.sameName", null));
return;
}
-
pageSelector.setPage(page);
+ event.getRequestContext().addUIComponentToUpdateByAjax(pageSelector);
}
}
+ static public class SelectTabActionListener extends UIFormTabPane.SelectTabActionListener
+ {
+ public void execute(Event<UIFormTabPane> event) throws Exception
+ {
+ super.execute(event);
+ PortalRequestContext pcontext = Util.getPortalRequestContext();
+ pcontext.setResponseComplete(true);
+ }
+ }
+
private void switchLabelMode(boolean isExtendedMode)
{
getUIStringInput(LABEL).setRendered(!isExtendedMode);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-11-03 14:03:18 UTC (rev 7957)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-11-03 14:45:59 UTC (rev 7958)
@@ -72,13 +72,14 @@
@EventConfig(listeners = UISiteManagement.DeletePortalActionListener.class, confirm = "UIPortalBrowser.deletePortal")}),
@ComponentConfig(type = UIPageNodeForm.class, lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = {
@EventConfig(listeners = UIPageNodeForm.SaveActionListener.class),
- @EventConfig(listeners = UIPageNodeForm.ChangeLanguageActionListener.class, phase = Phase.DECODE),
+ @EventConfig(listeners = UIPageNodeForm.ChangeLanguageActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UISiteManagement.BackActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm.SwitchLabelModeActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm.SwitchPublicationDateActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm.SwitchVisibleActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPageNodeForm.ClearPageActionListener.class, phase = Phase.DECODE),
- @EventConfig(listeners = UIPageNodeForm.CreatePageActionListener.class, phase = Phase.DECODE)}),
+ @EventConfig(listeners = UIPageNodeForm.CreatePageActionListener.class, phase = Phase.DECODE),
+ @EventConfig(listeners = UIPageNodeForm.SelectTabActionListener.class, phase = Phase.DECODE)}),
@ComponentConfig(type = UIPopupWindow.class, template = "system:/groovy/webui/core/UIPopupWindow.gtmpl",
events = @EventConfig(listeners = UISiteManagement.CloseActionListener.class, name = "ClosePopup"))})
public class UISiteManagement extends UIContainer
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java 2011-11-03 14:03:18 UTC (rev 7957)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java 2011-11-03 14:45:59 UTC (rev 7958)
@@ -190,7 +190,6 @@
return selectedIcon;
}
- @SuppressWarnings("unused")
public void decode(Object input, WebuiRequestContext context) throws Exception
{
if (input == null || String.valueOf(input).length() < 1)
@@ -205,7 +204,6 @@
UIFormInputIconSelector uiForm = event.getSource();
String paramName = event.getRequestContext().getRequestParameter(OBJECTID);
uiForm.setValues(paramName);
- //uiForm.setRenderSibbling(UIFormInputIconSelector.class);
}
}
@@ -223,10 +221,9 @@
uiIconSelector.setSelectedIconSet(set);
}
}
- //uiIconSelector.setRenderSibbling(UIFormInputIconSelector.class) ;
UIForm uiForm = uiIconSelector.getAncestorOfType(UIForm.class);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent());
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
}
@@ -246,21 +243,18 @@
uiIconSelector.setSelectedIconSet(set);
}
}
- //uiIconSelector.setRenderSibbling(UIFormInputIconSelector.class) ;
UIForm uiForm = uiIconSelector.getAncestorOfType(UIForm.class);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent());
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
return;
}
uiIconSelector.setSelectedIcon(iconName);
- //uiIconSelector.setRenderSibbling(UIFormInputIconSelector.class) ;
UIForm uiForm = uiIconSelector.getAncestorOfType(UIForm.class);
- event.getRequestContext().addUIComponentToUpdateByAjax(uiForm.getParent());
+ event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
}
- //TODO Rename this to CategoryIconSet
static public class CategoryIcon
{
13 years, 1 month
gatein SVN: r7957 - in components/pc/trunk/samples/src/main: java/org/gatein/pc/samples/google and 1 other directory.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-11-03 10:03:18 -0400 (Thu, 03 Nov 2011)
New Revision: 7957
Modified:
components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleWeatherClippingPortlet.java
Log:
- Fixed Google portlets: tweaked excerpt that we look for, changed user agent so that we don't get JS-generated HTML, tweaked post-processing for weather icons.
Modified: components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml
===================================================================
--- components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml 2011-11-03 10:23:56 UTC (rev 7956)
+++ components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml 2011-11-03 14:03:18 UTC (rev 7957)
@@ -50,7 +50,7 @@
<preference>
<!-- Query used to retrieve data -->
<name>query</name>
- <value>http://www.google.com/search?gl=US&hl=en&q=</value>
+ <value>http://www.google.com/search?gl=US&hl=en&q=map+</value>
<read-only>false</read-only>
</preference>
<preference>
@@ -59,7 +59,7 @@
finds after this String.
-->
<name>beginningString</name>
- <value><![CDATA[<div id=res]]></value>
+ <value><![CDATA[<li class="g"]]></value>
<read-only>false</read-only>
</preference>
</portlet-preferences>
@@ -103,7 +103,7 @@
finds after this String.
-->
<name>beginningString</name>
- <value><![CDATA[<div id=res]]></value>
+ <value><![CDATA[<li class="g"]]></value>
<read-only>false</read-only>
</preference>
</portlet-preferences>
Modified: components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java
===================================================================
--- components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java 2011-11-03 10:23:56 UTC (rev 7956)
+++ components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleClippingPortlet.java 2011-11-03 14:03:18 UTC (rev 7957)
@@ -63,7 +63,7 @@
* should result in the expected result.
*/
private static final String DEFAULT_QUERY = "http://www.google.com/search?gl=US&hl=en&q=";
- private static final String DEFAULT_BEG = "<div id=res>";
+ private static final String DEFAULT_BEG = "<li class=\"g\"";
private static final String DEFAULT_ZIP = "94102";
private static final String END_TABLE = "</table>";
private static final String BEG_TABLE = "<table";
@@ -78,7 +78,7 @@
URL url = new URL(query);
URLConnection connection = url.openConnection();
- connection.setRequestProperty("User-Agent", "Mozilla/5.0");
+ connection.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)");
BufferedInputStream in = new BufferedInputStream(connection.getInputStream());
String html = new String(getBytes(in, 16384), "UTF-8");
Modified: components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleWeatherClippingPortlet.java
===================================================================
--- components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleWeatherClippingPortlet.java 2011-11-03 10:23:56 UTC (rev 7956)
+++ components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/google/GoogleWeatherClippingPortlet.java 2011-11-03 14:03:18 UTC (rev 7957)
@@ -43,6 +43,7 @@
endIndex = html.indexOf(A_END, begIndex);
html = html.substring(0, begIndex) + html.substring(endIndex + A_END.length());
}
+ html = html.replaceAll("src=\"\\/\\/", "src=\"http:\\/\\/");
return super.postProcessHTML(html);
}
13 years, 1 month
gatein SVN: r7956 - portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.
by do-not-reply@jboss.org
Author: ndkhoiits
Date: 2011-11-03 06:23:56 -0400 (Thu, 03 Nov 2011)
New Revision: 7956
Modified:
portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
Log:
Update format XML code and some typos in SSO document
Modified: portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-11-03 10:23:13 UTC (rev 7955)
+++ portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-11-03 10:23:56 UTC (rev 7956)
@@ -19,7 +19,7 @@
In this tutorial, the SSO server is installed in a Tomcat installation. Tomcat can be obtained from <ulink type="http" url="http://tomcat.apache.org">http://tomcat.apache.org</ulink>.
</para>
<para>
- All the packages required for setup can be found in a zip file located at: <ulink type="http" url="https://repository.jboss.org/nexus/content/groups/public/org/gatein/sso/s...">https://repository.jboss.org/nexus/content/groups/public/org/gatein/sso/s...</ulink>. In this document we will call $GATEIN_SSO_HOME the directory where the file is extracted.
+ All the packages required for setup can be found in a zip file located at <ulink type="http" url="https://repository.jboss.org/nexus/content/groups/public/org/gatein/sso/s...">here</ulink>. In this document, $GATEIN_SSO_HOME is called as the directory where the file is extracted.
</para>
<para>
Users are advised to not run any portal extensions that could override the data when manipulating the <filename>gatein.ear</filename> file directly.
@@ -42,7 +42,7 @@
<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-CAS_server">
<title>CAS server</title>
<para>
- First, set up the server to authenticate against the portal login module. In this example the CAS server will be installed on Tomcat.
+ First, set up the server to authenticate against the portal login module. In this example, the CAS server is installed on Tomcat.
</para>
<section id="sect-Reference_Guide-CAS_server-Obtaining_CAS">
<title>Obtaining CAS</title>
@@ -57,7 +57,7 @@
<section id="sect-Reference_Guide-CAS_server-Modifying_CAS_server">
<title>Modifying the CAS server</title>
<para>
- To configure the web archive as desired, the simplest way is to make the necessary changes directly in CAS codebase.
+ To configure the web archive as desired, the simplest way is to make the necessary changes directly in the CAS codebase.
</para>
<note>
<para>
@@ -66,10 +66,10 @@
</para>
</note>
<para>
- First, we need to change the default authentication handler with the one provided by &PRODUCT;.
+ First, change the default authentication handler with the one provided by &PRODUCT;.
</para>
<para>
- The CAS Server Plugin makes secure authentication callbacks to a RESTful service installed on the remote GateIn server in order to authenticate a user.
+ The CAS Server Plugin makes secure authentication callbacks to a RESTful service installed on the remote &PRODUCT; server to authenticate a user.
</para>
<para>
In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <filename>cas.war/WEB-INF/deployerConfigContext.xml </filename> file.
@@ -108,14 +108,10 @@
class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" /></emphasis>
</list>
</property>
-</programlisting>
- </para>
- </step>
- <step>
+</programlisting>
<para>
With the following (Make sure to set the host, port and context with the values corresponding to your portal). Also available in <filename>GATEIN_SSO_HOME/cas/plugin/WEB-INF/deployerConfigContext.xml</filename>.
</para>
- <para>
<programlisting><!--
| Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate,
@@ -166,7 +162,7 @@
Change the default port to avoid a conflict with the default &PRODUCT; (for testing purposes). Edit <filename>TOMCAT_HOME/conf/server.xml</filename> and replace the 8080 port to 8888.
<note>
<para>
- If &PRODUCT; is running on the same machine as Tomcat, other ports need to be changed in addition to 8080 in order to avoid port conflicts.
+ If &PRODUCT; is running on the same machine as Tomcat, other ports need to be changed in addition to 8080 to avoid port conflicts.
They can be changed to any free port. For example, you can change admin port from 8005 to 8805, and AJP port from 8009 to 8809.
</para>
</note>
@@ -206,7 +202,6 @@
p:warnCookieGenerator-ref="warnCookieGenerator"
p:ticketGrantingTicketCookieGenerator-ref="ticketGrantingTicketCookieGenerator"
<emphasis role="bold">p:followServiceRedirects="true"/></emphasis>
-
</programlisting>
</note>
</section>
@@ -223,7 +218,7 @@
<itemizedlist>
<listitem>
<para>
- In JBoss AS, edit <filename>gatein.ear/META-INF/gatein-jboss-beans.xml</filename> and uncomment this section:
+ In JBoss AS, edit <filename>gatein.ear/META-INF/gatein-jboss-beans.xml</filename> and uncomment on this section:
</para>
<programlisting><authentication>
<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required">
@@ -238,7 +233,7 @@
</listitem>
<listitem>
<para>
- In Tomcat, edit <filename>GATEIN_HOME/conf/jaas.conf</filename> and uncomment this section:
+ In Tomcat, edit <filename>GATEIN_HOME/conf/jaas.conf</filename>, uncomment on this section and comment other parts:
</para>
<programlisting>org.gatein.sso.agent.login.SSOLoginModule required;
org.exoplatform.services.security.j2ee.TomcatLoginModule required
@@ -291,7 +286,7 @@
</listitem>
<listitem>
<para>
- In the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file modify the 'Sign In' link as follows:
+ In the <filename>gatein.ear/web.war/groovy/portal/webui/component/UILogoPortlet.gtmpl</filename> file, modify the 'Sign In' link as follows:
<programlisting>
<![CDATA[
<!--
@@ -322,73 +317,62 @@
Add the following Filters at the top of the filter chain in <filename>gatein.ear/02portal.war/WEB-INF/web.xml</filename>:
-<programlisting>
-<![CDATA[
- <filter>
- <filter-name>LoginRedirectFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class>
- <init-param>
- <!-- This should point to your SSO authentication server -->
- <param-name>LOGIN_URL</param-name>
- <!--
- If casRenewTicket param value of InitiateLoginServlet is: not specified or false
- -->
- <param-value>http://localhost:8888/cas/login?service=
- http://localhost:8080/portal/initiatessologin</param-value>
- <!--
- If casRenewTicket param value of InitiateLoginServlet is : true
- -->
- <!--
- <param-value>http://localhost:8888/cas/login?
- service=http://localhost:8080/portal/initiatessologin&renew=true</param-value>
- -->
- </init-param>
- </filter>
- <filter>
- <filter-name>CASLogoutFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.CASLogoutFilter</filter-class>
- <init-param>
- <!-- This should point to your JOSSO authentication server -->
- <param-name>LOGOUT_URL</param-name>
- <param-value>http://localhost:8888/cas/logout</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>InitiateLoginFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
- <init-param>
- <param-name>ssoServerUrl</param-name>
- <param-value>http://localhost:8888/cas</param-value>
- </init-param>
- <init-param>
- <param-name>casRenewTicket</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>casServiceUrl</param-name>
- <param-value>http://localhost:8080/portal/initiatessologin</param-value>
- </init-param>
- <init-param>
- <param-name>loginUrl</param-name>
- <param-value>http://localhost:8080/portal/dologin</param-value>
- </init-param>
- </filter>
-
- <!-- Mapping the filters at the very top of the filter chain -->
- <filter-mapping>
- <filter-name>LoginRedirectFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>CASLogoutFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>InitiateLoginFilter</filter-name>
- <url-pattern>/initiatessologin</url-pattern>
- </filter-mapping>
-]]>
-</programlisting>
+ <programlisting><![CDATA[<filter>
+ <filter-name>LoginRedirectFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class>
+ <init-param>
+ <!-- This should point to your SSO authentication server -->
+ <param-name>LOGIN_URL</param-name>
+ <!-- If casRenewTicket param value of InitiateLoginServlet is: not specified or false -->
+ <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/init...</param-value>
+ <!-- If casRenewTicket param value of InitiateLoginServlet is : true -->
+ <!-- <param-value>http://localhost:8888/cas/login? service=http://localhost:8080/portal/initiatessologin&renew=true</param-value> -->
+ </init-param>
+</filter>
+<filter>
+ <filter-name>CASLogoutFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.CASLogoutFilter</filter-class>
+ <init-param>
+ <!-- This should point to your JOSSO authentication server -->
+ <param-name>LOGOUT_URL</param-name>
+ <param-value>http://localhost:8888/cas/logout</param-value>
+ </init-param>
+</filter>
+<filter>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
+ <init-param>
+ <param-name>ssoServerUrl</param-name>
+ <param-value>http://localhost:8888/cas</param-value>
+ </init-param>
+ <init-param>
+ <param-name>casRenewTicket</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>casServiceUrl</param-name>
+ <param-value>http://localhost:8080/portal/initiatessologin</param-value>
+ </init-param>
+ <init-param>
+ <param-name>loginUrl</param-name>
+ <param-value>http://localhost:8080/portal/dologin</param-value>
+ </init-param>
+</filter>
+
+<!-- Mapping the filters at the very top of the filter chain -->
+<filter-mapping>
+ <filter-name>LoginRedirectFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>CASLogoutFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <url-pattern>/initiatessologin</url-pattern>
+</filter-mapping>]]>
+ </programlisting>
</para>
</listitem>
</itemizedlist>
@@ -403,18 +387,18 @@
<section id="sect-Reference_Guide-Single_Sign_On-JOSSO">
<title>JOSSO</title>
<para>
- This Single Sign On plugin enables seamless integration between &PRODUCT; and the JOSSO Single Sign On Framework. Details about JOSSO can be found <ulink url="http://www.josso.org">here</ulink>.
+ This Single-Sign-On plugin enables the seamless integration between &PRODUCT; and the JOSSO Single-Sign-On Framework. Details about JOSSO can be found <ulink url="http://www.josso.org">here</ulink>.
</para>
<para>
- Setting up this integration involves two steps. The first step is to install or configure a JOSSO server, and the second is to set up the portal to use the JOSSO server.
+ Setting up this integration consists of two steps: installing/configuring a JOSSO server, and setting up the portal to use the JOSSO server.
</para>
<section id="sect-Reference_Guide-JOSSO-JOSSO_server">
<title>JOSSO server</title>
<para>
- This section details setting up the JOSSO server to authenticate against the &PRODUCT; login module.
+ This section describes how to set up the JOSSO server to authenticate against the &PRODUCT; login module.
</para>
<para>
- In this example the JOSSO server will be installed on Tomcat.
+ In this example, the JOSSO server will be installed on Tomcat.
</para>
<section id="sect-Reference_Guide-JOSSO_server-Obtaining_JOSSO">
<title>Obtaining JOSSO</title>
@@ -468,8 +452,8 @@
<note>
<title>Port Conflicts</title>
<para>
- If &PRODUCT; is running on the same machine as Tomcat, other ports need to be changed in addition to 8080 in order to avoid port conflicts.
- They can be changed to any free port. For example, you can change admin port from 8005 to 8805, and AJP port from 8009 to 8809.
+ If &PRODUCT; is running on the same machine as Tomcat, other ports need to be changed in addition to 8080 to avoid port conflicts.
+ They can be changed to any free port. For example, you can change the admin port from 8005 to 8805, and AJP port from 8009 to 8809.
</para>
</note>
</para>
@@ -604,55 +588,50 @@
Add the following Filters at the top of the filter chain in <filename>gatein.ear/02portal.war/WEB-INF/web.xml</filename>:
-<programlisting>
-<![CDATA[
- <filter>
- <filter-name>LoginRedirectFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class>
- <init-param>
- <!-- This should point to your SSO authentication server -->
- <param-name>LOGIN_URL</param-name>
- <param-value>http://localhost:8888/josso/signon/login.do?
- josso_back_to=http://localhost:8080/portal/initiatessologin</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>JOSSOLogoutFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class>
- <init-param>
+<programlisting><![CDATA[<filter>
+ <filter-name>LoginRedirectFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class>
+ <init-param>
+ <!-- This should point to your SSO authentication server -->
+ <param-name>LOGIN_URL</param-name>
+ <param-value>http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhos...</param-value>
+ </init-param>
+</filter>
+<filter>
+ <filter-name>JOSSOLogoutFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class>
+ <init-param>
<!-- This should point to your JOSSO authentication server -->
<param-name>LOGOUT_URL</param-name>
<param-value>http://localhost:8888/josso/signon/logout.do</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>InitiateLoginFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
- <init-param>
- <param-name>ssoServerUrl</param-name>
- <param-value>http://localhost:8888/josso/signon/login.do</param-value>
- </init-param>
- <init-param>
- <param-name>loginUrl</param-name>
- <param-value>http://localhost:8080/portal/dologin</param-value>
- </init-param>
- </filter>
-
- <!-- filters should be placed at the very top of the filter chain -->
- <filter-mapping>
- <filter-name>LoginRedirectFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>JOSSOLogoutFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>InitiateLoginFilter</filter-name>
- <url-pattern>/initiatessologin</url-pattern>
- </filter-mapping>
-]]>
-</programlisting>
+ </init-param>
+</filter>
+<filter>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
+ <init-param>
+ <param-name>ssoServerUrl</param-name>
+ <param-value>http://localhost:8888/josso/signon/login.do</param-value>
+ </init-param>
+ <init-param>
+ <param-name>loginUrl</param-name>
+ <param-value>http://localhost:8080/portal/dologin</param-value>
+ </init-param>
+</filter>
+
+<!-- Mapping the filters at the very top of the filter chain -->
+<filter-mapping>
+ <filter-name>LoginRedirectFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>JOSSOLogoutFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <url-pattern>/initiatessologin</url-pattern>
+</filter-mapping>]]></programlisting>
</para>
</listitem>
</itemizedlist>
@@ -679,19 +658,19 @@
</para>
<section id="sect-Reference_Guide-OpenSSO_server-Obtaining_OpenSSO">
<title>Obtaining OpenSSO</title>
- <!--<para>
- OpenSSO can be downloaded from <ulink type="http" url="http://download.oracle.com/otn/nt/middleware/11g/oracle_opensso_80U2.zip">http://download.oracle.com/otn/nt/middleware/11g/oracle_opensso_80U2.zip</ulink>.
+ <para>
+ OpenSSO must be purchased from <ulink type="http" url="http://www.oracle.com/technetwork/middleware/id-mgmt/overview/index.html">Oracle</ulink>.
</para>
<para>
- Once downloaded, extract the package into a suitable location. This location will be referred to as <filename>OPENSSO_HOME</filename> in this example.
- </para> -->
+ For testing purpose, we will use OpenSSO_80U2 can be downloaded from <ulink type="http" url="http://download.oracle.com/otn/nt/middleware/11g/oracle_opensso_80U2.zip">Oracle</ulink>.
+ </para>
<para>
- OpenSSO must be purchased from <ulink type="http" url="http://www.oracle.com/technetwork/middleware/id-mgmt/overview/index.html">Oracle</ulink>.
+ Once downloaded, extract the package into a suitable location. This location will be referred to as <filename>OPENSSO_HOME</filename> in this example.
</para>
</section>
<section id="sect-Reference_Guide-OpenSSO_server-Modifying_OpenSSO_server">
- <title>Modifying OpenSSO server</title>
+ <title>Modifying the OpenSSO server</title>
<para>
To configure the web server as desired, it is simpler to directly modify the sources.
</para>
@@ -699,7 +678,7 @@
The first step is to add the &PRODUCT; Authentication Plugin:
</para>
<para>
- The plugin makes secure authentication callbacks to a RESTful service installed on the remote &PRODUCT; server in order to authenticate a user.
+ The plugin makes secure authentication callbacks to a RESTful service installed on the remote &PRODUCT; server to authenticate a user.
</para>
<para>
In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <filename>opensso.war/config/auth/default/AuthenticationPlugin.xml</filename> file.
@@ -712,11 +691,11 @@
</step>
<step>
<para>
- Change the default port to avoid a conflict with the default &PRODUCT; port (for testing purposes). Do this by editing <filename>TOMCAT_HOME/conf/server.xml</filename> and replacing the 8080 port to 8888.
+ Change the default port to avoid a conflict with the default &PRODUCT; port (for testing purposes) by editing <filename>TOMCAT_HOME/conf/server.xml</filename> and replacing the 8080 port with 8888.
<note>
<para>
- If &PRODUCT; is running on the same machine as Tomcat, other ports need to be changed in addition to 8080 in order to avoid port conflicts.
- They can be changed to any free port. For example, you can change admin port from 8005 to 8805, and AJP port from 8009 to 8809.
+ If &PRODUCT; is running on the same machine as Tomcat, other ports need to be changed in addition to 8080 to avoid port conflicts.
+ They can be changed to any free port. For example, you can change the admin port from 8005 to 8805, and AJP port from 8009 to 8809.
</para>
</note>
</para>
@@ -815,7 +794,6 @@
<para>Do the same for "gatein" realm.</para>
</step>
</procedure>
- <para>Also, instead of configuring OpenSSO manually as above, you can refer to the available configuration files <ulink url="https://repository.jboss.org/nexus/content/groups/public/org/gatein/sso/s...">here</ulink>.</para>
</section>
</section>
@@ -846,7 +824,7 @@
</listitem>
<listitem>
<para>
- If you are running &PRODUCT; in Tomcat, edit $GATEIN_HOME/conf/jaas.conf and uncomment this section
+ If you are running &PRODUCT; in Tomcat, edit $GATEIN_HOME/conf/jaas.conf, uncomment on this section and comment other parts:
</para>
<programlisting>org.gatein.sso.agent.login.SSOLoginModule required;
org.exoplatform.services.security.j2ee.TomcatLoginModule required
@@ -929,59 +907,54 @@
Add the following Filters at the top of the filter chain in <filename>gatein.ear/02portal.war/WEB-INF/web.xml</filename>:
-<programlisting>
-<![CDATA[
- <filter>
- <filter-name>LoginRedirectFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class>
- <init-param>
- <!-- This should point to your SSO authentication server -->
- <param-name>LOGIN_URL</param-name>
- <param-value>http://localhost:8888/opensso/UI/Login?
- realm=gatein&goto=http://localhost:8080/portal/initiatessologin</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>OpenSSOLogoutFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class>
- <init-param>
- <!-- This should point to your OpenSSO authentication server -->
+<programlisting><![CDATA[<filter>
+ <filter-name>LoginRedirectFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class>
+ <init-param>
+ <!-- This should point to your SSO authentication server -->
+ <param-name>LOGIN_URL</param-name>
+ <param-value>http://localhost:8888/opensso/UI/Login?realm=gatein&goto=http://local...</param-value>
+ </init-param>
+</filter>
+<filter>
+ <filter-name>OpenSSOLogoutFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class>
+ <init-param>
+ <!-- This should point to your SSO authentication server -->
<param-name>LOGOUT_URL</param-name>
<param-value>http://localhost:8888/opensso/UI/Logout</param-value>
- </init-param>
- </filter>
- <filter>
- <filter-name>InitiateLoginFilter</filter-name>
- <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
- <init-param>
- <param-name>ssoServerUrl</param-name>
- <param-value>hhttp://localhost:8888/opensso</param-value>
- </init-param>
- <init-param>
- <param-name>loginUrl</param-name>
- <param-value>http://localhost:8080/portal/dologin</param-value>
- </init-param>
- <init-param>
+ </init-param>
+</filter>
+<filter>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
+ <init-param>
+ <param-name>ssoServerUrl</param-name>
+ <param-value>http://localhost:8888/opensso</param-value>
+ </init-param>
+ <init-param>
+ <param-name>loginUrl</param-name>
+ <param-value>http://localhost:8080/portal/dologin</param-value>
+ </init-param>
+ <init-param>
<param-name>ssoCookieName</param-name>
<param-value>iPlanetDirectoryPro</param-value>
- </init-param>
- </filter>
-
- <!-- place the filters at the top of the filter chain -->
- <filter-mapping>
- <filter-name>LoginRedirectFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>OpenSSOLogoutFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>InitiateLoginFilter</filter-name>
- <url-pattern>/initiatessologin</url-pattern>
- </filter-mapping>
-]]>
-</programlisting>
+ </init-param>
+</filter>
+
+<!-- Mapping the filters at the very top of the filter chain -->
+<filter-mapping>
+ <filter-name>LoginRedirectFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>OpenSSOLogoutFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+</filter-mapping>
+<filter-mapping>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <url-pattern>/initiatessologin</url-pattern>
+</filter-mapping>]]></programlisting>
</para>
</listitem>
</itemizedlist>
@@ -1219,11 +1192,10 @@
<programlisting><![CDATA[<!-- SPNEGO domain -->
<application-policy name="host">
<authentication>
- <login-module code="com.sun.security.auth.module.Krb5LoginModule"
- flag="required">
- <module-option name="storeKey">true</module-option>
- <module-option name="useKeyTab">true</module-option>
- <module-option name="principal">HTTP/server.local.network(a)LOCAL.NETWORK</module-option>
+ <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required">
+ <module-option name="storeKey">true</module-option>
+ <module-option name="useKeyTab">true</module-option>
+ <module-option name="principal">HTTP/server.local.network(a)LOCAL.NETWORK</module-option>
<module-option name="keyTab">/etc/krb5.keytab</module-option>
<module-option name="doNotPrompt">true</module-option>
<module-option name="debug">true</module-option>
@@ -1245,9 +1217,9 @@
</para>
<programlisting language="xml">
-<![CDATA[
+<![CDATA[<deployment xmlns="urn:jboss:bean-deployer:2.0">
<property name="authenticators">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
<key>BASIC</key>
<value>org.apache.catalina.authenticator.BasicAuthenticator</value>
13 years, 1 month
gatein SVN: r7955 - in components/mop/trunk: api and 2 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-11-03 06:23:13 -0400 (Thu, 03 Nov 2011)
New Revision: 7955
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2011-11-03 10:23:04 UTC (rev 7954)
+++ components/mop/trunk/api/pom.xml 2011-11-03 10:23:13 UTC (rev 7955)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-GA</version>
+ <version>1.1.1-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2011-11-03 10:23:04 UTC (rev 7954)
+++ components/mop/trunk/core/pom.xml 2011-11-03 10:23:13 UTC (rev 7955)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-GA</version>
+ <version>1.1.1-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-11-03 10:23:04 UTC (rev 7954)
+++ components/mop/trunk/pom.xml 2011-11-03 10:23:13 UTC (rev 7955)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-GA</version>
+ <version>1.1.1-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.0-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.0-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.0-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2011-11-03 10:23:04 UTC (rev 7954)
+++ components/mop/trunk/spi/pom.xml 2011-11-03 10:23:13 UTC (rev 7955)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-GA</version>
+ <version>1.1.1-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
13 years, 1 month
gatein SVN: r7954 - components/mop/tags.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-11-03 06:23:04 -0400 (Thu, 03 Nov 2011)
New Revision: 7954
Added:
components/mop/tags/1.1.0-GA/
Log:
[maven-scm] copy for tag 1.1.0-GA
13 years, 1 month
gatein SVN: r7953 - in components/mop/trunk: api and 2 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-11-03 06:22:52 -0400 (Thu, 03 Nov 2011)
New Revision: 7953
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.1.0-GA
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2011-11-03 10:21:38 UTC (rev 7952)
+++ components/mop/trunk/api/pom.xml 2011-11-03 10:22:52 UTC (rev 7953)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta08-SNAPSHOT</version>
+ <version>1.1.0-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2011-11-03 10:21:38 UTC (rev 7952)
+++ components/mop/trunk/core/pom.xml 2011-11-03 10:22:52 UTC (rev 7953)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta08-SNAPSHOT</version>
+ <version>1.1.0-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-11-03 10:21:38 UTC (rev 7952)
+++ components/mop/trunk/pom.xml 2011-11-03 10:22:52 UTC (rev 7953)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta08-SNAPSHOT</version>
+ <version>1.1.0-GA</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.0-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.0-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.0-GA</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2011-11-03 10:21:38 UTC (rev 7952)
+++ components/mop/trunk/spi/pom.xml 2011-11-03 10:22:52 UTC (rev 7953)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-Beta08-SNAPSHOT</version>
+ <version>1.1.0-GA</version>
</parent>
<!-- ****************** -->
13 years, 1 month
gatein SVN: r7952 - components/mop/trunk.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2011-11-03 06:21:38 -0400 (Thu, 03 Nov 2011)
New Revision: 7952
Modified:
components/mop/trunk/pom.xml
Log:
GTNMOP-46 : Update to Chromattic 1.1.1 and JCR 1.14.3
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-11-03 08:08:39 UTC (rev 7951)
+++ components/mop/trunk/pom.xml 2011-11-03 10:21:38 UTC (rev 7952)
@@ -124,7 +124,7 @@
<!-- Build settings -->
<!-- ************** -->
- <org.chromattic.version>1.1.0</org.chromattic.version>
+ <org.chromattic.version>1.1.1</org.chromattic.version>
<!--
Current testuite doesn't work with surefire 2.7 defined in parent pom
13 years, 1 month
gatein SVN: r7951 - in portal/trunk: web/eXoResources/src/main/webapp/javascript/eXo/webui and 1 other directory.
by do-not-reply@jboss.org
Author: trong.tran
Date: 2011-11-03 04:08:39 -0400 (Thu, 03 Nov 2011)
New Revision: 7951
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js
Log:
GTNPORTAL-2255 Group Navigation management portlet would be able to fill up free space of the page
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-11-03 08:02:27 UTC (rev 7950)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-11-03 08:08:39 UTC (rev 7951)
@@ -115,6 +115,7 @@
UIVirtualList virtualList = getChild(UIVirtualList.class);
virtualList.dataBind(new ObjectPageList<UserNavigation>(groupNav, groupNav.size()));
+ virtualList.setAutoAdjustHeight(true);
}
public void setScope(Scope scope)
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js 2011-11-03 08:02:27 UTC (rev 7950)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIVirtualList.js 2011-11-03 08:08:39 UTC (rev 7951)
@@ -23,81 +23,74 @@
var uiVirtualList = document.getElementById(componentId);
if (uiVirtualList == null) return;
- var virtualHeight = 300;
-
- //If parent of virtualList have style.display = none --> can't get virtualList's height
- var tmp = uiVirtualList;
- if (tmp.offsetHeight == 0) {
- tmp = uiVirtualList.cloneNode(true);
- tmp.style.visibility = "hidden";
- tmp.style.display = "block";
- document.body.appendChild(tmp);
+ if (!hasNext)
+ {
+ uiVirtualList.isFinished = true;
}
- if (eXo.core.DOMUtil.getStyle(tmp, "height")) {
- virtualHeight = tmp.offsetHeight;
- }
+ var virtualHeight = eXo.core.DOMUtil.getStyle(uiVirtualList, 'height', true);
+
+ if (virtualHeight == 0)
+ {
+ virtualHeight = 300;
+ }
+
uiVirtualList.style.height = virtualHeight + "px";
if (autoAdjustHeight)
{
+ uiVirtualList.autoAdjustHeight = autoAdjustHeight;
eXo.core.Browser.fillUpFreeSpace(uiVirtualList);
}
+
+ uiVirtualList.scrollTop = 0;
- var children = eXo.core.DOMUtil.getChildrenByTagName(tmp,"div");
- var childrenHeight = 0;
- for (var i=0; i<children.length;i++) {
- childrenHeight += children[i].offsetHeight;
- }
-
- if (tmp !== uiVirtualList) {
- document.body.removeChild(tmp);
- }
-
- if (childrenHeight <= uiVirtualList.offsetHeight)
+ this.loadIfNeeded(uiVirtualList);
+}
+
+UIVirtualList.prototype.loadIfNeeded = function(uiVirtualList)
+{
+ if (uiVirtualList.clientHeight == uiVirtualList.scrollHeight)
{
- if (hasNext && childrenHeight != 0)
+ if (uiVirtualList.isFinished)
{
- uiVirtualList.onscroll();
- }
- else
- {
- uiVirtualList.isFinished = true;
- if (autoAdjustHeight)
+ if (uiVirtualList.autoAdjustHeight)
{
uiVirtualList.style.height = "auto";
}
}
+ else
+ {
+ uiVirtualList.onscroll();
+ }
}
- uiVirtualList.isInitiated = true;
- uiVirtualList.scrollTop = 0;
}
UIVirtualList.prototype.getFeedBox = function(componentId) {
- var DOMUtil = eXo.core.DOMUtil;
- var uiVirtualList = document.getElementById(componentId);
- var feedBox = DOMUtil.findFirstDescendantByClass(uiVirtualList, "div","FeedBox");
- if (feedBox == null) {
- feedBox = DOMUtil.findFirstDescendantByClass(uiVirtualList, "tbody","FeedBox");
- }
- return feedBox;
+ var DOMUtil = eXo.core.DOMUtil;
+ var uiVirtualList = document.getElementById(componentId);
+ var feedBox = DOMUtil.findFirstDescendantByClass(uiVirtualList, "div","FeedBox");
+ if (feedBox == null) {
+ feedBox = DOMUtil.findFirstDescendantByClass(uiVirtualList, "tbody","FeedBox");
+ }
+ return feedBox;
}
UIVirtualList.prototype.onScroll = function(uiVirtualList, url) {
- if (uiVirtualList.isFinished || uiVirtualList.isLocked) return;
- var DOMUtil = eXo.core.DOMUtil;
- var componentHeight = uiVirtualList.offsetHeight;
- var scrollPosition = uiVirtualList.scrollTop;
- var scrollerHeight = uiVirtualList.scrollHeight;
- var scrollable_gap = scrollerHeight - (scrollPosition + componentHeight);
- // if scrollbar reaches bottom
- if (scrollable_gap <= 1) {
- var feedBox = this.getFeedBox(uiVirtualList.id);
- var appendHTML = feedBox.innerHTML;
- uiVirtualList.storeHTML = appendHTML;
- uiVirtualList.isLocked = true;
- ajaxGet(url);
- }
+ if (uiVirtualList.isFinished || uiVirtualList.inProgress) return;
+ var DOMUtil = eXo.core.DOMUtil;
+ var componentHeight = uiVirtualList.offsetHeight;
+ var scrollPosition = uiVirtualList.scrollTop;
+ var scrollerHeight = uiVirtualList.scrollHeight;
+ var scrollable_gap = scrollerHeight - (scrollPosition + componentHeight);
+ // if scrollbar reaches bottom
+ if (scrollable_gap <= 1) {
+ var feedBox = this.getFeedBox(uiVirtualList.id);
+ var html = feedBox.innerHTML;
+ uiVirtualList.backupHTML = html;
+ uiVirtualList.inProgress = true;
+ ajaxGet(url);
+ }
}
UIVirtualList.prototype.updateList = function(componentId, hasNext) {
@@ -111,21 +104,20 @@
}
var feedBox = this.getFeedBox(uiVirtualList.id);
- var loadedContent = uiVirtualList.storeHTML;
+ var loadedContent = uiVirtualList.backupHTML;
if (eXo.core.Browser.browserType != "ie") {
- feedBox.innerHTML = loadedContent + feedBox.innerHTML;
- } else {
- var index = uiVirtualList.innerHTML.indexOf(feedBox.className);
- index = uiVirtualList.innerHTML.indexOf(">", index) + 1;
- var firstSec = uiVirtualList.innerHTML.substring(0, index);
- var secondSec = uiVirtualList.innerHTML.substring(index);
- uiVirtualList.innerHTML = firstSec + loadedContent + secondSec;
+ feedBox.innerHTML = loadedContent + feedBox.innerHTML;
+ } else {
+ var index = uiVirtualList.innerHTML.indexOf(feedBox.className);
+ index = uiVirtualList.innerHTML.indexOf(">", index) + 1;
+ var firstSec = uiVirtualList.innerHTML.substring(0, index);
+ var secondSec = uiVirtualList.innerHTML.substring(index);
+ uiVirtualList.innerHTML = firstSec + loadedContent + secondSec;
}
- uiVirtualList.isLocked = false;
- if (!uiVirtualList.isFinished && !uiVirtualList.isInitiated) {
- this.init(componentId);
- }
+ uiVirtualList.inProgress = false;
+
+ this.loadIfNeeded(uiVirtualList);
}
eXo.webui.UIVirtualList = new UIVirtualList();
13 years, 1 month
gatein SVN: r7950 - epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal.
by do-not-reply@jboss.org
Author: hfnukal
Date: 2011-11-03 04:02:27 -0400 (Thu, 03 Nov 2011)
New Revision: 7950
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
Log:
JBEPP-1091 Portal is signed
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-11-02 21:38:11 UTC (rev 7949)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-11-03 08:02:27 UTC (rev 7950)
@@ -15,6 +15,8 @@
<packaging>pom</packaging>
<properties>
+
+ <mead.target>jboss-epp-5</mead.target>
<mead.svn.base>${svn.base}</mead.svn.base>
<mead.svn.repo>${svn.gatein.repo}</mead.svn.repo>
13 years, 1 month
gatein SVN: r7949 - portal/trunk.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-11-02 17:38:11 -0400 (Wed, 02 Nov 2011)
New Revision: 7949
Modified:
portal/trunk/pom.xml
Log:
- Updated to use PC 2.3.0-GA.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-11-02 21:26:52 UTC (rev 7948)
+++ portal/trunk/pom.xml 2011-11-02 21:38:11 UTC (rev 7949)
@@ -45,7 +45,7 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Beta08</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta08</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
13 years, 1 month