gatein SVN: r2997 - in components/wsrp/trunk: wsrp1-ws and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-05-06 08:34:13 -0400 (Thu, 06 May 2010)
New Revision: 2997
Modified:
components/wsrp/trunk/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
- Added JAX-WS dependency.
- Added version for wsrp2-ws.
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-05-06 12:03:37 UTC (rev 2996)
+++ components/wsrp/trunk/pom.xml 2010-05-06 12:34:13 UTC (rev 2997)
@@ -92,6 +92,11 @@
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>
+ <artifactId>wsrp-wsrp2-ws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-integration-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-05-06 12:03:37 UTC (rev 2996)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-05-06 12:34:13 UTC (rev 2997)
@@ -31,7 +31,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
<packaging>jar</packaging>
- <name>GateIn WSRP Generated JAX-WS Classes</name>
+ <name>GateIn WSRP v1 Generated JAX-WS Classes</name>
<dependencies>
<dependency>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-05-06 12:03:37 UTC (rev 2996)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-05-06 12:34:13 UTC (rev 2997)
@@ -34,4 +34,16 @@
<artifactId>wsrp-wsrp2-ws</artifactId>
<packaging>jar</packaging>
<name>GateIn WSRP v2 Generated JAX-WS Classes</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
14 years, 7 months
gatein SVN: r2996 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-06 08:03:37 -0400 (Thu, 06 May 2010)
New Revision: 2996
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml
Log:
JBEPP-274: Resolved DOC TODOs with EPP team
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml 2010-05-06 11:41:02 UTC (rev 2995)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Author_Group.xml 2010-05-06 12:03:37 UTC (rev 2996)
@@ -22,7 +22,7 @@
<shortaffil>Red Hat</shortaffil>
<orgdiv>JBoss Engineering</orgdiv>
</affiliation>
- <email>theute(a)redhat.com</email>
+ <email>ltexier(a)redhat.com</email>
</editor>
<editor>
<firstname>Thomas</firstname>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-05-06 11:41:02 UTC (rev 2995)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-05-06 12:03:37 UTC (rev 2996)
@@ -513,10 +513,10 @@
</para>
</listitem>
</itemizedlist>
- <para>If installing the JDK on Red Hat Enterprise Linux, Fedora, or another RPM-based Linux system, it is recommended that the self-extracting file containing the RPM package is selected. This option will set up and use the SysV service scripts in addition to installing the JDK. The RPM option is also recommended if the &PRODUCT; is being set up in a production environment. Should you decide not to use the self-extracting file, the next step can be ignored.
+ <para>If installing the JDK on Red Hat Enterprise Linux, Fedora, or another RPM-based Linux system, it is recommended that the self-extracting file containing the RPM package is selected. This option will set up and use the SysV service scripts in addition to installing the JDK. The RPM option is also recommended if the &PRODUCT; is being set up in a production environment.
</para>
</listitem>
- <listitem>
+<!-- <listitem>
<para>
Download and install the appropriate <literal>-compat RPM</literal> from <literal>JPackage</literal> <ulink url="ftp://jpackage.hmdc.harvard.edu/JPackage/1.7/generic/RPMS.non-free/"> here</ulink>. Please ensure you choose a matching version of the <literal>-compat</literal> package to the JDK you installed.
</para>
@@ -529,7 +529,7 @@
QE NOTE: "Download and install the appropriate -compat RPM from JPackage here." Should we instruct users to install unsigned rpms?
</para>
</note>
- </listitem>
+ </listitem> -->
<listitem>
<para>
Create an environment variable that points to the JDK installation directory and call it <literal>JAVA_HOME</literal>. Add <literal>$JAVA_HOME/bin</literal> to the system path to be able to run <literal>java</literal> from the command line. You can do this by adding the following lines to the <filename>.bashrc</filename> file in your home directory. <programlisting>
@@ -594,12 +594,6 @@
</listitem>
</itemizedlist>
</para>
- <note>
- <title>DOC TODO:</title>
- <para>
- Better to use java-1.6.0-variant rather than java-1.6.0-sun as could be sun or openjdk. Also include openJDK download site info http://openjdk.java.net/install/ ?
- </para>
- </note>
</listitem>
<listitem>
<para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml 2010-05-06 11:41:02 UTC (rev 2995)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml 2010-05-06 12:03:37 UTC (rev 2996)
@@ -67,12 +67,6 @@
<para>
When installed from the zip archive, authentication is required to access the majority of JBoss services, including administrative services. User accounts have not been set up to eliminate the possibility of default username/password based attacks.
</para>
- <note>
- <title>DOC TODO:</title>
- <para>
- Is this still the case in 5.0? It seems to have default accounts in place.
- </para>
- </note>
<important><title>Default Admin User Configuration</title>
<para>
@@ -132,21 +126,6 @@
</programlisting>
</para>
</formalpara>
- <note>
- <title>DOC TODO:</title>
- <para>
- <filename>/server/$CONFIG/deploy/messaging/messaging-service.xml</filename>
- </para>
-<screen><!-- The password used by the message sucker connections to create connections.
- THIS SHOULD ALWAYS BE CHANGED AT INSTALL TIME TO SECURE SYSTEM
- <attribute name="SuckerPassword"></attribute></screen>
- <para>
- Question 1: Should this file also have the SuckerPassword set?
- </para>
- <para>
- Question 2: Should I document this?
- </para>
- </note>
</section>
<section id="Disabling_Authentication">
14 years, 7 months
gatein SVN: r2995 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-06 07:41:02 -0400 (Thu, 06 May 2010)
New Revision: 2995
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml
Log:
Changed minimum requirements
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-05-06 08:35:36 UTC (rev 2994)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-05-06 11:41:02 UTC (rev 2995)
@@ -21,16 +21,10 @@
</section>
<section id="Pre_Requisites-Hardware_and_Operating_System_Requirements">
<title>System Requirements</title>
- <note>
- <title>DOC TODO:</title>
- <para>
- These requirements taken from the <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/4....">EAP 4.3.0CP07 Docs</ulink>. Are they appropriate?
- </para>
- </note>
<formalpara>
<title>Minimum Installation Requirements</title>
<para>
- The minimum hardware required to support the installation of the JBoss Application Server is a 240MB hard disk drive. Additional space is required for the installation of the JDK upon which the the JBoss Application Server depends. The JDK installation size is currently up to 150MB.
+ The minimum hard disk space required to support the installation of the JBoss Enterprise Portal Platform is about 550MB. Additional space is required for the installation of the JDK upon which the the JBoss Application Server depends. The JDK installation size is currently up to 150MB.
</para>
</formalpara>
<formalpara>
@@ -62,7 +56,7 @@
<itemizedlist>
<listitem>
<para>
- Disk Space: 1GB
+ Disk Space: 1.5GB
</para>
<itemizedlist>
<listitem>
@@ -91,12 +85,12 @@
</listitem>
<listitem>
<para>
- RAM: 128 MB
+ RAM: 1.5 GB
</para>
<itemizedlist>
<listitem>
<para>
- RAM installations of 1GB or more will be required to run a server upon which small to medium applications are deployed. 4GB or more is preferable for larger applications or to run a GUI server interface.
+ RAM installations of 2 GB or more will be required to run a server upon which small to medium applications are deployed. 4GB or more is preferable for larger applications or to run a GUI server interface.
</para>
</listitem>
</itemizedlist>
14 years, 7 months
gatein SVN: r2994 - portal/trunk/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-06 04:35:36 -0400 (Thu, 06 May 2010)
New Revision: 2994
Modified:
portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd
Log:
GTNPORTAL-1158: Missing element in gatein-resources.xsd
Modified: portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd 2010-05-06 08:11:21 UTC (rev 2993)
+++ portal/trunk/component/portal/src/main/java/gatein_resources_1_0.xsd 2010-05-06 08:35:36 UTC (rev 2994)
@@ -45,6 +45,7 @@
<xs:complexType name="portal-skin">
<xs:sequence>
<xs:element name="skin-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="skin-module" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="css-path" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="overwrite" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
14 years, 7 months
gatein SVN: r2993 - in portal/trunk/portlet/exoadmin/src/main: webapp/groovy/navigation/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-05-06 04:11:21 -0400 (Thu, 06 May 2010)
New Revision: 2993
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl
Log:
GTNPORTAL-1151: User could not add new navigation even though he is manager of group
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 2010-05-06 07:51:36 UTC (rev 2992)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-05-06 08:11:21 UTC (rev 2993)
@@ -36,6 +36,7 @@
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
+import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -52,6 +53,7 @@
import org.exoplatform.webui.event.Event.Phase;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.UUID;
@@ -168,6 +170,50 @@
selectedNavigation = navigation;
}
+ /**
+ * User has right to add navigation to a group in below cases
+ *
+ * 1. He/She is member of admin groups
+ *
+ * 2. He/She is manager of the group
+ *
+ * @param pcontext
+ * @return
+ */
+ private boolean userHasRightToAddNavigation()
+ {
+ PortalRequestContext pcontext = Util.getPortalRequestContext();
+ String remoteUser = pcontext.getRemoteUser();
+ if (remoteUser == null)
+ {
+ return false;
+ }
+
+ UserACL userACL = this.getApplicationComponent(UserACL.class);
+ if (userACL.isUserInGroup(userACL.getAdminGroups()))
+ {
+ return true;
+ }
+
+ OrganizationService orgService = this.getApplicationComponent(OrganizationService.class);
+ try
+ {
+ Collection<?> groups = orgService.getGroupHandler().findGroupByMembership(remoteUser, UserACL.MANAGER);
+ if (groups != null && groups.size() > 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+ }
+
static public class EditNavigationActionListener extends EventListener<UIGroupNavigationManagement>
{
public void execute(Event<UIGroupNavigationManagement> event) throws Exception
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2010-05-06 07:51:36 UTC (rev 2992)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UIGroupNavigationManagement.gtmpl 2010-05-06 08:11:21 UTC (rev 2993)
@@ -6,7 +6,7 @@
uicomponent.loadNavigations();
uicomponent.renderChild(UIVirtualList.class);
- if(uicomponent.getNavigations() != null && uicomponent.getNavigations().size() > 0){ %>
+ if(uicomponent.userHasRightToAddNavigation()){ %>
<div class="UIAction">
<table class="ActionContainer">
14 years, 7 months
gatein SVN: r2992 - portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-05-06 03:51:36 -0400 (Thu, 06 May 2010)
New Revision: 2992
Modified:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html
Log:
EPP5 UI tests: improved test SNF_PRL_19
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-05-06 04:47:24 UTC (rev 2991)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-05-06 07:51:36 UTC (rev 2992)
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/portal/public/classic/</td>
+ <td>/portal/public/classic</td>
<td></td>
</tr>
<tr>
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
@@ -47,6 +52,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Site</td>
<td></td>
@@ -107,9 +117,14 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Edit Navigation</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
@@ -122,6 +137,11 @@
<td>1,1</td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Page Node Setting</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>name</td>
<td></td>
@@ -142,6 +162,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>css=div#UISiteManagement > div.UIPopupWindow div.TabsContainer div.NormalTab div.MiddleTab</td>
<td>1,1</td>
@@ -177,21 +202,41 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Save</td>
<td>1,1</td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Page Node Setting</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=test_node_label_19</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Save</td>
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Navigation Management</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>--Edit Portal Properties</td>
<td></td>
@@ -199,7 +244,7 @@
<tr>
<td>waitForElementPresent</td>
<td>link=Edit Portal's Properties</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>clickAt</td>
@@ -238,27 +283,32 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Platform</td>
+ <td>//a[@class='NodeIcon GroupAdminIcon' and @title='Platform']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Platform</td>
+ <td>//a[@class='NodeIcon GroupAdminIcon' and @title='Platform']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Administrators</td>
+ <td>//a[@class='NodeIcon GroupAdminIcon' and @title='Administrators']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Administrators</td>
+ <td>//a[@class='NodeIcon GroupAdminIcon' and @title='Administrators']</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[@class='ItemIcon' and @title='*']</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>//div[@id='PermissionSelector']//div[2]/a</td>
+ <td>//a[@class='ItemIcon' and @title='*']</td>
<td></td>
</tr>
<tr>
@@ -277,6 +327,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>3000</td>
+ <td></td>
+</tr>
+<tr>
<td>open</td>
<td>/portal/private/classic/</td>
<td></td>
@@ -333,7 +388,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UINavigationManagement']</td>
+ <td>//a[@title='test_node_label_19']</td>
<td></td>
</tr>
<tr>
@@ -363,7 +418,7 @@
</tr>
<tr>
<td>waitForElementNotPresent</td>
- <td>link=test_node_label_19</td>
+ <td>//a[@title='test_node_label_19']</td>
<td></td>
</tr>
<tr>
@@ -387,11 +442,21 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>test_node_label_19</td>
+ <td></td>
+</tr>
+<tr>
<td>verifyTextNotPresent</td>
<td>test_node_label_19</td>
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign out</td>
<td></td>
14 years, 7 months
gatein SVN: r2991 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US: modules and 1 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-06 00:47:24 -0400 (Thu, 06 May 2010)
New Revision: 2991
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Frontpage.png
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/Skinning.xml
Log:
JBEPP-276: Minor copy edits from BNE QE feedback
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/images/Common/Frontpage.png
===================================================================
(Binary files differ)
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-06 03:25:17 UTC (rev 2990)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Introduction.xml 2010-05-06 04:47:24 UTC (rev 2991)
@@ -6,7 +6,7 @@
<chapter id="chap-Reference_Guide-Introduction">
<title>Introduction</title>
<para>
- GateIn on which is based &PRODUCT; is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today's Web 2.0 applications.
+ &PRODUCT; is based on the GateIn project which is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single portal framework. The aim is to provide an intuitive user-friendly portal, and a framework to address the needs of today's Web 2.0 applications.
</para>
<mediaobject>
<imageobject role="html">
@@ -17,7 +17,7 @@
</imageobject>
</mediaobject>
<para>
- This book provides a deep-dive information about installation and configuration of the services provided by GateIn.
+ This book provides a deep-dive information about installation and configuration of the services provided by &PRODUCT;.
</para>
<section id="sect-Reference_Guide-Introduction-Related_Links">
<title>Related Links</title>
@@ -26,7 +26,7 @@
<term>Tecnical documentation</term>
<listitem>
<para>
- Other technical documentation, including an <emphasis role="bold">Installation Guide</emphasis>, a <emphasis role="bold">Reference Guide</emphasis> and component specific documentation, can be found at <ulink type="http" url="http://www.redhat.com/docs">www.redhat.com/docs</ulink>
+ Other technical documentation, including an <emphasis role="bold">Installation Guide</emphasis>, and a <emphasis role="bold">User Guide</emphasis> can be found at <ulink type="http" url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Platform_Portal">www.redhat.com/docs</ulink>
</para>
</listitem>
</varlistentry>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-05-06 03:25:17 UTC (rev 2990)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/Skinning.xml 2010-05-06 04:47:24 UTC (rev 2991)
@@ -435,11 +435,8 @@
<section id="sect-Reference_Guide-Creating_New_Skins-Creating_a_New_Window_Style">
<title>Creating a New Window Style</title>
<para>
- Window styles are the CSS applied to window decorations. An administrator can decide which style of decoration should go around the window when he adds a new application to a page.
+ Window styles are the CSS applied to window decorations. An administrator can decide which style of decoration should go around the window when he adds a new application or gadget to a page.
</para>
- <para>
- PortalDevelopment/Skinning/windowStyles
- </para>
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/PortalDevelopment/Skinning/windowStyles.png" format="PNG" align="center" scale="100" />
14 years, 7 months
gatein SVN: r2990 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: thanh_tung_do
Date: 2010-05-05 23:25:17 -0400 (Wed, 05 May 2010)
New Revision: 2990
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
Log:
GTNPORTAL-1112: fix problem when add new membership with description is null
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-05-05 18:12:01 UTC (rev 2989)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-05-06 03:25:17 UTC (rev 2990)
@@ -91,7 +91,7 @@
public String getDescription()
{
- return mType.getDescription();
+ return (mType.getDescription() != null? mType.getDescription():"");
}
public String getEncodedDescription()
14 years, 7 months
gatein SVN: r2989 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-05 14:12:01 -0400 (Wed, 05 May 2010)
New Revision: 2989
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
Log:
GTNPORTAL-1162: creating new membership problem
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-05-05 18:08:35 UTC (rev 2988)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-05-05 18:12:01 UTC (rev 2989)
@@ -96,8 +96,15 @@
public String getEncodedDescription()
{
- EntityEncoder encoder = EntityEncoder.FULL;
- return encoder.encode(getDescription());
+ if (getDescription() != null)
+ {
+ EntityEncoder encoder = EntityEncoder.FULL;
+ return encoder.encode(getDescription());
+ }
+ else
+ {
+ return null;
+ }
}
}
}
14 years, 7 months
gatein SVN: r2988 - portal/branches/EPP_5_0_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-05 14:08:35 -0400 (Wed, 05 May 2010)
New Revision: 2988
Modified:
portal/branches/EPP_5_0_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
Log:
JBEPP-337: Avoid duplicate instantiation of the component org.exoplatform.groovyscript.text.TemplateService under rush condition
Using Startable as workaround
Modified: portal/branches/EPP_5_0_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-05-05 18:01:23 UTC (rev 2987)
+++ portal/branches/EPP_5_0_Branch/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-05-05 18:08:35 UTC (rev 2988)
@@ -41,6 +41,7 @@
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.cache.ExoCache;
import org.gatein.common.io.IOTools;
+import org.picocontainer.Startable;
import java.io.InputStream;
import java.util.ArrayList;
@@ -53,7 +54,7 @@
@Property(key = "type", value = "template")})
@ManagedDescription("Template management service")
@RESTEndpoint(path = "templateservice")
-public class TemplateService
+public class TemplateService implements Startable
{
private GroovyTemplateEngine engine_;
@@ -230,4 +231,12 @@
return null;
}
}
+
+ public void start()
+ {
+ }
+
+ public void stop()
+ {
+ }
}
14 years, 7 months