- kune-commits - lists.ourproject.org

01 Sep '11

Author: vjrj_ Date: 2011-09-01 05:36:23 +0200 (Thu, 01 Sep 2011) New Revision: 1501 Added: trunk/src/main/java/cc/kune/core/client/resources/arrow-undo.png trunk/src/main/java/cc/kune/core/client/resources/copy.png trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.java.txt trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.ui.xml trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml trunk/src/main/java/cc/kune/gspace/client/i18n/RangeLabelPager.java trunk/src/main/java/cc/kune/gspace/client/i18n/ShowMorePagerPanel.java Removed: trunk/Blogs trunk/blogs Modified: trunk/TODO trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/domain/Group.java trunk/src/main/java/cc/kune/domain/GroupList.java trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java trunk/src/main/java/cc/kune/msgs/client/UserMessage.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml trunk/src/main/java/cc/kune/msgs/public/kune-message.css trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java Log: CLOSED - # 111: Rights problems in user space http://kune.ourproject.org/issues/ticket/111 NEW - # 81: Minor CSS issues in chrommium http://kune.ourproject.org/issues/ticket/81 Deleted: trunk/Blogs =================================================================== Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/TODO 2011-09-01 03:36:23 UTC (rev 1501) @@ -285,6 +285,8 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** Study mozilla web apps: +https://apps.mozillalabs.com/ ** Menubar submenus problem https://groups.google.com/group/google-web-toolkit/browse_thread/thread/aa8… ** Template system for new waves with legal free/open procedures Deleted: trunk/blogs =================================================================== Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2011-09-01 03:36:23 UTC (rev 1501) @@ -16,7 +16,6 @@ <inherits name="cc.kune.pspace.PSpace" /> <inherits name="com.calclab.suco.Suco" /> <inherits name="org.adamtacy.GWTEffects"></inherits> - <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd' /> <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />  Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/tabbed/AbstractTabbedDialogPanel.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -26,14 +26,17 @@ import cc.kune.common.client.ui.dialogs.MessageToolbar; import cc.kune.common.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter.AbstractTabbedDialogView; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.user.client.ui.DecoratedTabPanel; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; import com.google.gwt.user.client.ui.IsWidget; +import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.Widget; public abstract class AbstractTabbedDialogPanel implements AbstractTabbedDialogView { @@ -51,7 +54,7 @@ private final ProvidersCollection provCollection; private final String sndBtnId; private final String sndBtnTitle; - private DecoratedTabPanel tabPanel; + private TabLayoutPanel tabPanel; private String title; private int width; @@ -108,6 +111,7 @@ public void addTab(final IsWidget view, final IsWidget tabWidget) { createDialogIfNecessary(); tabPanel.add(view, tabWidget); + setPositions(); } @Override @@ -121,10 +125,12 @@ height).icon(iconCls).firstButtonId(firstBtnId).firstButtonTitle(firstBtnTitle).sndButtonId( dialogId).sndButtonTitle(sndBtnTitle).sndButtonId(sndBtnId).title(title).build(); messageErrorBar = new MessageToolbar(images, errorLabelId); - tabPanel = new DecoratedTabPanel(); + tabPanel = new TabLayoutPanel(25, Unit.PX); provCollection.createAll(); - tabPanel.getDeckPanel().setSize(String.valueOf(width), String.valueOf(height)); + tabPanel.setSize(String.valueOf(width), String.valueOf(height)); dialog.getInnerPanel().add(tabPanel); + tabPanel.addStyleName("k-tabpanel-aditionalpadding"); + tabPanel.addStyleName("k-tabs"); dialog.getFirstBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { @@ -187,6 +193,7 @@ public void insertTab(final IsWidget tab, final IsWidget tabTitle, final int index) { createDialogIfNecessary(); tabPanel.insert(tab, tabTitle, index); + setPositions(); } public boolean isVisible() { @@ -214,6 +221,25 @@ } } + // private void setPosition(final IsWidget widget) { + // // DOM.setStyleAttribute(widget.asWidget().getElement(), "position", + // // "relative"); + // // + // (widget.asWidget()).getParent().getElement().getStyle().setPosition(Position.RELATIVE); + // } + + private void setPositions() { + for (int i = 0; i < tabPanel.getWidgetCount(); i++) { + final Widget widget = tabPanel.getWidget(i); + DOM.setStyleAttribute(widget.getElement(), "position", "relative"); + + final Element parent = DOM.getParent(widget.getElement()); + DOM.setStyleAttribute(parent, "overflowX", "visible"); + DOM.setStyleAttribute(parent, "overflowY", "visible"); + DOM.setStyleAttribute(parent, "position", "relative"); + } + } + public void setTitle(final String title) { this.title = title; if (dialog != null) { Modified: trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/core/KuneCore.gwt.xml 2011-09-01 03:36:23 UTC (rev 1501) @@ -5,21 +5,22 @@  <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> - <source path="shared" /> - <public path="public" /> + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> + <source path="shared"/> + <public path="public"/>  - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.xml.XML" /> - <inherits name="cc.kune.gspace.GSpace" /> - <inherits name="cc.kune.msgs.KuneMsgs" /> - <inherits name="cc.kune.common.KuneCommon" /> + <inherits name="com.google.gwt.user.User"/> + <inherits name="com.google.gwt.xml.XML"/> + <inherits name="cc.kune.gspace.GSpace"/> + <inherits name="cc.kune.msgs.KuneMsgs"/> + <inherits name="cc.kune.common.KuneCommon"/>  - <inherits name='com.calclab.emite.core.EmiteCore' /> - <inherits name="com.extjs.gxt.ui.GXT" /> - - <inherits name="com.calclab.suco.Suco" /> - <inherits name='com.gwtplatform.mvp.Mvp' /> + <inherits name='com.calclab.emite.core.EmiteCore'/> + <inherits name="com.extjs.gxt.ui.GXT"/> +  + <inherits name="com.calclab.suco.Suco"/> + <inherits name='com.gwtplatform.mvp.Mvp'/> + <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/>   </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -79,6 +79,9 @@ @Source("arrow-right-white.gif") ImageResource arrowRightWhite(); + @Source("arrow-undo.png") + ImageResource arrowUndo(); + @Source("arrow-up-green.png") ImageResource arrowUpGreen(); @@ -316,6 +319,9 @@ @Source("content_edit.png") ImageResource contentEdit(); + @Source("copy.png") + ImageResource copy(); + @Source("copyleft.png") ImageResource copyleft(); Added: trunk/src/main/java/cc/kune/core/client/resources/arrow-undo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/arrow-undo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/copy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/copy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-09-01 03:36:23 UTC (rev 1501) @@ -1,6 +1,4 @@ -CHARSET "UTF-8 "; - -body { +CHARSET "UTF-8 "; body { background-color: transparent; color: black; font-family: 'Ubuntu', Arial; @@ -923,13 +921,13 @@ outline: 0 none; } -button[disabled]:active,button[disabled],input[type="reset"][disabled]:active,input[type="reset"][disabled],input[type="button"][disabled]:active,input[type="button"][disabled],select[disabled]>input[type="button"],select[disabled]>input[type="button"]:active,input[type="submit"][disabled]:active,input[type="submit"][disabled],.k-button-disabled, button.k-button-disabled +button[disabled]:active,button[disabled],input[type="reset"][disabled]:active,input[type="reset"][disabled],input[type="button"][disabled]:active,input[type="button"][disabled],select[disabled]>input[type="button"],select[disabled]>input[type="button"]:active,input[type="submit"][disabled]:active,input[type="submit"][disabled],.k-button-disabled,button.k-button-disabled { color: gray !important; border-color: #CCCCCC !important; background: inherits !important; - kfilter: alpha(opacity = 60 - ) !important; + kfilter: alpha(opacity = + 60) !important; -moz-opacity: 0.60 !important; -khtml-opacity: 0.60 !important; opacity: 0.60 !important; @@ -1214,8 +1212,8 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90 - ); + kfilter: alpha(opacity = + 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -1434,8 +1432,7 @@ border-radius: 4px; } -button.k-drop-allowed-hover, -.k-drop-allowed-hover { +button.k-drop-allowed-hover,.k-drop-allowed-hover { border: dashed 2px #3a9fd6 !important; } @@ -1478,4 +1475,32 @@ .k-i18n-recommend { border: 1px solid gray; background-color: #F2F2F2; +} + +.k-tabs .gwt-TabLayoutPanelTab { + background-color: #d38d5f; + color: #552200; + height: 20px !important; + margin: 0 2px; + padding: 2px; + cursor: pointer; + font-weight: bold; +} + +.k-tabs .gwt-TabLayoutPanelTab-selected { + background-color: #552200; + color: #FFF; +} + +.k-tabpanel-aditionalpadding { + padding-bottom: 27px !important; +} + +.k-tabs .gwt-TabLayoutPanel, .k-tabs .gwt-TabLayoutPanelTab { + -webkit-border-top-right-radius: 5px; + -moz-border-radius-topright: 5px; + border-top-right-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-radius-topleft: 5px; + border-top-left-radius: 5px; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/domain/Group.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Group.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/domain/Group.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -317,6 +317,6 @@ @Override public String toString() { - return "Group[" + shortName + "]"; + return "Group[" + shortName + ", " + hashCode() + "]"; } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/domain/GroupList.java =================================================================== --- trunk/src/main/java/cc/kune/domain/GroupList.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/domain/GroupList.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -82,7 +82,10 @@ case EVERYONE: return true; default: - return list.contains(group); + // Workaround for: + // http://www.timo-ernst.net/2011/06/remove-and-contains-not-working-on-your-j… + return new HashSet<Group>(list).contains(group); + // return list.contains(group); } } Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceArmorImpl.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -126,6 +126,7 @@ @Override public void enableCenterScroll(final boolean enable) { + // TODO use here Element.getStyle()... if (enable) { centerScroll.setAlwaysShowScrollBars(false); DOM.setStyleAttribute(centerScroll.getElement(), "position", "absolute"); Added: trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.java.txt =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.java.txt (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.java.txt 2011-09-01 03:36:23 UTC (rev 1501) @@ -0,0 +1,193 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.gwt.sample.showcase.client.content.cell; + +import com.google.gwt.cell.client.AbstractCell; +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.RunAsyncCallback; +import com.google.gwt.i18n.client.Constants; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.cellview.client.CellList; +import com.google.gwt.user.cellview.client.HasKeyboardPagingPolicy.KeyboardPagingPolicy; +import com.google.gwt.user.cellview.client.HasKeyboardSelectionPolicy.KeyboardSelectionPolicy; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.gwt.user.client.ui.AbstractImagePrototype; +import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.view.client.SelectionChangeEvent; +import com.google.gwt.view.client.SingleSelectionModel; +import com.sun.corba.se.pept.transport.ContactInfo; + +public class CwCellList extends ContentWidget { + + /** + * The UiBinder interface used by this example. + */ + interface Binder extends UiBinder<Widget, CwCellList> { + } + + /** + * The Cell used to render a {@link ContactInfo}. + */ + static class ContactCell extends AbstractCell<ContactInfo> { + + /** + * The html of the image used for contacts. + */ + private final String imageHtml; + + public ContactCell(final ImageResource image) { + this.imageHtml = AbstractImagePrototype.create(image).getHTML(); + } + + @Override + public void render(final Context context, final ContactInfo value, final SafeHtmlBuilder sb) { + // Value can be null, so do a null check.. + if (value == null) { + return; + } + + sb.appendHtmlConstant("<table>"); + + // Add the contact image. + sb.appendHtmlConstant("<tr><td rowspan='3'>"); + sb.appendHtmlConstant(imageHtml); + sb.appendHtmlConstant("</td>"); + + // Add the name and address. + sb.appendHtmlConstant("<td style='font-size:95%;'>"); + sb.appendEscaped(value.getFullName()); + sb.appendHtmlConstant("</td></tr><tr><td>"); + sb.appendEscaped(value.getAddress()); + sb.appendHtmlConstant("</td></tr></table>"); + } + } + + /** + * The constants used in this Content Widget. + */ + public static interface CwConstants extends Constants { + String cwCellListDescription(); + + String cwCellListName(); + } + + /** + * The images used for this example. + */ + static interface Images extends ClientBundle { + ImageResource contact(); + } + + /** + * The CellList. + */ + private CellList<ContactInfo> cellList; + + /** + * The contact form used to update contacts. + */ + @UiField + I18nTranslatorForm contactForm; + + /** + * The pager used to change the range of data. + */ + @UiField + ShowMorePagerPanel pagerPanel; + + /** + * The pager used to display the current range. + */ + @UiField + RangeLabelPager rangeLabelPager; + + /** + * Constructor. + * + * @param constants + * the constants + */ + public CwCellList(final CwConstants constants) { + super(constants.cwCellListName(), constants.cwCellListDescription(), false, "ContactDatabase.java", + "CwCellList.ui.xml", "ContactInfoForm.java", "ShowMorePagerPanel.java", "RangeLabelPager.java"); + } + + @Override + protected void asyncOnInitialize(final AsyncCallback<Widget> callback) { + GWT.runAsync(CwCellList.class, new RunAsyncCallback() { + + @Override + public void onFailure(final Throwable caught) { + callback.onFailure(caught); + } + + @Override + public void onSuccess() { + callback.onSuccess(onInitialize()); + } + }); + } + + /** + * Initialize this example. + */ + @Override + public Widget onInitialize() { + final Images images = GWT.create(Images.class); + + // Create a CellList. + final ContactCell contactCell = new ContactCell(images.contact()); + + // Set a key provider that provides a unique key for each contact. If key is + // used to identify contacts when fields (such as the name and address) + // change. + cellList = new CellList<ContactInfo>(contactCell, ContactDatabase.ContactInfo.KEY_PROVIDER); + cellList.setPageSize(30); + cellList.setKeyboardPagingPolicy(KeyboardPagingPolicy.INCREASE_RANGE); + cellList.setKeyboardSelectionPolicy(KeyboardSelectionPolicy.BOUND_TO_SELECTION); + + // Add a selection model so we can select cells. + final SingleSelectionModel<ContactInfo> selectionModel = new SingleSelectionModel<ContactInfo>( + ContactDatabase.ContactInfo.KEY_PROVIDER); + cellList.setSelectionModel(selectionModel); + selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() { + @Override + public void onSelectionChange(final SelectionChangeEvent event) { + contactForm.setContact(selectionModel.getSelectedObject()); + } + }); + + // Create the UiBinder. + final Binder uiBinder = GWT.create(Binder.class); + final Widget widget = uiBinder.createAndBindUi(this); + + // Add the CellList to the data provider in the database. + ContactDatabase.get().addDataDisplay(cellList); + + // Set the cellList as the display of the pagers. This example has two + // pagers. pagerPanel is a scrollable pager that extends the range when the + // user scrolls to the bottom. rangeLabelPager is a pager that displays the + // current range, but does not have any controls to change the range. + pagerPanel.setDisplay(cellList); + rangeLabelPager.setDisplay(cellList); + + return widget; + } +} Added: trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/CwCellList.ui.xml 2011-09-01 03:36:23 UTC (rev 1501) @@ -0,0 +1,51 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder + xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui" + xmlns:c='urn:import:com.google.gwt.user.cellview.client' + xmlns:s="urn:import:cc.kune.gspace.client.i18n"> + + <ui:style> + .scrollable { + height: 400px; + width: 250px; + border: 1px solid #ccc; + text-align: left; + } + + .contactFormCell { + padding-left: 20px; + } + </ui:style> + + <g:HTMLPanel> + <table> + <tr> + <td + valign='top' + align='center'> + <s:ShowMorePagerPanel + addStyleNames='{style.scrollable}' + ui:field='pagerPanel' /> + <s:RangeLabelPager + ui:field='rangeLabelPager' /> + </td> + <td + class='{style.contactFormCell}' + valign='top' + align='center'> + <s:I18nTranslatorForm + ui:field='contactForm' /> + <br /> + </td> + </tr> + <tr> + <td + align='center'> + <s:ShowMorePagerPanel + ui:field='pager' /> + </td> + </tr> + </table> + </g:HTMLPanel> +</ui:UiBinder> Added: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -0,0 +1,75 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package cc.kune.gspace.client.i18n; + +import cc.kune.common.client.tooltip.Tooltip; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.HasBlurHandlers; +import com.google.gwt.event.dom.client.HasKeyPressHandlers; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.TextArea; +import com.google.gwt.user.client.ui.Widget; + +/** + * A form used for editing contacts. + */ +public class I18nTranslatorForm extends Composite { + + interface Binder extends UiBinder<Widget, I18nTranslatorForm> { + } + + private static Binder uiBinder = GWT.create(Binder.class); + + @UiField + Image copyIcon; + @UiField + Label noteForTranslators; + @UiField + Label toTranslate; + @UiField + TextArea translation; + + public I18nTranslatorForm() { + initWidget(uiBinder.createAndBindUi(this)); + Tooltip.to(copyIcon, "FIXME"); + } + + public HasBlurHandlers getBlurTraslation() { + return translation; + } + + public HasKeyPressHandlers getKeysTraslation() { + return translation; + } + + @UiHandler("copyIcon") + void handleClickOnCopyIcon(final ClickEvent e) { + translation.setText(toTranslate.getText()); + } + + public void setInfo(final String toTranslate, final String noteForTranslators, final String translation) { + this.toTranslate.setText(toTranslate); + this.noteForTranslators.setText(noteForTranslators); + this.translation.setText(translation); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.ui.xml 2011-09-01 03:36:23 UTC (rev 1501) @@ -0,0 +1,54 @@ +<!DOCTYPE ui:UiBinder SYSTEM 'http://dl.google.com/gwt/DTD/xhtml.ent'> +<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' + xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:d='urn:import:com.google.gwt.user.datepicker.client' + ui:generateFormat='com.google.gwt.i18n.rebind.format.PropertiesFormat' + ui:generateLocales='default'> + + <ui:with field='res' type='cc.kune.core.client.resources.CoreResources' /> + + <ui:style> + .titles { + font-size: bold; + text-align: right; + padding-right: 10px; + vertical-align: top; + } + + .table { + display: table; + } + + .copyicon { + vertical-align: top; + } + + .row { + display: table-row; + margin: 5px 5px 15px 5px; + } + + .cell { + display: table-cell; + margin: 5px; + } + </ui:style> + <g:FlowPanel addStyleNames="{style.table}"> + <g:FlowPanel addStyleNames="{style.row}"> + <g:Label ui:field="toTranslateTitle" addStyleNames="{style.titles} {style.cell}" + text="translate this:" /> + <g:Label ui:field="toTranslate" addStyleNames="{style.cell}" /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.row}"> + <g:Label ui:field="toLanguageTitle" addStyleNames="{style.titles} {style.cell}" + text="to Spanish:" /> + <g:TextArea ui:field='translation' addStyleNames="{style.cell}" /> + <g:Image ui:field="copyIcon" addStyleNames="{style.cell} {style.copyicon}" + resource='{res.arrowUndo}' /> + </g:FlowPanel> + <g:FlowPanel addStyleNames="{style.row}"> + <g:Label ui:field="noteForTranslatorsTittle" text="Note:" + addStyleNames="{style.titles} {style.cell}" /> + <g:Label ui:field="noteForTranslators" addStyleNames="{style.cell}" /> + </g:FlowPanel> + </g:FlowPanel> +</ui:UiBinder> Added: trunk/src/main/java/cc/kune/gspace/client/i18n/RangeLabelPager.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/RangeLabelPager.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/RangeLabelPager.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -0,0 +1,50 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package cc.kune.gspace.client.i18n; + +import com.google.gwt.i18n.client.HasDirection; +import com.google.gwt.user.cellview.client.AbstractPager; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.view.client.HasRows; +import com.google.gwt.view.client.Range; + +/** + * A pager that displays the current range without any controls to change the + * range. + */ +public class RangeLabelPager extends AbstractPager { + + /** + * The label that shows the current range. + */ + private final HTML label = new HTML(); + + /** + * Construct a new {@link RangeLabelPager}. + */ + public RangeLabelPager() { + initWidget(label); + } + + @Override + protected void onRangeOrRowCountChanged() { + final HasRows display = getDisplay(); + final Range range = display.getVisibleRange(); + final int start = range.getStart(); + final int end = start + range.getLength(); + label.setText(start + " - " + end + " : " + display.getRowCount(), HasDirection.Direction.LTR); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/i18n/ShowMorePagerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/ShowMorePagerPanel.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/ShowMorePagerPanel.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -0,0 +1,117 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package cc.kune.gspace.client.i18n; + +import com.google.gwt.event.dom.client.ScrollEvent; +import com.google.gwt.event.dom.client.ScrollHandler; +import com.google.gwt.user.cellview.client.AbstractPager; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.view.client.HasRows; + +/** + * A scrolling pager that automatically increases the range every time the + * scroll bar reaches the bottom. + */ +public class ShowMorePagerPanel extends AbstractPager { + + /** + * The default increment size. + */ + private static final int DEFAULT_INCREMENT = 20; + + /** + * The increment size. + */ + private int incrementSize = DEFAULT_INCREMENT; + + /** + * The last scroll position. + */ + private int lastScrollPos = 0; + + /** + * The scrollable panel. + */ + private final ScrollPanel scrollable = new ScrollPanel(); + + /** + * Construct a new {@link ShowMorePagerPanel}. + */ + public ShowMorePagerPanel() { + initWidget(scrollable); + + // Do not let the scrollable take tab focus. + scrollable.getElement().setTabIndex(-1); + + // Handle scroll events. + scrollable.addScrollHandler(new ScrollHandler() { + public void onScroll(ScrollEvent event) { + // If scrolling up, ignore the event. + int oldScrollPos = lastScrollPos; + lastScrollPos = scrollable.getScrollPosition(); + if (oldScrollPos >= lastScrollPos) { + return; + } + + HasRows display = getDisplay(); + if (display == null) { + return; + } + int maxScrollTop = scrollable.getWidget().getOffsetHeight() + - scrollable.getOffsetHeight(); + if (lastScrollPos >= maxScrollTop) { + // We are near the end, so increase the page size. + int newPageSize = Math.min( + display.getVisibleRange().getLength() + incrementSize, + display.getRowCount()); + display.setVisibleRange(0, newPageSize); + } + } + }); + } + + /** + * Get the number of rows by which the range is increased when the scrollbar + * reaches the bottom. + * + * @return the increment size + */ + public int getIncrementSize() { + return incrementSize; + } + + @Override + public void setDisplay(HasRows display) { + assert display instanceof Widget : "display must extend Widget"; + scrollable.setWidget((Widget) display); + super.setDisplay(display); + } + + /** + * Set the number of rows by which the range is increased when the scrollbar + * reaches the bottom. + * + * @param incrementSize the incremental number of rows + */ + public void setIncrementSize(int incrementSize) { + this.incrementSize = incrementSize; + } + + @Override + protected void onRangeOrRowCountChanged() { + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -28,6 +28,7 @@ import com.extjs.gxt.ui.client.event.BaseEvent; import com.extjs.gxt.ui.client.event.Events; +import com.extjs.gxt.ui.client.event.FieldEvent; import com.extjs.gxt.ui.client.event.Listener; import com.extjs.gxt.ui.client.widget.form.Field; import com.google.gwt.event.dom.client.ChangeHandler; @@ -92,8 +93,15 @@ final Field field : super.getFormPanel().getFields()) { // field.addListener(Events.Change, listener); field.addListener(Events.Blur, listener); + field.addListener(Events.OnKeyPress, new Listener<FieldEvent>() { + @Override + public void handleEvent(final FieldEvent fe) { + if (fe.getEvent().getKeyCode() == 13) { + changeHandler.onChange(null); + } + } + }); } - } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/gspace/client/resources/gSpaceArmor.css 2011-09-01 03:36:23 UTC (rev 1501) @@ -214,7 +214,7 @@ } .entityToolsCenter span { - font-size: 26px; + font-size: 22px; font-weight: bold; } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -266,6 +266,7 @@ final StateContainerDTO stateContainer = (StateContainerDTO) state; getView().setContainer(stateContainer); final AccessRights rights = stateContainer.getContainerRights(); + // NotifyUser.info("Rights: " + rights, true); final GuiActionDescCollection actions = actionsRegistry.getCurrentActions(stateContainer.getGroup(), stateContainer.getTypeId(), session.isLogged(), rights, ActionGroups.TOOLBAR); final ContainerDTO container = stateContainer.getContainer(); Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -49,14 +49,17 @@ interface MessageUiBinder extends UiBinder<Widget, UserMessage> { } + public interface MsgTemplate extends SafeHtmlTemplates { @Template("<span>{0}</span>") SafeHtml format(SafeHtml message); } + public interface MsgWithTitleTemplate extends SafeHtmlTemplates { - @Template("<span><b>{0}</b><br/><p>{1}</p></span>") + @Template("<span><span class=\"k-msg-title\">{0}</span><p>{1}</p></span>") SafeHtml format(SafeHtml title, SafeHtml message); } + private static String closeTitle = "Close"; private static int fadeMills = 5000; Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -23,9 +23,12 @@ import cc.kune.msgs.client.UserMessagesPresenter.UserMessagesView; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.logical.shared.AttachEvent; +import com.google.gwt.event.logical.shared.AttachEvent.Handler; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -36,7 +39,9 @@ private static MessagesPanelUiBinder uiBinder = GWT.create(MessagesPanelUiBinder.class); @UiField - VerticalPanel vp; + FlowPanel bottom; + @UiField + VerticalPanel panel; public UserMessagesPanel() { initWidget(uiBinder.createAndBindUi(this)); @@ -46,6 +51,17 @@ public void add(final NotifyLevel level, final String title, final String message, final String id, final boolean closeable, final CloseCallback closeCallback) { final UserMessage msg = new UserMessage(level, title, message, id, closeable, closeCallback); - vp.add(msg); + panel.add(msg); + if (panel.getWidgetCount() == 2) { + bottom.setVisible(true); + } + msg.addAttachHandler(new Handler() { + @Override + public void onAttachOrDetach(final AttachEvent event) { + if (!event.isAttached() && panel.getWidgetCount() == 1) { + bottom.setVisible(false); + } + } + }); } } Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/msgs/client/UserMessagesPanel.ui.xml 2011-09-01 03:36:23 UTC (rev 1501) @@ -1,9 +1,13 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <g:VerticalPanel verticalAlignment="ALIGN_TOP" - ui:field="vp" width="100%" height="" - addStyleNames="k-msg-panel, k-box-10shadow, k-top-10corners" + <g:VerticalPanel verticalAlignment="ALIGN_TOP" width="100%" + height="" addStyleNames="k-msg-panel, k-box-10shadow, k-top-10corners" spacing="10"> + <g:VerticalPanel ui:field="panel" width="100%" + height=""> + </g:VerticalPanel> + <g:FlowPanel ui:field="bottom" visible="false" + addStyleNames="k-msg-panel-bottom"/> </g:VerticalPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/msgs/public/kune-message.css =================================================================== --- trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-09-01 03:36:23 UTC (rev 1501) @@ -1,33 +1,38 @@ .k-msg-panel { - background-color: #892c00; - border-collapse: separate; - border-spacing: 15px 8px; + background-color: #892c00; + border-collapse: separate !important; } -.k-msg-panel-title { - color: #ffe9da; - font-weight: bold; - margin-bottom: 10px; +.k-msg-panel table { } +.k-msg-panel-bottom { + margin-bottom: 8px; +} + .k-msg { - border: solid 1px #F2F2F2; - background: #fff0e6; - color: #280b0b; - border-collapse: separate; - border-spacing: 0px; + border: solid 1px #F2F2F2; + background: #fff0e6; + color: #280b0b; + margin: 8px 8px 0; + width: auto; } +.k-msg-title { + font-weight: bold; + margin-bottom: 8px; +} + .k-msg-close { - position: relative; - right: -14px; - top: 0px; + position: relative; + right: -14px; + top: 0px; } .k-msg-icon { - padding: 10px 10px 5px; + padding: 10px 10px 5px; } .k-msg-label { - font-size: 16px; + font-size: 16px; } \ No newline at end of file Modified: trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Iterator; @@ -36,6 +37,7 @@ import cc.kune.core.client.errors.GroupLongNameInUseException; import cc.kune.core.client.errors.GroupShortNameInUseException; import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.rpcservices.ContentService; import cc.kune.core.client.rpcservices.UserService; import cc.kune.core.server.integration.IntegrationTest; import cc.kune.core.server.integration.IntegrationTestHelper; @@ -46,10 +48,13 @@ import cc.kune.core.server.users.UserInfo; import cc.kune.core.server.users.UserInfoService; import cc.kune.core.shared.domain.UserSNetVisibility; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.I18nCountryDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.SubscriptionMode; import cc.kune.core.shared.dto.TimeZoneDTO; import cc.kune.core.shared.dto.UserDTO; @@ -60,6 +65,8 @@ import com.google.inject.persist.UnitOfWork; public class UserServiceTest extends IntegrationTest { + @Inject + ContentService contentService; private I18nCountryDTO country; @Inject I18nLanguageManager i18nLangManager; @@ -115,6 +122,22 @@ userService.createUser(user, false); } + @Test + public void createUserShouldPermitEditOfSelfHomepage() throws Exception { + assertNull(session.getUser().getId()); + final UserDTO user = new UserDTO("test", "test", "123456", "example1234(a)example.com", lang, country, + timezone, null, true, SubscriptionMode.manual, "blue"); + userService.createUser(user, true); + doLogin("test", "123456"); + final StateAbstractDTO homepage = contentService.getContent(getHash(), new StateToken("test")); + assertTrue(homepage.getGroupRights().isAdministrable()); + assertTrue(homepage.getGroupRights().isEditable()); + assertTrue(((StateContentDTO) homepage).getContentRights().isAdministrable()); + assertTrue(((StateContentDTO) homepage).getContentRights().isEditable()); + assertTrue(((StateContentDTO) homepage).getContainerRights().isAdministrable()); + assertTrue(((StateContentDTO) homepage).getContainerRights().isEditable()); + } + @Before public void init() { new IntegrationTestHelper(this); Modified: trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java 2011-08-30 08:04:22 UTC (rev 1500) +++ trunk/src/test/java/cc/kune/core/server/manager/GroupManagerDefaultTest.java 2011-09-01 03:36:23 UTC (rev 1501) @@ -189,4 +189,13 @@ assertEquals(4, result2.getList().size()); rollbackTransaction(); } + + @Test + public void sameGroupHasSameHash() throws Exception { + final Group group1 = new Group("ysei", "Yellow Submarine Environmental Initiative", defLicense, + GroupType.PROJECT); + final Group group2 = new Group("ysei", "", defLicense, GroupType.PROJECT); + assertEquals(group1, group2); + assertEquals(group1.hashCode(), group2.hashCode()); + } }

