gatein SVN: r3167 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-21 08:32:27 -0400 (Fri, 21 May 2010)
New Revision: 3167
Modified:
portal/trunk/pom.xml
Log:
Actually needed for the packaging part :-/
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-05-21 11:03:45 UTC (rev 3166)
+++ portal/trunk/pom.xml 2010-05-21 12:32:27 UTC (rev 3167)
@@ -911,6 +911,26 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>java.net</id>
+ <url>http://download.java.net/maven/2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>exo-int</id>
+ <url>http://maven2.exoplatform.org/rest/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
14 years, 7 months
- 1
- 0
gatein SVN: r3166 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-21 07:03:45 -0400 (Fri, 21 May 2010)
New Revision: 3166
Modified:
portal/trunk/pom.xml
Log:
Upgrade JCR and dependencies
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-05-21 07:36:46 UTC (rev 3165)
+++ portal/trunk/pom.xml 2010-05-21 11:03:45 UTC (rev 3166)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.1-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.1-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.1-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.1-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.2-CR1</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.2-CR1</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.2-CR1</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.2-CR1</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
@@ -49,12 +49,12 @@
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.5.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.3-CR01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.1</version.chromattic>
+ <version.chromattic>1.0.2</version.chromattic>
<version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>
14 years, 7 months
- 1
- 0
gatein SVN: r3165 - in portal/trunk: webui/core/src/main/java/org/exoplatform/webui/form/ext and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-05-21 03:36:46 -0400 (Fri, 21 May 2010)
New Revision: 3165
Modified:
portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java
Log:
GTNPORTAL-1236 Persist value after re-render UIFormComboBox and bonus UIFormComboBox into SampleUIForm
Modified: portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java
===================================================================
--- portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java 2010-05-21 07:06:30 UTC (rev 3164)
+++ portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleUIForm.java 2010-05-21 07:36:46 UTC (rev 3165)
@@ -44,6 +44,7 @@
import org.exoplatform.webui.form.UIFormTextAreaInput;
import org.exoplatform.webui.form.UIFormInputWithActions.ActionData;
import org.exoplatform.webui.form.ext.UIFormColorPicker;
+import org.exoplatform.webui.form.ext.UIFormComboBox;
import org.exoplatform.webui.form.validator.MandatoryValidator;
/**
@@ -74,6 +75,8 @@
private static final String DATE_OF_BIRTH = "dateOfBirth";
private static final String DESCRIPTION = "description";
+
+ private static final String COMBOBOX = "ComboBox";
private List<String> userNames = new ArrayList<String>();
@@ -107,6 +110,12 @@
List<SelectItemOption<String>> selectItemOptions = makeSelectItemOptions();
inputSet.addUIFormInput(new UIFormSelectBox(POSITION, null, selectItemOptions));
inputSet.addUIFormInput(new UIFormCheckBoxInput<String>(RECEIVE_EMAIL, null, "test"));
+
+ List<SelectItemOption<String>> comboBoxItemOptions = new ArrayList<SelectItemOption<String>>();
+ comboBoxItemOptions.add(new SelectItemOption<String>(("VI")));
+ comboBoxItemOptions.add(new SelectItemOption<String>(("UK")));
+ comboBoxItemOptions.add(new SelectItemOption<String>(("FR")));
+ inputSet.addUIFormInput(new UIFormComboBox(COMBOBOX, COMBOBOX, comboBoxItemOptions));
}
private List<SelectItemOption<String>> makeRadioOptions()
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java 2010-05-21 07:06:30 UTC (rev 3164)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/ext/UIFormComboBox.java 2010-05-21 07:36:46 UTC (rev 3165)
@@ -201,7 +201,13 @@
text += " />";
text +=
"<input class='UIComboboxInput' options=\"" + options
- + "\" onkeyup='eXo.webui.UICombobox.complete(this,event);' type='text' " + renderJsActions() + " /></div>";
+ + "\" onkeyup='eXo.webui.UICombobox.complete(this,event);' type='text' " + renderJsActions();
+ if(value_ != null && value_.trim().length() > 0)
+ {
+ text += "value='" + encodeValue(value_).toString() + "'";
+ }
+
+ text += " /></div>";
w.write(text);
}
14 years, 7 months
- 1
- 0
gatein SVN: r3164 - portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-05-21 03:06:30 -0400 (Fri, 21 May 2010)
New Revision: 3164
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
Log:
GTNPORTAL-1237 Check tab name if has space only
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-05-21 07:05:11 UTC (rev 3163)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-05-21 07:06:30 UTC (rev 3164)
@@ -292,7 +292,7 @@
return false;
}
label = label.trim();
- if (Character.isDigit(label.charAt(0)) || label.charAt(0) == '-')
+ if (label.length() < 1 || Character.isDigit(label.charAt(0)) || label.charAt(0) == '-')
{
return false;
}
@@ -463,7 +463,7 @@
String newTabLabel = context.getRequestParameter(RENAMED_TAB_LABEL_PARAMETER);
if (!tabPane.validateName(newTabLabel))
{
- context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", null));
+ context.getUIApplication().addMessage(new ApplicationMessage("UITabPaneDashboard.msg.wrongTabName", null, ApplicationMessage.ERROR));
return;
}
String newUri = tabPane.renamePageNode(nodeIndex, newTabLabel);
14 years, 7 months
- 1
- 0
gatein SVN: r3163 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/AuthenticationAndIdentity.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-21 03:05:11 -0400 (Fri, 21 May 2010)
New Revision: 3163
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png
Log:
JBEPP-276: New OrganizationServiceClassDiagram.png image
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/AuthenticationAndIdentity/OrganizationServiceClassDiagram.png
===================================================================
(Binary files differ)
14 years, 7 months
- 1
- 0
gatein SVN: r3162 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US: modules and 6 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-21 02:43:22 -0400 (Fri, 21 May 2010)
New Revision: 3162
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/PortletDevelopment/Standard/jsp_portlet/output.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml
Log:
JBEPP-276: QE recommendations edits
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/PortletDevelopment/Standard/jsp_portlet/output.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/Foundations.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -569,8 +569,9 @@
The <emphasis role="bold">Unified servlet context</emphasis>, and <emphasis role="bold">unified classloader</emphasis> are part of the <emphasis role="bold">extension mechanism</emphasis> (which is detailed in the next section).
</para>
<para>
- They provide standard API (<literal>ServletContext</literal>, <literal>ClassLoader</literal>) with specific resource loading behavior, such as visibility into associated web application archives, configured with dependencies property of <literal>PortalContainerDefinition</literal>.
+ They provide the standard API (<literal>ServletContext</literal>, <literal>ClassLoader</literal>) with specific resource loading behavior, such as visibility into associated web application archives, configured with dependencies property of <literal>PortalContainerDefinition</literal>.
</para>
+<!-- DOC TODO: Confirm if 'visibility into' is the approapriate phrase to use here -->
<para>
Resources from other web applications are queried in the order specified by the dependencies. The later entries in the list override the previous ones.
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -19,17 +19,17 @@
</step>
<step>
<para>
- Copy the <filename>jcr.ear</filename> into <filename>%jboss_home%/server/default/deploy</filename>.
+ Copy the <filename>jcr.ear</filename> into <filename>$JBOSS_HOME/server/default/deploy</filename>.
</para>
</step>
<step>
<para>
- Save the <filename>exo-configuration.xml</filename> into the root <filename>%jboss_home%/exo-configuration.xml</filename>.
+ Save the <filename>exo-configuration.xml</filename> into the root <filename>$JBOSS_HOME/exo-configuration.xml</filename>.
</para>
</step>
<step>
<para>
- Configure JAAS by inserting the XML fragment shown below into <filename>%jboss_home%/server/default/conf/login-config.xml</filename>.
+ Configure JAAS by inserting the XML fragment shown below into <filename>$JBOSS_HOME/server/default/conf/login-config.xml</filename>.
</para>
<programlisting language="XML" role="XML"><![CDATA[<application-policy name="exo-domain">
@@ -46,7 +46,7 @@
<para>
The <filename>exo-configuration.xml</filename> must contain the following parts:
</para>
-
+<!-- DOC TODO: There is no exo-configuration.xml file in the jar or in the svn trunk/. Does this file exist? -->
<programlisting language="XML" role="XML"><![CDATA[<component>
<key>org.jboss.cache.transaction.TransactionManagerLookup</key>
<type>org.jboss.cache.GenericTransactionManagerLookup</type>^
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -11,6 +11,7 @@
<para>
The JCR Service can use multiple repositories and each repository can have multiple workspaces.
</para>
+<!--DOC TODO Add more definition of respositories and workspaces -->
<para>
The repository configuration parameters support human-readable formats of values. They are not case-sensitive.
</para>
@@ -105,6 +106,7 @@
<section id="sect-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration">
<title>Portal and Standalone configuration</title>
+<!-- DOC TODO Do we need to discuss JCR in Satandalone mode, is this relevant?-->
<para>
Like other eXo services, eXo JCR can be configured and used in portal (or embedded) mode (as a service embedded in EPP5) and in standalone mode.
</para>
@@ -169,7 +171,7 @@
<area coords="10" id="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-conf-path" />
<area coords="15" id="area-Reference_Guide-eXo_JCR_configuration-Portal_and_Standalone_configuration-JCR_Service_Configuration-working-conf" />
</areaspec>
-
+<!-- DOC TODO: There is no exo-configuration.xml file in the jar or in the svn trunk/. Does this file exist? -->
<programlisting language="XML" role="XML"><![CDATA[<component>
<key>org.exoplatform.services.jcr.RepositoryService</key>
<type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
@@ -213,12 +215,14 @@
<para>
The default configuration of the Repository Service is defined in <filename><replaceable>jar:</replaceable>/conf/portal/exo-jcr-config.xml</filename>. It is available in both portal and standalone modes.
</para>
+<!-- DOC TODO: There is no exo-configuration.xml file in the jar or in the svn trunk/. Does this file exist? -->
<para>
In portal mode it is overriden and located in the portal web application <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename>.
</para>
<para>
An example of the Repository Service configuration for standalone mode is included below:
</para>
+<!-- DOC TODO: convert the varlists below this code sample to callouts, and ensure tags and attributes are marked up appropriately-->
<!-- <programlistingco>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -128,7 +128,7 @@
<section id="sect-Reference_Guide-External_Value_Storages-Content_Addressable_Value_storage_CAS_support">
<title>Content Addressable Value storage (CAS) support</title>
<para>
- eXo JCR supports the <phrase>Content-addressable storage</phrase> feature for <phrase>Values</phrase> storing.
+ eXo JCR supports the <phrase>Content-addressable storage</phrase> feature for <phrase>values</phrase> storing.
</para>
<para>
Content-addressable storage, also referred to as associative storage and abbreviated as <emphasis role="bold">CAS</emphasis>, is a mechanism for storing information that can be retrieved based on its content, not its storage location.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -6,10 +6,10 @@
<section id="sect-Reference_Guide-Introduction">
<title>Introduction</title>
<para>
- The Java Content Repository (JCR) API was created within the Java Community Process (JCP)<ulink type="http" url="http://jcp.org/">http://jcp.org/</ulink>) as a collaboration between an expert group and the Java community.
+ The Java Content Repository (JCR) API was created within the Java Community Process (<ulink type="http" url="http://jcp.org/">http://jcp.org/</ulink>) as a collaboration between an expert group and the Java community.
</para>
<para>
- Within the JCP, JCR is known as Java Specification Request-170 (JSR-170) <ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=170">http://www.jcp.org/en/jsr/detail?id=170</ulink>.
+ Within the Java Community Process (JCP), JCR is known as Java Specification Request-170 (JSR-170) <ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=170">http://www.jcp.org/en/jsr/detail?id=170</ulink>.
</para>
<section id="sect-Reference_Guide-JCR_JSR_170_API_main_concepts-The_Data_model">
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -11,7 +11,7 @@
JBossTransactionsService implements eXo <xref linkend="chap-Reference_Guide-eXoJCR"/> and provides access to <ulink type="http" url="http://www.jboss.org/jbosstm/">JBoss Transaction Service (JBossTS)</ulink> JTA implementation via eXo container dependency.
</para>
<para>
- TransactionService used in JCR cache <emphasis>org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache</emphasis> implementaion. See <ulink url="cluster-config.html">Cluster configuration</ulink> for example.
+ TransactionService used in JCR cache <emphasis>org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache</emphasis> implementation.
</para>
</section>
@@ -21,17 +21,16 @@
Example configuration:
</para>
-<programlisting> <component>
- <key>org.exoplatform.services.transaction.TransactionService</key>
- <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type>
- <init-params>
- <value-param>
- <name>timeout</name>
- <value>3000</value>
- </value-param>
- </init-params>
- </component>
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<component>
+ <key>org.exoplatform.services.transaction.TransactionService</key>
+ <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type>
+ <init-params>
+ <value-param>
+ <name>timeout</name>
+ <value>3000</value>
+ </value-param>
+ </init-params>
+ </component>]]></programlisting>
<para>
timeout - XA transaction timeout in seconds
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -34,6 +34,7 @@
<para>
Currently the data container is tested with the following Rational Database Management Systems (RDBMS):
</para>
+<!-- Commented out in favor of more extensive list found in EPP 5.0 ERD (and converted to XML for Release Notes)
<itemizedlist>
<listitem>
<para>
@@ -75,8 +76,136 @@
HSQLDB (1.8.0.7)
</para>
</listitem>
- </itemizedlist>
+ </itemizedlist> -->
+ <table id="tabl-Release_Notes-Certified_Environments-Database_Support_">
+ <title>Database Support </title>
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>
+ RDBMS
+ </entry>
+ <entry>
+ Server
+ </entry>
+ <entry>
+ JBDC Driver
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+ MySQL
+ </entry>
+ <entry>
+ <para>
+ 5.1 (certified)
+ </para>
+ <para>
+ 5.0 (compatible)
+ </para>
+ </entry>
+ <entry>
+ <para>
+ MYSQL Connector/J 5.1.8 (certified)
+ </para>
+ <para>
+ MySQL Connector/J 5.0.8 (compatible)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Oracle DB
+ </entry>
+ <entry>
+ <para>
+ 10g R2 (10.2.0.4) (certified)
+ </para>
+ <para>
+ 11g R1 (11.1.0.7.0) (compatible)
+ </para>
+ <para>
+ 11g RAC (11.1.0.7.0) (compatible)
+ </para>
+ </entry>
+ <entry>
+ <para>
+ Oracle 10g R2 (10.2.0.4) (certified)
+ </para>
+ <para>
+ Oracle 11g R1 (11.1.0.7) (compatible)
+ </para>
+ <para>
+ Oracle 11g R1 (11.1.0.7) (compatible)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ MS SQL Server
+ </entry>
+ <entry>
+ <para>
+ 2005 SP3 (certified)
+ </para>
+ <para>
+ 2008 SP1 (certified)
+ </para>
+ </entry>
+ <entry>
+ JDBC Driver 2.0 (certified)
+ </entry>
+ </row>
+ <row>
+ <entry>
+ PostgresSQL
+ </entry>
+ <entry>
+ <para>
+ 8.3.7 (certified)
+ </para>
+ <para>
+ 8.2.4 (compatible)
+ </para>
+ </entry>
+ <entry>
+ <para>
+ JDBC4 Driver, Ver 8.3-605 (certified)
+ </para>
+ <para>
+ JDBC4 Driver, Ver 8.2-510 (compatible)
+ </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ DB2
+ </entry>
+ <entry>
+ 9.7 (certified)
+ </entry>
+ <entry>
+ IBM Data Server Driver for JDBC and SQLJ (JCC Driver) Version: 9.1 (fixpack 3a) (certified)
+ </entry>
+ </row>
+ <row>
+ <entry>
+ Sybase
+ </entry>
+ <entry>
+ 15.0.2 (certified)
+ </entry>
+ <entry>
+ JConnect v6.0.5 (Build 26564 / 11 Jun 2009) (certified)
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
<para>
Each of these database managers supports ANSI SQL standards but each has its own specifics as well. Consequently, each database has its own configuration in eXo JCR as a database dialect parameter.
</para>
@@ -126,76 +255,75 @@
The following example is in standalone mode with two data containers <parameter>jdbcjcr</parameter> (a local HSQLDB) and <parameter>jdbcjcr1</parameter> (a remote MySQL container):
</para>
-<programlisting language="XML" role="XML"><component>
- <key>org.exoplatform.services.naming.InitialContextInitializer</key>
- <type>org.exoplatform.services.naming.InitialContextInitializer</type>
- <component-plugins>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcjcr</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
- <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/>
- <property name="username" value="sa"/>
- <property name="password" value=""/>
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcjcr1</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="url" value="jdbc:mysql://exoua.dnsalias.net/jcr"/>
- <property name="username" value="exoadmin"/>
- <property name="password" value="exo12321"/>
- <property name="maxActive" value="50"/>
- <property name="maxIdle" value="5"/>
- <property name="initialSize" value="5"/>
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugins>
- <init-params>
- <value-param>
- <name>default-context-factory</name>
- <value>org.exoplatform.services.naming.SimpleContextFactory</value>
- </value-param>
- </init-params>
- </component>
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<component>
+ <key>org.exoplatform.services.naming.InitialContextInitializer</key>
+ <type>org.exoplatform.services.naming.InitialContextInitializer</type>
+ <component-plugins>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>bind.datasource</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.naming.BindReferencePlugin</type>
+ <init-params>
+ <value-param>
+ <name>bind-name</name>
+ <value>jdbcjcr1</value>
+ </value-param>
+ <value-param>
+ <name>class-name</name>
+ <value>javax.sql.DataSource</value>
+ </value-param>
+ <value-param>
+ <name>factory</name>
+ <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
+ </value-param>
+ <properties-param>
+ <name>ref-addresses</name>
+ <description>ref-addresses</description>
+ <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+ <property name="url" value="jdbc:mysql://exoua.dnsalias.net/jcr"/>
+ <property name="username" value="exoadmin"/>
+ <property name="password" value="exo12321"/>
+ <property name="maxActive" value="50"/>
+ <property name="maxIdle" value="5"/>
+ <property name="initialSize" value="5"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugins>
+ <init-params>
+ <value-param>
+ <name>default-context-factory</name>
+ <value>org.exoplatform.services.naming.SimpleContextFactory</value>
+ </value-param>
+ </init-params>
+ </component>]]></programlisting>
</step>
<step>
<para>
@@ -504,7 +632,7 @@
</programlisting>
<para>
- To configure multiple repository workspaces with one database the "multi-db" parameter must be switched off (set the value to "false").
+ To configure multiple repository workspaces with a single database the "multi-db" parameter must be switched off (set the value to "false").
</para>
<para>
The following example shows configuration for two workspaces <parameter>ws</parameter> (jdbcjcr) and <parameter>ws1</parameter> (jdbcjcr) which will be persisted in one <application>PostgreSQL</application> database:
@@ -685,7 +813,7 @@
<section id="sect-Reference_Guide-JDBC_Data_Container_Config-Forse_Query_Hints">
<title>Force Query Hints</title>
<para>
- Some databases (such as <application>Oracle</application> and <application>MySQL</application>)support hints to increase query performance.
+ Some databases (such as <application>Oracle</application> and <application>MySQL</application>) support hints to increase query performance.
</para>
<para>
eXo JCR has a separate complex query implementation for the <application>Oracle</application> dialect which uses query hints to increase performance for important queries.
@@ -694,13 +822,12 @@
To enable this option complete the configuration property as shown below:
</para>
-<programlisting><workspace name="ws" auto-init-root-nodetype="nt:unstructured">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="dialect" value="oracle"/>
- <property name="force.query.hints" value="true" />
- ......
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[<workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="dialect" value="oracle"/>
+ <property name="force.query.hints" value="true" />
+ ......]]></programlisting>
<note>
<para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -6,9 +6,12 @@
<section id="sect-Reference_Guide-Search_Configuration">
<title>Search Configuration</title>
<para>
-Search can be configured to perform in a specified way.
- </para>
- <para>
+ The search function in JCR can be configured to perform in specific ways. This section will discuss configuring the search function to improve search performance and results.
+ </para>
+ <para>
+ Below is an example of the configuration file that governs search behaviors. Refer to <xref linkend="sect-Reference_Guide-Search_Configuration-Global_Search_Index"/> for how searching operates in JCR and discussions about customized searches.
+ </para>
+ <para>
The JCR index configuration file is located at <filename>/portal/WEB-INF/conf/jcr/repository-configuration.xml</filename>.
</para>
<para>
@@ -48,7 +51,8 @@
</note>
<table pgwide="0" align="left" >
<title>Configuration parameters</title>
- <tgroup cols="4">
+<!--Removing 'version' column <tgroup cols="4"> -->
+ <tgroup cols="3">
<thead>
<row>
<entry>
@@ -60,9 +64,9 @@
<entry>
Description
</entry>
- <entry>
+ <!-- <entry>
Version
- </entry>
+ </entry> -->
</row>
</thead>
<tbody>
@@ -76,9 +80,9 @@
<entry>
The location of the index directory. This parameter is mandatory. It is called "<literal>indexDir</literal>" in versions prior to version 1.9.
</entry>
- <entry>
+ <!--<entry>
1.0
- </entry>
+ </entry> -->
</row>
<row>
<entry>
@@ -90,10 +94,10 @@
<entry>
Advises lucene to use compound files for the index files.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
min-merge-docs
@@ -104,10 +108,10 @@
<entry>
The minimum number of nodes in an index until segments are merged.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
volatile-idle-time
@@ -118,10 +122,10 @@
<entry>
Idle time in seconds until the volatile index part is moved to a persistent index even though <literal>minMergeDocs</literal> is not reached.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
max-merge-docs
@@ -132,10 +136,10 @@
<entry>
The maximum number of nodes in segments that will be merged. The default value changed to <literal>Integer.MAX_VALUE</literal> in JCR version 1.9.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
merge-factor
@@ -146,10 +150,10 @@
<entry>
Determines how often segment indices are merged.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
max-field-length
@@ -160,10 +164,10 @@
<entry>
The number of words that are fulltext indexed at most per property.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
cache-size
@@ -174,10 +178,10 @@
<entry>
Size of the document number cache. This cache maps uuids to lucene document numbers
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
force-consistencycheck
@@ -188,10 +192,10 @@
<entry>
Runs a consistency check on every startup. If false, a consistency check is only performed when the search index detects a prior forced shutdown.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
auto-repair
@@ -202,10 +206,10 @@
<entry>
Errors detected by a consistency check are automatically repaired. If false, errors are only written to the log.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
query-class
@@ -216,10 +220,10 @@
<entry>
Classname that implements the javax.jcr.query.Query interface.This class must also extend from the class: org.exoplatform.services.jcr.impl.core.query.AbstractQueryImpl.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
document-order
@@ -230,10 +234,10 @@
<entry>
If true and the query does not contain an 'order by' clause, result nodes will be in document order. For better performance set to 'false' when queries return many nodes.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
result-fetch-size
@@ -244,10 +248,10 @@
<entry>
The number of results when a query is executed. Default value: <literal>Integer.MAX_VALUE</literal>.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
excerptprovider-class
@@ -258,10 +262,10 @@
<entry>
The name of the class that implements <literal>$lucene.ExcerptProvider</literal>. This should be used for the <literal>rep:excerpt()</literal> function in a query.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
support-highlighting
@@ -272,10 +276,10 @@
<entry>
If set to true additional information is stored in the index to support highlighting using the <literal>rep:excerpt()</literal> function.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
synonymprovider-class
@@ -286,10 +290,10 @@
<entry>
The name of a class that implements <literal>$lucene.SynonymProvider</literal>. The default value is null.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
synonymprovider-config-path
@@ -300,10 +304,10 @@
<entry>
The path to the synonym provider configuration file. This path is interpreted relative to the path parameter. If there is a path element inside the <literal>SearchIndex</literal> element, then this path is interpreted relative to the root path of the path. Whether this parameter is mandatory depends on the synonym provider implementation. The default value is null.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
indexing-configuration-path
@@ -314,10 +318,10 @@
<entry>
The path to the indexing configuration file.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
indexing-configuration-class
@@ -328,10 +332,10 @@
<entry>
The name of the class that implements <literal>$lucene.IndexingConfiguration</literal>.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
force-consistencycheck
@@ -342,10 +346,10 @@
<entry>
If set to true a consistency check is performed depending on the parameter <literal>forceConsistencyCheck</literal>. If set to false no consistency check is performed on startup, even if a redo log had been applied.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
spellchecker-class
@@ -356,10 +360,10 @@
<entry>
The name of a class that implements <literal>$lucene.SpellChecker</literal>.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
errorlog-size
@@ -370,10 +374,10 @@
<entry>
The default size of error log file in Kb.
</entry>
- <entry>
+<!-- <entry>
1.9
</entry>
- </row>
+ --> </row>
<row>
<entry>
upgrade-index
@@ -401,10 +405,10 @@
It is reccommended that a backup of the index be made before conversion. (Only for migrations from JCR 1.9 and later.)
</para>
</entry>
- <entry>
+<!-- <entry>
1.12
</entry>
- </row>
+ --> </row>
<row>
<entry>
analyzer
@@ -415,10 +419,10 @@
<entry>
Class name of a lucene analyzer to use for fulltext indexing of text.
</entry>
- <entry>
+<!-- <entry>
1.12
</entry>
- </row>
+ --> </row>
</tbody>
</tgroup>
</table>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/statistics.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -315,10 +315,10 @@
The statistics manager manages all the statistics provided by eXo JCR. It is responsible for printing the data into the CSV files but also exposing the statistics through JMX or Rest, or both.
</para>
<para>
- The statistics manager will create all the CSV files for each category of statistics that it manages. The format of those files is <emphasis>Statistics<replaceable>${category-name}</replaceable>-<replaceable>${creation-timestamp}</replaceable>.csv</emphasis>.
+ The statistics manager will create Comma-Separated Values (CSV) files for each category of statistics that it manages. The format of those files is <emphasis>Statistics<replaceable>${category-name}</replaceable>-<replaceable>${creation-timestamp}</replaceable>.csv</emphasis>.
</para>
<para>
- Those files will be created in the user directory if it is possible, otherwise they will be placed into the temporary directory. The format of those files is <envar>CSV</envar> (i.e. Comma-Separated Values). One new line will be added regularly (every five seconds by default) and one last line will be added at JVM exit. Each line will be composed of the five figures described below for each method and globally for all the methods.
+ Those files will be created in the user directory if it is possible, otherwise they will be placed into the temporary directory. Those files are formatted as CSV. One new line will be added regularly (every five seconds by default) and one last line will be added at JVM exit. Each line will be composed of the five figures described below for each method and globally for all the methods.
</para>
<table id="tabl-Reference_Guide-Statistics_Manager-Metric_Alias">
@@ -372,7 +372,7 @@
The persistence of the statistics can be disabled by setting the JVM parameter; <emphasis>JCRStatisticsManager.persistence.enabled</emphasis> to <emphasis>false</emphasis>. It is set to <emphasis>true</emphasis> by default.
</para>
<para>
- The period of time between each record (i.e. line of data into the file) can be defined by setting the JVM parameter; <emphasis>JCRStatisticsManager.persistence.timeout</emphasis> to the desired value expressed in milliseconds. It is set to <emphasis>5000</emphasis> by default.
+ The period of time between each record (that is, the line of data into the file) can be defined by setting the JVM parameter; <emphasis>JCRStatisticsManager.persistence.timeout</emphasis> to the desired value expressed in milliseconds. It is set to <emphasis>5000</emphasis> by default.
</para>
<para>
The statistics can also be accessed via JMX. The available methods are:
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/transaction-manager-lookup.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -11,11 +11,10 @@
It's JBossCache class registered as eXo container component in configuration.xml file.
</para>
-<programlisting> <component>
- <key>org.jboss.cache.transaction.TransactionManagerLookup</key>
- <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type>
- </component>
-</programlisting>
+<programlisting language="XML" role="XML"><![CDATA[ <component>
+ <key>org.jboss.cache.transaction.TransactionManagerLookup</key>
+ <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type>
+ </component>]]></programlisting>
<para>
JBossStandaloneJTAManagerLookup used in standalone environment. But for Application Server environment use GenericTransactionManagerLookup.
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -74,11 +74,13 @@
</listitem>
</varlistentry>
</variablelist>
+<!-- DOC TODO
<important>
<para>
The following sections require more textual information.
</para>
- </important>
+ </important> -->
+
<section id="sect-Reference_Guide-Gadgets-Existing_Gadgets">
<title>Existing Gadgets</title>
<mediaobject>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -41,7 +41,7 @@
<imagedata fileref="images/Common/Non-tech-docs.png" format="PNG" align="center" scale="90" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/Common/Non-tech-docs.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/Common/Non-tech-docs.png" format="PNG" align="center" contentwidth="130mm" />
</imageobject>
</mediaobject>
</listitem>
@@ -57,7 +57,7 @@
<imagedata fileref="images/Common/Videos.png" format="PNG" align="center" scale="90" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/Common/Videos.png" format="PNG" align="center" contentwidth="150mm" />
+ <imagedata fileref="images/Common/Videos.png" format="PNG" align="center" contentwidth="130mm" />
</imageobject>
</mediaobject>
</listitem>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/DefaultPortalConfiguration.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -8,7 +8,7 @@
<section id="sect-Reference_Guide-Default_Portal_Configuration-Overview">
<title>Overview</title>
<para>
- &PRODUCT;'s default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (i.e.: <literal>http://{hostname}:{port}/sample-portal/</literal>).
+ &PRODUCT;'s default home page URL is <literal>http://{hostname}:{port}/portal/</literal>. There may be multiple independent portals deployed in parallel at any given time, each of which has its root context (<literal>http://{hostname}:{port}/sample-portal/</literal>, for example).
</para>
<para>
Each portal is internally composed of one or more 'portals'. This is because there needs to be at least one such portal available. The default portal is called '<emphasis>Classic</emphasis>'. When accessing &PRODUCT;'s default URL, you are automatically directed to the '<emphasis>Classic</emphasis>' portal.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -126,7 +126,7 @@
<calloutlist>
<callout arearefs="area-Reference_Guide-i18n.locales.configuration.locale">
<para>
- <emphasis>locale</emphasis>: The locale has to be defined such as defined here <ulink type="http" url="http://ftp.ics.uci.edu-pub-ietf-http-related-iso639.txt" />. In this example "<emphasis>ar</emphasis>" is Arabic.
+ <emphasis>locale</emphasis>: The locale has to be defined as per the codes defined <ulink type="http" url="http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt">here</ulink>. In this example "<emphasis>ar</emphasis>" is Arabic.
</para>
</callout>
<callout arearefs="area-Reference_Guide-i18n.locales.configuration.output-encoding">
@@ -293,7 +293,7 @@
When translating an application it can sometimes be difficult to find the right key for a given property.
</para>
<para>
- Execute the portal in <emphasis role="bold">debug mode</emphasis> and select, from the available languages, select the special language; <emphasis role="bold">Magic locale</emphasis>.
+ Execute the portal in <emphasis role="bold">debug mode</emphasis> and select, from the available languages, the special language; <emphasis role="bold">Magic locale</emphasis>.
</para>
<para>
This feature translates a key to the same key value.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -32,7 +32,7 @@
<section id="sect-Reference_Guide-XML_Resources_Bundles-XML_format">
<title>XML format</title>
<para>
- The XML format is very simple and has been developed based on the <emphasis>DRY</emphasis> (<ulink type="http" url="http://www.artima.com/intv/dry.html">Don't Repeat Yourself</ulink>) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file:
+ The XML format is very simple and has been developed based on the 'Don't Repeat Yourself' (DRY) principle. Usually resource bundle keys are hierarchically defined and we can leverage the hierarchic nature of the XML for that purpose. Here is an example of turning a property file into an XML resource bundle file:
</para>
<programlisting>UIAccountForm.tab.label.AccountInputSet = ...
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/configuration.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -322,9 +322,10 @@
<para>
Just like with any portlet 2.0 event consumer and receiver, you must define them in the <filename>portlet.xml</filename>.
</para>
+<!--Unsure if community reference is appropriate enterprise doc. As per QE concern (anross
<para>
To see a working example, checkout the Seam Booking Demo portlet. <ulink url="http://anonsvn.jboss.org/repos/portletbridge/tags/2.0.0.FINAL/examples/se..." />
- </para>
+ </para> -->
<para>
You must also define the following <emphasis>init params</emphasis> in your <filename>portlet.xml</filename>.
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/PortletBridge/gettingstarted.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -117,7 +117,7 @@
<section id="sect-Reference_Guide-Getting_started_with_JBoss_Portlet_Bridge-Maven_Archetypes">
<title>Maven Archetypes</title>
<para>
- This project utilizes <ulink url="http://maven.apache.org/guides/introduction/introduction-to-archetypes.html">Maven archetypes</ulink> which allow you get up and running with different flavors of the bridge quickly.
+ This product utilizes <ulink url="http://maven.apache.org/guides/introduction/introduction-to-archetypes.html">Maven archetypes</ulink> which allow you get up and running with different flavors of the bridge quickly.
<table frame="all" id="tabl-Reference_Guide-Maven_Archetypes-Available_Archetypes">
<title>Available Archetypes</title>
<tgroup align="left" cols="5" colsep="1" rowsep="1">
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -34,7 +34,7 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" align="center" scale="100" />
+ <imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" align="center" scale="95" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/PortletDevelopment/Standard/SpecPortalDef.png" format="PNG" align="center" contentwidth="140mm" />
@@ -488,8 +488,8 @@
<area coords="25" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.requestDispatcher" />
<area coords="26" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.include" />
</areaspec>
-<!-- TODO highlight once Publican 1.6.3 installed (JAVA)-->
-<programlisting><![CDATA[package org.gatein.portal.examples.portlets;
+
+<programlisting language="Java" role="JAVA"><![CDATA[package org.gatein.portal.examples.portlets;
import java.io.IOException;
@@ -556,8 +556,8 @@
<para>
The generic portlet that is inherited dispatches the different views to the methods: <literal>doView</literal> , <literal>doHelp</literal> and <literal>doEdit</literal>.
</para>
-<!-- TODO highlight once Publican 1.6.3 installed (JAVA)-->
-<programlisting><![CDATA[...
+
+<programlisting language="Java" role="JAVA"><![CDATA[...
protected void doHelp(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException,
UnavailableException
{
@@ -589,8 +589,8 @@
<area coords="5" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.getActionParameter" />
<area coords="6" id="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.setRenderParameter" />
</areaspec>
-<!-- TODO highlight once Publican 1.6.3 installed (JAVA)-->
-<programlisting><![CDATA[...
+
+<programlisting language="Java" role="JAVA"><![CDATA[...
public void processAction(ActionRequest aRequest, ActionResponse aResponse) throws PortletException, IOException,
UnavailableException
{
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml 2010-05-20 22:03:47 UTC (rev 3161)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/WSRP.xml 2010-05-21 06:43:22 UTC (rev 3162)
@@ -326,31 +326,10 @@
<important>
<title>Chunked Encoding</title>
<para>
- Oracle does not support chunked encoding. Therefore if <emphasis role="bold">Oracle</emphasis>'s WSDL is used as a producer the following error will occur:
+ Some WSRP producers, such as Oracle, do not support chunked encoding. Using an Oracle WSRP producer will therefore produce an error.
</para>
-
-<screen>05:15:32,125 ERROR [SOAPFaultHelperJAXWS] SOAP request exception
-java.io.IOException: Could not transmit message
- at org.jboss.ws.core.client.HTTPRemotingConnection.invoke(HTTPRemotingConnection.java:265)
- at org.jboss.ws.core.client.SOAPProtocolConnectionHTTP.invoke(SOAPProtocolConnectionHTTP.java:71)
- at org.jboss.ws.core.CommonClient.invoke(CommonClient.java:340)
- at org.jboss.ws.core.jaxws.client.ClientImpl.invoke(ClientImpl.java:290)
-
-..........
-Caused by: org.jboss.remoting.CannotConnectException: Can not connect http client invoker after 1 attempt(s)
- at org.jboss.remoting.transport.http.HTTPClientInvoker.makeInvocation(HTTPClientInvoker.java:249)
- at org.jboss.remoting.transport.http.HTTPClientInvoker.transport(HTTPClientInvoker.java:161)
- at org.jboss.remoting.MicroRemoteClientInvoker.invoke(MicroRemoteClientInvoker.java:165)
- at org.jboss.remoting.Client.invoke(Client.java:1724)
- at org.jboss.remoting.Client.invoke(Client.java:629)
- at org.jboss.ws.core.client.HTTPRemotingConnection.invoke(HTTPRemotingConnection.java:243)
- ... 135 more
-Caused by: org.jboss.ws.WSException: Invalid HTTP server response [503] - Service Unavailable
- at org.jboss.ws.core.soap.SOAPMessageUnMarshallerHTTP.read(SOAPMessageUnMarshallerHTTP.java:75)
- at org.jboss.remoting.transport.http.HTTPClientInvoker.readResponse(HTTPClientInvoker.java:570)
-</screen>
<para>
- A workaround for this issue involves editing the chunksize setting in the <filename>standard-jaxws-client-config.xml</filename> file.
+ A workaround for this issue involves editing the <parameter>chunksize</parameter> setting in the <filename>standard-jaxws-client-config.xml</filename> file.
</para>
<para>
Refer to <ulink type="http" url="http://community.jboss.org/wiki/Workaroundwhenchunkedencodingisnotsupported">http://community.jboss.org/wiki/Workaroundwhenchunkedencodingisnotsupported</ulink> for more information.
14 years, 7 months
- 1
- 0
gatein SVN: r3161 - in portal/trunk: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2010-05-20 18:03:47 -0400 (Thu, 20 May 2010)
New Revision: 3161
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/ExtGroup.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipImpl.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
- GTNPORTAL-1231 - Problem when LDAP group name contains slash
- GTNPORTAL-1232 - Groups and user memberships are displayed unordered
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java 2010-05-20 22:03:47 UTC (rev 3161)
@@ -44,6 +44,8 @@
private String pathSeparator = ".";
+ private String slashReplacement = "@_@_@";
+
private boolean forceMembershipOfMappedTypes = false;
private String associationMembershipType;
@@ -52,7 +54,10 @@
private boolean useJTA = false;
+ private boolean sortGroups = true;
+ private boolean sortMemberships = true;
+
public Config()
{
}
@@ -154,6 +159,16 @@
return null;
}
+ public String getPLIDMGroupName(String gtnGroupName)
+ {
+ return gtnGroupName.replaceAll(getSlashReplacement(), "/");
+ }
+
+ public String getGtnGroupName(String plidmGroupName)
+ {
+ return plidmGroupName.replaceAll("/", getSlashReplacement());
+ }
+
Set<String> getTypes(String id)
{
HashSet<String> types = new HashSet<String>();
@@ -283,4 +298,34 @@
{
this.useJTA = useJTA;
}
+
+ public String getSlashReplacement()
+ {
+ return slashReplacement;
+ }
+
+ public void setSlashReplacement(String slashReplacement)
+ {
+ this.slashReplacement = slashReplacement;
+ }
+
+ public boolean isSortGroups()
+ {
+ return sortGroups;
+ }
+
+ public void setSortGroups(boolean sortGroups)
+ {
+ this.sortGroups = sortGroups;
+ }
+
+ public boolean isSortMemberships()
+ {
+ return sortMemberships;
+ }
+
+ public void setSortMemberships(boolean sortMemberships)
+ {
+ this.sortMemberships = sortMemberships;
+ }
}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/ExtGroup.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/ExtGroup.java 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/ExtGroup.java 2010-05-20 22:03:47 UTC (rev 3161)
@@ -29,7 +29,7 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class ExtGroup implements Group, Serializable
+public class ExtGroup implements Group, Serializable, Comparable
{
private String id;
@@ -155,4 +155,17 @@
result = 31 * result + (desc != null ? desc.hashCode() : 0);
return result;
}
+
+ public int compareTo(Object o)
+ {
+ if (!(o instanceof Group))
+ {
+ return 0;
+ }
+
+ Group group = (Group)o;
+
+ return groupName.compareTo(group.getGroupName());
+
+ }
}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2010-05-20 22:03:47 UTC (rev 3161)
@@ -83,17 +83,21 @@
{
org.picketlink.idm.api.Group parentGroup = null;
+ String childPLGroupName = getPLIDMGroupName(child.getGroupName());
+
if (parent != null)
{
+
+ String parentPLGroupName = getPLIDMGroupName(parent.getGroupName());
try
{
parentGroup =
getIdentitySession().getPersistenceManager().
- findGroup(parent.getGroupName(), orgService.getConfiguration().getGroupType(parent.getParentId()));
+ findGroup(parentPLGroupName, orgService.getConfiguration().getGroupType(parent.getParentId()));
}
catch (Exception e)
{
- log.info("Cannot obtain group: " + parent.getGroupName(), e);
+ log.info("Cannot obtain group: " + parentPLGroupName, e);
}
@@ -162,15 +166,17 @@
org.picketlink.idm.api.Group jbidGroup = null;
+ String plGroupName = getPLIDMGroupName(group.getGroupName());
+
try
{
jbidGroup =
getIdentitySession().getPersistenceManager().
- findGroup(group.getGroupName(), orgService.getConfiguration().getGroupType(group.getParentId()));
+ findGroup(plGroupName, orgService.getConfiguration().getGroupType(group.getParentId()));
}
catch (Exception e)
{
- log.info("Cannot obtain group: " + group.getGroupName() + "; ", e);
+ log.info("Cannot obtain group: " + plGroupName + "; ", e);
}
if (jbidGroup == null)
@@ -198,7 +204,7 @@
}
catch (Exception e)
{
- log.info("Cannot clear group relationships: " + group.getGroupName() + "; ", e);
+ log.info("Cannot clear group relationships: " + plGroupName + "; ", e);
}
try
@@ -207,7 +213,7 @@
}
catch (Exception e)
{
- log.info("Cannot remove group: " + group.getGroupName() + "; ", e);
+ log.info("Cannot remove group: " + plGroupName + "; ", e);
}
if (broadcast)
@@ -292,9 +298,11 @@
{
try
{
+ String plGroupName = getPLIDMGroupName(parent.getGroupName());
+
jbidGroup =
getIdentitySession().getPersistenceManager().
- findGroup(parent.getGroupName(), orgService.getConfiguration().getGroupType(parent.getParentId()));
+ findGroup(plGroupName, orgService.getConfiguration().getGroupType(parent.getParentId()));
}
catch (Exception e)
{
@@ -377,8 +385,15 @@
// UI has hardcoded casts to List
- return new LinkedList<Group>(exoGroups);
+ List results = new LinkedList<Group>(exoGroups);
+ if (orgService.getConfiguration().isSortGroups())
+ {
+ Collections.sort(results);
+ }
+
+ return results;
+
}
public Collection findGroupsOfUser(String user) throws Exception
@@ -522,8 +537,10 @@
log.info("Identity operation error: ", e);
}
- ExtGroup exoGroup = new ExtGroup(jbidGroup.getName());
+ String gtnGroupName = getGtnGroupName(jbidGroup.getName());
+ ExtGroup exoGroup = new ExtGroup(gtnGroupName);
+
if (attrs.containsKey(GROUP_DESCRIPTION) && attrs.get(GROUP_DESCRIPTION).getValue() != null)
{
exoGroup.setDescription(attrs.get(GROUP_DESCRIPTION).getValue().toString());
@@ -535,7 +552,7 @@
// UI requires that group has label
else
{
- exoGroup.setLabel(exoGroup.getGroupName());
+ exoGroup.setLabel(gtnGroupName);
}
// Resolve full ID
@@ -544,7 +561,7 @@
exoGroup.setId(id);
// child of root
- if (id.length() == jbidGroup.getName().length() + 1)
+ if (id.length() == gtnGroupName.length() + 1)
{
exoGroup.setParentId(null);
}
@@ -566,6 +583,8 @@
Collection<org.picketlink.idm.api.Group> parents = new HashSet();
+ String gtnGroupName = getGtnGroupName(jbidGroup.getName());
+
try
{
parents = getIdentitySession().getRelationshipManager().findAssociatedGroups(jbidGroup, null, false, false);
@@ -589,6 +608,8 @@
String id = orgService.getConfiguration().getParentId(jbidGroup.getGroupType());
+
+
if (id != null && orgService.getConfiguration().isForceMembershipOfMappedTypes())
{
if (id.endsWith("/*"))
@@ -596,12 +617,12 @@
id = id.substring(0, id.length() - 2);
}
- return id + "/" + jbidGroup.getName();
+ return id + "/" + gtnGroupName;
}
// All groups not connected to the root should be just below the root
- return "/" + jbidGroup.getName();
+ return "/" + gtnGroupName;
//TODO: make it configurable
// throw new IllegalStateException("Group present that is not connected to the root: " + jbidGroup.getName());
@@ -610,7 +631,7 @@
String parentGroupId = getGroupId(((org.picketlink.idm.api.Group)parents.iterator().next()));
- return parentGroupId + "/" + jbidGroup.getName();
+ return parentGroupId + "/" + gtnGroupName;
}
@@ -619,10 +640,12 @@
org.picketlink.idm.api.Group jbidGroup = null;
+ String plGroupName = getPLIDMGroupName(exoGroup.getGroupName());
+
try
{
jbidGroup = getIdentitySession().getPersistenceManager().
- findGroup(exoGroup.getGroupName(), orgService.getConfiguration().getGroupType(exoGroup.getParentId()));
+ findGroup(plGroupName, orgService.getConfiguration().getGroupType(exoGroup.getParentId()));
}
catch (Exception e)
{
@@ -636,7 +659,7 @@
{
jbidGroup =
getIdentitySession().getPersistenceManager().
- createGroup(exoGroup.getGroupName(), orgService.getConfiguration().getGroupType(exoGroup.getParentId()));
+ createGroup(plGroupName, orgService.getConfiguration().getGroupType(exoGroup.getParentId()));
}
catch (Exception e)
{
@@ -719,5 +742,16 @@
return rootGroup;
}
+ public String getPLIDMGroupName(String gtnGroupName)
+ {
+ return orgService.getConfiguration().getPLIDMGroupName(gtnGroupName);
+ }
+ public String getGtnGroupName(String plidmGroupName)
+ {
+ return orgService.getConfiguration().getGtnGroupName(plidmGroupName);
+ }
+
+
+
}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2010-05-20 22:03:47 UTC (rev 3161)
@@ -102,9 +102,11 @@
+ " because membership type is null");
}
+ String plGroupName = getPLIDMGroupName(g.getGroupName());
+
String groupId =
getIdentitySession().getPersistenceManager().
- createGroupKey(g.getGroupName(), orgService.getConfiguration().getGroupType(g.getParentId()));
+ createGroupKey(plGroupName, orgService.getConfiguration().getGroupType(g.getParentId()));
if (isCreateMembership(mt.getName()))
@@ -147,9 +149,12 @@
public void saveMembership(Membership m, boolean broadcast) throws Exception
{
+
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(m.getGroupId()));
+
String groupId =
getIdentitySession().getPersistenceManager().
- createGroupKey(getGroupNameFromId(m.getGroupId()), getGroupTypeFromId(m.getGroupId()));
+ createGroupKey(plGroupName, getGroupTypeFromId(m.getGroupId()));
boolean hasRole = false;
@@ -215,9 +220,11 @@
Membership m = new MembershipImpl(id);
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(m.getGroupId()));
+
String groupId =
getIdentitySession().getPersistenceManager().
- createGroupKey(getGroupNameFromId(m.getGroupId()), getGroupTypeFromId(m.getGroupId()));
+ createGroupKey(plGroupName, getGroupTypeFromId(m.getGroupId()));
boolean hasRole = false;
@@ -376,9 +383,11 @@
public Membership findMembershipByUserGroupAndType(String userName, String groupId, String type) throws Exception
{
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(groupId));
+
String gid =
getIdentitySession().getPersistenceManager().
- createGroupKey(getGroupNameFromId(groupId), getGroupTypeFromId(groupId));
+ createGroupKey(plGroupName, getGroupTypeFromId(groupId));
boolean hasMembership = false;
@@ -445,9 +454,11 @@
return Collections.emptyList();
}
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(groupId));
+
String gid =
getIdentitySession().getPersistenceManager().
- createGroupKey(getGroupNameFromId(groupId), getGroupTypeFromId(groupId));
+ createGroupKey(plGroupName, getGroupTypeFromId(groupId));
Collection<RoleType> roleTypes = new HashSet();
@@ -571,8 +582,10 @@
public Collection findMembershipsByGroupId(String groupId) throws Exception
{
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(groupId));
+
String gid =
- getIdentitySession().getPersistenceManager().createGroupKey(getGroupNameFromId(groupId),
+ getIdentitySession().getPersistenceManager().createGroupKey(plGroupName,
getGroupTypeFromId(groupId));
Collection<Role> roles = new HashSet();
@@ -631,16 +644,24 @@
}
//TODO: Exo UI has harcoded casts to List
- return new LinkedList(memberships);
+ List<MembershipImpl> results = new LinkedList<MembershipImpl>(memberships);
+ if (orgService.getConfiguration().isSortMemberships())
+ {
+ Collections.sort(results);
+ }
+
+ return results;
}
public Membership findMembership(String id) throws Exception
{
Membership m = new MembershipImpl(id);
+ String plGroupName = getPLIDMGroupName(getGroupNameFromId(m.getGroupId()));
+
String groupId =
- getIdentitySession().getPersistenceManager().createGroupKey(getGroupNameFromId(m.getGroupId()),
+ getIdentitySession().getPersistenceManager().createGroupKey(plGroupName,
getGroupTypeFromId(m.getGroupId()));
@@ -765,4 +786,14 @@
}
return true;
}
+
+ public String getPLIDMGroupName(String gtnGroupName)
+ {
+ return orgService.getConfiguration().getPLIDMGroupName(gtnGroupName);
+ }
+
+ public String getGtnGroupName(String plidmGroupName)
+ {
+ return orgService.getConfiguration().getGtnGroupName(plidmGroupName);
+ }
}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipImpl.java 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipImpl.java 2010-05-20 22:03:47 UTC (rev 3161)
@@ -24,7 +24,7 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class MembershipImpl implements Membership
+public class MembershipImpl implements Membership, Comparable
{
private String membershipType = "member";
@@ -145,4 +145,16 @@
result = 31 * result + (groupId != null ? groupId.hashCode() : 0);
return result;
}
+
+ public int compareTo(Object o)
+ {
+ if (!(o instanceof Membership) || userName == null)
+ {
+ return 0;
+ }
+
+ Membership m = (Membership)o;
+
+ return userName.compareTo(m.getUserName());
+ }
}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-05-20 22:03:47 UTC (rev 3161)
@@ -85,8 +85,11 @@
{
parentId = groupId.substring(0, groupId.lastIndexOf("/"));
}
+
+ String plGroupName = configuration.getPLIDMGroupName(name);
+
return idmService_.getIdentitySession().getPersistenceManager().
- findGroup(name, getConfiguration().getGroupType(parentId));
+ findGroup(plGroupName, getConfiguration().getGroupType(parentId));
}
@Override
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/pom.xml 2010-05-20 22:03:47 UTC (rev 3161)
@@ -47,7 +47,7 @@
<org.gatein.common.version>2.0.2-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.4.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.5.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.2-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-05-20 16:04:25 UTC (rev 3160)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-05-20 22:03:47 UTC (rev 3161)
@@ -210,6 +210,22 @@
<field name="useJTA">
<boolean>false</boolean>
</field>
+
+ <!-- If PLIDM group will have name containing slash "/" char than it will be replace with following string.
+ Slashes are used in group paths and if present in names may cause unpredictable behaviour -->
+ <field name="slashReplacement">
+ <string>@_@_@</string>
+ </field>
+
+ <!-- If groups should be displayed in a sorted order in the management UI-->
+ <field name="sortGroups">
+ <boolean>true</boolean>
+ </field>
+
+ <!-- If memberships should be displayed in a sorted order in the management UI-->
+ <field name="sortMemberships">
+ <boolean>true</boolean>
+ </field>
</object>
</object-param>
</init-params>
14 years, 7 months
- 1
- 0
gatein SVN: r3160 - portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-05-20 12:04:25 -0400 (Thu, 20 May 2010)
New Revision: 3160
Modified:
portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleMultiValueInputSet.java
Log:
Improve some codes in MultivalueInputset Sample
Modified: portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleMultiValueInputSet.java
===================================================================
--- portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleMultiValueInputSet.java 2010-05-20 12:47:28 UTC (rev 3159)
+++ portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleMultiValueInputSet.java 2010-05-20 16:04:25 UTC (rev 3160)
@@ -126,7 +126,7 @@
msgBuild.append("<br/>");
}
- return new ApplicationMessage(msgBuild.toString(), null);
+ return new ApplicationMessage(msgBuild.toString().replace(".", "*"), null);
}
private void makeDateInputMsg(UIFormMultiValueInputSet multiInput, StringBuilder msgBuild)
@@ -154,7 +154,7 @@
UploadResource uploadResource = ((UIFormUploadInput)multiInputChild).getUploadResource();
if (uploadResource != null)
{
- msgBuild.append(" " + uploadResource.getFileName().replace(".", "*"));
+ msgBuild.append(" " + uploadResource.getFileName());
}
else
{
14 years, 7 months
- 1
- 0
gatein SVN: r3159 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US: images/PortletDevelopment/Standard/jsp_portlet and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-20 08:47:28 -0400 (Thu, 20 May 2010)
New Revision: 3159
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/PortletDevelopment/Standard/first_portlet/deployed.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/PortletDevelopment/Standard/jsp_portlet/output.png
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
Log:
JBEPP-276: Reference Guide
Added screenshots, fixed few little things
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/PortletDevelopment/Standard/first_portlet/deployed.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/PortletDevelopment/Standard/jsp_portlet/output.png
===================================================================
(Binary files differ)
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2010-05-20 11:01:22 UTC (rev 3158)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2010-05-20 12:47:28 UTC (rev 3159)
@@ -78,7 +78,7 @@
<section id="sect-Reference_Guide-JSR_168_and_JSR_286_overview-Window_States">
<title>Window States</title>
<para>
- Window states are an indicator of how much page space a portlet consumes on any given page. The three states defined by the JSR-168 specification are:
+ Window states are an indicator of how much page space a portlet consumes on any given page. The three states defined by the JSR-286 specification are:
</para>
<variablelist>
<varlistentry>
@@ -126,10 +126,9 @@
<para>
This section describes how to deploy a portlet in &PRODUCT;.
</para>
-<!-- SimpleHelloWorld does not seem to be in the product. JIRA comment by jjamrich JBEPP-276 17/May/10
<para>
- A sample portlet called <filename>SimplestHelloWorld</filename> is located in the <literal>examples</literal> directory at the root of your &PRODUCT; binary package. This sample is used in the following examples.
- </para> -->
+ An example portlet called <filename>SimplestHelloWorld</filename> is located in the <literal>epp-doc/examples/portlets</literal> directory at the root of your &PRODUCT; sources package.
+ </para>
<section id="sect-Reference_Guide-Deploying_your_first_Portlet-Compiling">
<title>Compiling</title>
<para>
@@ -146,7 +145,8 @@
</step>
<step>
<para>
- If the compile is successfully packaged, the result will be available in: <filename><replaceable>applicationname</replaceable>/target/<replaceable>applicationname</replaceable>-0.0.1.war </filename>.
+ If the example is successfully packaged, the result will be available in: <filename>simplesthelloworld/target/gatein-simplest-helloworld<replaceable>-1.0.0-GA-SNAPSHOT</replaceable>.war </filename>.
+
</para>
</step>
<step>
@@ -164,14 +164,14 @@
Create a new portal page and add the portlet to it.
</para>
- <!-- Outdated Screenshot <mediaobject>
+ <mediaobject>
<imageobject role="html">
<imagedata fileref="images/PortletDevelopment/Standard/first_portlet/deployed.png" format="PNG" align="center" scale="100" />
</imageobject>
<imageobject role="fo">
<imagedata fileref="images/PortletDevelopment/Standard/first_portlet/deployed.png" format="PNG" align="center" contentwidth="120mm" />
</imageobject>
- </mediaobject> -->
+ </mediaobject>
</step>
</procedure>
@@ -402,11 +402,10 @@
</listitem>
</orderedlist>
-<!-- No examples in binary packages as per comment by jjamrich JIRA JBEPP-276 17/May/10
<formalpara>
<title>Compiling the example</title>
<para>
- The example used in this section can be found in the <filename>JSPHelloUser</filename> directory.
+ The example used in this section can be found in the <literal>epp-doc/examples/portlets</literal> directory at the root of your &PRODUCT; sources package.
</para>
</formalpara>
<para>
@@ -420,17 +419,17 @@
</programlisting>
</para>
<para>
- in the <filename>JSPHelloUser</filename> directory.
+ in the <filename>jsphellouser</filename> directory.
</para>
</step>
<step>
<para>
- Copy <filename>JSPHelloUser/target/JSPHelloUser-0.0.1.war </filename> to the <literal>deploy</literal> directory of JBoss Application Server.
+ Copy <filename>jsphellouser/target/gatein-jsp-hellouser-<replaceable>1.0.0-GA-SNAPSHOT</replaceable>.war</filename> to the <literal>deploy</literal> directory of JBoss Application Server.
</para>
</step>
<step>
<para>
- Select the new <literal>JSPHelloUser</literal> tab in your portal.
+ Create a new portal page and add the portlet to it.
</para>
</step>
</procedure>
@@ -446,7 +445,7 @@
<para>
The <literal>EDIT</literal> button only appears for logged-in users.
</para>
- </note> -->
+ </note>
<section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-Package_Structure">
<title>Package Structure</title>
<para>
@@ -456,7 +455,7 @@
The <literal>JSPHelloUser</literal> portlet contains the mandatory portlet application descriptors. The following is an example of the directory structure of the <literal>JSPHelloUser</literal> portlet:
</para>
-<programlisting>JSPHelloUser-0.0.1.war
+<programlisting>gatein-jsp-hellouser->1.0.0-GA-SNAPSHOT.war
|-- META-INF
| |-- MANIFEST.MF
|-- WEB-INF
@@ -480,7 +479,7 @@
<section id="sect-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class">
<title>Portlet Class</title>
<para>
- The code below is from the <filename> JSPHelloUser/src/main/java/org/gatein/portal/examples/portlets/JSPHelloUserPortlet.java </filename> Java source. It is split in different pieces.
+ The code below is from the <filename> jsphellouser/src/main/java/org/gatein/portal/examples/portlets/JSPHelloUserPortlet.java </filename> Java source. It is split in different pieces.
</para>
<programlistingco>
<areaspec>
@@ -738,7 +737,7 @@
In order to write a portlet using JSF a 'bridge' is needed. This software allows developers to write a portlet application as if it was a JSF application. The bridge then negotiates the interactions between the two layers.
</para>
<para>
- An example of the JBoss Portlet Bridge is available in <filename>/portletbridge/examples/</filename>. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application.
+ An example using the JBoss Portlet Bridge is available in the <literal>epp-doc/examples/portlets</literal> directory at the root of your &PRODUCT; sources package. The configuration is slightly different from a JSP application. This example can be used as a base to configure instead of creating a new application.
</para>
<para>
As in any JSF application, the file <literal>faces-config.xml</literal> is required. It must contain the following information:
@@ -826,7 +825,10 @@
</callout>
</calloutlist>
</programlistingco>
-
+ <note>
+ <title>JBoss Portlet Bridge</title>
+ <para>For more information about the JBoss Portlet Bridge, see the dedicated chapter which is part of this document.</para>
+ </note>
</section>
</section>
14 years, 7 months
- 1
- 0
gatein SVN: r3158 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-20 07:01:22 -0400 (Thu, 20 May 2010)
New Revision: 3158
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
Log:
Update Java code to have jdk 1.5 compatibility, that is needed for eXo 's Hudson build
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-05-20 10:01:40 UTC (rev 3157)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-05-20 11:01:22 UTC (rev 3158)
@@ -218,7 +218,7 @@
if (portletResponse instanceof FragmentResponse)
{
FragmentResponse fragmentResponse = (FragmentResponse)portletResponse;
- content = new String(fragmentResponse.getBytes(), Charset.forName("UTF-8"));
+ content = new String(fragmentResponse.getBytes(), "UTF-8");
}
else
{
14 years, 7 months
- 1
- 0