March 2010 - gatein-commits - Jboss List Archives

gatein SVN: r2016 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/portal and 5 other directories.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-03-06 13:34:42 -0500 (Sat, 06 Mar 2010) New Revision: 2016 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: GTNPORTAL-799 Fix non displaying of field labels in form, Clean up code and resource bundle files Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ar.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -98,11 +98,6 @@  - <UIPermissionForm> - <label> - <UIListPermissionSelector /> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>:الاسم</name> @@ -160,7 +155,6 @@ <name>:اسم الفئة</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector /> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_de.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Import anzeigen ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Name: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -87,7 +86,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=Diese Kategorie existiert bereits! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=Berechtigungs-Einstellungen UICategoryForm.tab.label.categorySetting=Kategorie-Einstellungen Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector=Select Permission UIApplicationInfo.label.name=Name: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -88,7 +87,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=This category is existing, please enter another one! -UICategoryForm.label.UIListPermissionSelector= Select Permission UICategoryForm.tab.label.categoryPermission=Permission Setting UICategoryForm.tab.label.categorySetting=Category Setting Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_es.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Nombre: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -88,7 +87,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=Esta categor\u00eda ya existe , por favor seleccione otra! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=Ajustes de Permisos UICategoryForm.tab.label.categorySetting=Ajustes de la Categor\u00eda Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_it.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Cambia la visuale dell'importazione ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Nome: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -88,7 +87,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=La categoria esiste gi\u00E0, inseriscine un'altra! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=Gestione dei Permessi UICategoryForm.tab.label.categorySetting=Gestione della Categoria Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ja.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Change Show Import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=\u540d\u524d: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -87,7 +86,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=\u3053\u306e\u30ab\u30c6\u30b4\u30ea\u30fc\u306f\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u3082\u306e\u3092\u52a0\u3048\u3066\u304f\u3060\u3055\u3044\uff01 -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=\u6a29\u9650\u306e\u8a2d\u5b9a UICategoryForm.tab.label.categorySetting=\u30ab\u30c6\u30b4\u30ea\u306e\u8a2d\u5b9a Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ko.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -98,11 +98,6 @@  - <UIPermissionForm> - <label> - <UIListPermissionSelector /> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>이름:</name> @@ -160,7 +155,6 @@ <name>카테고리 이름:</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector /> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_ne.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -55,7 +55,6 @@ UIApplicationRegistryEditMode.label.showImport=\u0906\u092f\u093e\u0924 \u0926\u0947\u0916\u093e\u0909\u0928\u0941 \u092a\u0930\u093f\u0935\u0930\u094d\u0924\u0928 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector= UIApplicationInfo.label.name=Name: \u0928\u093e\u092e: UIApplicationInfo.label.displayName=#{label.displayName} UIApplicationInfo.label.description=#{label.description} @@ -90,7 +89,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=\u092f\u094b \u0935\u0930\u094d\u0917 \u092a\u0939\u093f\u0932\u0947 \u0928\u0948 \u0909\u092a\u0932\u092c\u094d\u0927 \u091b, \u0915\u0943\u092a\u092f\u093e \u0905\u0930\u094d\u0915\u094b \u0939\u093e\u0932\u094d\u0928\u0941\u0939\u094b\u0938\u094d! -UICategoryForm.label.UIListPermissionSelector= UICategoryForm.tab.label.categoryPermission=\u0905\u0928\u0941\u092e\u0924\u0940 \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928 UICategoryForm.tab.label.categorySetting=\u0935\u0930\u094d\u0917 \u0935\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_nl.properties 2010-03-06 18:34:42 UTC (rev 2016) @@ -52,7 +52,6 @@ UIApplicationRegistryEditMode.label.showImport=Verander toon import ##org.exoplatform.applicationregistry.webui.component.UIApplicationInfo -UIPermissionForm.label.UIListPermissionSelector UIApplicationInfo.label.name=#{word.name} UIApplicationInfo.label.displayName=#{word.displayName} UIApplicationInfo.label.description=#{word.description} @@ -87,7 +86,6 @@ UICategoryForm.action.Save=#{word.save} UICategoryForm.action.Cancel=#{word.cancel} UICategoryForm.msg.SameName=Categorie bestaat reeds, gelieve een andere de kiezen. -UICategoryForm.label.UIListPermissionSelector UICategoryForm.tab.label.categoryPermission=Permissie instellingen UICategoryForm.tab.label.categorySetting=Categorie instellingen Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -98,11 +98,6 @@  - <UIPermissionForm> - <label> - <UIListPermissionSelector>Lựa chọn quyền</UIListPermissionSelector> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>Tên:</name> @@ -160,7 +155,6 @@ <name>Tên danh mục:</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector>Lựa chọn quyền</UIListPermissionSelector> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -60,11 +60,6 @@ <showImport>修改显示导入</showImport> </label> </UIApplicationRegistryEditMode> - <UIPermissionForm> - <label> - <UIListPermissionSelector></UIListPermissionSelector> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>名称： </name> @@ -116,7 +111,6 @@ <name>分类名称：</name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector></UIListPermissionSelector> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_zh_TW.xml 2010-03-06 18:34:42 UTC (rev 2016) @@ -60,11 +60,6 @@ <showImport>Change Show Import</showImport> </label> </UIApplicationRegistryEditMode> - <UIPermissionForm> - <label> - <UIListPermissionSelector></UIListPermissionSelector> - </label> - </UIPermissionForm> <UIApplicationInfo> <label> <name>名稱: </name> @@ -116,7 +111,6 @@ <name>類別名稱: </name> <displayName>#{label.displayName}</displayName> <description>#{label.description}</description> - <UIListPermissionSelector></UIListPermissionSelector> </label> <action> <Save>#{word.save}</Save> Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-03-06 18:34:42 UTC (rev 2016) @@ -12,7 +12,7 @@ <div class="TRPortalComposer"> <div class="TCPortalComposer"> <div class="OverflowContainer"> - <div class="<%=uicomponent.isCollapse ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> + <div class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> <% if(uicomponent.isShowControl) { %> <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("Abort")%>"><span></span></a> <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> @@ -28,7 +28,7 @@ </div> </div> - <div class="MLPortalComposer" style="display: <%=uicomponent.isCollapse ? "none": "block"%>"> + <div class="MLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> <div class="MRPortalComposer"> <div class="MCPortalComposer"> <div class="UIWindowContent"> @@ -42,7 +42,7 @@ </div> </div> - <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapse ? "none": "block"%>"> + <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> <div class="BRPortalComposer"> <div class="BCPortalComposer"> <div class="UIAction"> Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2010-03-06 18:34:42 UTC (rev 2016) @@ -8,8 +8,18 @@ for(field in uiform.getChildren()) { if(field.isRendered()) { %> - <tr> + <tr> + <%fieldName = uicomponent.getLabel(field.getName());%> + <% + if(fieldName != null && fieldName.length() > 0 && !fieldName.equals(uicomponent.getId()) && !fieldName.equals(field.getName())) { + %> + <td class="FieldLabel"> + <%=uicomponent.getLabel(field.getName()) %> + </td> <td class="FieldComponent"><% uiform.renderField(field) %></td> + <%} else {%> + <td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td> + <%}%> </tr> <% } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -20,11 +20,7 @@ package org.exoplatform.portal.application; import org.exoplatform.Constants; -import org.exoplatform.commons.utils.CharsetCharEncoder; -import org.exoplatform.commons.utils.CharsetTextEncoder; import org.exoplatform.commons.utils.PortalPrinter; -import org.exoplatform.commons.utils.TableCharEncoder; -import org.exoplatform.commons.utils.TextEncoder; import org.exoplatform.commons.utils.WriterPrinter; import org.exoplatform.container.ExoContainer; import org.exoplatform.portal.config.UserPortalConfigService; @@ -44,8 +40,6 @@ import org.exoplatform.webui.core.lifecycle.HtmlValidator; import org.w3c.dom.Element; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; @@ -65,10 +59,13 @@ import java.util.Map; import java.util.Set; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * This class extends the abstract WebuiRequestContext which itself extends the RequestContext one - * <p/> - * It mainly implements the abstract methods and overide some. + * + * <p>It mainly implements the abstract methods and overide some. */ public class PortalRequestContext extends WebuiRequestContext { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -194,11 +194,21 @@ super.processRender(context); } + /** + * Retrieve the UIApplication which is maximized to cover whole the PageBody + * + * @return the maximized portlet + */ public UIPortalComponent getMaximizedUIComponent() { return maximizedUIComponent; } + /** + * Store the portlet maximized into the current PageBody + * + * @param uiMaximizedComponent the portlet to be stored in UIPageBody + */ public void setMaximizedUIComponent(UIPortalComponent uiMaximizedComponent) { this.maximizedUIComponent = uiMaximizedComponent; Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -229,7 +229,11 @@ this.navigation = _navigation; } - /** Refresh the UIPage under UIPortal */ + /** + * Refresh the UIPage under UIPortal + * + * @throws Exception + */ public void refreshUIPage() throws Exception { if(selectedNode_ == null) Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -86,7 +86,7 @@ private boolean isEditted = false; - private boolean isCollapse = false; + private boolean isCollapsed = false; private boolean isShowControl = true; @@ -98,6 +98,7 @@ uiTabPane.setSelectedTab(1); } + //TODO: this seems not to be used public void setPortalMode(int mode) { if (mode < 0 || mode > 4) @@ -112,6 +113,15 @@ return getAncestorOfType(UIPortalApplication.class).getModeState(); } + /** + * Returns <code>true</code> there was at least one change + * has been done in this edition time. + * + * <p>This value is used in the template of this component + * to notice the user if there was something has been changed + * + * @return + */ public boolean isEditted() { return isEditted; @@ -122,14 +132,19 @@ isEditted = b; } + /** + * Return a value of <code>boolean</code> to tell current state of the composer + * + * @return <code>true</code> if the composer is collapsed currently + */ public boolean isCollapse() { - return isCollapse; + return isCollapsed; } public void setCollapse(boolean isCollapse) { - this.isCollapse = isCollapse; + this.isCollapsed = isCollapse; } public boolean isShowControl() @@ -142,7 +157,7 @@ isShowControl = state; } - public boolean isUsedInWizard() + private boolean isUsedInWizard() { UIWorkingWorkspace uiWorkingWS = getAncestorOfType(UIWorkingWorkspace.class); UIPortalToolPanel uiToolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); @@ -154,7 +169,12 @@ return false; } - public void save() throws Exception + /** + * Perform saving changes of the edition of SiteConfig into database + * + * @throws Exception if there is anything wrong in saving process + */ + private void save() throws Exception { PortalRequestContext prContext = Util.getPortalRequestContext(); UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); @@ -169,14 +189,12 @@ UserPortalConfigService configService = getApplicationComponent(UserPortalConfigService.class); DataStorage dataStorage = getApplicationComponent(DataStorage.class); - if (isPortalExist(editPortal)) + if (!isPortalExist(editPortal)) { - dataStorage.save(portalConfig); - } - else - { return; } + + dataStorage.save(portalConfig); uiPortalApp.getUserPortalConfig().setPortal(portalConfig); UserPortalConfig userPortalConfig = configService.getUserPortalConfig(ownerUser, remoteUser); @@ -219,7 +237,14 @@ skinService.invalidatePortalSkinCache(editPortal.getName(), editPortal.getSkin()); } - public boolean isPortalExist(UIPortal editPortal) throws Exception + /** + * Check the <code>editPortal</code> whether it is existing in database or not + * + * @param editPortal + * @return + * @throws Exception + */ + private boolean isPortalExist(UIPortal editPortal) throws Exception { String remoteUser = Util.getPortalRequestContext().getRemoteUser(); @@ -238,6 +263,11 @@ return configService.getUserPortalConfig(portalOwner, remoteUser) != null; } + /** + * Updates the availability children of the UIEditInlineWorkspace except to the UIPortalComposer + * + * @throws Exception + */ public void updateWorkspaceComponent() throws Exception { UIPortalApplication uiApp = Util.getUIPortalApplication(); @@ -374,6 +404,12 @@ } + /** + * Listens the <code>save</code> action of the composer while editing SiteConfig + * + * @author <a href="trong.tran(a)exoplatform.com">Trong Tran</a> + * @version $Revision$ + */ static public class FinishActionListener extends EventListener<UIPortalComposer> { @@ -403,14 +439,8 @@ uiWorkingWS.getChild(UIEditInlineWorkspace.class).setRendered(false); uiPortal = (UIPortal)siteBody.getUIComponent(); - if (PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())) - { - uiPortalApp.setSessionOpen(true); - } - else - { - uiPortalApp.setSessionOpen(false); - } + uiPortalApp.setSessionOpen(PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())); + uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); prContext.setFullRender(true); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-03-06 15:19:32 UTC (rev 2015) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-03-06 18:34:42 UTC (rev 2016) @@ -728,7 +728,7 @@ return this.all_Navigations; } - private static class UIPortalKey + private class UIPortalKey { private String ownerType;

