[kune-commits] r1233 - in trunk: . src/main/java/cc/kune/common/client src/main/java/cc/kune/common/client/actions/gwtui src/main/java/cc/kune/common/client/notify src/main/java/cc/kune/common/client/ui src/main/java/cc/kune/common/client/utils src/main/java/cc/kune/core src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/client/init src/main/java/cc/kune/core/client/resources src/main/java/cc/kune/core/client/sitebar/spaces src/main/java/cc/kune/core/public src/main/java/cc/kune/gspace src/main/java/cc/kune/msgs/client src/main/java/cc/kune/msgs/public src/main/java/cc/kune/pspace/client src/main/resources src/main/resources/META-INF src/test/java src/test/java/org src/test/java/org/ourproject/kune src/test/java/org/ourproject/kune/platf/server src/test/java/testsuites
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Fri Feb 4 21:52:27 CET 2011
Author: vjrj_
Date: 2011-02-04 21:52:27 +0100 (Fri, 04 Feb 2011)
New Revision: 1233
Added:
trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java
trunk/src/main/java/cc/kune/common/client/notify/SimpleUserMessage.java
trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.java
trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml
trunk/src/main/java/cc/kune/common/client/ui/MaskWidgetView.java
trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java
trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.ui.xml
trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif
trunk/src/main/java/cc/kune/core/client/resources/loading_gadget.gif
trunk/src/main/java/cc/kune/core/client/resources/loading_gadget_small.gif
trunk/src/test/java/org/FaultyTestSuite.java
trunk/src/test/java/testsuites/
trunk/src/test/java/testsuites/IntegrationTestSuite.java
trunk/src/test/java/testsuites/OthersTestSuite.java
trunk/src/test/java/testsuites/PlatfClientTestSuite.java
trunk/src/test/java/testsuites/ServerManagerTestSuite.java
trunk/src/test/java/testsuites/ServerOtherTestSuite.java
trunk/src/test/java/testsuites/ServerTestSuite.java
Removed:
trunk/src/main/java/cc/kune/common/client/SampleEntrypoint.java
trunk/src/main/java/cc/kune/common/client/notify/UserMessage.java
trunk/src/test/java/org/ourproject/kune/FaultyTestSuite.java
trunk/src/test/java/org/ourproject/kune/IntegrationTestSuite.java
trunk/src/test/java/org/ourproject/kune/OthersTestSuite.java
trunk/src/test/java/org/ourproject/kune/PlatfClientTestSuite.java
trunk/src/test/java/org/ourproject/kune/ServerManagerTestSuite.java
trunk/src/test/java/org/ourproject/kune/ServerTestSuite.java
Modified:
trunk/DEV-GUIDE
trunk/TODO
trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java
trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml
trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java
trunk/src/main/java/cc/kune/core/Core.gwt.xml
trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java
trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java
trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java
trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java
trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java
trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java
trunk/src/main/java/cc/kune/core/public/ws.css
trunk/src/main/java/cc/kune/core/public/ws.html
trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml
trunk/src/main/java/cc/kune/msgs/client/UserMessage.java
trunk/src/main/java/cc/kune/msgs/public/kune-message.css
trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml
trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java
trunk/src/main/resources/META-INF/persistence.xml
trunk/src/main/resources/kune.properties
trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java
Log:
NEW - # 21: Server Test fixing
http://kune.ourproject.org/issues/ticket/21
CLOSED - # 22: Mask widget
http://kune.ourproject.org/issues/ticket/22
CLOSED - # 18: Event Logger (for dev purposes)
http://kune.ourproject.org/issues/ticket/18
Modified: trunk/DEV-GUIDE
===================================================================
--- trunk/DEV-GUIDE 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/DEV-GUIDE 2011-02-04 20:52:27 UTC (rev 1233)
@@ -192,7 +192,7 @@
generates .project and download necessary code jars. Then you can import the project in eclipse (File > Import > Existing Projects into Workspace).
-Also you have to set the variable M2_REPO (Eclipse Preferences > Java > Build Path > Classpath Variables > New) to the location of your local maven repo (in our case /home/ouruser/.m2/repository).
+Also you have to set the variable M2_REPO (Eclipse Preferences > Java > Build Path > Classpath Variables > New) to the location of your local maven repo (in our case /home/youruser/.m2/repository).
Is recommended that you use the PMD plugin:
http://pmd.sourceforge.net/
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/TODO 2011-02-04 20:52:27 UTC (rev 1233)
@@ -255,6 +255,9 @@
** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5
* MID-TERM
+** TODO registration/general mask
+** TODO sigin forms to uibinder (intro sing-in)
+** TODO Use google-guice guicepersist (in 3.0) instead of warp-persist
** TODO See GWT+RPC with Guice:
http://stuffthathappens.com/blog/2009/09/14/guice-with-gwt/
http://pavelgj.blogspot.com/2008/02/gwt-remoteserviceservlet-guice.html
@@ -267,7 +270,6 @@
** Use hibernate cache
http://ehcache.sourceforge.net/documentation/openjpa_provider.html
http://ehcache.sourceforge.net/documentation/hibernate.html
-
** TODO <v> Images zoom-in/out with style="cursor: url(somezoomcursor.cur);"
http://www.w3.org/TR/SVG/interact.html#Cursors
http://www.w3.org/TR/CSS2/ui.html
Copied: trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java (from rev 1228, trunk/src/main/java/cc/kune/common/client/SampleEntrypoint.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/SampleEntryPoint.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,125 @@
+package cc.kune.common.client;
+
+import cc.kune.common.client.actions.AbstractExtendedAction;
+import cc.kune.common.client.actions.Action;
+import cc.kune.common.client.actions.ActionEvent;
+import cc.kune.common.client.actions.KeyStroke;
+import cc.kune.common.client.actions.Shortcut;
+import cc.kune.common.client.actions.ui.ActionFlowPanel;
+import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
+import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
+import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor;
+import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
+import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
+import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor;
+import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor;
+import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
+import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor;
+import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor;
+import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type;
+import cc.kune.common.client.notify.SimpleUserMessage;
+import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
+import cc.kune.common.client.ui.IconLabel;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+
+public class SampleEntryPoint implements EntryPoint {
+ public interface ISampleView {
+ void addAll(GuiActionDescCollection actions);
+ }
+
+ public class TestAction extends AbstractExtendedAction {
+ public TestAction(final String text) {
+ super(text);
+ }
+
+ public TestAction(final String text, final String tooltip, final String icon) {
+ super(text, tooltip, icon);
+ }
+
+ @Override
+ public void actionPerformed(final ActionEvent event) {
+ final String message = "Testing: " + super.getValue(Action.NAME);
+ // Log.info(message);
+ userMsg.show(message);
+ }
+ }
+ SimpleUserMessage userMsg = new SimpleUserMessage();
+
+ @Override
+ public void onModuleLoad() {
+
+ final SampleGinjector ginjector = GWT.create(SampleGinjector.class);
+ ginjector.getGxtGuiProvider();
+ ginjector.getGuiProvider();
+ final GlobalShortcutRegister shortcutRegister = ginjector.getGlobalShortcutRegister();
+
+ final GuiActionDescCollection actions = new GuiActionDescCollection();
+
+ final TestAction action = new TestAction("Action 1", "Some tooltip", "oc-testico");
+ final TestAction action2 = new TestAction("Action 2");
+
+ final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C'));
+ shortcutRegister.put(shortcut, action);
+
+ final ButtonDescriptor simpleBtn = new ButtonDescriptor(action);
+ // Same action but different text
+ simpleBtn.putValue(Action.NAME, "Action 1 diff name");
+
+ final PushButtonDescriptor pushBtn = new PushButtonDescriptor(action2);
+ pushBtn.setPushed(true);
+ pushBtn.putValue(Action.NAME, "Push btn");
+
+ final ToolbarDescriptor toolbar = new ToolbarDescriptor();
+
+ final ToolbarSeparatorDescriptor tsepFill = new ToolbarSeparatorDescriptor(Type.fill, toolbar);
+ final ToolbarSeparatorDescriptor toolbarSpace = new ToolbarSeparatorDescriptor(Type.spacer, toolbar);
+
+ simpleBtn.setParent(toolbar);
+ pushBtn.setParent(toolbar);
+
+ final MenuDescriptor menu = new MenuDescriptor(action);
+ menu.putValue(Action.NAME, "Menu");
+
+ final MenuDescriptor menu2 = new MenuDescriptor(action);
+ menu2.putValue(Action.NAME, "Menu2");
+
+ menu.setParent(toolbar);
+ final SubMenuDescriptor submenu = new SubMenuDescriptor("Some Submenu", "tip", "oc-testico");
+ submenu.setParent(menu);
+ final MenuSeparatorDescriptor menuSep = new MenuSeparatorDescriptor(menu);
+
+ final TestAction action3 = new TestAction("Action 3", "Some tooltip", "oc-testico");
+ final TestAction action4 = new TestAction("Action 4");
+
+ final MenuItemDescriptor menuItem = new MenuItemDescriptor(menu, action3);
+ final MenuItemDescriptor menuItem2 = new MenuItemDescriptor(menu, action4);
+ final MenuItemDescriptor menuItem3 = new MenuItemDescriptor(submenu, action);
+ final MenuItemDescriptor menuItem4 = new MenuItemDescriptor(submenu, action);
+ final IconLabelDescriptor iconLabelDescr = new IconLabelDescriptor(action);
+ final IconLabelDescriptor iconLabelNoAct = new IconLabelDescriptor(action4);
+ final MenuItemDescriptor menuItem5 = new MenuItemDescriptor(menu2, action);
+
+ action.setShortcut(shortcut);
+
+ actions.add(toolbar, simpleBtn, tsepFill, pushBtn, toolbarSpace, menu, tsepFill, menuItem, menuItem2, menuSep,
+ menuItem2, menuItem, iconLabelDescr, submenu, menuItem3, menuItem4, menu2, iconLabelNoAct, menuItem5);
+
+ final ActionFlowPanel view = new ActionFlowPanel(ginjector.getGuiProvider());
+ view.addActions(actions);
+
+ final IconLabel simpleIconLabel = new IconLabel("IconLabel (no action)");
+ simpleIconLabel.setIcon("oc-testico");
+ simpleIconLabel.setTitle("tooltip");
+
+ final VerticalPanel panel = new VerticalPanel();
+ panel.setWidth("100%");
+ panel.add(view);
+ panel.add(simpleIconLabel);
+
+ RootPanel.get().add(view);
+ }
+}
Deleted: trunk/src/main/java/cc/kune/common/client/SampleEntrypoint.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/SampleEntrypoint.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/common/client/SampleEntrypoint.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,125 +0,0 @@
-package cc.kune.common.client;
-
-import cc.kune.common.client.actions.AbstractExtendedAction;
-import cc.kune.common.client.actions.Action;
-import cc.kune.common.client.actions.ActionEvent;
-import cc.kune.common.client.actions.KeyStroke;
-import cc.kune.common.client.actions.Shortcut;
-import cc.kune.common.client.actions.ui.ActionFlowPanel;
-import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor;
-import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
-import cc.kune.common.client.actions.ui.descrip.IconLabelDescriptor;
-import cc.kune.common.client.actions.ui.descrip.MenuDescriptor;
-import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor;
-import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor;
-import cc.kune.common.client.actions.ui.descrip.PushButtonDescriptor;
-import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor;
-import cc.kune.common.client.actions.ui.descrip.ToolbarDescriptor;
-import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor;
-import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type;
-import cc.kune.common.client.notify.UserMessage;
-import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
-import cc.kune.common.client.ui.IconLabel;
-
-import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.RootPanel;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-public class SampleEntrypoint implements EntryPoint {
- public interface ISampleView {
- void addAll(GuiActionDescCollection actions);
- }
-
- public class TestAction extends AbstractExtendedAction {
- public TestAction(final String text) {
- super(text);
- }
-
- public TestAction(final String text, final String tooltip, final String icon) {
- super(text, tooltip, icon);
- }
-
- @Override
- public void actionPerformed(final ActionEvent event) {
- final String message = "Testing: " + super.getValue(Action.NAME);
- // Log.info(message);
- userMsg.show(message);
- }
- }
- UserMessage userMsg = new UserMessage();
-
- @Override
- public void onModuleLoad() {
-
- final SampleGinjector ginjector = GWT.create(SampleGinjector.class);
- ginjector.getGxtGuiProvider();
- ginjector.getGuiProvider();
- final GlobalShortcutRegister shortcutRegister = ginjector.getGlobalShortcutRegister();
-
- final GuiActionDescCollection actions = new GuiActionDescCollection();
-
- final TestAction action = new TestAction("Action 1", "Some tooltip", "oc-testico");
- final TestAction action2 = new TestAction("Action 2");
-
- final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('C'));
- shortcutRegister.put(shortcut, action);
-
- final ButtonDescriptor simpleBtn = new ButtonDescriptor(action);
- // Same action but different text
- simpleBtn.putValue(Action.NAME, "Action 1 diff name");
-
- final PushButtonDescriptor pushBtn = new PushButtonDescriptor(action2);
- pushBtn.setPushed(true);
- pushBtn.putValue(Action.NAME, "Push btn");
-
- final ToolbarDescriptor toolbar = new ToolbarDescriptor();
-
- final ToolbarSeparatorDescriptor tsepFill = new ToolbarSeparatorDescriptor(Type.fill, toolbar);
- final ToolbarSeparatorDescriptor toolbarSpace = new ToolbarSeparatorDescriptor(Type.spacer, toolbar);
-
- simpleBtn.setParent(toolbar);
- pushBtn.setParent(toolbar);
-
- final MenuDescriptor menu = new MenuDescriptor(action);
- menu.putValue(Action.NAME, "Menu");
-
- final MenuDescriptor menu2 = new MenuDescriptor(action);
- menu2.putValue(Action.NAME, "Menu2");
-
- menu.setParent(toolbar);
- final SubMenuDescriptor submenu = new SubMenuDescriptor("Some Submenu", "tip", "oc-testico");
- submenu.setParent(menu);
- final MenuSeparatorDescriptor menuSep = new MenuSeparatorDescriptor(menu);
-
- final TestAction action3 = new TestAction("Action 3", "Some tooltip", "oc-testico");
- final TestAction action4 = new TestAction("Action 4");
-
- final MenuItemDescriptor menuItem = new MenuItemDescriptor(menu, action3);
- final MenuItemDescriptor menuItem2 = new MenuItemDescriptor(menu, action4);
- final MenuItemDescriptor menuItem3 = new MenuItemDescriptor(submenu, action);
- final MenuItemDescriptor menuItem4 = new MenuItemDescriptor(submenu, action);
- final IconLabelDescriptor iconLabelDescr = new IconLabelDescriptor(action);
- final IconLabelDescriptor iconLabelNoAct = new IconLabelDescriptor(action4);
- final MenuItemDescriptor menuItem5 = new MenuItemDescriptor(menu2, action);
-
- action.setShortcut(shortcut);
-
- actions.add(toolbar, simpleBtn, tsepFill, pushBtn, toolbarSpace, menu, tsepFill, menuItem, menuItem2, menuSep,
- menuItem2, menuItem, iconLabelDescr, submenu, menuItem3, menuItem4, menu2, iconLabelNoAct, menuItem5);
-
- final ActionFlowPanel view = new ActionFlowPanel(ginjector.getGuiProvider());
- view.addActions(actions);
-
- final IconLabel simpleIconLabel = new IconLabel("IconLabel (no action)");
- simpleIconLabel.setIcon("oc-testico");
- simpleIconLabel.setTitle("tooltip");
-
- final VerticalPanel panel = new VerticalPanel();
- panel.setWidth("100%");
- panel.add(view);
- panel.add(simpleIconLabel);
-
- RootPanel.get().add(view);
- }
-}
Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -131,7 +131,7 @@
if (key == null) {
iconLabel.setText(text);
} else {
- iconLabel.setLabelHtml(text + createShortCut(key, "oc-mshortcut-hidden")
+ iconLabel.setLabelText(text + createShortCut(key, "oc-mshortcut-hidden")
+ createShortCut(key, "oc-mshortcut"));
}
}
Copied: trunk/src/main/java/cc/kune/common/client/notify/SimpleUserMessage.java (from rev 1228, trunk/src/main/java/cc/kune/common/client/notify/UserMessage.java)
===================================================================
--- trunk/src/main/java/cc/kune/common/client/notify/SimpleUserMessage.java (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/notify/SimpleUserMessage.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,52 @@
+package cc.kune.common.client.notify;
+
+import org.cobogw.gwt.user.client.ui.RoundedPanel;
+
+import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.PopupPanel;
+
+public class SimpleUserMessage extends Composite {
+ private static final int SHOWTIME = 3500;
+ private final RoundedPanel rp;
+ private final Label msg;
+ private PopupPanel popupPalette;
+ private final Timer timer;
+
+ public SimpleUserMessage() {
+ msg = new Label();
+ msg.addStyleName("oc-user-msg");
+ rp = new RoundedPanel(msg, RoundedPanel.ALL, 2);
+ rp.setBorderColor("#FFCC00");
+ timer = new Timer() {
+ @Override
+ public void run() {
+ hide();
+ }
+ };
+
+ }
+
+ public void hide() {
+ if (popupPalette != null) {
+ popupPalette.hide();
+ }
+ }
+
+ public void show(final String message) {
+ msg.setText(message);
+ popupPalette = new PopupPanel(true, false);
+ popupPalette.setWidget(rp);
+ popupPalette.setPopupPositionAndShow(new PopupPanel.PositionCallback() {
+ public void setPosition(final int offsetWidth, final int offsetHeight) {
+ popupPalette.setPopupPosition((Window.getClientWidth() - msg.getOffsetWidth()) / 2,
+ Window.getClientHeight() / 3);
+ }
+ });
+ popupPalette.setStyleName("oc-user-msg-popup");
+ popupPalette.setAnimationEnabled(true);
+ timer.schedule(SHOWTIME);
+ }
+}
Deleted: trunk/src/main/java/cc/kune/common/client/notify/UserMessage.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/notify/UserMessage.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/common/client/notify/UserMessage.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,52 +0,0 @@
-package cc.kune.common.client.notify;
-
-import org.cobogw.gwt.user.client.ui.RoundedPanel;
-
-import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PopupPanel;
-
-public class UserMessage extends Composite {
- private static final int SHOWTIME = 3500;
- private final RoundedPanel rp;
- private final Label msg;
- private PopupPanel popupPalette;
- private final Timer timer;
-
- public UserMessage() {
- msg = new Label();
- msg.addStyleName("oc-user-msg");
- rp = new RoundedPanel(msg, RoundedPanel.ALL, 2);
- rp.setBorderColor("#FFCC00");
- timer = new Timer() {
- @Override
- public void run() {
- hide();
- }
- };
-
- }
-
- public void hide() {
- if (popupPalette != null) {
- popupPalette.hide();
- }
- }
-
- public void show(final String message) {
- msg.setText(message);
- popupPalette = new PopupPanel(true, false);
- popupPalette.setWidget(rp);
- popupPalette.setPopupPositionAndShow(new PopupPanel.PositionCallback() {
- public void setPosition(final int offsetWidth, final int offsetHeight) {
- popupPalette.setPopupPosition((Window.getClientWidth() - msg.getOffsetWidth()) / 2,
- Window.getClientHeight() / 3);
- }
- });
- popupPalette.setStyleName("oc-user-msg-popup");
- popupPalette.setAnimationEnabled(true);
- timer.schedule(SHOWTIME);
- }
-}
Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -9,10 +9,10 @@
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FocusPanel;
-import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasDirectionalText;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.Widget;
public class IconLabel extends Composite implements HasWidgets, HasDirectionalText {
@@ -25,8 +25,10 @@
@UiField
HorizontalPanel hp;
@UiField
- HTML label;
+ InlineLabel icon;
@UiField
+ InlineLabel label;
+ @UiField
FocusPanel self;
public IconLabel() {
@@ -45,7 +47,7 @@
@Override
public void addStyleName(final String style) {
- label.addStyleName(style);
+ hp.addStyleName(style);
}
public void addTextStyleName(final String style) {
@@ -82,12 +84,12 @@
}
public void setIcon(final String imgCss) {
- label.addStyleName(imgCss);
- label.addStyleName("oc-ico-pad");
+ icon.setStyleName(imgCss);
+ icon.addStyleName("oc-ico-pad");
}
- public void setLabelHtml(final String html) {
- label.setHTML(html);
+ public void setLabelText(final String text) {
+ label.setText(text);
}
@Override
Modified: trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/common/client/ui/IconLabel.ui.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -18,7 +18,8 @@
<g:FocusPanel ui:field="self">
<g:HorizontalPanel styleName="{style.pad}"
ui:field="hp">
- <g:HTML ui:field="label" styleName="{style.label}" />
+ <g:InlineLabel ui:field="icon"/>
+ <g:InlineLabel ui:field="label" styleName="{style.label}" />
</g:HorizontalPanel>
</g:FocusPanel>
</ui:UiBinder>
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.java (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,68 @@
+package cc.kune.common.client.ui;
+
+import javax.annotation.Nonnull;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.PopupPanel;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public class MaskWidget extends PopupPanel implements MaskWidgetView {
+
+ interface MaskWidgetUiBinder extends UiBinder<Widget, MaskWidget> {
+ }
+ private static MaskWidgetUiBinder uiBinder = GWT.create(MaskWidgetUiBinder.class);
+ @UiField
+ FlowPanel flow;
+ @UiField
+ Image icon;
+ @UiField
+ Label label;
+
+ @UiField
+ SimplePanel mainPanel;
+
+ public MaskWidget() {
+ super(false, false);
+ add(uiBinder.createAndBindUi(this));
+ setStyleName("k-mask");
+ }
+
+ @Override
+ @Nonnull
+ public void mask(final IsWidget widget) {
+ mask(widget, "");
+ }
+
+ @Override
+ @Nonnull
+ public void mask(final IsWidget widget, final String message) {
+ label.setText(message);
+ setPopupPositionAndShow(new PositionCallback() {
+ @Override
+ public void setPosition(final int offsetWidth, final int offsetHeight) {
+ final Widget asWidget = widget.asWidget();
+ final int w = asWidget.getOffsetWidth();
+ final int h = asWidget.getOffsetHeight();
+ MaskWidget.this.setPopupPosition(asWidget.getAbsoluteLeft(), asWidget.getAbsoluteTop());
+ getElement().getStyle().setWidth(w, Unit.PX);
+ getElement().getStyle().setHeight(h, Unit.PX);
+ flow.getElement().getStyle().setTop((h - flow.getOffsetHeight()) / 2d, Unit.PX);
+ flow.getElement().getStyle().setLeft((w - flow.getOffsetWidth()) / 2d, Unit.PX);
+ }
+ });
+ }
+
+ @Override
+ public void unMask() {
+ hide();
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,46 @@
+<!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">
+ <ui:with field='img' type='cc.kune.core.client.resources.CoreResources' />
+ <ui:style>
+ .main {
+
+ }
+
+ .flow {
+ position: absolute;
+ /* left: 40%;
+ top: 40%;
+ height: auto; */
+ border: solid 1px #ccc;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ border-radius: 10px;
+ background-color: white;
+ padding: 3px;
+ }
+
+ .icon {
+ width: 35px;
+ height: 35px;
+ margin-right: 3px;
+ float: left;
+ vertical-align: top;
+ }
+
+ .label {
+ float: left;
+ font-size: 16px;
+ color: #808080;
+ line-height: 1.9em;
+ padding: 0 5px 0 1px;
+ }
+ </ui:style>
+ <g:SimplePanel ui:field="mainPanel" styleName='{style.main}'>
+ <g:FlowPanel ui:field="flow" styleName='{style.flow}'>
+ <g:Image ui:field="icon" styleName='{style.icon}'
+ resource="{img.kuneAnim}" />
+ <g:Label ui:field="label" styleName='{style.label}' />
+ </g:FlowPanel>
+ </g:SimplePanel>
+</ui:UiBinder>
\ No newline at end of file
Property changes on: trunk/src/main/java/cc/kune/common/client/ui/MaskWidget.ui.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/common/client/ui/MaskWidgetView.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/ui/MaskWidgetView.java (rev 0)
+++ trunk/src/main/java/cc/kune/common/client/ui/MaskWidgetView.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,13 @@
+package cc.kune.common.client.ui;
+
+import com.google.gwt.user.client.ui.IsWidget;
+
+public interface MaskWidgetView {
+
+ void mask(IsWidget widget);
+
+ void mask(IsWidget widget, String message);
+
+ void unMask();
+
+}
Property changes on: trunk/src/main/java/cc/kune/common/client/ui/MaskWidgetView.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/common/client/utils/TextUtils.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -21,6 +21,8 @@
import java.util.ArrayList;
+import com.google.gwt.safehtml.shared.SimpleHtmlSanitizer;
+
public class TextUtils {
// Original regexp from http://www.regular-expressions.info/email.html
@@ -41,9 +43,13 @@
: text;
}
- /*
+ /**
* This method escape only some dangerous html chars
+ *
+ * Try to use {@link SimpleHtmlSanitizer} better
+ *
*/
+ @Deprecated
public static String escapeHtmlLight(final String source) {
String result = source;
if (source != null) {
@@ -56,6 +62,12 @@
return result;
}
+ /**
+ * FIXME: Is this safe? Try to use {@link SimpleHtmlSanitizer} also in the
+ * method
+ *
+ */
+ @Deprecated
public static String generateHtmlLink(final String href, final String text) {
return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>";
}
Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd">
<module rename-to="ws">
- <!-- source / public / etc ==================================== -->
- <!-- excluding test sources for this module workaround for open issue 4454
- see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 -->
- <source path='client'
- excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
- <source path="shared" />
- <public path="public" />
- <script src="js/jquery-1.3.2.min.js" />
- <script src="js/jquery.qtip-1.0.0-rc3.min.js" />
- <!-- Dependencies ============================================= -->
- <inherits name="com.google.gwt.user.User" />
- <inherits name="cc.kune.gspace.GSpace" />
- <inherits name="cc.kune.msgs.KuneMsgs" />
- <inherits name="cc.kune.common.KuneCommon" />
- <inherits name="com.extjs.gxt.ui.GXT" />
- <inherits name="com.jhickman.web.gwt.gxtuibinder.GxtUiBinder" />
- <inherits name="com.calclab.suco.Suco" />
- <!-- Styles =================================================== -->
- <!-- <inherits name="com.google.gwt.user.theme.standard.Standard" /> -->
+ <!-- source / public / etc ==================================== -->
+ <!-- excluding test sources for this module workaround for open issue 4454
+ see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 -->
+ <source path='client'
+ excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
+ <source path="shared" />
+ <public path="public" />
+ <script src="js/jquery-1.3.2.min.js" />
+ <script src="js/jquery.qtip-1.0.0-rc3.min.js" />
+ <!-- Dependencies ============================================= -->
+ <inherits name="com.google.gwt.user.User" />
+ <inherits name="cc.kune.gspace.GSpace" />
+ <inherits name="cc.kune.msgs.KuneMsgs" />
+ <inherits name="cc.kune.common.KuneCommon" />
+ <inherits name="com.extjs.gxt.ui.GXT" />
+ <inherits name="com.jhickman.web.gwt.gxtuibinder.GxtUiBinder" />
+ <inherits name="com.calclab.suco.Suco" />
+ <inherits name='com.gwtplatform.mvp.Mvp' />
+ <!-- Styles =================================================== -->
+ <!-- <inherits name="com.google.gwt.user.theme.standard.Standard" /> -->
</module>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -6,6 +6,8 @@
import cc.kune.common.client.actions.ui.bind.GuiProvider;
import cc.kune.common.client.shortcuts.DefaultGlobalShortcutRegister;
import cc.kune.common.client.shortcuts.GlobalShortcutRegister;
+import cc.kune.common.client.ui.MaskWidget;
+import cc.kune.common.client.ui.MaskWidgetView;
import cc.kune.core.client.auth.Register;
import cc.kune.core.client.auth.RegisterPanel;
import cc.kune.core.client.auth.RegisterPresenter;
@@ -83,11 +85,6 @@
bind(I18nUITranslationService.class).in(Singleton.class);
bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class);
- bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class);
- bind(GxtGuiProvider.class).in(Singleton.class);
- bind(GwtGuiProvider.class).in(Singleton.class);
- bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class);
-
// Presenters
bindPresenter(CorePresenter.class, CorePresenter.CoreView.class, CoreViewImpl.class,
CorePresenter.CoreProxy.class);
@@ -114,11 +111,17 @@
bind(UserMessagesPanel.class).in(Singleton.class);
// bind(MessagePanelView.class).to(MessagePanel.class);
+ // UI
bind(WsArmorImpl.class).in(Singleton.class);
bind(WsArmor.class).to(WsArmorImpl.class).in(Singleton.class);
- bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class);
+ bind(GuiProvider.class).to(DefaultGuiProvider.class).in(Singleton.class);
+ bind(GxtGuiProvider.class).in(Singleton.class);
+ bind(GwtGuiProvider.class).in(Singleton.class);
+ bind(GlobalShortcutRegister.class).to(DefaultGlobalShortcutRegister.class).in(Singleton.class);
+ bind(MaskWidgetView.class).to(MaskWidget.class).in(Singleton.class);
+
+ // Core App
bind(Session.class).to(SessionDefault.class).in(Singleton.class);
-
bind(ErrorHandler.class).in(Singleton.class);
bind(StateManagerDefault.class).in(Singleton.class);
bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class);
@@ -126,6 +129,7 @@
bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class);
bind(PrefetchUtilities.class).in(Singleton.class);
bind(AppStarter.class).to(AppStarterDefault.class).in(Singleton.class);
+ bind(CookiesManager.class).to(CookiesManagerImpl.class).in(Singleton.class);
bind(SitebarNewGroupLink.class).in(Singleton.class);
bind(SitebarSignInLink.class).in(Singleton.class);
Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -20,6 +20,7 @@
package cc.kune.core.client.auth;
import cc.kune.common.client.noti.NotifyLevelImages;
+import cc.kune.common.client.ui.MaskWidgetView;
import cc.kune.core.client.resources.CoreMessages;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.ui.KuneUiUtils;
@@ -44,8 +45,9 @@
private final RegisterForm registerForm;
@Inject
- public RegisterPanel(final I18nTranslationService i18n, final Session session, final NotifyLevelImages images) {
- super(REGISTER_DIALOG, i18n, i18n.t(CoreMessages.REGISTER_TITLE), true, true, true, 400, 420, "",
+ public RegisterPanel(final I18nTranslationService i18n, final Session session, final MaskWidgetView mask,
+ final NotifyLevelImages images) {
+ super(REGISTER_DIALOG, mask, i18n, i18n.t(CoreMessages.REGISTER_TITLE), true, true, true, 400, 420, "",
i18n.t(CoreMessages.REGISTER_TITLE), REGISTER_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"),
CANCEL_BUTTON_ID, images, ERRMSG, 5);
final VerticalPanel panel = new VerticalPanel();
Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -170,10 +170,10 @@
new UserNotifyEvent(
NotifyLevel.info,
i18n.t("Welcome"),
- i18n.t("Thanks for registering. "
- + "Now you can participate more actively in this site with other people and groups. "
+ i18n.t("Thanks for joining this site. "
+ + "Now you can actively participate in this site. "
+ "You can also use your personal space to publish contents. "
- + "Your email is not verified, please follow the instructions you will receive by email."),
+ + "Note: your email is not verified, please follow the instructions you will receive by email."),
true));
}
@@ -182,9 +182,9 @@
new UserNotifyEvent(
NotifyLevel.info,
i18n.t("Welcome"),
- i18n.t("Thanks for registering"
- + "Now you can participate more actively in this site with other people and groups. "
- + "Your email is not verified, please follow the instructions you will receive by email."),
+ i18n.t("Thanks for joining this site"
+ + "Now you can actively participate in this site. "
+ + "Note: your email is not verified, please follow the instructions you will receive by email."),
true));
}
};
Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -21,11 +21,11 @@
import cc.kune.common.client.noti.NotifyLevel;
import cc.kune.common.client.noti.NotifyLevelImages;
+import cc.kune.common.client.ui.MaskWidgetView;
import cc.kune.core.client.ui.dialogs.BasicTopDialog;
import cc.kune.core.client.ui.dialogs.MessageToolbar;
import cc.kune.core.shared.i18n.I18nTranslationService;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.HasClickHandlers;
import com.google.gwt.event.logical.shared.HasCloseHandlers;
import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget;
@@ -39,11 +39,12 @@
private final String errorLabelId;
protected final I18nTranslationService i18n;
private final NotifyLevelImages images;
+ private final MaskWidgetView mask;
private MessageToolbar messageErrorBar;
- public SignInAbstractPanel(final String dialogId, final I18nTranslationService i18n, final String title,
- final boolean autohide, final boolean modal, final boolean autoscroll, final int width, final int heigth,
- final String icon, final String firstButtonTitle, final String firstButtonId,
+ public SignInAbstractPanel(final String dialogId, final MaskWidgetView mask, final I18nTranslationService i18n,
+ final String title, final boolean autohide, final boolean modal, final boolean autoscroll, final int width,
+ final int heigth, final String icon, final String firstButtonTitle, final String firstButtonId,
final String cancelButtonTitle, final String cancelButtonId, final NotifyLevelImages images,
final String errorLabelId, final int tabIndexStart) {
dialog = new BasicTopDialog(dialogId, title, autohide, modal, autoscroll, width, heigth, icon,
@@ -51,6 +52,7 @@
this.i18n = i18n;
this.images = images;
this.errorLabelId = errorLabelId;
+ this.mask = mask;
}
@Override
@@ -94,13 +96,11 @@
}
public void mask(final String message) {
- GWT.log("Mask not implemented");
-
+ mask.mask(dialog);
}
public void maskProcessing() {
- GWT.log("Mask not implemented");
- // mask(i18n.t("Processing"));
+ mask.mask(dialog, i18n.t("Processing"));
}
public void setErrorMessage(final String message, final NotifyLevel level) {
@@ -113,6 +113,6 @@
}
public void unMask() {
- GWT.log("Unask not implemented");
+ mask.unMask();
}
}
Added: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,32 @@
+package cc.kune.core.client.auth;
+
+import cc.kune.core.shared.i18n.I18nTranslationService;
+
+import com.extjs.gxt.ui.client.widget.form.FormPanel;
+import com.extjs.gxt.ui.client.widget.form.TextField;
+import com.google.gwt.core.client.GWT;
+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.Widget;
+
+public class SignInNewForm extends Composite {
+
+ interface SignInNewFormUiBinder extends UiBinder<Widget, SignInNewForm> {
+ }
+ private static SignInNewFormUiBinder uiBinder = GWT.create(SignInNewFormUiBinder.class);
+
+ @UiField
+ FormPanel form;
+ @UiField
+ TextField<String> nick;
+ @UiField
+ TextField<String> password;
+
+ public SignInNewForm(final I18nTranslationService i18n) {
+ initWidget(uiBinder.createAndBindUi(this));
+ nick.setFieldLabel(i18n.t("Nickname or email"));
+ password.setFieldLabel(i18n.t("Password"));
+ }
+
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.ui.xml (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.ui.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,17 @@
+<!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:gxt="urn:import:com.extjs.gxt.ui.client.widget"
+ xmlns:form="urn:import:com.extjs.gxt.ui.client.widget.form">
+ <ui:style>
+
+ </ui:style>
+
+ <form:FormPanel ui:field="form" heading="Simple Form" frame="true" width="370"
+ padding="10" borders="false" labelWidth="75" headerVisible="false">
+ <form:TextField ui:field="nick" allowBlank="false" validationDelay="1000"
+ width="100" tabIndex="100" />
+ <form:TextField ui:field="password" allowBlank="false" validationDelay="1000"
+ width="150" tabIndex="101" password="true" />
+ </form:FormPanel>
+
+</ui:UiBinder>
\ No newline at end of file
Property changes on: trunk/src/main/java/cc/kune/core/client/auth/SignInNewForm.ui.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -20,6 +20,7 @@
package cc.kune.core.client.auth;
import cc.kune.common.client.noti.NotifyLevelImages;
+import cc.kune.common.client.ui.MaskWidgetView;
import cc.kune.core.client.resources.CoreMessages;
import cc.kune.core.client.ui.KuneUiUtils;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -42,8 +43,8 @@
private final SignInForm signInForm;
@Inject
- public SignInPanel(final I18nTranslationService i18n, final NotifyLevelImages images) {
- super(SIGNIN_DIALOG, i18n, i18n.t(CoreMessages.SIGN_IN_TITLE), true, true, true, 360, 430, "",
+ public SignInPanel(final I18nTranslationService i18n, final MaskWidgetView mask, final NotifyLevelImages images) {
+ super(SIGNIN_DIALOG, mask, i18n, i18n.t(CoreMessages.SIGN_IN_TITLE), true, true, true, 360, 430, "",
i18n.t(CoreMessages.SIGN_IN_TITLE), SIGN_IN_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"),
CANCEL_BUTTON_ID, images, ERROR_MSG, 102);
@@ -62,10 +63,8 @@
private VerticalPanel createNoAccountRegister() {
final VerticalPanel noAccRegisterPanel = new VerticalPanel();
- // noAccRegisterPanel.setBorder(false);
- // noAccRegisterPanel.setMargins(0, 20, 0, 0);
final HorizontalPanel hpanel = new HorizontalPanel();
- final Label dontHaveAccount = new Label(i18n.t("Don't you have an account?"));
+ final Label dontHaveAccount = new Label(i18n.t("Don't have an account?"));
registerLabel = new Label(i18n.t("Create one."));
registerLabel.ensureDebugId(CREATE_ONE);
registerLabel.addStyleName("kune-Margin-Medium-l");
Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -35,7 +35,6 @@
import com.google.gwt.user.client.Window.ClosingEvent;
import com.google.gwt.user.client.Window.ClosingHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.RootPanel;
import com.google.inject.Inject;
public class AppStarterDefault implements AppStarter {
@@ -62,7 +61,8 @@
private void getInitData() {
siteService.getInitData(session.getUserHash(), new AsyncCallback<InitDataDTO>() {
private void hideInitialPanels() {
- final RootPanel curtain = RootPanel.get("kuneinitialcurtain");
+ // final RootPanel curtain =
+ // RootPanel.get("kuneinitialcurtain");
// Fade anim = new Fade(curtain.getElement());
// anim.setDuration(3);
// anim.addEffectCompletedHandler(new EffectCompletedHandler() {
Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -273,6 +273,12 @@
@Source("fullscreen.png")
ImageResource fullscreen();
+ @Source("loading_gadget.gif")
+ ImageResource gadgetLoading();
+
+ @Source("loading_gadget_small.gif")
+ ImageResource gadgetLoadingSmall();
+
@Source("gnu-fdl.gif")
ImageResource gnuFdl();
@@ -294,6 +300,9 @@
@Source("info-light.png")
ImageResource infoLight();
+ @Source("kune-anim.gif")
+ ImageResource kuneAnim();
+
@Source("kune-close.png")
ImageResource kuneClose();
Added: trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/cc/kune/core/client/resources/kune-anim.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/cc/kune/core/client/resources/loading_gadget.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/cc/kune/core/client/resources/loading_gadget.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/cc/kune/core/client/resources/loading_gadget_small.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/cc/kune/core/client/resources/loading_gadget_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorViewImpl.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -35,9 +35,9 @@
public SpaceSelectorViewImpl(final WsArmor armor, final I18nTranslationService i18n) {
armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0);
homeButton.setTitle(i18n.t("Home page of this site"));
- userButton.setTitle(i18n.t("User space: Waves (aka docs) in which you participate"));
- groupButton.setTitle(i18n.t("Group and personal space: Where you can create and publish contents"));
- publicButton.setTitle(i18n.t("Public space: This is how the rest of public see your published works"));
+ userButton.setTitle(i18n.t("User space: Waves (docs) in which you participate"));
+ groupButton.setTitle(i18n.t("Group and personal space: Where you can create and publish contents for your personal or group spaces"));
+ publicButton.setTitle(i18n.t("Public space: This is only a preview of how this page looks like to the general public on the web, outside this site"));
}
@Override
Modified: trunk/src/main/java/cc/kune/core/public/ws.css
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/public/ws.css 2011-02-04 20:52:27 UTC (rev 1233)
@@ -373,12 +373,15 @@
font: 18px/27px 'Ubuntu', arial;
}
-.k-btn-sitebar button {
+.k-btn-sitebar, .k-btn-sitebar button {
font: 13px 'Ubuntu', arial;
color: #B3B3B3;
cursor: pointer;
text-decoration: underline;
white-space: nowrap;
+}
+
+.k-btn-sitebar button {
margin-top: -5px;
}
@@ -699,7 +702,15 @@
}
.k-error-tb span {
- position:relative;
+ position: relative;
top: -7px;
left: 9px;
+}
+
+.k-mask {
+ background-color: #F2F2F2 !important;
+ /* kfilter: alpha(opacity = 78) !important; */
+ -moz-opacity: 0.78 !important;
+ -khtml-opacity: 0.78 !important;
+ opacity: 0.78 !important;
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/public/ws.html
===================================================================
--- trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/core/public/ws.html 2011-02-04 20:52:27 UTC (rev 1233)
@@ -8,11 +8,11 @@
<meta name="emite.httpBase" content="/http-bind" />
<meta name="emite.host" content="localhost" />
<meta name="emite.searchHost" content="search.localhost" />
- <meta name="emite.session" content="login" />
+<meta name="emite.session" content="login" />
<meta name="emite.user" content="admin at localhost" />
<meta name="emite.password" content="easyeasy" />
-<meta name="hablar.roomService" content="conference.localhost" />
-<!--<meta name="hablar.login" content="true" />-->
+<meta name="hablar.roomService" content="rooms.localhost" />
+<meta name="hablar.login" content="false" />
<meta name="hablar.roster" content="true" />
<meta name="hablar.dockRoster" content="left" />
<meta name="hablar.icons" content="alt" />
Modified: trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/gspace/GSpace.gwt.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,12 +1,13 @@
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd">
<module>
- <inherits name="com.google.gwt.user.User" />
- <!-- <entry-point class="cc.kune.core.ws.armor.client.WsArmorEntryPoint"
- /> -->
- <public path="public" />
- <source path="client" />
- <!-- NOTE: this only compiles for chromium/safari ============= -->
- <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
- <!-- <set-property name="user.agent" value="gecko1_8" /> -->
- <set-property name="user.agent" value="safari" />
+ <inherits name="com.google.gwt.user.User" />
+ <!-- <entry-point class="cc.kune.core.ws.armor.client.WsArmorEntryPoint"
+ /> -->
+ <public path="public" />
+ <source path="client" />
+ <inherits name="cc.kune.pspace.PSpace" />
+ <!-- NOTE: this only compiles for chromium/safari ============= -->
+ <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
+ <!-- <set-property name="user.agent" value="gecko1_8" /> -->
+<!-- <set-property name="user.agent" value="safari" />-->
</module>
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/msgs/client/UserMessage.java
===================================================================
--- trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/msgs/client/UserMessage.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -11,6 +11,9 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.safehtml.client.SafeHtmlTemplates;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SimpleHtmlSanitizer;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
@@ -26,9 +29,21 @@
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>")
+ SafeHtml format(SafeHtml title, SafeHtml message);
+ }
private static String closeTitle = "Close";
+
private static int fadeMills = 5000;
+ private static final MsgTemplate MSG_NO_TITLE = GWT.create(MsgTemplate.class);
+ private static final MsgWithTitleTemplate MSG_WITH_TITLE = GWT.create(MsgWithTitleTemplate.class);
+
private static MessageUiBinder uiBinder = GWT.create(MessageUiBinder.class);
public static void setCloseTitle(final String title) {
@@ -38,6 +53,7 @@
public static void setFadeMills(final int mills) {
fadeMills = mills;
}
+
@UiField
PushButton close;
@@ -56,7 +72,12 @@
if (TextUtils.notEmpty(id)) {
super.ensureDebugId(id);
}
- label.setHTML((title != null && title.length() > 0 ? "<b>" + title + "</b><br/>" : "") + message);
+ if (TextUtils.notEmpty(title)) {
+ label.setHTML(MSG_WITH_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(title),
+ SimpleHtmlSanitizer.sanitizeHtml(message)));
+ } else {
+ label.setHTML(MSG_NO_TITLE.format(SimpleHtmlSanitizer.sanitizeHtml(message)));
+ }
close.setVisible(closeable);
close.setTitle(closeTitle);
if (!closeable) {
Modified: trunk/src/main/java/cc/kune/msgs/public/kune-message.css
===================================================================
--- trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/msgs/public/kune-message.css 2011-02-04 20:52:27 UTC (rev 1233)
@@ -29,5 +29,5 @@
}
.k-msg-label {
- font-size: 17px;
+ font-size: 16px;
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml
===================================================================
--- trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/pspace/client/PSpacePanel.ui.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -9,18 +9,24 @@
</ui:style>
<g:LayoutPanel width="100%" height="100%" ui:field="mainPanel">
<g:layer left="0px" width="100.0pct" top="0px" height="100.0pct">
- <g:Frame styleName="{style.frame}" ui:field="frame"
+ <g:Frame styleName="{style.frame}" ui:field="frame" width="100%"
+ height="100%" />
+ </g:layer>
+ <g:layer left="0px" width="100.0pct" top="0px" height="100.0pct">
+ <g:HTMLPanel ui:field="mask" styleName="k-publicspace-mask"
width="100%" height="100%" />
</g:layer>
- <g:layer left="0px" width="100.0pct" top="0px" height="100.0pct">
- <g:HTMLPanel ui:field="mask" styleName="k-publicspace-mask" width="100%" height="100%" />
- </g:layer>
<g:layer left="50px" width="250px" height="100px" bottom="50px">
- <g:FlowPanel width="250px" height="100px" ui:field="messagePanel" addStyleNames="k-publicspace-panel" >
- <g:SimplePanel addStyleNames="k-publicspace-icon"><g:Image ui:field="icon" /></g:SimplePanel>
+ <g:FlowPanel width="250px" height="100px" ui:field="messagePanel"
+ addStyleNames="k-publicspace-panel">
+ <g:SimplePanel addStyleNames="k-publicspace-icon">
+ <g:Image ui:field="icon" />
+ </g:SimplePanel>
<g:InlineLabel ui:field="title" addStyleNames="k-publicspace-title" />
- <g:InlineLabel ui:field="description" addStyleNames="k-publicspace-description" />
- <g:SimplePanel ui:field="actionPanelContainer" addStyleNames="k-publicspace-actions" />
+ <g:InlineLabel ui:field="description"
+ addStyleNames="k-publicspace-description" />
+ <g:SimplePanel ui:field="actionPanelContainer"
+ addStyleNames="k-publicspace-actions" />
</g:FlowPanel>
</g:layer>
</g:LayoutPanel>
Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -79,7 +79,7 @@
private void setContentPublic() {
getView().getTitle().setText(i18n.t("Preview"));
getView().getDescription().setText(
- i18n.t("This is only a preview of how this page looks like to the general public."));
+ i18n.t("This is only a preview of how this page looks like to the general public on the web, outside this site."));
}
public void setState(final StateAbstractDTO state) {
Modified: trunk/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/src/main/resources/META-INF/persistence.xml 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/resources/META-INF/persistence.xml 2011-02-04 20:52:27 UTC (rev 1233)
@@ -8,26 +8,30 @@
transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<properties>
- <property name="hibernate.archive.autodetection"
- value="class, hbm" />
+ <property name="hibernate.archive.autodetection" value="class, hbm" />
<property name="hibernate.show_sql" value="false" />
<property name="hibernate.format_sql" value="false" />
<property name="use_sql_comments" value="true" />
- <property name="hibernate.dialect"
- value="org.hibernate.dialect.MySQLInnoDBDialect" />
- <property name="hibernate.connection.driver_class"
- value="com.mysql.jdbc.Driver" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" />
+ <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
<property name="hibernate.connection.url"
value="jdbc:mysql://localhost/kune_dev?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8" />
<property name="hibernate.connection.username" value="kune" />
<property name="hibernate.connection.password" value="db4kune" />
+
+ <!-- http://stackoverflow.com/questions/221379/hibernate-hbm2ddl-auto-update-in-production
+ (NO!, une liquibase, for instance) -->
+ <!-- http://stackoverflow.com/questions/438146/hibernate-question-hbm2ddl-auto-possible-values-and-what-they-do -->
<property name="hibernate.hbm2ddl.auto" value="update" />
<!-- https://www.hibernate.org/214.html -->
+ <property name="hibernate.connection.provider_class"
+ value="org.hibernate.connection.C3P0ConnectionProvider" />
<property name="hibernate.c3p0.min_size" value="5" />
<property name="hibernate.c3p0.max_size" value="50" />
<property name="hibernate.c3p0.timeout" value="100" />
<property name="hibernate.c3p0.max_statements" value="0" />
<property name="hibernate.c3p0.idle_test_period" value="3000" />
+ <property name="c3p0.preferredTestQuery" value="SELECT 1" />
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider" />
<property name="hibernate.search.default.indexBase"
@@ -38,25 +42,26 @@
<persistence-unit name="test_db" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<properties>
- <property name="hibernate.archive.autodetection"
- value="class, hbm" />
+ <property name="hibernate.archive.autodetection" value="class, hbm" />
<property name="hibernate.show_sql" value="false" />
<property name="hibernate.format_sql" value="false" />
<property name="use_sql_comments" value="false" />
- <property name="hibernate.dialect"
- value="org.hibernate.dialect.MySQLInnoDBDialect" />
- <property name="hibernate.connection.driver_class"
- value="com.mysql.jdbc.Driver" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLInnoDBDialect" />
+ <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver" />
<property name="hibernate.connection.url"
value="jdbc:mysql://localhost/kune_test?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8" />
<property name="hibernate.connection.username" value="kune" />
<property name="hibernate.connection.password" value="db4kune" />
- <property name="hibernate.hbm2ddl.auto" value="create" />
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <!-- <property name="hibernate.hbm2ddl.auto" value="create" /> -->
+ <property name="hibernate.connection.provider_class"
+ value="org.hibernate.connection.C3P0ConnectionProvider" />
<property name="hibernate.c3p0.min_size" value="5" />
<property name="hibernate.c3p0.max_size" value="50" />
<property name="hibernate.c3p0.timeout" value="100" />
<property name="hibernate.c3p0.max_statements" value="0" />
<property name="hibernate.c3p0.idle_test_period" value="3000" />
+ <property name="c3p0.preferredTestQuery" value="SELECT 1" />
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider" />
<property name="hibernate.search.default.indexBase"
@@ -70,15 +75,12 @@
<property name="hibernate.show_sql" value="false" />
<property name="hibernate.format_sql" value="false" />
<property name="use_sql_comments" value="false" />
- <property name="hibernate.dialect"
- value="org.hibernate.dialect.H2Dialect" />
- <property name="hibernate.hbm2ddl.auto" value="create" />
- <property name="hibernate.connection.driver_class"
- value="org.h2.Driver" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
<property name="hibernate.connection.username" value="sa" />
<property name="hibernate.connection.password" value="" />
- <property name="hibernate.connection.url"
- value="jdbc:h2:mem:testdb" />
+ <property name="hibernate.connection.url" value="jdbc:h2:mem:testdb" />
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider" />
<property name="hibernate.search.default.indexBase"
Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/main/resources/kune.properties 2011-02-04 20:52:27 UTC (rev 1233)
@@ -59,19 +59,6 @@
### See: http://code.google.com/p/wave-protocol/wiki/Installation
### wave server configuration
-#kune.wave.xmpp_server_hostname = localhost
-#kune.wave.xmpp_server_secret = asdfasdf
-#kune.wave.xmpp_component_name = wave
-#kune.wave.xmpp_server_port = 5275
-#kune.wave.xmpp_server_ip = localhost
-#kune.wave.xmpp_server_ping =
-#kune.wave.client_frontend_hostname = 127.0.0.1
-#kune.wave.client_frontend_port = 9876
-#kune.wave.certificate_private_key = war/WEB-INF/localhost.key
-#kune.wave.certificate_files = war/WEB-INF/localhost.cer
-#kune.wave.certificate_domain = localhost
-#kune.wave.waveserver_disable_verification = false
-#kune.wave.waveserver_disable_signer_verification = true
wave.server.config = wave-server.properties
### More info about properties
Copied: trunk/src/test/java/org/FaultyTestSuite.java (from rev 1232, trunk/src/test/java/org/ourproject/kune/FaultyTestSuite.java)
===================================================================
--- trunk/src/test/java/org/FaultyTestSuite.java (rev 0)
+++ trunk/src/test/java/org/FaultyTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,22 @@
+package org;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.platf.integration.content.ContentServiceGetTest;
+import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest;
+import org.ourproject.kune.platf.server.finders.RateFinderTest;
+import org.ourproject.kune.platf.server.manager.ContentManagerTest;
+import org.ourproject.kune.platf.server.manager.UserManagerTest;
+import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerMoreTest;
+
+/**
+ * A Test Suite to test (only) some tests that fails
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ RateFinderTest.class, UserManagerTest.class, SocialNetworkManagerMoreTest.class,
+ ContentManagerTest.class, ContentServiceIntegrationTest.class, ContentServiceGetTest.class })
+public class FaultyTestSuite {
+
+}
Property changes on: trunk/src/test/java/org/FaultyTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/src/test/java/org/ourproject/kune/FaultyTestSuite.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/FaultyTestSuite.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/FaultyTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,22 +0,0 @@
-package org.ourproject.kune;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.ourproject.kune.platf.integration.content.ContentServiceGetTest;
-import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest;
-import org.ourproject.kune.platf.server.finders.RateFinderTest;
-import org.ourproject.kune.platf.server.manager.ContentManagerTest;
-import org.ourproject.kune.platf.server.manager.UserManagerTest;
-import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerMoreTest;
-
-/**
- * A Test Suite to test (only) some tests that fails
- *
- */
- at RunWith(Suite.class)
- at SuiteClasses({ RateFinderTest.class, UserManagerTest.class, SocialNetworkManagerMoreTest.class,
- ContentManagerTest.class, ContentServiceIntegrationTest.class, ContentServiceGetTest.class })
-public class FaultyTestSuite {
-
-}
Deleted: trunk/src/test/java/org/ourproject/kune/IntegrationTestSuite.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/IntegrationTestSuite.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/IntegrationTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,33 +0,0 @@
-package org.ourproject.kune;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.ourproject.kune.platf.integration.DatabaseInitializationTest;
-import org.ourproject.kune.platf.integration.content.ContentCommentServiceTest;
-import org.ourproject.kune.platf.integration.content.ContentServiceAddTest;
-import org.ourproject.kune.platf.integration.content.ContentServiceGetTest;
-import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest;
-import org.ourproject.kune.platf.integration.content.ContentServiceSaveTest;
-import org.ourproject.kune.platf.integration.content.ContentServiceVariousTest;
-import org.ourproject.kune.platf.integration.kuneservice.GroupServiceTest;
-import org.ourproject.kune.platf.integration.site.SiteServiceTest;
-import org.ourproject.kune.platf.integration.site.UserServiceTest;
-import org.ourproject.kune.platf.integration.socialnet.SocialNetworkMembersTest;
-import org.ourproject.kune.platf.integration.socialnet.SocialNetworkServiceTest;
-
-/**
- * Rescan with :
- *
- * <pre>
- * find src/test/java/org/ourproject/kune/platf/integration/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
- * </pre>
- *
- */
- at RunWith(Suite.class)
- at SuiteClasses({ UserServiceTest.class, SiteServiceTest.class, SocialNetworkServiceTest.class,
- SocialNetworkMembersTest.class, DatabaseInitializationTest.class, ContentServiceAddTest.class,
- ContentServiceIntegrationTest.class, ContentCommentServiceTest.class, ContentServiceVariousTest.class,
- ContentServiceGetTest.class, ContentServiceSaveTest.class, GroupServiceTest.class })
-public class IntegrationTestSuite {
-}
Deleted: trunk/src/test/java/org/ourproject/kune/OthersTestSuite.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/OthersTestSuite.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/OthersTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,38 +0,0 @@
-package org.ourproject.kune;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.ourproject.kune.blogs.server.BlogServerToolTest;
-import org.ourproject.kune.chat.ChatToolTest;
-import org.ourproject.kune.chat.server.managers.XmppManagerTest;
-import org.ourproject.kune.docs.DocumentToolTest;
-import org.ourproject.kune.docs.server.DocumentServerToolTest;
-import org.ourproject.kune.gallery.server.GalleryServerToolTest;
-import org.ourproject.kune.rack.filters.rest.TestRESTMethodFinder;
-import org.ourproject.kune.rack.filters.rest.TestRESTServiceDefinition;
-import org.ourproject.kune.wiki.server.WikiServerToolTest;
-import org.ourproject.kune.workspace.client.entityheader.EntityLogoPresenterTest;
-import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenterTest;
-import org.ourproject.kune.workspace.client.socialnet.RolActionTest;
-import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest;
-import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenterTest;
-import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenterTest;
-
-/**
- * Rescan with :
- *
- * <pre>
- * find src/test/java/org/ourproject/kune/{chat,docs,gallery,wiki,workspace,blogs,rack} -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
- *
- * </pre>
- *
- */
- at RunWith(Suite.class)
- at SuiteClasses({ ChatToolTest.class, XmppManagerTest.class, DocumentToolTest.class, DocumentServerToolTest.class,
- GalleryServerToolTest.class, WikiServerToolTest.class, EntityLogoPresenterTest.class,
- ToolSelectorPresenterTest.class, TagsSummaryPresenterTest.class, RolActionTest.class, RolComparatorTest.class,
- LicenseWizardPresenterTest.class, BlogServerToolTest.class, TestRESTServiceDefinition.class,
- TestRESTMethodFinder.class })
-public class OthersTestSuite {
-}
Deleted: trunk/src/test/java/org/ourproject/kune/PlatfClientTestSuite.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/PlatfClientTestSuite.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/PlatfClientTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,33 +0,0 @@
-package org.ourproject.kune;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.ourproject.kune.platf.client.actions.ActionRegistryTest;
-import org.ourproject.kune.platf.client.actions.ContentIconsRegistryTest;
-import org.ourproject.kune.platf.client.actions.KeyStrokeTest;
-import org.ourproject.kune.platf.client.actions.ShortcutTest;
-import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTOTest;
-import org.ourproject.kune.platf.client.ui.KuneStringUtilsTest;
-import org.ourproject.kune.platf.client.ui.TextUtilsTest;
-import org.ourproject.kune.platf.client.ui.dialogs.upload.FileUploaderPresenterTest;
-import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaDescriptorTest;
-import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPresenterTest;
-import org.ourproject.kune.platf.client.utils.UrlTest;
-
-/**
- * Rescan with :
- *
- * <pre>
- * find src/test/java/org/ourproject/kune/platf/client/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
- * </pre>
- *
- */
- at RunWith(Suite.class)
- at SuiteClasses({ BasicMimeTypeDTOTest.class, UrlTest.class, RTESavingEditorPresenterTest.class,
- ExternalMediaDescriptorTest.class, FileUploaderPresenterTest.class, TextUtilsTest.class,
- KuneStringUtilsTest.class, ShortcutTest.class, KeyStrokeTest.class, ContentIconsRegistryTest.class,
- ActionRegistryTest.class })
-public class PlatfClientTestSuite {
-
-}
Deleted: trunk/src/test/java/org/ourproject/kune/ServerManagerTestSuite.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/ServerManagerTestSuite.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/ServerManagerTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,52 +0,0 @@
-package org.ourproject.kune;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.ourproject.kune.platf.server.access.AccessRightsServiceTest;
-import org.ourproject.kune.platf.server.access.FinderTest;
-import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptorTest;
-import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptorTest;
-import org.ourproject.kune.platf.server.domain.GroupListTest;
-import org.ourproject.kune.platf.server.finders.GroupFinderTest;
-import org.ourproject.kune.platf.server.finders.LicenseFinderTest;
-import org.ourproject.kune.platf.server.finders.RateFinderTest;
-import org.ourproject.kune.platf.server.finders.UserFinderTest;
-import org.ourproject.kune.platf.server.manager.ContentManagerTest;
-import org.ourproject.kune.platf.server.manager.GroupManagerTest;
-import org.ourproject.kune.platf.server.manager.I18nManagerTest;
-import org.ourproject.kune.platf.server.manager.LicenseManagerTest;
-import org.ourproject.kune.platf.server.manager.TagManagerTest;
-import org.ourproject.kune.platf.server.manager.TagUserContentTest;
-import org.ourproject.kune.platf.server.manager.UserManagerTest;
-import org.ourproject.kune.platf.server.manager.file.EntityLogoUploadManagerTest;
-import org.ourproject.kune.platf.server.manager.file.FileDownloadManagerTest;
-import org.ourproject.kune.platf.server.manager.file.FileManagerTest;
-import org.ourproject.kune.platf.server.manager.file.FileUploadManagerTest;
-import org.ourproject.kune.platf.server.manager.file.FileUtilsTest;
-import org.ourproject.kune.platf.server.manager.file.ImageUtilsDefaultTest;
-import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerMoreTest;
-import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerTest;
-import org.ourproject.kune.platf.server.mapper.MapperTest;
-import org.ourproject.kune.platf.server.properties.KunePropertiesTest;
-
-/**
- * Rescan with :
- *
- * <pre>
- * find src/test/java/org/ourproject/kune/platf/server/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
- * </pre>
- *
- */
- at RunWith(Suite.class)
- at SuiteClasses({ GroupListTest.class, AccessRightsServiceTest.class, FinderTest.class, KunePropertiesTest.class,
- I18nManagerTest.class, TagManagerTest.class, LicenseManagerTest.class, UserManagerTest.class,
- ContentManagerTest.class, FileUploadManagerTest.class, FileDownloadManagerTest.class,
- ImageUtilsDefaultTest.class, EntityLogoUploadManagerTest.class, FileManagerTest.class, FileUtilsTest.class,
- SocialNetworkManagerTest.class, SocialNetworkManagerMoreTest.class, GroupManagerTest.class,
- TagUserContentTest.class, LicenseFinderTest.class, UserFinderTest.class, GroupFinderTest.class,
- RateFinderTest.class, AuthorizatedMethodInterceptorTest.class, AuthenticatedMethodInterceptorTest.class,
- MapperTest.class })
-public class ServerManagerTestSuite {
-
-}
Deleted: trunk/src/test/java/org/ourproject/kune/ServerTestSuite.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/ServerTestSuite.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/ServerTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -1,32 +0,0 @@
-package org.ourproject.kune;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-import org.ourproject.kune.platf.server.access.AccessRightsServiceTest;
-import org.ourproject.kune.platf.server.access.FinderTest;
-import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptorTest;
-import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptorTest;
-import org.ourproject.kune.platf.server.domain.GroupListTest;
-import org.ourproject.kune.platf.server.finders.GroupFinderTest;
-import org.ourproject.kune.platf.server.finders.LicenseFinderTest;
-import org.ourproject.kune.platf.server.finders.RateFinderTest;
-import org.ourproject.kune.platf.server.finders.UserFinderTest;
-import org.ourproject.kune.platf.server.mapper.MapperTest;
-import org.ourproject.kune.platf.server.properties.KunePropertiesTest;
-
-/**
- * Rescan with :
- *
- * <pre>
- * find src/test/java/org/ourproject/kune/platf/server/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
- * </pre>
- *
- */
- at RunWith(Suite.class)
- at SuiteClasses({ GroupListTest.class, AccessRightsServiceTest.class, FinderTest.class, KunePropertiesTest.class,
- LicenseFinderTest.class, UserFinderTest.class, GroupFinderTest.class, RateFinderTest.class,
- AuthorizatedMethodInterceptorTest.class, AuthenticatedMethodInterceptorTest.class, MapperTest.class })
-public class ServerTestSuite {
-
-}
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -64,7 +64,7 @@
public PersistencePreLoadedDataTest() {
// test: use memory
// test_db: use mysql
- super("test", "kune.properties");
+ // super("test_db", "kune.properties");
}
@After
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/PersistenceTest.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -20,7 +20,8 @@
public PersistenceTest() {
// test: use memory
// test_db: use mysql
- this("test", "kune.properties");
+ // Also configurable ein TestHelper
+ this("test_db", "kune.properties");
}
public PersistenceTest(final String persistenceUnit, final String propetiesFileName) {
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java 2011-02-02 05:37:02 UTC (rev 1232)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -17,6 +17,7 @@
public abstract class TestHelper {
public static Injector create(final Module module, final String persistenceUnit, final String propetiesFileName) {
final Injector injector = Guice.createInjector(module, new Module() {
+ @Override
public void configure(final Binder binder) {
binder.bindScope(SessionScoped.class, Scopes.SINGLETON);
binder.bindScope(RequestScoped.class, Scopes.SINGLETON);
@@ -31,7 +32,8 @@
public static void inject(final Object target) {
// test: use memory
// test_db: use mysql
- TestHelper.create(new PlatformServerModule(), "test", "kune.properties").injectMembers(target);
+ // Also configurable ein PersistenceTest
+ TestHelper.create(new PlatformServerModule(), "test_db", "kune.properties").injectMembers(target);
}
}
Copied: trunk/src/test/java/testsuites/IntegrationTestSuite.java (from rev 1232, trunk/src/test/java/org/ourproject/kune/IntegrationTestSuite.java)
===================================================================
--- trunk/src/test/java/testsuites/IntegrationTestSuite.java (rev 0)
+++ trunk/src/test/java/testsuites/IntegrationTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,32 @@
+package testsuites;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.platf.integration.DatabaseInitializationTest;
+import org.ourproject.kune.platf.integration.content.ContentCommentServiceTest;
+import org.ourproject.kune.platf.integration.content.ContentServiceAddTest;
+import org.ourproject.kune.platf.integration.content.ContentServiceGetTest;
+import org.ourproject.kune.platf.integration.content.ContentServiceSaveTest;
+import org.ourproject.kune.platf.integration.content.ContentServiceVariousTest;
+import org.ourproject.kune.platf.integration.kuneservice.GroupServiceTest;
+import org.ourproject.kune.platf.integration.site.SiteServiceTest;
+import org.ourproject.kune.platf.integration.site.UserServiceTest;
+import org.ourproject.kune.platf.integration.socialnet.SocialNetworkMembersTest;
+import org.ourproject.kune.platf.integration.socialnet.SocialNetworkServiceTest;
+
+/**
+ * Rescan with :
+ *
+ * <pre>
+ * find src/test/java/org/ourproject/kune/platf/integration/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
+ * </pre>
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ UserServiceTest.class, SiteServiceTest.class, SocialNetworkServiceTest.class,
+ SocialNetworkMembersTest.class, DatabaseInitializationTest.class, ContentServiceAddTest.class,
+ ContentCommentServiceTest.class, ContentServiceVariousTest.class, ContentServiceGetTest.class,
+ ContentServiceSaveTest.class, GroupServiceTest.class })
+public class IntegrationTestSuite {
+}
Property changes on: trunk/src/test/java/testsuites/IntegrationTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/src/test/java/testsuites/OthersTestSuite.java (from rev 1231, trunk/src/test/java/org/ourproject/kune/OthersTestSuite.java)
===================================================================
--- trunk/src/test/java/testsuites/OthersTestSuite.java (rev 0)
+++ trunk/src/test/java/testsuites/OthersTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,38 @@
+package testsuites;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.blogs.server.BlogServerToolTest;
+import org.ourproject.kune.chat.ChatToolTest;
+import org.ourproject.kune.chat.server.managers.XmppManagerTest;
+import org.ourproject.kune.docs.DocumentToolTest;
+import org.ourproject.kune.docs.server.DocumentServerToolTest;
+import org.ourproject.kune.gallery.server.GalleryServerToolTest;
+import org.ourproject.kune.rack.filters.rest.TestRESTMethodFinder;
+import org.ourproject.kune.rack.filters.rest.TestRESTServiceDefinition;
+import org.ourproject.kune.wiki.server.WikiServerToolTest;
+import org.ourproject.kune.workspace.client.entityheader.EntityLogoPresenterTest;
+import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardPresenterTest;
+import org.ourproject.kune.workspace.client.socialnet.RolActionTest;
+import org.ourproject.kune.workspace.client.socialnet.RolComparatorTest;
+import org.ourproject.kune.workspace.client.tags.TagsSummaryPresenterTest;
+import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenterTest;
+
+/**
+ * Rescan with :
+ *
+ * <pre>
+ * find src/test/java/org/ourproject/kune/{chat,docs,gallery,wiki,workspace,blogs,rack} -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
+ *
+ * </pre>
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ ChatToolTest.class, XmppManagerTest.class, DocumentToolTest.class, DocumentServerToolTest.class,
+ GalleryServerToolTest.class, WikiServerToolTest.class, EntityLogoPresenterTest.class,
+ ToolSelectorPresenterTest.class, TagsSummaryPresenterTest.class, RolActionTest.class, RolComparatorTest.class,
+ LicenseWizardPresenterTest.class, BlogServerToolTest.class, TestRESTServiceDefinition.class,
+ TestRESTMethodFinder.class })
+public class OthersTestSuite {
+}
Property changes on: trunk/src/test/java/testsuites/OthersTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/src/test/java/testsuites/PlatfClientTestSuite.java (from rev 1231, trunk/src/test/java/org/ourproject/kune/PlatfClientTestSuite.java)
===================================================================
--- trunk/src/test/java/testsuites/PlatfClientTestSuite.java (rev 0)
+++ trunk/src/test/java/testsuites/PlatfClientTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,33 @@
+package testsuites;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.platf.client.actions.ActionRegistryTest;
+import org.ourproject.kune.platf.client.actions.ContentIconsRegistryTest;
+import org.ourproject.kune.platf.client.actions.KeyStrokeTest;
+import org.ourproject.kune.platf.client.actions.ShortcutTest;
+import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTOTest;
+import org.ourproject.kune.platf.client.ui.KuneStringUtilsTest;
+import org.ourproject.kune.platf.client.ui.TextUtilsTest;
+import org.ourproject.kune.platf.client.ui.dialogs.upload.FileUploaderPresenterTest;
+import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaDescriptorTest;
+import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPresenterTest;
+import org.ourproject.kune.platf.client.utils.UrlTest;
+
+/**
+ * Rescan with :
+ *
+ * <pre>
+ * find src/test/java/org/ourproject/kune/platf/client/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
+ * </pre>
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ BasicMimeTypeDTOTest.class, UrlTest.class, RTESavingEditorPresenterTest.class,
+ ExternalMediaDescriptorTest.class, FileUploaderPresenterTest.class, TextUtilsTest.class,
+ KuneStringUtilsTest.class, ShortcutTest.class, KeyStrokeTest.class, ContentIconsRegistryTest.class,
+ ActionRegistryTest.class })
+public class PlatfClientTestSuite {
+
+}
Property changes on: trunk/src/test/java/testsuites/PlatfClientTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/src/test/java/testsuites/ServerManagerTestSuite.java (from rev 1231, trunk/src/test/java/org/ourproject/kune/ServerManagerTestSuite.java)
===================================================================
--- trunk/src/test/java/testsuites/ServerManagerTestSuite.java (rev 0)
+++ trunk/src/test/java/testsuites/ServerManagerTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,38 @@
+package testsuites;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.platf.server.manager.ContentManagerTest;
+import org.ourproject.kune.platf.server.manager.GroupManagerTest;
+import org.ourproject.kune.platf.server.manager.I18nManagerTest;
+import org.ourproject.kune.platf.server.manager.LicenseManagerTest;
+import org.ourproject.kune.platf.server.manager.TagManagerTest;
+import org.ourproject.kune.platf.server.manager.TagUserContentTest;
+import org.ourproject.kune.platf.server.manager.UserManagerTest;
+import org.ourproject.kune.platf.server.manager.file.EntityLogoUploadManagerTest;
+import org.ourproject.kune.platf.server.manager.file.FileDownloadManagerTest;
+import org.ourproject.kune.platf.server.manager.file.FileManagerTest;
+import org.ourproject.kune.platf.server.manager.file.FileUploadManagerTest;
+import org.ourproject.kune.platf.server.manager.file.FileUtilsTest;
+import org.ourproject.kune.platf.server.manager.file.ImageUtilsDefaultTest;
+import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerMoreTest;
+import org.ourproject.kune.platf.server.manager.impl.SocialNetworkManagerTest;
+
+/**
+ * Rescan with :
+ *
+ * <pre>
+ * find src/test/java/org/ourproject/kune/platf/server/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
+ * </pre>
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ I18nManagerTest.class, TagManagerTest.class, LicenseManagerTest.class, UserManagerTest.class,
+ ContentManagerTest.class, FileUploadManagerTest.class, FileDownloadManagerTest.class,
+ ImageUtilsDefaultTest.class, EntityLogoUploadManagerTest.class, FileManagerTest.class, FileUtilsTest.class,
+ SocialNetworkManagerTest.class, SocialNetworkManagerMoreTest.class, GroupManagerTest.class,
+ TagUserContentTest.class })
+public class ServerManagerTestSuite {
+
+}
Property changes on: trunk/src/test/java/testsuites/ServerManagerTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/src/test/java/testsuites/ServerOtherTestSuite.java
===================================================================
--- trunk/src/test/java/testsuites/ServerOtherTestSuite.java (rev 0)
+++ trunk/src/test/java/testsuites/ServerOtherTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,32 @@
+package testsuites;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.platf.server.access.AccessRightsServiceTest;
+import org.ourproject.kune.platf.server.access.FinderTest;
+import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptorTest;
+import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptorTest;
+import org.ourproject.kune.platf.server.domain.GroupListTest;
+import org.ourproject.kune.platf.server.finders.GroupFinderTest;
+import org.ourproject.kune.platf.server.finders.LicenseFinderTest;
+import org.ourproject.kune.platf.server.finders.RateFinderTest;
+import org.ourproject.kune.platf.server.finders.UserFinderTest;
+import org.ourproject.kune.platf.server.mapper.MapperTest;
+import org.ourproject.kune.platf.server.properties.KunePropertiesTest;
+
+/**
+ * Rescan with :
+ *
+ * <pre>
+ * find src/test/java/org/ourproject/kune/platf/server/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
+ * </pre>
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ GroupListTest.class, AccessRightsServiceTest.class, FinderTest.class, KunePropertiesTest.class,
+ LicenseFinderTest.class, UserFinderTest.class, GroupFinderTest.class, RateFinderTest.class,
+ AuthorizatedMethodInterceptorTest.class, AuthenticatedMethodInterceptorTest.class, MapperTest.class })
+public class ServerOtherTestSuite {
+
+}
Property changes on: trunk/src/test/java/testsuites/ServerOtherTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/src/test/java/testsuites/ServerTestSuite.java (from rev 1232, trunk/src/test/java/org/ourproject/kune/ServerTestSuite.java)
===================================================================
--- trunk/src/test/java/testsuites/ServerTestSuite.java (rev 0)
+++ trunk/src/test/java/testsuites/ServerTestSuite.java 2011-02-04 20:52:27 UTC (rev 1233)
@@ -0,0 +1,32 @@
+package testsuites;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+import org.ourproject.kune.platf.server.access.AccessRightsServiceTest;
+import org.ourproject.kune.platf.server.access.FinderTest;
+import org.ourproject.kune.platf.server.auth.AuthenticatedMethodInterceptorTest;
+import org.ourproject.kune.platf.server.auth.AuthorizatedMethodInterceptorTest;
+import org.ourproject.kune.platf.server.domain.GroupListTest;
+import org.ourproject.kune.platf.server.finders.GroupFinderTest;
+import org.ourproject.kune.platf.server.finders.LicenseFinderTest;
+import org.ourproject.kune.platf.server.finders.RateFinderTest;
+import org.ourproject.kune.platf.server.finders.UserFinderTest;
+import org.ourproject.kune.platf.server.mapper.MapperTest;
+import org.ourproject.kune.platf.server.properties.KunePropertiesTest;
+
+/**
+ * Rescan with :
+ *
+ * <pre>
+ * find src/test/java/org/ourproject/kune/platf/server/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g'
+ * </pre>
+ *
+ */
+ at RunWith(Suite.class)
+ at SuiteClasses({ GroupListTest.class, AccessRightsServiceTest.class, FinderTest.class, KunePropertiesTest.class,
+ LicenseFinderTest.class, UserFinderTest.class, GroupFinderTest.class, RateFinderTest.class,
+ AuthorizatedMethodInterceptorTest.class, AuthenticatedMethodInterceptorTest.class, MapperTest.class })
+public class ServerTestSuite {
+
+}
Property changes on: trunk/src/test/java/testsuites/ServerTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the kune-commits
mailing list