1 0

[kune issues] #111: Rights problems in user space
by kune issues 01 Sep '11

01 Sep '11

#111: Rights problems in user space --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: defect | Status: new Priority: critical | Milestone: Component: Group space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Seems that exist problems in docs/blogs, etc in users groups, because you cannot edit/create new docs -- Ticket URL: <http://kune.ourproject.org/issues/ticket/111> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #117: Try to remove /ws/ prefix
by kune issues 01 Sep '11

01 Sep '11

#117: Try to remove /ws/ prefix --------------------------+------------------- Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: 0.1.0 Component: Server side | Version: 0.0.9 Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------- -- Ticket URL: <http://kune.ourproject.org/issues/ticket/117> kune issues <http://kune.ourproject.org/issues/>

1 0

[kune issues] #116: Verify that somebody cannot be in admins and in collabs in the same group
by kune issues 01 Sep '11

01 Sep '11

#116: Verify that somebody cannot be in admins and in collabs in the same group -----------------------------------+------------------- Reporter: vjrj | Owner: vjrj Type: defect | Status: new Priority: major | Milestone: 0.1.0 Component: Group Social Network | Version: 0.0.9 Resolution: | Keywords: Blocked By: | Blocking: -----------------------------------+------------------- ... at the same time -- Ticket URL: <http://kune.ourproject.org/issues/ticket/116> kune issues <http://kune.ourproject.org/issues/>