15 years

1
0
0 / 0

gatein SVN: r2015 - portal/trunk/component/web/src/main/java/org/exoplatform/web/login.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-06 10:19:32 -0500 (Sat, 06 Mar 2010) New Revision: 2015 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java Log: add logging to remember me filter Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java 2010-03-05 21:37:08 UTC (rev 2014) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java 2010-03-06 15:19:32 UTC (rev 2015) @@ -19,6 +19,8 @@ package org.exoplatform.web.login; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.common.text.FastURLEncoder; import javax.servlet.*; @@ -39,6 +41,9 @@ /** . */ private static final FastURLEncoder CONVERTER = FastURLEncoder.getUTF8Instance(); + /** . */ + private static final Logger log = LoggerFactory.getLogger(RememberMeFilter.class); + public void init(FilterConfig filterConfig) throws ServletException { } @@ -52,7 +57,8 @@ { if (req.getRemoteUser() == null && "GET".equals(req.getMethod())) { - if (InitiateLoginServlet.getRememberMeTokenCookie(req) != null) + String token = InitiateLoginServlet.getRememberMeTokenCookie(req); + if (token != null) { StringBuilder builder = new StringBuilder(); builder.append(req.getContextPath()); @@ -76,6 +82,7 @@ } } String s = builder.toString(); + log.debug("Redirecting unauthenticated request with token " + token + " to URL " + s); resp.sendRedirect(s); return; }

