gatein SVN: r2371 - in portal/trunk/web/portal/src/main/webapp: WEB-INF/conf/uiconf/portal/webui/container and 1 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-03-26 08:40:57 -0400 (Fri, 26 Mar 2010)
New Revision: 2371
Added:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy
Log:
GTNPORTAL-397 Create a new columns container template called "Autofit Columns Layout" which will not divide columns equally
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_de.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=Reihenlayout
ContainerOptions.Category.column=Spaltenlayout
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Registerkartenlayout
ContainerOptions.Category.mix=Kombiniertes Layout
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=Zwei Spalten
ContainerOptions.Item.threeColumns=Drei Spalten
ContainerOptions.Item.threeToolbarColumns=Drei Werkzeugleisten-Spalten
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=Zwei Registerkarten
ContainerOptions.Item.threeTabs=Drei Registerkarten
ContainerOptions.Item.twoColumnsOneRow=Zwei Spalten, Eine Reihe
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=Rows Layout
ContainerOptions.Category.column=Columns Layout
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Tabs Layout
ContainerOptions.Category.mix=Mixed Layout
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=Two Columns
ContainerOptions.Item.threeColumns=Three Columns
ContainerOptions.Item.threeToolbarColumns=Three Toolbar Columns
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=Two Tabs
ContainerOptions.Item.threeTabs=Three Tabs
ContainerOptions.Item.twoColumnsOneRow=Two Columns, One Row
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_es.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=Distribuci\u00f3n de Filas
ContainerOptions.Category.column=Distribuci\u00f3n de Columnas
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Distribuci\u00f3n de Tabs
ContainerOptions.Category.mix=Distribuci\u00f3n Mixta
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=Dos Columnas
ContainerOptions.Item.threeColumns=Tres Columnas
ContainerOptions.Item.threeToolbarColumns=Barra de Herramientas de Tres Columnas
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=Dos Tabs
ContainerOptions.Item.threeTabs=Tres Tabs
ContainerOptions.Item.twoColumnsOneRow=Dos Columnas, Una Fila
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -115,6 +115,7 @@
ContainerOptions.Category.row=Rows Layout
ContainerOptions.Category.column=Columns Layout
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Tabs Layout
ContainerOptions.Category.mix=Mixed Layout
@@ -125,6 +126,9 @@
ContainerOptions.Item.twoColumns=Two Columns
ContainerOptions.Item.threeColumns=Three Columns
ContainerOptions.Item.threeToolbarColumns=Three Toolbar Columns
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=Two Tabs
ContainerOptions.Item.threeTabs=Three Tabs
ContainerOptions.Item.twoColumnsOneRow=Two Columns, One Row
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=Layout delle Righe
ContainerOptions.Category.column=Layout delle Colonne
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Layout dei Tab
ContainerOptions.Category.mix=Layout Vari
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=Due Colonne
ContainerOptions.Item.threeColumns=Tre Colonne
ContainerOptions.Item.threeToolbarColumns=Tre Colonne Toolbar
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=Due Tab
ContainerOptions.Item.threeTabs=Tre Tab
ContainerOptions.Item.twoColumnsOneRow=Due Colonne, Una Riga
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ja.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=\u884c\u30ec\u30a4\u30a2\u30a6\u30c8
ContainerOptions.Category.column=\u5217\u30ec\u30a4\u30a2\u30a6\u30c8
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=\u30bf\u30d6\u30ec\u30a4\u30a2\u30a6\u30c8
ContainerOptions.Category.mix=\u30df\u30c3\u30af\u30b9\u30ec\u30a4\u30a2\u30a6\u30c8
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=2\u5217
ContainerOptions.Item.threeColumns=3\u5217
ContainerOptions.Item.threeToolbarColumns=3\u30c4\u30fc\u30eb\u30d0\u30fc\u5217
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=2\u30bf\u30d6
ContainerOptions.Item.threeTabs=3\u30bf\u30d6
ContainerOptions.Item.twoColumnsOneRow=2\u5217\u30011\u884c
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_ne.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=\u0930\u094b\u091c \u0922\u093e\u091a\u093e
ContainerOptions.Category.column=\u0915\u094b\u0932\u0941\u092e\u0915\u094b \u0922\u093e\u091a\u093e
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=\u091f\u094d\u092f\u093e\u092c\u094d\u0938\u094d\u0915\u094b \u0922\u093e\u091a\u093e
ContainerOptions.Category.mix=\u092e\u093f\u0938\u094d\u0930\u093f\u0924 \u0922\u093e\u091a\u093e
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=\u0968 \u0915\u094b\u0932\u0941\u092e\u094d\u0938\u094d
ContainerOptions.Item.threeColumns=\u0969 \u0915\u094b\u0932\u0941\u092e\u094d\u0938\u094d
ContainerOptions.Item.threeToolbarColumns=\u0969 \u091f\u0941\u0932\u092c\u093e\u0930 \u0915\u094b\u0932\u0941\u092e\u094d\u0938\u094d
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=\u0968 \u091f\u094d\u092f\u093e\u092c\u094d\u0938
ContainerOptions.Item.threeTabs=\u0969 \u091f\u094d\u092f\u093e\u092c\u094d\u0938
ContainerOptions.Item.twoColumnsOneRow=\u0968 \u0915\u094b\u0932\u0941\u092e\u094d\u0938\u094d, \u0967 \u0930\u094b
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_nl.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -128,6 +128,7 @@
ContainerOptions.Category.row=Rijen lay-out
ContainerOptions.Category.column=Kolommen lay-out
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Tabbladen lay-out
ContainerOptions.Category.mix=Gemixte lay-out
@@ -138,6 +139,9 @@
ContainerOptions.Item.twoColumns=2 kolommen
ContainerOptions.Item.threeColumns=3 kolommen
ContainerOptions.Item.threeToolbarColumns=3 werkbalk kolommen
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=2 tabbladen
ContainerOptions.Item.threeTabs=3 tabbladen
ContainerOptions.Item.twoColumnsOneRow=2 kolommen en 1 rij
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-03-26 12:40:57 UTC (rev 2371)
@@ -109,6 +109,7 @@
ContainerOptions.Category.row=Rows Layout
ContainerOptions.Category.column=Columns Layout
+ContainerOptions.Category.autofitColumn=Autofit Columns Layout
ContainerOptions.Category.tabs=Tabs Layout
ContainerOptions.Category.mix=Mixed Layout
@@ -119,6 +120,9 @@
ContainerOptions.Item.twoColumns=Two Columns
ContainerOptions.Item.threeColumns=Three Columns
ContainerOptions.Item.threeToolbarColumns=Three Toolbar Columns
+ContainerOptions.Item.autofitOneColumns=Autofit One Column
+ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
+ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
ContainerOptions.Item.twoTabs=Two Tabs
ContainerOptions.Item.threeTabs=Three Tabs
ContainerOptions.Item.twoColumnsOneRow=Two Columns, One Row
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2010-03-26 10:10:33 UTC (rev 2370)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/container/ContainerConfigOption.groovy 2010-03-26 12:40:57 UTC (rev 2371)
@@ -69,6 +69,27 @@
"</container>",
"ThreeColumnContainerLayout")) ;
templates.add(column);
+
+ SelectItemCategory autofitColumn = new SelectItemCategory("autofitColumn") ;
+ autofitColumn.addSelectItemOption(new SelectItemOption("autofitOneColumns","" +
+ "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" +
+ " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" +
+ "</container>",
+ "OneRowContainerLayout")) ;
+ autofitColumn.addSelectItemOption(new SelectItemOption("autofitTwoColumns",
+ "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" +
+ " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" +
+ " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" +
+ "</container>",
+ "TwoColumnContainerLayout")) ;
+ autofitColumn.addSelectItemOption(new SelectItemOption("autofitThreeColumns",
+ "<container template=\"system:/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl\">" +
+ " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" +
+ " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" +
+ " <container template=\"system:/groovy/portal/webui/container/UIContainer.gtmpl\"></container>" +
+ "</container>",
+ "ThreeColumnContainerLayout")) ;
+ templates.add(autofitColumn);
SelectItemCategory tabs = new SelectItemCategory("tabs") ;
tabs.addSelectItemOption(new SelectItemOption("twoTabs",
Added: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableAutofitColumnContainer.gtmpl 2010-03-26 12:40:57 UTC (rev 2371)
@@ -0,0 +1,98 @@
+<%
+ import org.exoplatform.commons.utils.ExpressionUtil;
+ import org.exoplatform.portal.webui.workspace.UIPortalApplication;
+
+ def rcontext = _ctx.getRequestContext();
+ ResourceBundle res = rcontext.getApplicationResourceBundle();
+
+ UIPortalApplication uiPortalApp = rcontext.getUIApplication();
+ boolean hasPermission = uicomponent.hasPermission();
+ if(!uiPortalApp.isEditing() && !hasPermission) return;
+
+ /** Trim the prefix UIContainer- if any, this hardcoded part is needed to update nested container via Ajax */
+ String componentId = uicomponent.getId();
+ if(componentId.startsWith("UIContainer-")){
+ uicomponent.setId(componentId.substring("UIContainer-".length()));
+ }
+
+%>
+<div class="UIContainer <%=uiPortalApp.isEditing()?"EdittingContainer":""%> <%=hasPermission?"":"ProtectedContainer"%>"
+ id="UIContainer-${uicomponent.id}"
+ onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);"
+ onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
+ <div class="NormalContainerBlock">
+ <div class="LeftContainerBlock">
+ <div class="RightContainerBlock UIComponentBlock">
+
+ <%
+ int portalMode = uiPortalApp.getModeState();
+ String style = "";
+ String width = uicomponent.getWidth();
+ String height = uicomponent.getHeight();
+ if(width != null) style += "width:"+width+";";
+ if(height != null) style += "height:"+height+";";
+ if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE){
+ %>
+ <div class="LAYOUT-CONTAINER LAYOUT-BLOCK">
+ <%} else {%>
+ <div class="VIEW-CONTAINER VIEW-BLOCK">
+ <%} %>
+ <div id="$uicomponent.id">
+ <%if(hasPermission) {%>
+ <table class="UITableColumnContainer" style="margin: 0px auto; $style">
+ <tr class="TRContainer">
+ <% for(uiChild in uicomponent.getChildren()) {%>
+ <td class="${uiChild.id}TDContainer TDContainer"><% uicomponent.renderUIComponent(uiChild) %></td>
+ <% } %>
+ </tr>
+ </table>
+ <%} else {print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>";}%>
+ </div>
+ </div>
+ <%/*Debug On IE -----For DND */%>
+
+ <%if(portalMode != UIPortalApplication.NORMAL_MODE){%>
+ <div class="EDITION-BLOCK EDITION-CONTAINER" style="display: none;">
+ <div style="position: relative;">
+ <div style="position: absolute; top: -86px;">
+
+ <div class="NewLayer" style="display: none; visibility: hidden;"><span></span></div>
+ <div class="CONTROL-CONTAINER CONTROL-BLOCK" style="position: absolute; top: -6px;">
+ <%/*Begin InfoBar*/%>
+ <div class="UIInfoBar">
+ <div class="BlueRoundedStyle">
+ <div class="LeftBar">
+ <div class="RightBar">
+ <div class="MiddleBar">
+ <div class="FixHeight">
+ <div class="DragControlArea" title="<%=_ctx.appRes("UIContainer.tooltip.drag")%>" onmousedown="eXo.portal.PortalDragDrop.init.call(this,event);"><span></span></div>
+ <%
+ String strTitle = uicomponent.getTitle() != null ?
+ ExpressionUtil.getExpressionValue(res, uicomponent.getTitle()) :
+ _ctx.appRes("UIContainer.title.Container");
+ %>
+ <div class="ContainerIcon DefaultContainer16x16Icon"><%=hasPermission ? strTitle : _ctx.appRes("UIPortlet.label.protectedContent")%></div>
+ <%if(hasPermission) {%>
+ <a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
+ <%}%>
+ <div class="ClearBoth"><span></span></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <%/*End InfoBar*/ %>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <%} %>
+
+ </div>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
14 years, 9 months
gatein SVN: r2370 - portal/trunk.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2010-03-26 06:10:33 -0400 (Fri, 26 Mar 2010)
New Revision: 2370
Modified:
portal/trunk/pom.xml
Log:
- GTNPORTAL-949 - fixed version of PLIDM
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-26 09:26:19 UTC (rev 2369)
+++ portal/trunk/pom.xml 2010-03-26 10:10:33 UTC (rev 2370)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.0-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.1.0-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.1.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.2.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.0</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
14 years, 9 months
gatein SVN: r2369 - in portal/branches/EPP_5_0_Branch: web/portal/src/main/webapp/groovy/webui/core and 1 other directories.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-03-26 05:26:19 -0400 (Fri, 26 Mar 2010)
New Revision: 2369
Modified:
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
Log:
JBEPP-211: GTNPORTAL-495 ported to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
===================================================================
--- portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-25 20:54:53 UTC (rev 2368)
+++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-26 09:26:19 UTC (rev 2369)
@@ -558,10 +558,6 @@
return true;
};
-UIPortal.prototype.expandAll = function(element) {
- if (this.isExpandAll==true) return true;
- return false;
-};
/*
* This method will start the creation of a new javascript application such as a widget
*
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-25 20:54:53 UTC (rev 2368)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-26 09:26:19 UTC (rev 2369)
@@ -104,7 +104,7 @@
<div class="CollapseAll FloatLeft" onclick="eXo.portal.UIPortal.collapseExpand(this);$actionCollapseAll">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.CollapseAll")%>
</div>
- <div class="ExpandAll FloatLeft" onclick="if(!eXo.portal.UIPortal.expandAll(this)){$actionExpandAll}">
+ <div class="ExpandAll FloatLeft" onclick="{$actionExpandAll}">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.ExpandAll")%>
</div>
</div>
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-25 20:54:53 UTC (rev 2368)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-26 09:26:19 UTC (rev 2369)
@@ -330,9 +330,6 @@
uiNavigation.loadTreeNodes();
- JavascriptManager jsManager = prContext.getJavascriptManager();
- jsManager.addJavascript("eXo.portal.UIPortal.isExpandAll=false;");
-
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation);
}
}
@@ -349,9 +346,6 @@
expandAllNode(treeNode);
- JavascriptManager jsManager = prContext.getJavascriptManager();
- jsManager.addJavascript("eXo.portal.UIPortal.isExpandAll=true;");
-
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation);
}
14 years, 9 months
gatein SVN: r2368 - portal/trunk.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-03-25 16:54:53 -0400 (Thu, 25 Mar 2010)
New Revision: 2368
Removed:
portal/trunk/skins/
Log:
Remove files which should not have been added into svn.
14 years, 9 months
gatein SVN: r2367 - in portal/trunk: skins and 6 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-03-25 16:42:17 -0400 (Thu, 25 Mar 2010)
New Revision: 2367
Added:
portal/trunk/skins/
portal/trunk/skins/simpleskin/
portal/trunk/skins/simpleskin/target/
portal/trunk/skins/simpleskin/target/war/
portal/trunk/skins/simpleskin/target/war/work/
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
Log:
GTNPORTAL-495: expand all on the sitemap would only work if a flag was set saying the nodes were not already expanded, but this flag was not always being set properly. Removing this flag as even if it was being set correctly it still cannot determine if a node or page has been added or removed since the last expansion.
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-25 13:03:25 UTC (rev 2366)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-03-25 20:42:17 UTC (rev 2367)
@@ -558,10 +558,6 @@
return true;
};
-UIPortal.prototype.expandAll = function(element) {
- if (this.isExpandAll==true) return true;
- return false;
-};
/*
* This method will start the creation of a new javascript application such as a widget
*
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-25 13:03:25 UTC (rev 2366)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UISitemapTree.gtmpl 2010-03-25 20:42:17 UTC (rev 2367)
@@ -104,7 +104,7 @@
<div class="CollapseAll FloatLeft" onclick="eXo.portal.UIPortal.collapseExpand(this);$actionCollapseAll">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.CollapseAll")%>
</div>
- <div class="ExpandAll FloatLeft" onclick="if(!eXo.portal.UIPortal.expandAll(this)){$actionExpandAll}">
+ <div class="ExpandAll FloatLeft" onclick="{$actionExpandAll}">
<%=_ctx.appRes(siteMapPortlet.getName() + ".label.ExpandAll")%>
</div>
</div>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-25 13:03:25 UTC (rev 2366)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-25 20:42:17 UTC (rev 2367)
@@ -330,9 +330,6 @@
uiNavigation.loadTreeNodes();
- JavascriptManager jsManager = prContext.getJavascriptManager();
- jsManager.addJavascript("eXo.portal.UIPortal.isExpandAll=false;");
-
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation);
}
}
@@ -349,9 +346,6 @@
expandAllNode(treeNode);
- JavascriptManager jsManager = prContext.getJavascriptManager();
- jsManager.addJavascript("eXo.portal.UIPortal.isExpandAll=true;");
-
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigation);
}
14 years, 9 months
gatein SVN: r2366 - in portal/branches/EPP_5_0_Branch: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-03-25 09:03:25 -0400 (Thu, 25 Mar 2010)
New Revision: 2366
Modified:
portal/branches/EPP_5_0_Branch/component/pc/src/main/java/org/exoplatform/services/portletcontainer/PortletContainerException.java
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
Log:
JBEPP-239: GTNPORTAL-897 and GTNPORTAL-931 ported to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/component/pc/src/main/java/org/exoplatform/services/portletcontainer/PortletContainerException.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/pc/src/main/java/org/exoplatform/services/portletcontainer/PortletContainerException.java 2010-03-25 12:10:07 UTC (rev 2365)
+++ portal/branches/EPP_5_0_Branch/component/pc/src/main/java/org/exoplatform/services/portletcontainer/PortletContainerException.java 2010-03-25 13:03:25 UTC (rev 2366)
@@ -32,8 +32,6 @@
public PortletContainerException(final Throwable cause)
{
super(cause);
- if (cause != null)
- cause.printStackTrace();
}
/**
@@ -51,8 +49,6 @@
public PortletContainerException(final String message, final Throwable cause)
{
super(message, cause);
- if (cause != null)
- cause.printStackTrace();
}
}
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-03-25 12:10:07 UTC (rev 2365)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-03-25 13:03:25 UTC (rev 2366)
@@ -221,6 +221,7 @@
{
PortletContainerException pcException;
+ //
if (portletResponse instanceof ErrorResponse)
{
ErrorResponse errorResponse = (ErrorResponse)portletResponse;
@@ -233,17 +234,24 @@
+ "]. Expected a FragmentResponse or an ErrorResponse");
}
- PortletExceptionHandleService portletExceptionService =
- (PortletExceptionHandleService)uiPortlet_.getApplicationComponent(PortletExceptionHandleService.class);
- portletExceptionService.handle(pcException);
+ //
+ PortletExceptionHandleService portletExceptionService = uiPortlet_.getApplicationComponent(PortletExceptionHandleService.class);
+ if (portletExceptionService != null)
+ {
+ portletExceptionService.handle(pcException);
+ }
+ else
+ {
+ log.warn("Could not find the PortletExceptionHandleService in the exo container");
+ }
+ //
+ log.error("Portlet render in edit mode threw an exception", pcException);
content = "An error has occured. Please see the logs for details.";
}
portletContent.setLength(0);
portletContent.append(content);
- //
-
}
catch (Throwable ex)
{
14 years, 9 months
gatein SVN: r2365 - in portal/trunk/testsuite/selenium-snifftests: src/main/java/org/exoplatform/portal/selenium and 1 other directories.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-03-25 08:10:07 -0400 (Thu, 25 Mar 2010)
New Revision: 2365
Modified:
portal/trunk/testsuite/selenium-snifftests/pom.xml
portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html
Log:
GTNPORTAL-960 - selenium.host variable to run tests on any host, fixed tests: Test_POR_14_01_043, Test_SNF_PRL_20, Test_POR_20_026, Test_SNF_PRL_21 - speed issues with other DBs, added waiting on needed place, removed useless waiting
Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-03-25 11:10:41 UTC (rev 2364)
+++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-03-25 12:10:07 UTC (rev 2365)
@@ -17,6 +17,7 @@
<selenium.browser>firefox</selenium.browser>
<selenium.timeout>10000</selenium.timeout>
<selenium.speed>300</selenium.speed>
+ <selenium.host>localhost</selenium.host>
<org.selenium.maven-plugin.version>1.0</org.selenium.maven-plugin.version>
</properties>
@@ -147,6 +148,10 @@
<name>selenium.timeout</name>
<value>${selenium.timeout}</value>
</property>
+ <property>
+ <name>selenium.host</name>
+ <value>${selenium.host}</value>
+ </property>
</systemProperties>
</configuration>
</execution>
Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-25 11:10:41 UTC (rev 2364)
+++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-25 12:10:07 UTC (rev 2365)
@@ -90,14 +90,16 @@
sb.append("public String speed = \"100\";\n");
sb.append("public String timeout = \"30000\";\n");
sb.append("public int timeoutSecInt = 30;\n");
- sb.append("public String browser = \"firefox\";\n");
+ sb.append("public String browser = \"firefox\";\n");
+ sb.append("public String host = \"localhost\";\n");
sb.append("public void setSpeed() {\n selenium.setSpeed(speed);\n}\n\n");
sb.append("public void setUp() throws Exception {\n");
sb.append(" browser = System.getProperty(\"selenium.browser\", browser);\n");
sb.append(" timeout = System.getProperty(\"selenium.timeout\", timeout);\n");
sb.append(" timeoutSecInt = Integer.parseInt(timeout)/1000;\n");
- sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n");
- sb.append(" super.setUp(\"http://localhost:8080/portal/\", \"*\" + browser);\n");
+ sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n");
+ sb.append(" host = System.getProperty(\"selenium.host\", host);\n");
+ sb.append(" super.setUp(\"http://\" + host + \":8080/portal/\", \"*\" + browser);\n");
sb.append("}\n\n");
}
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html 2010-03-25 11:10:41 UTC (rev 2364)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html 2010-03-25 12:10:07 UTC (rev 2365)
@@ -603,25 +603,40 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Group</td>
+ <td>link=Users and groups management</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Group</td>
+ <td>link=Users and groups management</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Users and groups management</td>
+ <td>searchTerm</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Users and groups management</td>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>POR_14_043</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=User Name</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=//form[@id='UISearchForm']/div[2]/a</td>
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>xpath=//img[@alt='DeleteUser']</td>
<td></td>
@@ -637,6 +652,16 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextNotPresent</td>
+ <td>POR_14_043</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Sign out</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-03-25 11:10:41 UTC (rev 2364)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-03-25 12:10:07 UTC (rev 2365)
@@ -487,6 +487,11 @@
<td></td>
</tr>
<tr>
+ <td>open</td>
+ <td>/portal/private/classic/</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Site</td>
<td></td>
@@ -517,6 +522,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForTextNotPresent</td>
<td>Test_POR_20_026</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-03-25 11:10:41 UTC (rev 2364)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-03-25 12:10:07 UTC (rev 2365)
@@ -179,7 +179,7 @@
<tr>
<td>verifyTextPresent</td>
<td>test_portal_name_20</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>echo</td>
@@ -202,6 +202,11 @@
<td></td>
</tr>
<tr>
+ <td>pause</td>
+ <td>5000</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForTextNotPresent</td>
<td>test_portal_name_20</td>
<td></td>
@@ -209,7 +214,7 @@
<tr>
<td>verifyTextNotPresent</td>
<td>test_portal_name_20</td>
- <td>1,1</td>
+ <td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-03-25 11:10:41 UTC (rev 2364)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-03-25 12:10:07 UTC (rev 2365)
@@ -197,26 +197,11 @@
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>link=Site</td>
+ <td>pause</td>
+ <td>5000</td>
<td></td>
</tr>
<tr>
- <td>waitForTextPresent</td>
- <td>Portal Navigation</td>
- <td></td>
-</tr>
-<tr>
- <td>refresh</td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td>waitForTextPresent</td>
- <td>Portal Navigation</td>
- <td></td>
-</tr>
-<tr>
<td>waitForTextNotPresent</td>
<td>test_portal_name_21</td>
<td></td>
14 years, 9 months
gatein SVN: r2364 - portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-03-25 07:10:41 -0400 (Thu, 25 Mar 2010)
New Revision: 2364
Modified:
portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
Log:
JBEPP-244:GTNPORTAL-896 to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-03-25 10:53:23 UTC (rev 2363)
+++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-03-25 11:10:41 UTC (rev 2364)
@@ -49,6 +49,8 @@
import org.gatein.pc.api.invocation.response.ErrorResponse;
import org.gatein.pc.api.invocation.response.HTTPRedirectionResponse;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
+import org.gatein.pc.api.invocation.response.SecurityErrorResponse;
+import org.gatein.pc.api.invocation.response.SecurityResponse;
import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse;
import javax.portlet.PortletMode;
@@ -141,6 +143,10 @@
{
handleErrorResponse((ErrorResponse)portletResponse);
}
+ else if (portletResponse instanceof SecurityResponse)
+ {
+ handleSecurityResponse((SecurityResponse)portletResponse);
+ }
else
{
throw new Exception("Unexpected response type [" + portletResponse + "]. Expected an UpdateNavigationResponse" +
@@ -246,6 +252,19 @@
{
throw (Exception)response.getCause();
}
+
+ private void handleSecurityResponse(SecurityResponse response) throws Exception
+ {
+ if (response instanceof SecurityErrorResponse)
+ {
+ SecurityErrorResponse securityErrorResponse = (SecurityErrorResponse)response;
+ throw new Exception("SecurityErrorResponse Returned while trying to process portlet action. ", securityErrorResponse.getThrowable());
+ }
+ else
+ {
+ throw new Exception("Security Response of type " + response.getClass() + " encountered while trying to process portlet action.");
+ }
+ }
}
/**
14 years, 9 months
gatein SVN: r2363 - portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-03-25 06:53:23 -0400 (Thu, 25 Mar 2010)
New Revision: 2363
Modified:
portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
Log:
JBEPP-236: GTNPORTAL-886 ported to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java 2010-03-25 10:36:57 UTC (rev 2362)
+++ portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java 2010-03-25 10:53:23 UTC (rev 2363)
@@ -261,7 +261,15 @@
// Check if attribute is part of User interface data
if (!UserDAOImpl.USER_NON_PROFILE_KEYS.contains(key))
{
- filteredAttrs.put(key, attrs.get(key).getValue().toString());
+ Object value = attrs.get(key).getValue();
+ if (value != null)
+ {
+ filteredAttrs.put(key, value.toString());
+ }
+ else
+ {
+ filteredAttrs.put(key, null);
+ }
}
}
14 years, 9 months
gatein SVN: r2362 - portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-03-25 06:36:57 -0400 (Thu, 25 Mar 2010)
New Revision: 2362
Modified:
portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
JBEPP-254: GTNPORTAL-950 ported to the EPP branch
Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-25 08:48:27 UTC (rev 2361)
+++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-25 10:36:57 UTC (rev 2362)
@@ -221,6 +221,20 @@
<value>picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
<value>picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
</values-param>
+ <values-param profiles="sybase">
+ <name>hibernate.mapping</name>
+ <value>picketlink-idm/sybase-mappings/HibernateRealm.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObject.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectCredentialType.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectType.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
+ <value>picketlink-idm/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
+ </values-param>
</init-params>
</component-plugin>
</external-component-plugins>
14 years, 9 months