1 0

[kune issues] #109: Send Feedback button
by kune issues 31 Aug '11

31 Aug '11

#109: Send Feedback button --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: Common | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ The button, creates a Wave with the admins, and there you can write your problems/ideas/issues/feedback. Should be something general for every kune site. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/109> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #114: Explain properly the tools
by kune issues 31 Aug '11

31 Aug '11

#114: Explain properly the tools -------------------------+------------------- Reporter: samer@… | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: Group space | Version: Keywords: | Blocked By: Blocking: | -------------------------+------------------- The tools Documents, Barters, Blogs, Tasks, etc don't have an appropriate explanation, and people don't understand how do they work. They should have a mouse on-over with a description (the same way as the top-left icons do). Also, it'd help if the "sample X" (sample barter, sample post, etc) describe also more of how to use them... For example, instead of just saying "This is only a post sample. You can edit it, rename the post and this blog", say "This is a blog post sample. As in usual blogs, you can include any text you want here (clicking "Edit" here or in your user- space), or rename it as you prefer (click on "a post sample", up)." -- Ticket URL: <http://kune.ourproject.org/issues/ticket/114> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #115: Evaluate the use of these new gadgets
by kune issues 31 Aug '11

31 Aug '11

#115: Evaluate the use of these new gadgets --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: WIAB Server | Version: Resolution: | Keywords: easy Blocked By: | Blocking: --------------------------+------------------ Jeremy (supercopter) suggest the use of some other gadgets also (we are using already some of them). No all the gadgets can be used in the "New" menu, then we have to evaluate which to use there. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/115> kune issues <http://kune.ourproject.org/issues/>