15 years

1
0
0 / 0

gatein SVN: r2014 - portal/trunk/packaging.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-03-05 16:37:08 -0500 (Fri, 05 Mar 2010) New Revision: 2014 Modified: portal/trunk/packaging/profiles.xml Log: Rollback profiles.xml file to not include user specific directories (again). Modified: portal/trunk/packaging/profiles.xml =================================================================== --- portal/trunk/packaging/profiles.xml 2010-03-05 17:26:51 UTC (rev 2013) +++ portal/trunk/packaging/profiles.xml 2010-03-05 21:37:08 UTC (rev 2014) @@ -29,7 +29,7 @@ ex: On Windows 'c:/AS' ex: On Linux '/home/user/AS' --> - <exo.projects.directory.dependencies>/home/theute/Portal/Development/workspace_GateIn/portal/packaging</exo.projects.directory.dependencies> + <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> <!-- If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)

15 years

1
0
0 / 0

gatein SVN: r2013 - in portal/trunk: component/web and 6 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 12:26:51 -0500 (Fri, 05 Mar 2010) New Revision: 2013 Modified: portal/trunk/component/web/pom.xml portal/trunk/gadgets/core/pom.xml portal/trunk/gadgets/eXoGadgets/pom.xml portal/trunk/gadgets/server/pom.xml portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/packaging/profiles.xml portal/trunk/pom.xml portal/trunk/webui/portal/pom.xml Log: GTNPORTAL-792: Produce Shindig source repository Use our fork of Shindig Modified: portal/trunk/component/web/pom.xml =================================================================== --- portal/trunk/component/web/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/component/web/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -71,8 +71,8 @@ <artifactId>exo.portal.component.scripting</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> Modified: portal/trunk/gadgets/core/pom.xml =================================================================== --- portal/trunk/gadgets/core/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/gadgets/core/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -35,7 +35,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${org.shindig.version}</version> <type>jar</type> @@ -68,12 +68,12 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <type>jar</type> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <type>jar</type> </dependency> Modified: portal/trunk/gadgets/eXoGadgets/pom.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/gadgets/eXoGadgets/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -47,10 +47,11 @@ <artifactId>exo.portal.webui.portal</artifactId> <scope>provided</scope> </dependency> + <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <scope>provided</scope> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <scope>provided</scope> </dependency> </dependencies> Modified: portal/trunk/gadgets/server/pom.xml =================================================================== --- portal/trunk/gadgets/server/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/gadgets/server/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -48,18 +48,18 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <type>war</type> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <scope>provided</scope> </dependency> Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05 17:26:51 UTC (rev 2013) @@ -205,10 +205,10 @@ addDependency(new Project("rome", "rome", "jar", "0.9")). addDependency(new Project("joda-time", "joda-time", "jar", "1.6")). addDependency(new Project("org.json", "json", "jar", "20070829")). - addDependency(new Project("org.apache.shindig", "shindig-common", "jar", shindigVersion)). - addDependency(new Project("org.apache.shindig", "shindig-gadgets", "jar", shindigVersion)). - addDependency(new Project("org.apache.shindig", "shindig-features", "jar", shindigVersion)). - addDependency(new Project("org.apache.shindig", "shindig-social-api", "jar", shindigVersion)). + addDependency(new Project("org.gatein.shindig", "shindig-common", "jar", shindigVersion)). + addDependency(new Project("org.gatein.shindig", "shindig-gadgets", "jar", shindigVersion)). + addDependency(new Project("org.gatein.shindig", "shindig-features", "jar", shindigVersion)). + addDependency(new Project("org.gatein.shindig", "shindig-social-api", "jar", shindigVersion)). addDependency(new Project("jdom", "jdom", "jar", "1.0")). addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.1")). addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")). Modified: portal/trunk/packaging/profiles.xml =================================================================== --- portal/trunk/packaging/profiles.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/packaging/profiles.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -29,7 +29,7 @@ ex: On Windows 'c:/AS' ex: On Linux '/home/user/AS' --> - <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> + <exo.projects.directory.dependencies>/home/theute/Portal/Development/workspace_GateIn/portal/packaging</exo.projects.directory.dependencies>  - <exo.projects.app.tomcat.version>tomcat-6.0.16</exo.projects.app.tomcat.version> + <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>  Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -42,7 +42,7 @@ <org.exoplatform.ws.version>2.1.0-CR2</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.12.0-CR2</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>SNAPSHOT-r790473</org.shindig.version> + <org.shindig.version>1.0-r790473-Patch01</org.shindig.version> <org.gatein.common.version>2.0.0-CR03</org.gatein.common.version> <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR05</org.gatein.pc.version> @@ -637,33 +637,33 @@ </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${org.shindig.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${org.shindig.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${org.shindig.version}</version> </dependency> Modified: portal/trunk/webui/portal/pom.xml =================================================================== --- portal/trunk/webui/portal/pom.xml 2010-03-05 16:41:52 UTC (rev 2012) +++ portal/trunk/webui/portal/pom.xml 2010-03-05 17:26:51 UTC (rev 2013) @@ -76,11 +76,13 @@ <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> </dependency> + <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <type>jar</type> - </dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <type>jar</type> + </dependency> + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId>

15 years

1
0
0 / 0

gatein SVN: r2012 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 11:41:52 -0500 (Fri, 05 Mar 2010) New Revision: 2012 Added: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_de.js Log: GTNPORTAL-826: MessageResource_de.js is missing Contribution of Hardy Massen Added: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_de.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_de.js (rev 0) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_de.js 2010-03-05 16:41:52 UTC (rev 2012) @@ -0,0 +1,22 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +eXo.i18n.I18NMessage.SessionTimeout = "Die Benutzer-Sitzung ist abgelaufen! Aktualisieren Sie Ihren Browser."; +eXo.i18n.I18NMessage.TargetBlockNotFound = "Die zu aktualisierende Ziel-blockId wurde nicht gefunden: {0}"; +eXo.i18n.I18NMessage.BlockUpdateNotFound = "Die zu aktualisierende blockId wurde nicht gefunden: {0}";

15 years

1
0
0 / 0

gatein SVN: r2011 - in portal/trunk: component/portal/src/test/java/org/exoplatform/portal/config and 5 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2010-03-05 11:16:31 -0500 (Fri, 05 Mar 2010) New Revision: 2011 Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java portal/trunk/component/test/core/pom.xml portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/packaging/pkg/pom.xml portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js portal/trunk/pom.xml portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh Log: Update GTN so that it will build, complete the tests, and run on an IBM jdk (GTNPORTAL-815) -Remove default jdk Xshare option as its already the default on the Sun jdk, and its not an option on the IBM jdk. -Add the jcip.annotations jar to the test and to the build since the IBM jdk will fail with a TypeNotFoundException without it (see GTNPORTAL-636). -Specify the memory options for the compiler-plugin. If not set then GateIn with an out of memory exception when building with the IBM jdk. Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2010-03-05 16:16:31 UTC (rev 2011) @@ -116,6 +116,16 @@ PortalConfig pConfig = storage.getPortalConfig(PortalConfig.GROUP_TYPE, "/groupTest"); assertNotNull("the Group's PortalConfig is not null", pConfig); assertTrue(pConfig.getPortalLayout().getChildren() == null || pConfig.getPortalLayout().getChildren().size() == 4); + + /** + * We need to remove the /groupTest from the groupHandler as the + * handler is shared between the tests and can cause other tests + * to fail. + * TODO: make the tests fully independent + */ + groupHandler.removeGroup(group, false); + group = groupHandler.findGroupById("/groupTest"); + assertNull(group); } public void testUserLayout() throws Exception Modified: portal/trunk/component/test/core/pom.xml =================================================================== --- portal/trunk/component/test/core/pom.xml 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/component/test/core/pom.xml 2010-03-05 16:16:31 UTC (rev 2011) @@ -62,6 +62,11 @@ <artifactId>commons-dbcp</artifactId> </dependency> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + </dependency> + </dependencies> <build> Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-05 16:16:31 UTC (rev 2011) @@ -45,6 +45,7 @@ var shindigVersion = "${org.shindig.version}"; var groovyVersion = "${org.codehaus.groovy.version}"; var rhinoVersion = "${rhino.version}"; + var jcipVersion = "${jcip.version}"; //TODO versions for gatein components @@ -261,5 +262,10 @@ addDependency(new Project("org.exoplatform.portal", "gatein-sample-portal", "ear", module.version)). addDependency(new Project("org.exoplatform.portal", "starter-gatein", "ear", module.version)); +  + module.ibm = {}; + module.ibm.jdk = {}; + module.ibm.jdk.support =new Project("net.jcip", "jcip-annotations", "jar", jcipVersion); + return module; } Modified: portal/trunk/packaging/pkg/pom.xml =================================================================== --- portal/trunk/packaging/pkg/pom.xml 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/packaging/pkg/pom.xml 2010-03-05 16:16:31 UTC (rev 2011) @@ -193,7 +193,6 @@ <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> - <argument>-Xshare:auto</argument> <argument>-Xms128m</argument> <argument>-Xmx512m</argument> <argument>-classpath</argument> @@ -294,7 +293,6 @@ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument> <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> - <argument>-Xshare:auto</argument> <argument>-Xms128m</argument> <argument>-Xmx512m</argument> <argument>-classpath</argument> @@ -394,7 +392,6 @@ <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument> <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> - <argument>-Xshare:auto</argument> <argument>-Xms128m</argument> <argument>-Xmx512m</argument> <argument>-classpath</argument> @@ -496,7 +493,6 @@ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument> <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument> <argument>-Dexo.m2.home=${maven.home}</argument> - <argument>-Xshare:auto</argument> <argument>-Xms128m</argument> <argument>-Xmx512m</argument> <argument>-classpath</argument> Modified: portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js =================================================================== --- portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-05 16:16:31 UTC (rev 2011) @@ -47,6 +47,8 @@ product.addDependencies(portal.web.portal) ; product.addDependencies(portal.sample.extension) ; + product.addDependencies(portal.ibm.jdk.support); + product.addServerPatch("tomcat", portal.server.tomcat.patch) ; product.addServerPatch("jboss", portal.server.jboss.patch) ; product.addServerPatch("jbossear", portal.server.jbossear.patch) ; Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/pom.xml 2010-03-05 16:16:31 UTC (rev 2011) @@ -55,6 +55,7 @@ <javax.servlet.version>2.5</javax.servlet.version> <version.chromattic>1.0.0-cr2</version.chromattic> <version.reflect>1.0.0-beta5</version.reflect> + <jcip.version>1.0</jcip.version>   @@ -65,7 +66,6 @@  <arguments>-Prelease,pkg-tomcat,pkg-jbossas -Dmaven.test.skip=true</arguments> - </properties> <scm> @@ -673,6 +673,13 @@ <artifactId>junit</artifactId> <version>3.8.1</version> </dependency> + +  + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>${jcip.version}</version> + </dependency> </dependencies> @@ -752,6 +759,18 @@ </systemProperties> </configuration> </plugin> +  +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + <meminitial>256m</meminitial> + <maxmem>1024m</maxmem> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-03-05 16:16:31 UTC (rev 2011) @@ -29,7 +29,7 @@ set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf" set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf" set EXO_CONFIG_OPTS="-Dorg.exoplatform.container.configuration.debug" -set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% +set JAVA_OPTS=-Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% set JPDA_TRANSPORT=dt_socket set JPDA_ADDRESS=8000 Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-03-05 16:16:31 UTC (rev 2011) @@ -25,7 +25,7 @@ LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir=../gatein/conf" -EXO_CONFIG_OPTS="-Xshare:auto -Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug" +EXO_CONFIG_OPTS="-Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug" JPDA_TRANSPORT=dt_socket JPDA_ADDRESS=8000 Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-03-05 16:16:31 UTC (rev 2011) @@ -28,7 +28,7 @@ set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf" set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf" -set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%% +set JAVA_OPTS=-Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%% rem Launches the server call catalina.bat %* Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-03-05 16:10:59 UTC (rev 2010) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-03-05 16:16:31 UTC (rev 2011) @@ -29,7 +29,7 @@ SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=../gatein/conf" -JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" +JAVA_OPTS="-Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" export JAVA_OPTS # Launches the server

15 years

1
0
0 / 0

gatein SVN: r2010 - in portal/trunk: web/portal/src/main/webapp and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-05 11:10:59 -0500 (Fri, 05 Mar 2010) New Revision: 2010 Removed: portal/trunk/examples/portal/war/src/main/webapp/bookmark.jsp portal/trunk/web/portal/src/main/webapp/bookmark.jsp Log: GTNPORTAL-821 : remove bookmark.jsp Deleted: portal/trunk/examples/portal/war/src/main/webapp/bookmark.jsp =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/bookmark.jsp 2010-03-05 15:41:59 UTC (rev 2009) +++ portal/trunk/examples/portal/war/src/main/webapp/bookmark.jsp 2010-03-05 16:10:59 UTC (rev 2010) @@ -1,105 +0,0 @@ -<%-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---%> - -<%@ page import="java.util.*"%> -<%@ page import="javax.servlet.http.*"%> -<%@ page import="org.exoplatform.container.PortalContainer"%> -<%@ page import="org.exoplatform.services.portletcontainer.PortletContainerService"%> -<%@ page import="org.exoplatform.services.portletcontainer.pci.PortletData"%> -<%@ page import="org.exoplatform.services.portal.skin.model.*"%> -<%@ page import="org.exoplatform.services.portal.skin.SkinConfigService"%> - -<% - Enumeration e = session.getAttributeNames() ; - while(e.hasMoreElements()) { - String key = (String) e.nextElement() ; - session.removeAttribute(key); - } - - PortalContainer manager = PortalContainer.getCurrentInstance(session.getServletContext()) ; - PortletContainerService service = - (PortletContainerService) manager.getComponentInstanceOfType(PortletContainerService.class) ; - Map allPortletMetaData = service.getAllPortletMetaData() ; - SkinConfigService skinService = - (SkinConfigService) manager.getComponentInstanceOfType(SkinConfigService.class) ; - - String[] users = { "exo", "admin" } ; - String contextPath = request.getContextPath() ; -%> - - -<HTML> - <HEAd> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"/> - </HEAd> - <TITLE>Bookmarks</TITLE> - <BODY width="100%"> - <H1>Bookmarks</H1> - <table width="100%" border="1"> - <tr> - <th width="20%">Public Link</th> - <th width="60%">Description</th> - </tr> - - <tr> - <th colspan="3">Available default users (All the default users use "exo" as password</th> - </tr> - <%for(int i= 0; i < users.length; i++) { %> - <tr> - <td><a href="<%=contextPath%>/faces/public/<%=users[i]%>"><%=users[i]%></a></td> - <td>Portal of the <%=users[i]%> user </td> - </tr> - <%}%> - <tr> - <th colspan="3">Available Portlets</th> - </tr> - <%Set keys = allPortletMetaData.keySet(); %> - <%Iterator i = keys.iterator() ; %> - <%while(i.hasNext()) { %> - <% String key = (String) i.next() ;%> - <% PortletData portlet = (PortletData) allPortletMetaData.get(key) ; %> - <% String portletTitle = portlet.getPortletName() ; %> - <% String portletDescription = portlet.getDescription("en") ; %> - <% String portletApp = key.replace('.' , '/') ; %> - <% List styles = skinService.getPortletStyles(portletApp) ; %> - <% String styleParam = "" ; %> - <% if (styles != null && styles.size() > 0) { %> - <% Style style = (Style) styles.get(0) ; %> - <% styleParam = "&style=" + style.getName() ; %> - <% }%> - <tr> - <td><a href="<%=contextPath%>/faces/public/exotest?portletName=<%=portletApp%><%=styleParam%>"><%=portletTitle%></a></td> - <td><%=portletDescription%> </td> - </tr> - <%}%> - </table> - - <H3>Exo Project Links</H3> - <a href="http://exo.sourceforge.net/forum/index.php">Exo PHP Forum</a><br> - <a href="http://exoplatform.org">Exo platform community home page</a><br> - <a href="http://exoplatform.com">Exo platform company home page</a><br> -</BODY> -</HTML> - -<% - //session.setAttribute("_username", Constants.DEFAUL_PORTAL_OWNER) ; - session.invalidate() ; -%> Deleted: portal/trunk/web/portal/src/main/webapp/bookmark.jsp =================================================================== --- portal/trunk/web/portal/src/main/webapp/bookmark.jsp 2010-03-05 15:41:59 UTC (rev 2009) +++ portal/trunk/web/portal/src/main/webapp/bookmark.jsp 2010-03-05 16:10:59 UTC (rev 2010) @@ -1,105 +0,0 @@ -<%-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---%> - -<%@ page import="java.util.*"%> -<%@ page import="javax.servlet.http.*"%> -<%@ page import="org.exoplatform.container.PortalContainer"%> -<%@ page import="org.exoplatform.services.portletcontainer.PortletContainerService"%> -<%@ page import="org.exoplatform.services.portletcontainer.pci.PortletData"%> -<%@ page import="org.exoplatform.services.portal.skin.model.*"%> -<%@ page import="org.exoplatform.services.portal.skin.SkinConfigService"%> - -<% - Enumeration e = session.getAttributeNames() ; - while(e.hasMoreElements()) { - String key = (String) e.nextElement() ; - session.removeAttribute(key); - } - - PortalContainer manager = PortalContainer.getCurrentInstance(session.getServletContext()) ; - PortletContainerService service = - (PortletContainerService) manager.getComponentInstanceOfType(PortletContainerService.class) ; - Map allPortletMetaData = service.getAllPortletMetaData() ; - SkinConfigService skinService = - (SkinConfigService) manager.getComponentInstanceOfType(SkinConfigService.class) ; - - String[] users = { "exo", "admin" } ; - String contextPath = request.getContextPath() ; -%> - - -<HTML> - <HEAd> - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"/> - </HEAd> - <TITLE>Bookmarks</TITLE> - <BODY width="100%"> - <H1>Bookmarks</H1> - <table width="100%" border="1"> - <tr> - <th width="20%">Public Link</th> - <th width="60%">Description</th> - </tr> - - <tr> - <th colspan="3">Available default users (All the default users use "exo" as password</th> - </tr> - <%for(int i= 0; i < users.length; i++) { %> - <tr> - <td><a href="<%=contextPath%>/faces/public/<%=users[i]%>"><%=users[i]%></a></td> - <td>Portal of the <%=users[i]%> user </td> - </tr> - <%}%> - <tr> - <th colspan="3">Available Portlets</th> - </tr> - <%Set keys = allPortletMetaData.keySet(); %> - <%Iterator i = keys.iterator() ; %> - <%while(i.hasNext()) { %> - <% String key = (String) i.next() ;%> - <% PortletData portlet = (PortletData) allPortletMetaData.get(key) ; %> - <% String portletTitle = portlet.getPortletName() ; %> - <% String portletDescription = portlet.getDescription("en") ; %> - <% String portletApp = key.replace('.' , '/') ; %> - <% List styles = skinService.getPortletStyles(portletApp) ; %> - <% String styleParam = "" ; %> - <% if (styles != null && styles.size() > 0) { %> - <% Style style = (Style) styles.get(0) ; %> - <% styleParam = "&style=" + style.getName() ; %> - <% }%> - <tr> - <td><a href="<%=contextPath%>/faces/public/exotest?portletName=<%=portletApp%><%=styleParam%>"><%=portletTitle%></a></td> - <td><%=portletDescription%> </td> - </tr> - <%}%> - </table> - - <H3>Exo Project Links</H3> - <a href="http://exo.sourceforge.net/forum/index.php">Exo PHP Forum</a><br> - <a href="http://exoplatform.org">Exo platform community home page</a><br> - <a href="http://exoplatform.com">Exo platform company home page</a><br> -</BODY> -</HTML> - -<% - //session.setAttribute("_username", Constants.DEFAUL_PORTAL_OWNER) ; - session.invalidate() ; -%>

15 years

1
0
0 / 0

gatein SVN: r2009 - in components/shindig/trunk: features and 6 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 10:41:59 -0500 (Fri, 05 Mar 2010) New Revision: 2009 Modified: components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Prepare next iteration Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/features/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -23,7 +23,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,9 +36,9 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/fe...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/features</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/features</url> </scm> <build> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/java/common/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,9 +33,9 @@ <description>Common java code for Shindig</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/c...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/common</url> </scm> <build> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -34,9 +34,9 @@ all javascript required by the OpenSocial specification.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/g...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/gadgets</url> </scm> <build> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/java/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> </parent> <artifactId>shindig-parent</artifactId> @@ -40,9 +40,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/java</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java</url> </scm> <properties> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/java/samples/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> </parent> <artifactId>shindig-samples</artifactId> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/java/server/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,9 +33,9 @@ <description>Default server war containing both the gadget rendering code and the social api code.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/server</url> </scm> <properties> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/java/social-api/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,9 +33,9 @@ <description>Serves OpenSocial Data and the RESTful APIs.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/soci...</url> </scm> <build> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-03-05 15:37:16 UTC (rev 2008) +++ components/shindig/trunk/pom.xml 2010-03-05 15:41:59 UTC (rev 2009) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch01</version> + <version>1.0-r790473-Patch02-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Shindig Project</name> @@ -48,9 +48,9 @@   <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk</url> </scm>

15 years

1
0
0 / 0

gatein SVN: r2008 - components/shindig/tags.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 10:37:16 -0500 (Fri, 05 Mar 2010) New Revision: 2008 Added: components/shindig/tags/1.0-r790473-Patch01/ Log: Tagging Copied: components/shindig/tags/1.0-r790473-Patch01 (from rev 2007, components/shindig/trunk)

15 years

1
0
0 / 0

gatein SVN: r2007 - in components/shindig/trunk: assembly and 7 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 10:36:12 -0500 (Fri, 05 Mar 2010) New Revision: 2007 Modified: components/shindig/trunk/assembly/pom.xml components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Prepare for 1.0-r790473-Patch01 Modified: components/shindig/trunk/assembly/pom.xml =================================================================== --- components/shindig/trunk/assembly/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/assembly/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,7 +22,6 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../java/pom.xml</relativePath> </parent> Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/features/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -23,7 +23,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> <relativePath>../pom.xml</relativePath> </parent> @@ -36,9 +36,9 @@ </description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/fe...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/features</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/features</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm> <build> @@ -248,18 +248,13 @@ <configuration> <tasks> - <taskdef - name="jsdoctoolkit" - classname="uk.co.darrenhurley.ant.tasks.JsDocToolkit"/> + <taskdef name="jsdoctoolkit" classname="uk.co.darrenhurley.ant.tasks.JsDocToolkit" /> - <mkdir dir="${project.reporting.outputDirectory}/jsdoc"/> + <mkdir dir="${project.reporting.outputDirectory}/jsdoc" /> - <jsdoctoolkit - jsdochome="${project.build.directory}/jsdoc-toolkit/" - template="jsdoc" - outputdir="${project.reporting.outputDirectory}/jsdoc"> + <jsdoctoolkit jsdochome="${project.build.directory}/jsdoc-toolkit/" template="jsdoc" outputdir="${project.reporting.outputDirectory}/jsdoc"> <fileset dir="${basedir}/src/main/javascript/features"> - <include name="**/*.js"/> + <include name="**/*.js" /> </fileset> </jsdoctoolkit> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/java/common/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,9 +33,9 @@ <description>Common java code for Shindig</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/c...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/common</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm> <build> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> <relativePath>../pom.xml</relativePath> </parent> @@ -34,9 +34,9 @@ all javascript required by the OpenSocial specification.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/g...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/gadgets</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm> <build> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/java/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> </parent> <artifactId>shindig-parent</artifactId> @@ -40,9 +40,9 @@ </modules> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/java</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm> <properties> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/java/samples/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,8 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <version>1.0-r790473-Patch01</version> </parent> <artifactId>shindig-samples</artifactId> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/java/server/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,9 +33,9 @@ <description>Default server war containing both the gadget rendering code and the social api code.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/server</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm> <properties> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/java/social-api/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> <relativePath>../pom.xml</relativePath> </parent> @@ -33,9 +33,9 @@ <description>Serves OpenSocial Data and the RESTful APIs.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/soci...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm> <build> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-03-05 15:23:01 UTC (rev 2006) +++ components/shindig/trunk/pom.xml 2010-03-05 15:36:12 UTC (rev 2007) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch01-SNAPSHOT</version> + <version>1.0-r790473-Patch01</version> <packaging>pom</packaging> <name>Apache Shindig Project</name> @@ -48,9 +48,9 @@   <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url> </scm>

15 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2010