gatein SVN: r2664 - portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 14:46:55 -0400 (Thu, 15 Apr 2010)
New Revision: 2664
Modified:
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
Log:
JBEPP-305: Possible to inject javascript code into EPP input fields
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 18:43:48 UTC (rev 2663)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 18:46:55 UTC (rev 2664)
@@ -28,6 +28,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.gatein.common.text.EntityEncoder;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
@@ -64,7 +65,7 @@
return types;
}
- public class UIMembershipType
+ public class UIMembershipType implements Serializable
{
private MembershipType mType;
16 years
- 1
- 0
gatein SVN: r2663 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 14:43:48 -0400 (Thu, 15 Apr 2010)
New Revision: 2663
Modified:
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroup.java
Log:
GTNPORTAL-1083: java.io.NotSerializableException: org.exoplatform.webui.organization.UIGroup occurs when having cluster with more GateIn nodes
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroup.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroup.java 2010-04-15 18:39:13 UTC (rev 2662)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroup.java 2010-04-15 18:43:48 UTC (rev 2663)
@@ -1,9 +1,11 @@
package org.exoplatform.webui.organization;
+import java.io.Serializable;
+
import org.exoplatform.services.organization.Group;
import org.gatein.common.text.EntityEncoder;
-public class UIGroup {
+public class UIGroup implements Serializable {
private Group group;
16 years
- 1
- 0
gatein SVN: r2662 - 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-04-15 14:39:13 -0400 (Thu, 15 Apr 2010)
New Revision: 2662
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
Log:
GTNPORTAL-1082: Possible to inject javascript code into MembershipType description
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-04-15 17:42:19 UTC (rev 2661)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 18:39:13 UTC (rev 2662)
@@ -28,6 +28,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.gatein.common.text.EntityEncoder;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
@@ -64,7 +65,7 @@
return types;
}
- public class UIMembershipType
+ public class UIMembershipType implements Serializable
{
private MembershipType mType;
16 years
- 1
- 0
gatein SVN: r2661 - in portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 13:42:19 -0400 (Thu, 15 Apr 2010)
New Revision: 2661
Modified:
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
Log:
JBEPP-305: Possible to inject javascript code into EPP input fields
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 17:42:19 UTC (rev 2661)
@@ -26,14 +26,17 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.OrganizationService;
+import org.gatein.common.text.EntityEncoder;
+import java.util.Date;
import java.util.List;
+import java.util.ArrayList;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class FindMembershipTypesPageList extends StatelessPageList<MembershipType>
+public class FindMembershipTypesPageList extends StatelessPageList<FindMembershipTypesPageList.UIMembershipType>
{
public FindMembershipTypesPageList(int pageSize)
@@ -42,11 +45,58 @@
}
@Override
- protected ListAccess<MembershipType> connect() throws Exception
+ protected ListAccess<UIMembershipType> connect() throws Exception
{
ExoContainer container = PortalContainer.getInstance();
OrganizationService service = (OrganizationService)container.getComponentInstance(OrganizationService.class);
List<MembershipType> memberships = (List<MembershipType>)service.getMembershipTypeHandler().findMembershipTypes();
- return new ListAccessImpl<MembershipType>(MembershipType.class, memberships);
+
+ return new ListAccessImpl<UIMembershipType>(UIMembershipType.class, convertMembershipTypes(memberships));
}
+
+ private List<UIMembershipType> convertMembershipTypes(List<MembershipType> memberships)
+ {
+ List<UIMembershipType> types = new ArrayList<UIMembershipType>(memberships.size());
+ for (MembershipType type: memberships)
+ {
+ types.add(new UIMembershipType(type));
+ }
+ return types;
+ }
+
+ public class UIMembershipType
+ {
+ private MembershipType mType;
+
+ public UIMembershipType(MembershipType mType)
+ {
+ this.mType = mType;
+ }
+
+ public String getName()
+ {
+ return mType.getName();
+ }
+
+ public Date getCreatedDate()
+ {
+ return mType.getCreatedDate();
+ }
+
+ public Date getModifiedDate()
+ {
+ return mType.getModifiedDate();
+ }
+
+ public String getDescription()
+ {
+ return mType.getDescription();
+ }
+
+ public String getEncodedDescription()
+ {
+ EntityEncoder encoder = EntityEncoder.FULL;
+ return encoder.encode(getDescription());
+ }
+ }
}
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2010-04-15 17:42:19 UTC (rev 2661)
@@ -45,7 +45,7 @@
public class UIListMembershipType extends UIContainer
{
- private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "description"};
+ private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "encodedDescription"};
private static String[] USER_ACTION = {"EditMembership", "DeleteMembership"};
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2010-04-15 17:42:19 UTC (rev 2661)
@@ -307,7 +307,7 @@
<createdDate>تاريخ الإنشاء</createdDate>
<modifiedDate>تاريخ التعديل</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Erstelldatum
UIMembershipList.header.modifiedDate=Bearbeitungsdatum
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Rolle bearbeiten
UIMembershipList.action.title.DeleteMembership=Rolle löschen
UIMembershipList.msg.InUse=Sie können die Rolle nicht löschen, weil sie benutzt wird.
@@ -254,4 +254,4 @@
UITabPane.title.UISharedNavigation=Navigation der Gruppenseiten
UISharedNavigation.label.userNavigation=Name der Benutzerseiten-Navigation
UISharedNavigation.label.priority=Priorität
-UISharedNavigation.action.Save=Speichern
\ No newline at end of file
+UISharedNavigation.action.Save=Speichern
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Created date
UIMembershipList.header.modifiedDate=Modified date
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Edit Membership
UIMembershipList.action.title.DeleteMembership=Delete Membership
UIMembershipList.msg.InUse=You can not delete this membership because it is in use
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Fecha de Creaci\u00f3n
UIMembershipList.header.modifiedDate=Fecha de Modificaci\u00f3n
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Afiliaci\u00f3n
UIMembershipList.action.title.DeleteMembership=Borrar Afiliaci\u00f3n
UIMembershipList.msg.InUse=No puedes borrar esta afiliaci\u00f3n porque est\u00e1 siendo usada
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -168,7 +168,7 @@
UIMembershipList.header.createdDate=Date de cr\u00e9ation
UIMembershipList.header.modifiedDate=Date de modification
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editer le r\u00f4le
UIMembershipList.action.title.DeleteMembership=Supprimer le r\u00f4le
UIMembershipList.msg.InUse=Vous ne pouvez pas supprimer ce r\u00f4le car il est utilis\u00e9
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Data di creazione
UIMembershipList.header.modifiedDate=Data di modifica
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Modifica il Membership
UIMembershipList.action.title.DeleteMembership=Elimina il Membership
UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -170,7 +170,7 @@
UIMembershipList.header.createdDate=\u4f5c\u6210\u65e5
UIMembershipList.header.modifiedDate=\u66f4\u65b0\u65e5
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u7de8\u96c6
UIMembershipList.action.title.DeleteMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u524a\u9664
UIMembershipList.msg.InUse=\u3053\u306e\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u306f\u4f7f\u7528\u4e2d\u306a\u306e\u3067\u524a\u9664\u3067\u304d\u307e\u305b\u3093
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2010-04-15 17:42:19 UTC (rev 2661)
@@ -259,7 +259,7 @@
<createdDate>생성된 날짜</createdDate>
<modifiedDate>수정된 날짜</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
@@ -376,4 +376,4 @@
</label>
<deleteGroup>이 그룹을 삭제하시겠습니까?</deleteGroup>
</UIGroupManagement>
-</bundle>
\ No newline at end of file
+</bundle>
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -170,7 +170,7 @@
UIMembershipList.header.createdDate=\u092c\u0928\u093e\u090f\u0915\u094b \u092e\u093f\u0924\u0940
UIMembershipList.header.modifiedDate=\u092a\u0930\u093f\u092e\u093e\u0930\u094d\u091c\u0928 \u0917\u0930\u0947\u0915\u094b \u092e\u093f\u0924\u0940
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u0938\u092e\u094d\u092a\u093e\u0926\u0928
UIMembershipList.action.title.DeleteMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928\u0941
UIMembershipList.msg.InUse=\u0924\u092a\u093e\u0908\u0902 \u092f\u094b \u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928 \u0938\u0915\u094d\u0928\u0941 \u0939\u0941\u0928\u094d\u0928 \u0915\u093f\u0928\u0915\u0940 \u092f\u094b \u092a\u094d\u0930\u092f\u094b\u0917 \u092d\u0907\u0930\u0939\u0947\u0915\u094b \u091b
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -166,7 +166,7 @@
UIMembershipList.header.createdDate=Gecre\u00EBerd datum
UIMembershipList.header.modifiedDate=Gewijzigde datum
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Wijzig rol
UIMembershipList.action.title.DeleteMembership=Verwijder rol
UIMembershipList.msg.InUse=U kan deze rol niet verwijderen omdat die in gebruik is.
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Data de Criação
UIMembershipList.header.modifiedDate=Data de modificação
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Papel
UIMembershipList.action.title.DeleteMembership=Remover Papel
UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo.
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -159,7 +159,7 @@
UIMembershipList.header.createdDate=Дата создание
UIMembershipList.header.modifiedDate=Дата изменения
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Изменить участие
UIMembershipList.action.title.DeleteMembership=Отменить участие
UIMembershipList.msg.InUse=Невозможно отменить участие.
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2010-04-15 17:42:19 UTC (rev 2661)
@@ -158,7 +158,7 @@
UIMembershipList.header.createdDate=Дата створення
UIMembershipList.header.modifiedDate=Дата змін
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Редагувати клас
UIMembershipList.action.title.DeleteMembership=Видалити клас
UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
@@ -242,4 +242,4 @@
UITabPane.title.UISharedNavigation=Навігаційна сторінка групи
UISharedNavigation.label.userNavigation=Назва навігаційної сторінки користувача
UISharedNavigation.label.priority=Пріоритет
-UISharedNavigation.action.Save=Зберегти
\ No newline at end of file
+UISharedNavigation.action.Save=Зберегти
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-15 17:42:19 UTC (rev 2661)
@@ -307,7 +307,7 @@
<createdDate>Ngày tạo</createdDate>
<modifiedDate>Ngày sửa</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2010-04-15 17:42:19 UTC (rev 2661)
@@ -258,7 +258,7 @@
<createdDate>创建日期</createdDate>
<modifiedDate>修改日期</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
===================================================================
--- portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2010-04-15 17:22:38 UTC (rev 2660)
+++ portal/branches/EPP_5_0_0_CR01_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2010-04-15 17:42:19 UTC (rev 2661)
@@ -259,7 +259,7 @@
<createdDate>建立日期</createdDate>
<modifiedDate>修改日期</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
16 years
- 1
- 0
gatein SVN: r2660 - in portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 13:22:38 -0400 (Thu, 15 Apr 2010)
New Revision: 2660
Modified:
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
Log:
JBEPP-305: Possible to inject javascript code into EPP input fields
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 17:22:38 UTC (rev 2660)
@@ -26,14 +26,17 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.OrganizationService;
+import org.gatein.common.text.EntityEncoder;
+import java.util.Date;
import java.util.List;
+import java.util.ArrayList;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class FindMembershipTypesPageList extends StatelessPageList<MembershipType>
+public class FindMembershipTypesPageList extends StatelessPageList<FindMembershipTypesPageList.UIMembershipType>
{
public FindMembershipTypesPageList(int pageSize)
@@ -42,11 +45,58 @@
}
@Override
- protected ListAccess<MembershipType> connect() throws Exception
+ protected ListAccess<UIMembershipType> connect() throws Exception
{
ExoContainer container = PortalContainer.getInstance();
OrganizationService service = (OrganizationService)container.getComponentInstance(OrganizationService.class);
List<MembershipType> memberships = (List<MembershipType>)service.getMembershipTypeHandler().findMembershipTypes();
- return new ListAccessImpl<MembershipType>(MembershipType.class, memberships);
+
+ return new ListAccessImpl<UIMembershipType>(UIMembershipType.class, convertMembershipTypes(memberships));
}
+
+ private List<UIMembershipType> convertMembershipTypes(List<MembershipType> memberships)
+ {
+ List<UIMembershipType> types = new ArrayList<UIMembershipType>(memberships.size());
+ for (MembershipType type: memberships)
+ {
+ types.add(new UIMembershipType(type));
+ }
+ return types;
+ }
+
+ public class UIMembershipType
+ {
+ private MembershipType mType;
+
+ public UIMembershipType(MembershipType mType)
+ {
+ this.mType = mType;
+ }
+
+ public String getName()
+ {
+ return mType.getName();
+ }
+
+ public Date getCreatedDate()
+ {
+ return mType.getCreatedDate();
+ }
+
+ public Date getModifiedDate()
+ {
+ return mType.getModifiedDate();
+ }
+
+ public String getDescription()
+ {
+ return mType.getDescription();
+ }
+
+ public String getEncodedDescription()
+ {
+ EntityEncoder encoder = EntityEncoder.FULL;
+ return encoder.encode(getDescription());
+ }
+ }
}
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2010-04-15 17:22:38 UTC (rev 2660)
@@ -45,7 +45,7 @@
public class UIListMembershipType extends UIContainer
{
- private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "description"};
+ private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "encodedDescription"};
private static String[] USER_ACTION = {"EditMembership", "DeleteMembership"};
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2010-04-15 17:22:38 UTC (rev 2660)
@@ -307,7 +307,7 @@
<createdDate>تاريخ الإنشاء</createdDate>
<modifiedDate>تاريخ التعديل</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Erstelldatum
UIMembershipList.header.modifiedDate=Bearbeitungsdatum
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Rolle bearbeiten
UIMembershipList.action.title.DeleteMembership=Rolle löschen
UIMembershipList.msg.InUse=Sie können die Rolle nicht löschen, weil sie benutzt wird.
@@ -254,4 +254,4 @@
UITabPane.title.UISharedNavigation=Navigation der Gruppenseiten
UISharedNavigation.label.userNavigation=Name der Benutzerseiten-Navigation
UISharedNavigation.label.priority=Priorität
-UISharedNavigation.action.Save=Speichern
\ No newline at end of file
+UISharedNavigation.action.Save=Speichern
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Created date
UIMembershipList.header.modifiedDate=Modified date
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Edit Membership
UIMembershipList.action.title.DeleteMembership=Delete Membership
UIMembershipList.msg.InUse=You can not delete this membership because it is in use
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Fecha de Creaci\u00f3n
UIMembershipList.header.modifiedDate=Fecha de Modificaci\u00f3n
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Afiliaci\u00f3n
UIMembershipList.action.title.DeleteMembership=Borrar Afiliaci\u00f3n
UIMembershipList.msg.InUse=No puedes borrar esta afiliaci\u00f3n porque est\u00e1 siendo usada
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -168,7 +168,7 @@
UIMembershipList.header.createdDate=Date de cr\u00e9ation
UIMembershipList.header.modifiedDate=Date de modification
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editer le r\u00f4le
UIMembershipList.action.title.DeleteMembership=Supprimer le r\u00f4le
UIMembershipList.msg.InUse=Vous ne pouvez pas supprimer ce r\u00f4le car il est utilis\u00e9
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Data di creazione
UIMembershipList.header.modifiedDate=Data di modifica
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Modifica il Membership
UIMembershipList.action.title.DeleteMembership=Elimina il Membership
UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -170,7 +170,7 @@
UIMembershipList.header.createdDate=\u4f5c\u6210\u65e5
UIMembershipList.header.modifiedDate=\u66f4\u65b0\u65e5
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u7de8\u96c6
UIMembershipList.action.title.DeleteMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u524a\u9664
UIMembershipList.msg.InUse=\u3053\u306e\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u306f\u4f7f\u7528\u4e2d\u306a\u306e\u3067\u524a\u9664\u3067\u304d\u307e\u305b\u3093
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2010-04-15 17:22:38 UTC (rev 2660)
@@ -259,7 +259,7 @@
<createdDate>생성된 날짜</createdDate>
<modifiedDate>수정된 날짜</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
@@ -376,4 +376,4 @@
</label>
<deleteGroup>이 그룹을 삭제하시겠습니까?</deleteGroup>
</UIGroupManagement>
-</bundle>
\ No newline at end of file
+</bundle>
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -170,7 +170,7 @@
UIMembershipList.header.createdDate=\u092c\u0928\u093e\u090f\u0915\u094b \u092e\u093f\u0924\u0940
UIMembershipList.header.modifiedDate=\u092a\u0930\u093f\u092e\u093e\u0930\u094d\u091c\u0928 \u0917\u0930\u0947\u0915\u094b \u092e\u093f\u0924\u0940
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u0938\u092e\u094d\u092a\u093e\u0926\u0928
UIMembershipList.action.title.DeleteMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928\u0941
UIMembershipList.msg.InUse=\u0924\u092a\u093e\u0908\u0902 \u092f\u094b \u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928 \u0938\u0915\u094d\u0928\u0941 \u0939\u0941\u0928\u094d\u0928 \u0915\u093f\u0928\u0915\u0940 \u092f\u094b \u092a\u094d\u0930\u092f\u094b\u0917 \u092d\u0907\u0930\u0939\u0947\u0915\u094b \u091b
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -166,7 +166,7 @@
UIMembershipList.header.createdDate=Gecre\u00EBerd datum
UIMembershipList.header.modifiedDate=Gewijzigde datum
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Wijzig rol
UIMembershipList.action.title.DeleteMembership=Verwijder rol
UIMembershipList.msg.InUse=U kan deze rol niet verwijderen omdat die in gebruik is.
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Data de Criação
UIMembershipList.header.modifiedDate=Data de modificação
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Papel
UIMembershipList.action.title.DeleteMembership=Remover Papel
UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo.
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -159,7 +159,7 @@
UIMembershipList.header.createdDate=Дата создание
UIMembershipList.header.modifiedDate=Дата изменения
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Изменить участие
UIMembershipList.action.title.DeleteMembership=Отменить участие
UIMembershipList.msg.InUse=Невозможно отменить участие.
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2010-04-15 17:22:38 UTC (rev 2660)
@@ -158,7 +158,7 @@
UIMembershipList.header.createdDate=Дата створення
UIMembershipList.header.modifiedDate=Дата змін
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Редагувати клас
UIMembershipList.action.title.DeleteMembership=Видалити клас
UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
@@ -242,4 +242,4 @@
UITabPane.title.UISharedNavigation=Навігаційна сторінка групи
UISharedNavigation.label.userNavigation=Назва навігаційної сторінки користувача
UISharedNavigation.label.priority=Пріоритет
-UISharedNavigation.action.Save=Зберегти
\ No newline at end of file
+UISharedNavigation.action.Save=Зберегти
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-15 17:22:38 UTC (rev 2660)
@@ -307,7 +307,7 @@
<createdDate>Ngày tạo</createdDate>
<modifiedDate>Ngày sửa</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2010-04-15 17:22:38 UTC (rev 2660)
@@ -258,7 +258,7 @@
<createdDate>创建日期</createdDate>
<modifiedDate>修改日期</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2010-04-15 17:12:56 UTC (rev 2659)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2010-04-15 17:22:38 UTC (rev 2660)
@@ -259,7 +259,7 @@
<createdDate>建立日期</createdDate>
<modifiedDate>修改日期</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
16 years
- 1
- 0
gatein SVN: r2659 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 13:12:56 -0400 (Thu, 15 Apr 2010)
New Revision: 2659
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/UIListMembershipType.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
Log:
GTNPORTAL-1082: Possible to inject javascript code into MembershipType description
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-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindMembershipTypesPageList.java 2010-04-15 17:12:56 UTC (rev 2659)
@@ -26,14 +26,17 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.OrganizationService;
+import org.gatein.common.text.EntityEncoder;
+import java.util.Date;
import java.util.List;
+import java.util.ArrayList;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class FindMembershipTypesPageList extends StatelessPageList<MembershipType>
+public class FindMembershipTypesPageList extends StatelessPageList<FindMembershipTypesPageList.UIMembershipType>
{
public FindMembershipTypesPageList(int pageSize)
@@ -42,11 +45,58 @@
}
@Override
- protected ListAccess<MembershipType> connect() throws Exception
+ protected ListAccess<UIMembershipType> connect() throws Exception
{
ExoContainer container = PortalContainer.getInstance();
OrganizationService service = (OrganizationService)container.getComponentInstance(OrganizationService.class);
List<MembershipType> memberships = (List<MembershipType>)service.getMembershipTypeHandler().findMembershipTypes();
- return new ListAccessImpl<MembershipType>(MembershipType.class, memberships);
+
+ return new ListAccessImpl<UIMembershipType>(UIMembershipType.class, convertMembershipTypes(memberships));
}
+
+ private List<UIMembershipType> convertMembershipTypes(List<MembershipType> memberships)
+ {
+ List<UIMembershipType> types = new ArrayList<UIMembershipType>(memberships.size());
+ for (MembershipType type: memberships)
+ {
+ types.add(new UIMembershipType(type));
+ }
+ return types;
+ }
+
+ public class UIMembershipType
+ {
+ private MembershipType mType;
+
+ public UIMembershipType(MembershipType mType)
+ {
+ this.mType = mType;
+ }
+
+ public String getName()
+ {
+ return mType.getName();
+ }
+
+ public Date getCreatedDate()
+ {
+ return mType.getCreatedDate();
+ }
+
+ public Date getModifiedDate()
+ {
+ return mType.getModifiedDate();
+ }
+
+ public String getDescription()
+ {
+ return mType.getDescription();
+ }
+
+ public String getEncodedDescription()
+ {
+ EntityEncoder encoder = EntityEncoder.FULL;
+ return encoder.encode(getDescription());
+ }
+ }
}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListMembershipType.java 2010-04-15 17:12:56 UTC (rev 2659)
@@ -45,7 +45,7 @@
public class UIListMembershipType extends UIContainer
{
- private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "description"};
+ private static String[] USER_BEAN_FIELD = {"name", "createdDate", "modifiedDate", "encodedDescription"};
private static String[] USER_ACTION = {"EditMembership", "DeleteMembership"};
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ar.xml 2010-04-15 17:12:56 UTC (rev 2659)
@@ -307,7 +307,7 @@
<createdDate>تاريخ الإنشاء</createdDate>
<modifiedDate>تاريخ التعديل</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Erstelldatum
UIMembershipList.header.modifiedDate=Bearbeitungsdatum
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Rolle bearbeiten
UIMembershipList.action.title.DeleteMembership=Rolle löschen
UIMembershipList.msg.InUse=Sie können die Rolle nicht löschen, weil sie benutzt wird.
@@ -254,4 +254,4 @@
UITabPane.title.UISharedNavigation=Navigation der Gruppenseiten
UISharedNavigation.label.userNavigation=Name der Benutzerseiten-Navigation
UISharedNavigation.label.priority=Priorität
-UISharedNavigation.action.Save=Speichern
\ No newline at end of file
+UISharedNavigation.action.Save=Speichern
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Created date
UIMembershipList.header.modifiedDate=Modified date
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Edit Membership
UIMembershipList.action.title.DeleteMembership=Delete Membership
UIMembershipList.msg.InUse=You can not delete this membership because it is in use
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Fecha de Creaci\u00f3n
UIMembershipList.header.modifiedDate=Fecha de Modificaci\u00f3n
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Afiliaci\u00f3n
UIMembershipList.action.title.DeleteMembership=Borrar Afiliaci\u00f3n
UIMembershipList.msg.InUse=No puedes borrar esta afiliaci\u00f3n porque est\u00e1 siendo usada
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -168,7 +168,7 @@
UIMembershipList.header.createdDate=Date de cr\u00e9ation
UIMembershipList.header.modifiedDate=Date de modification
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editer le r\u00f4le
UIMembershipList.action.title.DeleteMembership=Supprimer le r\u00f4le
UIMembershipList.msg.InUse=Vous ne pouvez pas supprimer ce r\u00f4le car il est utilis\u00e9
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Data di creazione
UIMembershipList.header.modifiedDate=Data di modifica
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Modifica il Membership
UIMembershipList.action.title.DeleteMembership=Elimina il Membership
UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -170,7 +170,7 @@
UIMembershipList.header.createdDate=\u4f5c\u6210\u65e5
UIMembershipList.header.modifiedDate=\u66f4\u65b0\u65e5
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u7de8\u96c6
UIMembershipList.action.title.DeleteMembership=\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u3092\u524a\u9664
UIMembershipList.msg.InUse=\u3053\u306e\u30e1\u30f3\u30d0\u30fc\u30b7\u30c3\u30d7\u306f\u4f7f\u7528\u4e2d\u306a\u306e\u3067\u524a\u9664\u3067\u304d\u307e\u305b\u3093
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ko.xml 2010-04-15 17:12:56 UTC (rev 2659)
@@ -259,7 +259,7 @@
<createdDate>생성된 날짜</createdDate>
<modifiedDate>수정된 날짜</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
@@ -376,4 +376,4 @@
</label>
<deleteGroup>이 그룹을 삭제하시겠습니까?</deleteGroup>
</UIGroupManagement>
-</bundle>
\ No newline at end of file
+</bundle>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -170,7 +170,7 @@
UIMembershipList.header.createdDate=\u092c\u0928\u093e\u090f\u0915\u094b \u092e\u093f\u0924\u0940
UIMembershipList.header.modifiedDate=\u092a\u0930\u093f\u092e\u093e\u0930\u094d\u091c\u0928 \u0917\u0930\u0947\u0915\u094b \u092e\u093f\u0924\u0940
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u0938\u092e\u094d\u092a\u093e\u0926\u0928
UIMembershipList.action.title.DeleteMembership=\u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928\u0941
UIMembershipList.msg.InUse=\u0924\u092a\u093e\u0908\u0902 \u092f\u094b \u0938\u0926\u0938\u094d\u092f\u0924\u093e \u092e\u0947\u091f\u093e\u0909\u0928 \u0938\u0915\u094d\u0928\u0941 \u0939\u0941\u0928\u094d\u0928 \u0915\u093f\u0928\u0915\u0940 \u092f\u094b \u092a\u094d\u0930\u092f\u094b\u0917 \u092d\u0907\u0930\u0939\u0947\u0915\u094b \u091b
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -166,7 +166,7 @@
UIMembershipList.header.createdDate=Gecre\u00EBerd datum
UIMembershipList.header.modifiedDate=Gewijzigde datum
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Wijzig rol
UIMembershipList.action.title.DeleteMembership=Verwijder rol
UIMembershipList.msg.InUse=U kan deze rol niet verwijderen omdat die in gebruik is.
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -169,7 +169,7 @@
UIMembershipList.header.createdDate=Data de Criação
UIMembershipList.header.modifiedDate=Data de modificação
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Editar Papel
UIMembershipList.action.title.DeleteMembership=Remover Papel
UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo.
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -159,7 +159,7 @@
UIMembershipList.header.createdDate=Дата создание
UIMembershipList.header.modifiedDate=Дата изменения
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Изменить участие
UIMembershipList.action.title.DeleteMembership=Отменить участие
UIMembershipList.msg.InUse=Невозможно отменить участие.
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2010-04-15 17:12:56 UTC (rev 2659)
@@ -158,7 +158,7 @@
UIMembershipList.header.createdDate=Дата створення
UIMembershipList.header.modifiedDate=Дата змін
UIMembershipList.header.action=#{word.action}
-UIMembershipList.header.description=#{word.description}
+UIMembershipList.header.encodedDescription=#{word.description}
UIMembershipList.action.title.EditMembership=Редагувати клас
UIMembershipList.action.title.DeleteMembership=Видалити клас
UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується.
@@ -242,4 +242,4 @@
UITabPane.title.UISharedNavigation=Навігаційна сторінка групи
UISharedNavigation.label.userNavigation=Назва навігаційної сторінки користувача
UISharedNavigation.label.priority=Пріоритет
-UISharedNavigation.action.Save=Зберегти
\ No newline at end of file
+UISharedNavigation.action.Save=Зберегти
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-15 17:12:56 UTC (rev 2659)
@@ -307,7 +307,7 @@
<createdDate>Ngày tạo</createdDate>
<modifiedDate>Ngày sửa</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh.xml 2010-04-15 17:12:56 UTC (rev 2659)
@@ -258,7 +258,7 @@
<createdDate>创建日期</createdDate>
<modifiedDate>修改日期</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2010-04-15 15:59:44 UTC (rev 2658)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_zh_TW.xml 2010-04-15 17:12:56 UTC (rev 2659)
@@ -259,7 +259,7 @@
<createdDate>建立日期</createdDate>
<modifiedDate>修改日期</modifiedDate>
<action>#{word.action}</action>
- <description>#{word.description}</description>
+ <encodedDescription>#{word.description}</encodedDescription>
</header>
<action>
<title>
16 years
- 1
- 0
gatein SVN: r2658 - portal/trunk/docs/reference-guide/en/modules.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 11:59:44 -0400 (Thu, 15 Apr 2010)
New Revision: 2658
Added:
portal/trunk/docs/reference-guide/en/modules/Advanced.xml
Log:
Oups
Added: portal/trunk/docs/reference-guide/en/modules/Advanced.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Advanced.xml (rev 0)
+++ portal/trunk/docs/reference-guide/en/modules/Advanced.xml 2010-04-15 15:59:44 UTC (rev 2658)
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<chapter id="chap-Reference_Guide-Advanced">
+ <title>Advanced Development</title>
+ <xi:include href="Advanced/Foundations.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+
Property changes on: portal/trunk/docs/reference-guide/en/modules/Advanced.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years
- 1
- 0
gatein SVN: r2657 - in portal/trunk: gadgets/server/src/main/webapp/WEB-INF/classes/containers/default and 2 other directories.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-15 08:26:14 -0400 (Thu, 15 Apr 2010)
New Revision: 2657
Modified:
portal/trunk/gadgets/core/src/main/java/containers/default/container.js
portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js
portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
Log:
GTNPORTAL-1014 Returned currentView does not match enum view (revert code to revision 2549 to use code that is compatable with google gadgets) update missing files
Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-15 12:25:48 UTC (rev 2656)
+++ portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-15 12:26:14 UTC (rev 2657)
@@ -114,12 +114,12 @@
"jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
- "HOME" : {
+ "home" : {
"isOnlyVisible" : false,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
"aliases": ["DASHBOARD", "default"]
},
- "CANVAS" : {
+ "canvas" : {
"isOnlyVisible" : true,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
"aliases" : ["FULL_PAGE"]
Modified: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-15 12:25:48 UTC (rev 2656)
+++ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-15 12:26:14 UTC (rev 2657)
@@ -114,12 +114,12 @@
"jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
- "HOME" : {
+ "home" : {
"isOnlyVisible" : false,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
"aliases": ["DASHBOARD", "default"]
},
- "CANVAS" : {
+ "canvas" : {
"isOnlyVisible" : true,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
"aliases" : ["FULL_PAGE"]
Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
===================================================================
--- portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2010-04-15 12:25:48 UTC (rev 2656)
+++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2010-04-15 12:26:14 UTC (rev 2657)
@@ -13,7 +13,7 @@
def userPref = null;//uicomponent.getUserPref() ;
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript("eXo.gadget.UIGadget") ;
- jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','$id', $metadata, $userPref, 'CANVAS', '$hostName');") ;
+ jsmanager.addCustomizedOnLoadScript("eXo.gadget.UIGadget.createGadget('$url','$id', $metadata, $userPref, 'canvas', '$hostName');") ;
java.util.Map<String, String> metadataMap = GadgetUtil.getMapMetadata(url) ;
String height = "auto" ;
if(metadataMap.containsKey("height") && Integer.parseInt(metadataMap.get("height")) > 0)
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-15 12:25:48 UTC (rev 2656)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-15 12:26:14 UTC (rev 2657)
@@ -256,8 +256,8 @@
var portletFrag = DOMUtil.findAncestorByClass(uiGadget, "PORTLET-FRAGMENT") ;
if (!portletFrag) return;
var maximize = "maximize";
- if(view == 'CANVAS') maximize = "maximize";
- else if(view == 'HOME') maximize = "unmaximize";
+ if(view == 'canvas') maximize = "maximize";
+ else if(view == 'home') maximize = "unmaximize";
var compId = portletFrag.parentNode.id;
var uicomp = DOMUtil.getChildrenByTagName(portletFrag, "div")[0];
var href = eXo.env.server.portalBaseURL + "?portal:componentId=" + compId ;
@@ -276,10 +276,10 @@
*/
gadgets.IfrGadgetService.prototype.getUrlForView = function(
view) {
- if (view === 'CANVAS') {
- return 'CANVAS';
- } else if (view === 'HOME') {
- return 'HOME';
+ if (view === 'canvas') {
+ return 'canvas';
+ } else if (view === 'home') {
+ return 'home';
} else {
return null;
}
16 years
- 1
- 0
gatein SVN: r2656 - in portal/branches/EPP_5_0_0_Branch_Docs: Enterprise_Portal_Platform_Reference_Guide and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 08:25:48 -0400 (Thu, 15 Apr 2010)
New Revision: 2656
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/pom.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Release_Notes/pom.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml
Log:
Changed groupId, artifactId, version to not replace what is provdided by GateIn
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml 2010-04-15 12:15:31 UTC (rev 2655)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml 2010-04-15 12:25:48 UTC (rev 2656)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>dummy</groupId>
- <artifactId>dummy</artifactId>
- <version>0-SNAPSHOT</version>
+ <groupId>org.gatein.docs.dummy</groupId>
+ <artifactId>${docname}-${translation}</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/pom.xml 2010-04-15 12:15:31 UTC (rev 2655)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/pom.xml 2010-04-15 12:25:48 UTC (rev 2656)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.project</groupId>
+ <groupId>org.gatein.docs.dummy</groupId>
<artifactId>${docname}-${translation}</artifactId>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Release_Notes/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Release_Notes/pom.xml 2010-04-15 12:15:31 UTC (rev 2655)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Release_Notes/pom.xml 2010-04-15 12:25:48 UTC (rev 2656)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.project</groupId>
+ <groupId>org.gatein.docs.dummy</groupId>
<artifactId>${docname}-${translation}</artifactId>
- <version>1.0</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml 2010-04-15 12:15:31 UTC (rev 2655)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml 2010-04-15 12:25:48 UTC (rev 2656)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.parent</artifactId>
- <version>3.0.1-GA-SNAPSHOT</version>
+ <groupId>org.gatein.docs.dummy</groupId>
+ <artifactId>${docname}-${translation}</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
16 years
- 1
- 0
gatein SVN: r2655 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-15 08:15:31 -0400 (Thu, 15 Apr 2010)
New Revision: 2655
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/ClusteringConfiguration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.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/Installation.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml
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/Uninstall_JBoss.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml
Log:
Updating Installation guide
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/ClusteringConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/ClusteringConfiguration.xml 2010-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/ClusteringConfiguration.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -5,6 +5,14 @@
]>
<section id="sect-Reference_Guide-Clustering_Configuration">
<title>Clustering Configuration</title>
+ <indexterm>
+ <primary>Configuration</primary>
+ <secondary>Clustering</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Clustering</primary>
+ <secondary>Configuration</secondary>
+ </indexterm>
<section id="sect-Reference_Guide-Clustering_Configuration-Overview">
<title>Overview</title>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml 2010-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/DatabaseConfiguration.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -5,7 +5,14 @@
]>
<section id="sect-Reference_Guide-Database_Configuration">
<title>Database Configuration</title>
-
+ <indexterm>
+ <primary>Configuration</primary>
+ <secondary>Database</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Database</primary>
+ <secondary>Configuration</secondary>
+ </indexterm>
<section id="sect-Reference_Guide-Database_Configuration-Overview">
<title>Overview</title>
@@ -94,13 +101,23 @@
</section>
<section>
- <title>Example with MySQL</title>
- <formalpara id="form-Portal_EAP-Using_a_MySQL_Database-Installing_the_MySQL_RDBMS_JDBC_connector">
- <title>Installing the MySQL RDBMS JDBC connector</title>
- <para>
- The RDBMS JDBC MySQL connector is required for EPP to use a MySQL database:
- </para>
- </formalpara>
+ <title>Example with MySQL</title>
+
+ <indexterm>
+ <primary>Configuration</primary>
+ <secondary>MySQL</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Database</primary>
+ <secondary>MySQL</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>MySQL</primary>
+ </indexterm>
+ <formalpara id="form-Portal_EAP-Using_a_MySQL_Database-Installing_the_MySQL_RDBMS_JDBC_connector">
+ <title>Installing the MySQL RDBMS JDBC connector</title>
+ <para>The RDBMS JDBC MySQL connector is required for EPP to use a MySQL database:</para>
+ </formalpara>
<orderedlist>
<listitem>
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-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Getting_Started.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -9,25 +9,27 @@
<section id="Getting_Started-Pre_Requisites">
<title>Pre-Requisites</title>
<para>
- You must have adequate disk space<!--TODO how much --> to install JDK and &PRODUCT; while also allowing enough space for your applications. Before installing &PRODUCT; you must have a working installation of Java. Since JBoss is 100% pure Java you can have it working on any Operating System / Platform that supports Java. However, there are a few Operating System-specific issues that you should be aware of. Refer to <ulink url="http://www.jboss.org/community/docs/DOC-10687"></ulink> for more information.
+ You must have adequate disk space to install a JDK and &PRODUCT; (550MB) while also allowing enough space for your applications. Before installing &PRODUCT; you must have a working installation of Java. Since JBoss is 100% pure Java you can have it working on any Operating System / Platform that supports Java.
+ However, only some combinations are certified (tested prior to shipping) or supported (on which you can open support tickets), the certified combinations are listed below.
</para>
<section id="Pre_Requisites-EAP">
<title>Enterprise Application Platform</title>
<para>The Enterprise Portal Platform 5.0 is built upon the Enterprise Application Platform 5.0.
For more details about the underlying platform such as difference between the 4.3 and 5.0 versions, please refer to
- the EAP installation guide available at: <ulink url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/"></ulink>
-
+ the EAP installation guide available at: <ulink url="http://www.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/"></ulink>
</para>
</section>
<section id="Pre_Requisites-Hardware_and_Operating_System_Requirements">
<title>System Requirements</title>
-
<para>For the latest information on supported Operating System / JVM combinations and supported Database platforms, please refer to <ulink url="http://www.jboss.com/products/platforms/portals/testedconfigurations/">http://www.jboss.com/products/platforms/portals/testedconfigurations/</ulink>.
</para>
<para>
The following is a list of certified operating systems and JVM version combination:
</para>
-
+ <indexterm>
+ <primary>System Requirements</primary>
+ <secondary>OS/JVM</secondary>
+ </indexterm>
<table>
<title>
Supported Operating System / JVM Combinations.
@@ -123,7 +125,14 @@
<para>
The following is a list of supported databases and database drivers:
</para>
-
+ <indexterm>
+ <primary>System Requirements</primary>
+ <secondary>Database</secondary>
+ </indexterm>
+ <indexterm>
+ <primary>Database</primary>
+ <secondary>System Requirements</secondary>
+ </indexterm>
<table>
<title>
Supported and Certified Database / Database driver Combinations.
@@ -224,7 +233,10 @@
</tbody>
</tgroup>
</table>
-
+ <indexterm>
+ <primary>System Requirements</primary>
+ <secondary>Directory server</secondary>
+ </indexterm>
<para>
The following is a list of supported directory servers:
</para>
@@ -314,10 +326,8 @@
<para>
Java SDKs are provided by the Red Hat Enterprise Linux 5 Base and Supplementary channels for your Linux variant and architecture. The available JDKs corresponding to each channel and architecture are listed below:
</para>
- <para>
-
- </para>
- <variablelist><title></title>
+ <variablelist>
+ <title>RHEL 5 Java SDKs</title>
<varlistentry>
<term>
Channel: rhel-<arch>-server-5
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml 2010-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Installation.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -20,7 +20,7 @@
<para>
To install from a zip file, simply unzip the downloaded file to a directory of your choice. You can unzip the platform on any operating system that supports the zip format. Six types of server configurations will be included in your installation - minimal, default, production, all, standard and web.
- The Getting Started Guide of &JBEAP; as well as http://www.jboss.org/community/docs/DOC-12942 explain in detail the different server configuration file sets.
+ The Getting Started Guide of &JBEAP; explain in detail the different server configuration file sets.
<itemizedlist>
<listitem>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml 2010-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Introduction.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -15,28 +15,7 @@
Because it is Java-based, &PRODUCT; is cross-platform and easy to install and use on any operating system that supports Java. The readily available source code is a powerful learning tool to debug the server and understand it. It also gives you the flexibility to create customized versions for your personal or business use.
</para>
<para>
- Installing &PRODUCT; is simple and easy. You can have it installed and running in no time. This guide will teach you to install and uninstall JBoss.<!--: <itemizedlist>
- <listitem>
- <para>
- How to install &PRODUCT;
- </para>
- </listitem>
- <listitem>
- <para>
- How to Start and Stop your JBoss AS instance
- </para>
- </listitem>
- <listitem>
- <para>
- The Directory structure
- </para>
- </listitem>
- <listitem>
- <para>
- The key services and configuration files
- </para>
- </listitem>
- </itemizedlist>-->
+ Installing &PRODUCT; is simple and easy. You can have it installed and running in no time. This guide will teach you to install and uninstall it.
</para>
<section id="Introduction-Other_Manuals">
<title>Other Manuals</title>
@@ -45,6 +24,5 @@
<!--TODO mention about the other guides attached-->
</para>
</section>
-
</chapter>
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-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Post_Installation.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -9,7 +9,6 @@
<title>
Set JBOSS_HOME Environment Variable
</title>
- <para><remark>Minor edit changed 4.3 to 5.0 in path to installation directory.</remark></para>
<formalpara>
<title>
On a Linux Platform
@@ -37,15 +36,15 @@
<section id="Adjust_Memory_Settings">
<title>Adjust memory settings</title>
<para>
- The default configuration for the server to start with, if no other configuration is specified, is the production configuration. It is recommended to run the example Seam applications that are included with the documentation using the production configuration.
+ The default configuration for the server to start with, if no other configuration is specified, is the production configuration.
</para>
<para>
- To avoid memory issues, adjust the memory settings before deploying the applications. You can do this by updating <literal>JAVA_OPTS</literal> settings in the file <filename>JBOSS_DIST/jboss-as/bin/run.conf</filename> with these recommended values:
+ To avoid memory issues, adjust the memory settings before deploying the applications. You can do this by updating <literal>JAVA_OPTS</literal> settings in the file <filename>JBOSS_DIST/jboss-as/bin/run.conf</filename>. Those are the default values
+ and are usually sufficient:
<programlisting>
-Xms1303m -Xmx1303m -XX:MaxPermSize=256m ....
</programlisting>
</para>
- <para><remark>This is the default so the "adjust" statement is not correct. Should it be set higher than 256m?</remark></para>
</section>
@@ -99,39 +98,31 @@
<para>
JBoss Messaging makes internal connections between nodes in order to redistribute messages between clustered destinations. These connections are made with the user name of a special reserved user whose password is specified by this parameter <literal>SuckerPassword</literal> in the Server Peer configuration file:
<programlisting>
- <remark>$JBOSS_HOME/server/$CONFIG/deploy/messaging/messaging-service.xml</remark>
+ <remark>$JBOSS_HOME/server/$CONFIG/deploy/messaging/messaging-jboss-beans.xml</remark>
</programlisting>
Where <literal>$JBOSS_HOME</literal> is the install directory and <literal>$CONFIG</literal> is the server configuration being used.
To avoid a security risk, you MUST specify the value of the attribute <literal>SuckerPassword</literal>, failing which the default value will be used. Any one who knows the default password will be able to gain access to any destinations on the server. The following fragment should be uncommented and modified:
- <programlisting>
- <mbean code="org.jboss.jms.server.ServerPeer"
- name="jboss.messaging:service=ServerPeer"
- xmbean-dd="xmdesc/ServerPeer-xmbean.xml">
- ...
- ...
- ...
- ...
- <!-- 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>
- ...
- ...
- ...
- </mbean>
- </programlisting>
+ <programlisting><bean name="SecurityStore"
+class="org.jboss.jms.server.jbosssx.JBossASSecurityMetadataStore">
+ <! default security configuration >
+ ...
+ ...
+ ...
+ <property name="suckerPassword">CHANGE ME!!</property>
+ ...
+ ...
+ ...
+</bean>
+</programlisting>
</para>
</formalpara>
- <para><remark>Note to Reviewer</remark></para>
- <para>edit $JBOSS_HOME/server/$CONFIG/deploy/messaging/messaging-jboss-beans.xml as well?</para>
- <para><literal><property name="suckerPassword">CHANGE ME!!</property></literal></para>
- <para><remark>End Note to Reviewer</remark></para>
</section>
<section id="Disabling_Authentication">
<title>Disabling Authentication</title>
- <para><remark>No changes here as all paths and files are the same</remark></para>
<para>
- It is also possible to disable authentication on specific services. All specified paths in the sections below are relative to <literal>$JBOSS_HOME</literal>.
+ By default, authentication is disabled, if enabled here are the explanations to turn them off again.
+ All specified paths in the sections below are relative to <literal>$JBOSS_HOME</literal>.
</para>
<formalpara>
<title>Disabling Authentication for JXM Console:</title>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Uninstall_JBoss.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Uninstall_JBoss.xml 2010-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/en-US/Uninstall_JBoss.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -5,7 +5,7 @@
]>
<chapter id="Uninstall_JBoss">
- <title>Uninstall JBoss</title>
+ <title>Uninstall EPP</title>
<para>
As JBoss Enterprise Portal Platform was installed from a zipfile, you may uninstall it by simply deleting the &PRODUCT; installed directory.
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml 2010-04-15 12:14:27 UTC (rev 2654)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Installation_Guide/pom.xml 2010-04-15 12:15:31 UTC (rev 2655)
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.parent</artifactId>
- <version>3.0.1-GA-SNAPSHOT</version>
+ <groupId>dummy</groupId>
+ <artifactId>dummy</artifactId>
+ <version>0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>${bookname}-(${translation})</name>
16 years
- 1
- 0