1 1

r1500 - in trunk: . src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/manager/file src/main/java/cc/kune/core/server/properties src/main/java/cc/kune/core/server/rpc src/main/resources src/test/java/cc/kune/core/server/integration/site
by Vicente J. Ruiz Jurado 30 Aug '11

30 Aug '11

Author: vjrj_ Date: 2011-08-30 10:04:22 +0200 (Tue, 30 Aug 2011) New Revision: 1500 Added: trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java Removed: trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java Modified: trunk/pom.xml trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java trunk/src/main/resources/kune.properties Log: CLOSED - # 55: kune properties as parameter http://kune.ourproject.org/issues/ticket/55 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/pom.xml 2011-08-30 08:04:22 UTC (rev 1500) @@ -793,9 +793,9 @@ </commandlineArgs> <systemProperties> <systemProperty> - <key>kune.config</key> -  - <value>kune.properties</value> + <key>kune.server.config</key> + <value>src/main/resources/kune.properties</value> +  </systemProperty> <systemProperty> <key>wave.server.config</key> Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -81,7 +81,7 @@ public KuneRackModule(final String jpaUnit, final Scope sessionScope) { final SystemConfiguration sysConf = new SystemConfiguration(); - final String kuneConfig = sysConf.getString("kune.config"); + final String kuneConfig = sysConf.getString("kune.server.config"); configModule = new AbstractModule() { @Override Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -46,8 +46,8 @@ public FileGwtUploadAbstractServlet(final KuneProperties kuneProperties) { this.kuneProperties = kuneProperties; - this.maxSize = Integer.valueOf(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE_IN_KS)); - this.uploadDelay = Integer.valueOf(kuneProperties.get(KuneProperties.UPLOAD_DELAY_FOR_TEST)); + this.maxSize = kuneProperties.getInteger(KuneProperties.UPLOAD_MAX_FILE_SIZE_IN_KS); + this.uploadDelay = kuneProperties.getInteger(KuneProperties.UPLOAD_DELAY_FOR_TEST); } protected abstract String createUploadedFile(final String userHash, final StateToken stateToken, Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileUploadManagerAbstract.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -46,113 +46,116 @@ public abstract class FileUploadManagerAbstract extends HttpServlet { - private static final long serialVersionUID = -4227762495128652369L; + public static final Log LOG = LogFactory.getLog(FileUploadManager.class); - public static final Log LOG = LogFactory.getLog(FileUploadManager.class); + private static final long serialVersionUID = -4227762495128652369L; - protected static final String UTF8 = "UTF-8"; + protected static final String UTF8 = "UTF-8"; - @Inject - KuneProperties kuneProperties; + @Inject + KuneProperties kuneProperties; - protected abstract void beforePostStart(); + protected abstract void beforePostStart(); - protected abstract void beforeRespond(final HttpServletResponse response, final Writer w) throws IOException; + protected abstract void beforeRespond(final HttpServletResponse response, final Writer w) + throws IOException; - @Override - @SuppressWarnings({ "rawtypes", "deprecation" }) - protected void doPost(final HttpServletRequest req, final HttpServletResponse response) throws ServletException, - IOException { + abstract void createUploadedFile(final String userHash, final StateToken stateToken, + final String fileName, final FileItem file, final String typeId) throws Exception; - beforePostStart(); + @Override + @SuppressWarnings({ "rawtypes" }) + protected void doPost(final HttpServletRequest req, final HttpServletResponse response) + throws ServletException, IOException { - final DiskFileItemFactory factory = new DiskFileItemFactory(); - // maximum size that will be stored in memory - factory.setSizeThreshold(4096); - // the location for saving data that is larger than getSizeThreshold() - factory.setRepository(new File("/tmp")); + beforePostStart(); - if (!ServletFileUpload.isMultipartContent(req)) { - LOG.warn("Not a multipart upload"); - } + final DiskFileItemFactory factory = new DiskFileItemFactory(); + // maximum size that will be stored in memory + factory.setSizeThreshold(4096); + // the location for saving data that is larger than getSizeThreshold() + factory.setRepository(new File("/tmp")); - final ServletFileUpload upload = new ServletFileUpload(factory); - // maximum size before a FileUploadException will be thrown - upload.setSizeMax(Long.valueOf(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)) * 1024 * 1024); - - try { - final List fileItems = upload.parseRequest(req); - String userHash = null; - StateToken stateToken = null; - String typeId = null; - String fileName = null; - FileItem file = null; - for (final Iterator iterator = fileItems.iterator(); iterator.hasNext();) { - final FileItem item = (FileItem) iterator.next(); - if (item.isFormField()) { - final String name = item.getFieldName(); - final String value = item.getString(); - LOG.info("name: " + name + " value: " + value); - if (name.equals(FileConstants.HASH)) { - userHash = value; - } - if (name.equals(FileConstants.TOKEN)) { - stateToken = new StateToken(value); - } - if (name.equals(FileConstants.TYPE_ID)) { - typeId = value; - } - } else { - fileName = item.getName(); - LOG.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + item.getSize() - + " typeId: " + typeId); - file = item; - } - } - createUploadedFile(userHash, stateToken, fileName, file, typeId); - onSuccess(response); - } catch (final FileUploadException e) { - onFileUploadException(response); - } catch (final Exception e) { - onOtherException(response, e); - } + if (!ServletFileUpload.isMultipartContent(req)) { + LOG.warn("Not a multipart upload"); } - protected void doResponse(final HttpServletResponse response, final String additionalResponse) throws IOException { - doResponse(response, additionalResponse, HttpServletResponse.SC_OK); - } + final ServletFileUpload upload = new ServletFileUpload(factory); + // maximum size before a FileUploadException will be thrown + upload.setSizeMax(kuneProperties.getLong(KuneProperties.UPLOAD_MAX_FILE_SIZE) * 1024 * 1024); - protected void doResponse(final HttpServletResponse response, final String additionalResponse, - final int responseCode) throws IOException { - final Writer w = new OutputStreamWriter(response.getOutputStream()); - if (additionalResponse != null) { - w.write(additionalResponse); + try { + final List fileItems = upload.parseRequest(req); + String userHash = null; + StateToken stateToken = null; + String typeId = null; + String fileName = null; + FileItem file = null; + for (final Iterator iterator = fileItems.iterator(); iterator.hasNext();) { + final FileItem item = (FileItem) iterator.next(); + if (item.isFormField()) { + final String name = item.getFieldName(); + final String value = item.getString(); + LOG.info("name: " + name + " value: " + value); + if (name.equals(FileConstants.HASH)) { + userHash = value; + } + if (name.equals(FileConstants.TOKEN)) { + stateToken = new StateToken(value); + } + if (name.equals(FileConstants.TYPE_ID)) { + typeId = value; + } + } else { + fileName = item.getName(); + LOG.info("file: " + fileName + " fieldName: " + item.getFieldName() + " size: " + + item.getSize() + " typeId: " + typeId); + file = item; } - w.close(); - response.setStatus(responseCode); + } + createUploadedFile(userHash, stateToken, fileName, file, typeId); + onSuccess(response); + } catch (final FileUploadException e) { + onFileUploadException(response); + } catch (final Exception e) { + onOtherException(response, e); } + } - protected void logFileDel(final boolean delResult) { - if (!delResult) { - LOG.error("Cannot delete file"); - } - } + protected void doResponse(final HttpServletResponse response, final String additionalResponse) + throws IOException { + doResponse(response, additionalResponse, HttpServletResponse.SC_OK); + } - protected void onFileUploadException(final HttpServletResponse response) throws IOException { - doResponse(response, null); + protected void doResponse(final HttpServletResponse response, final String additionalResponse, + final int responseCode) throws IOException { + final Writer w = new OutputStreamWriter(response.getOutputStream()); + if (additionalResponse != null) { + w.write(additionalResponse); } + w.close(); + response.setStatus(responseCode); + } - protected void onOtherException(final HttpServletResponse response, final Exception e) throws IOException { - LOG.info("Exception: " + e.getCause()); - e.printStackTrace(); - doResponse(response, null); + protected void logFileDel(final boolean delResult) { + if (!delResult) { + LOG.error("Cannot delete file"); } + } - protected void onSuccess(final HttpServletResponse response) throws IOException { - doResponse(response, null); - } + protected void onFileUploadException(final HttpServletResponse response) throws IOException { + doResponse(response, null); + } - abstract void createUploadedFile(final String userHash, final StateToken stateToken, final String fileName, - final FileItem file, final String typeId) throws Exception; + protected void onOtherException(final HttpServletResponse response, final Exception e) + throws IOException { + LOG.info("Exception: " + e.getCause()); + e.printStackTrace(); + doResponse(response, null); + } + protected void onSuccess(final HttpServletResponse response) throws IOException { + doResponse(response, null); + } + } Modified: trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/manager/file/UserLogoDownloadManager.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -77,7 +77,8 @@ } private void noResult(final HttpServletResponse resp) throws IOException { - FileDownloadManagerUtils.returnNotFound(resp); + // FileDownloadManagerUtils.returnNotFound(resp); + FileDownloadManagerUtils.returnFile("src/main/webapp/others/unknown.jpg", resp.getOutputStream()); } private void replyDefAvatar(final HttpServletResponse resp) throws FileNotFoundException, IOException { Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -19,13 +19,14 @@ */ package cc.kune.core.server.properties; +import java.util.List; + public interface KuneProperties { String AVI_EMBEDED_OBJECT = "kune.media.aviembededobject"; String CHAT_DOMAIN = "kune.chat.domain"; String CHAT_HTTP_BASE = "kune.chat.httpbase"; String CHAT_ROOM_HOST = "kune.chat.roomHost"; String CURRENT_CC_VERSION = "kune.currentccversion"; - String DEFAULT_SITE_SHORT_NAME = "kune.default.site.shortName"; String FLV_EMBEDED_OBJECT = "kune.media.flvembededobject"; String IMAGES_CROPSIZE = "kune.images.cropsize"; @@ -57,4 +58,10 @@ String get(String key); String get(String key, String defaultValue); + + Integer getInteger(String key); + + List<String> getList(String key); + + Long getLong(String key); } Modified: trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -19,11 +19,14 @@ */ package cc.kune.core.server.properties; -import java.io.IOException; -import java.io.InputStream; import java.text.MessageFormat; -import java.util.Properties; +import java.util.List; +import org.apache.commons.configuration.CompositeConfiguration; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration.SystemConfiguration; + import cc.kune.core.server.ServerException; import com.google.inject.Inject; @@ -31,46 +34,61 @@ @Singleton public class KunePropertiesDefault implements KuneProperties { + private CompositeConfiguration config; private final String fileName; - private Properties properties; @Inject public KunePropertiesDefault(@PropertiesFileName final String fileName) { this.fileName = fileName; try { - properties = new Properties(); - final InputStream input = getInputStream(fileName); - properties.load(input); - } catch (final IOException e) { + config = new CompositeConfiguration(); + config.addConfiguration(new SystemConfiguration()); + config.addConfiguration(new PropertiesConfiguration(fileName)); + } catch (final ConfigurationException e) { final String msg = MessageFormat.format("Couldn't open property file {0}", fileName); throw new ServerException(msg, e); } + } + private void checkNull(final String key, final Object value) { + if (value == null) { + throw new ServerException("PROPERTY: " + key + " not defined in " + fileName); + } } @Override public String get(final String key) { - final String value = properties.getProperty(key); - if (value == null) { - throw new ServerException("PROPERTY: " + key + " not defined in " + fileName); - } + final String value = config.getString(key); + checkNull(key, value); return value; } @Override public String get(final String key, final String defaultValue) { - final String value = properties.getProperty(key); + final String value = config.getString(key); return value != null ? value : defaultValue; } - private InputStream getInputStream(final String fileName) { - final InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream( - fileName); - if (input == null) { - final String msg = MessageFormat.format("Properties file: ''{0}'' not found", fileName); - throw new ServerException(msg); - } - return input; + @Override + public Integer getInteger(final String key) { + final Integer value = config.getInt(key); + checkNull(key, value); + return value; } + @Override + public List<String> getList(final String key) { + @SuppressWarnings("unchecked") + final List<String> value = config.getList(key); + checkNull(key, value); + return value; + } + + @Override + public Long getLong(final String key) { + final Long value = config.getLong(key); + checkNull(key, value); + return value; + } + } Modified: trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -1,7 +1,6 @@ package cc.kune.core.server.properties; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import cc.kune.core.client.errors.DefaultException; @@ -15,8 +14,7 @@ private static final long serialVersionUID = 7455756500618858360L; public static List<String> fromList(final KuneProperties kuneProperties) { - return Arrays.asList(kuneProperties.get(KuneProperties.RESERVED_WORDS, "root").replaceAll(" ", "").split( - ",")); + return kuneProperties.getList(KuneProperties.RESERVED_WORDS); } @Inject Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -20,6 +20,7 @@ package cc.kune.core.server.rpc; import java.util.HashMap; +import java.util.List; import java.util.TimeZone; import cc.kune.core.client.errors.DefaultException; @@ -80,12 +81,12 @@ this.serverToolRegistry = serverToolRegistry; this.extMediaDescManager = extMediaDescManager; data = loadInitData(); - siteThemes = getSiteThemes(this.kuneProperties.get(KuneProperties.WS_THEMES).split(",")); + siteThemes = getSiteThemes(this.kuneProperties.getList(KuneProperties.WS_THEMES)); reservedWords = new ReservedWordsRegistryDTO(ReservedWordsRegistry.fromList(kuneProperties)); } private String[] getColors(final String key) { - return this.kuneProperties.get(key).split(","); + return this.kuneProperties.getList(key).toArray(new String[0]); } @Override @@ -104,7 +105,7 @@ return dataMapped; } - private HashMap<String, GSpaceTheme> getSiteThemes(final String[] themes) { + private HashMap<String, GSpaceTheme> getSiteThemes(final List<String> themes) { final HashMap<String, GSpaceTheme> map = new HashMap<String, GSpaceTheme>(); for (final String theme : themes) { map.put(theme, getThemeFromProperties(theme)); @@ -142,10 +143,10 @@ data.setMaxFileSizeInMb(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)); data.setUserTools(serverToolRegistry.getToolsForUsers()); data.setGroupTools(serverToolRegistry.getToolsForGroups()); - data.setImgResizewidth(Integer.valueOf(kuneProperties.get(KuneProperties.IMAGES_RESIZEWIDTH))); - data.setImgThumbsize(Integer.valueOf(kuneProperties.get(KuneProperties.IMAGES_THUMBSIZE))); - data.setImgCropsize(Integer.valueOf(kuneProperties.get(KuneProperties.IMAGES_CROPSIZE))); - data.setImgIconsize(Integer.valueOf(kuneProperties.get(KuneProperties.IMAGES_ICONSIZE))); + data.setImgResizewidth(kuneProperties.getInteger(KuneProperties.IMAGES_RESIZEWIDTH)); + data.setImgThumbsize(kuneProperties.getInteger(KuneProperties.IMAGES_THUMBSIZE)); + data.setImgCropsize(kuneProperties.getInteger(KuneProperties.IMAGES_CROPSIZE)); + data.setImgIconsize(kuneProperties.getInteger(KuneProperties.IMAGES_ICONSIZE)); data.setFlvEmbedObject(kuneProperties.get(KuneProperties.FLV_EMBEDED_OBJECT)); data.setMp3EmbedObject(kuneProperties.get(KuneProperties.MP3_EMBEDED_OBJECT)); data.setOggEmbedObject(kuneProperties.get(KuneProperties.OGG_EMBEDED_OBJECT)); Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/main/resources/kune.properties 2011-08-30 08:04:22 UTC (rev 1500) @@ -95,10 +95,6 @@ kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="showStatus" value="show"/> <param name="keepAspect" value="true"/> <param name="autoPlay" value="false"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> </applet> kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> -### See: http://code.google.com/p/wave-protocol/wiki/Installation -### wave server configuration -wave.server.config = wave-server.properties - ### More info about properties # http://en.wikipedia.org/wiki/.properties # http://java.sun.com/javase/6/docs/api/java/util/Properties.html#load(java.i… Copied: trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java (from rev 1496, trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java) =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -0,0 +1,83 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.server.integration.site; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; + +import org.junit.Before; +import org.junit.Test; + +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.server.UserSession; +import cc.kune.core.server.integration.IntegrationTest; +import cc.kune.core.server.integration.IntegrationTestHelper; +import cc.kune.core.server.manager.I18nLanguageManager; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.domain.Group; + +import com.google.inject.Inject; + +public class InitDataTest extends IntegrationTest { + + @Inject + Group groupFinder; + @Inject + I18nLanguageManager i18nLangManager; + @Inject + SiteService service; + @Inject + UserSession session; + + private void assertValidLicenseDTOList(final ArrayList<LicenseDTO> licenseList) { + assertTrue(licenseList.size() > 0); + for (final Object o : licenseList) { + assertNotNull(o); + assertEquals(LicenseDTO.class, o.getClass()); + } + } + + @Before + public void init() { + new IntegrationTestHelper(this); + } + + @Test + public void testGetInitData() throws Exception { + final InitDataDTO initData = service.getInitData(null); + assertNotNull(initData); + assertValidLicenseDTOList(initData.getLicenses()); + assertTrue(initData.getLanguages().size() > 0); + assertTrue(initData.getCountries().size() > 0); + assertNotNull(initData.getLanguages().get(0).getCode()); + assertNotNull(initData.getCountries().get(0).getCode()); + assertNotNull(initData.getGroupTools()); + assertNotNull(initData.getUserTools()); + assertTrue(initData.getGroupTools().size() > 0); + assertTrue(initData.getUserTools().size() > 0); + assertTrue(initData.getgSpaceThemes().size() > 1); + assertTrue(initData.getReservedWords().size() > 1); + } + +} Deleted: trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java 2011-08-20 18:04:22 UTC (rev 1499) +++ trunk/src/test/java/cc/kune/core/server/integration/site/SiteServiceTest.java 2011-08-30 08:04:22 UTC (rev 1500) @@ -1,81 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.server.integration.site; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; - -import org.junit.Before; -import org.junit.Test; - -import cc.kune.core.client.rpcservices.SiteService; -import cc.kune.core.server.UserSession; -import cc.kune.core.server.integration.IntegrationTest; -import cc.kune.core.server.integration.IntegrationTestHelper; -import cc.kune.core.server.manager.I18nLanguageManager; -import cc.kune.core.shared.dto.InitDataDTO; -import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.domain.Group; - -import com.google.inject.Inject; - -public class SiteServiceTest extends IntegrationTest { - - @Inject - SiteService service; - @Inject - UserSession session; - @Inject - Group groupFinder; - @Inject - I18nLanguageManager i18nLangManager; - - @Before - public void init() { - new IntegrationTestHelper(this); - } - - @Test - public void testGetInitData() throws Exception { - final InitDataDTO initData = service.getInitData(null); - assertNotNull(initData); - assertValidLicenseDTOList(initData.getLicenses()); - assertTrue(initData.getLanguages().size() > 0); - assertTrue(initData.getCountries().size() > 0); - assertNotNull(initData.getLanguages().get(0).getCode()); - assertNotNull(initData.getCountries().get(0).getCode()); - assertNotNull(initData.getGroupTools()); - assertNotNull(initData.getUserTools()); - assertTrue(initData.getGroupTools().size() > 0); - assertTrue(initData.getUserTools().size() > 0); - } - - private void assertValidLicenseDTOList(final ArrayList<LicenseDTO> licenseList) { - assertTrue(licenseList.size() > 0); - for (final Object o : licenseList) { - assertNotNull(o); - assertEquals(LicenseDTO.class, o.getClass()); - } - } - -}

1 0

[kune issues] #110: Add horizontal lines to wave editor
by kune issues 28 Aug '11

28 Aug '11

#110: Add horizontal lines to wave editor --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: WIAB Server | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/110> kune issues <http://kune.ourproject.org/issues/>

1 0

[kune issues] #107: Log access violation to detect attacks (in User/GroupRPC and similar)
by kune issues 21 Aug '11

21 Aug '11

#107: Log access violation to detect attacks (in User/GroupRPC and similar) --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/107> kune issues <http://kune.ourproject.org/issues/>

1 0