February 2012 - kune-commits - lists.ourproject.org

13 Feb '12

Author: vjrj_ Date: 2012-02-13 10:24:34 +0100 (Mon, 13 Feb 2012) New Revision: 1681 Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/ trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java trunk/src/main/java/cc/kune/core/client/resources/iconic/barters.png trunk/src/main/java/cc/kune/core/client/resources/iconic/blogs.png trunk/src/main/java/cc/kune/core/client/resources/iconic/chats.png trunk/src/main/java/cc/kune/core/client/resources/iconic/delete.png trunk/src/main/java/cc/kune/core/client/resources/iconic/docs.png trunk/src/main/java/cc/kune/core/client/resources/iconic/edit.png trunk/src/main/java/cc/kune/core/client/resources/iconic/events.png trunk/src/main/java/cc/kune/core/client/resources/iconic/link.png trunk/src/main/java/cc/kune/core/client/resources/iconic/lists.png trunk/src/main/java/cc/kune/core/client/resources/iconic/reply.png trunk/src/main/java/cc/kune/core/client/resources/iconic/tasks.png trunk/src/main/java/cc/kune/core/client/resources/iconic/wikis.png Modified: trunk/.classpath trunk/COPYRIGHT trunk/TODO trunk/img/screenshots/kune-home-stats.png trunk/img/screenshots/kune-inbox.png trunk/img/screenshots/kune-newgroup.png trunk/img/screenshots/kune-register.png trunk/img/screenshots/kune-social-net.png trunk/pom.xml trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java trunk/src/main/resources/wave-server.properties Log: Added new icons to Wave and tools Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/.classpath 2012-02-13 09:24:34 UTC (rev 1681) @@ -13,19 +13,19 @@ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.11/box-0.3.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.11/box-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.11/box-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.12/box-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.11/client-0.3.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.11/client-common-0.3.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.11/client-common-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.11/client-common-src-0.3.11-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.11/client-scheduler-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.11/client-scheduler-src-0.3.11-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.11/client-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.11/client-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.12/client-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.12/client-common-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.11/common-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.11/common-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -34,8 +34,8 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.11/communication-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.11/communication-src-0.3.11-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.11/concurrencycontrol-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.11/concurrencycontrol-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -57,7 +57,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.11/gwt-util-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.11/gwt-util-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -114,16 +114,16 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.11/media-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.11/media-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.11/model-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.11/model-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.11/proto-msg-0.3.11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.12/proto-msg-0.3.12.jar"/> <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> @@ -148,9 +148,9 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.11/util-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.11/util-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.11/waveinabox-server-0.3-0.3.11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.12/waveinabox-server-0.3-0.3.12.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> Modified: trunk/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/COPYRIGHT 2012-02-13 09:24:34 UTC (rev 1681) @@ -190,3 +190,8 @@ Ort43v Creative Commons Attribution-Share Alike 3.0 Unported license http://creativecommons.org/licenses/by-sa/3.0/deed.en + +#Iconic# +http://somerandomdude.com/work/iconic/ +Creative Commons Share Alike 3.0 +http://creativecommons.org/licenses/by-sa/3.0/us/ \ No newline at end of file Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/TODO 2012-02-13 09:24:34 UTC (rev 1681) @@ -12,6 +12,18 @@ nick == assigned to * SHORT-TERM (URGENT) +** icons in WIAB +<div class="NWC"> +<div class="ILC"></div> +</div> + +.ILC { + background: url("data:image/png;base6,4iVBORw0KGgoAAAANSUhEUgAAAA4AAAAWCAYAAADwza0nAAAAXUlEQVR42mNgGAWUgbS0tP8gTLKmp0+f/r927RrxmmGaQPTx48f/79y5k7BmZJtAmkD8VatW4deIrglkE0wTCAxlTcihR1ATTCO20MOrCaaRJJvQkxQME6VpFOAGALlX45hq7h8nAAAAAElFTkSuQmCC") no-repeat scroll 0 0 transparent; + height: 22px; + overflow: hidden; + width: 14px; +} + ** deploy automatize (update) *** copy jar *** copy via rsync gwt compilation (no delete to prevent code fail message) Modified: trunk/img/screenshots/kune-home-stats.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-inbox.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-newgroup.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-register.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-social-net.png =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/pom.xml 2012-02-13 09:24:34 UTC (rev 1681) @@ -19,7 +19,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> - <wiab.version>0.3.11</wiab.version> + <wiab.version>0.3.12</wiab.version> <skipTests>true</skipTests> </properties> <repositories> Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -25,6 +25,7 @@ import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -37,12 +38,13 @@ @Inject public BartersClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t("barters"), i18n.t("A decentralized way to offer (or ask for) services and goods to your groups or to anyone. Bartering means the exchange of goods by the agreement of two people"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.barters(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_BARTER); Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -27,6 +27,7 @@ import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -37,12 +38,13 @@ @Inject public BlogsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(BlogsConstants.ROOT_NAME), i18n.t("Blogs are a chronological list of posts (ordered by date) about a specific topic. Each post can be commented by the visitors"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.blogs(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_POST, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -25,6 +25,7 @@ import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -38,14 +39,14 @@ @Inject public ChatClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, - final ChatResources res) { + final ChatResources res, final IconicResources icons) { // FIXME: change this in ChatConstants and in db via migration super( NAME, i18n.t("chatrooms"), i18n.t( "A 'room' where you can have a group-chat with many users at once. Rooms can be public or private. Users can be from [%s] or other sites (compatible with gmail chat)", - i18n.getSiteCommonName()), toolSelector, cntCapRegistry, i18n, navResources); + i18n.getSiteCommonName()), icons.chats(), toolSelector, cntCapRegistry, i18n, navResources); this.res = res; registerIcons(); } Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.resources.iconic; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface IconicResources extends ClientBundle { + + @Source("barters.png") + ImageResource barters(); + + @Source("blogs.png") + ImageResource blogs(); + + @Source("chats.png") + ImageResource chats(); + + @Source("docs.png") + ImageResource docs(); + + @Source("events.png") + ImageResource events(); + + @Source("lists.png") + ImageResource lists(); + + @Source("tasks.png") + ImageResource tasks(); + + @Source("wikis.png") + ImageResource wikis(); +} Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/barters.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/barters.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/blogs.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/blogs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/chats.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/chats.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/delete.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/docs.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/docs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/edit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/events.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/events.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/link.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/lists.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/lists.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/reply.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/reply.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/tasks.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/tasks.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/wikis.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/wikis.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; @@ -39,12 +40,13 @@ @Inject public DocsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(DocsConstants.ROOT_NAME), i18n.t("Here you can create or upload your personal, group or public documents. These documents can be edited and commented collaboratively and simultaneously. These docs can be static pages in your web page if you publish them"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.docs(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -25,6 +25,7 @@ import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -35,9 +36,10 @@ @Inject public EventsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(ROOT_NAME), i18n.t("A calendar to schedule activities and events"), toolSelector, - cntCapRegistry, i18n, navResources); + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { + super(NAME, i18n.t(ROOT_NAME), i18n.t("A calendar to schedule activities and events"), + icons.events(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_MEETING); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -23,13 +23,15 @@ import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter; +import com.google.gwt.resources.client.ImageResource; + public abstract class AbstractClientTool { public AbstractClientTool(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector) { + final ImageResource icon, final ToolSelector toolSelector) { final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, tooltip, toolSelector); - final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(shortName); + final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(shortName, icon); presenter.init(panel); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -37,9 +37,10 @@ protected final NavResources navResources; public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry, - final I18nTranslationService i18n, final NavResources navResources) { - super(shortName, longName, tooltip, toolSelector); + final ImageResource icon, final ToolSelector toolSelector, + final ContentCapabilitiesRegistry contentCapabilitiesRegistry, final I18nTranslationService i18n, + final NavResources navResources) { + super(shortName, longName, tooltip, icon, toolSelector); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; this.i18n = i18n; this.navResources = navResources; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.dom.client.MouseOutEvent; import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; @@ -60,11 +61,11 @@ @UiField FocusPanel self; - public ToolSelectorItemPanel(final String shortName) { + public ToolSelectorItemPanel(final String shortName, final ImageResource icon) { initWidget(uiBinder.createAndBindUi(this)); ensureDebugId(TOOL_ID_PREFIX + shortName); setVisibleImpl(false); - iconLeft.setVisible(false); + iconLeft.setResource(icon); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2012-02-13 09:24:34 UTC (rev 1681) @@ -6,8 +6,9 @@ text-decoration: none; font-size: 16px; color: white; /* - text-shadow: 1px 1px 6px grey; - */ + text-shadow: 1px 1px 6px grey; + */ + margin-left: 5px; } .link a:link { @@ -18,8 +19,7 @@ } - .flow { - /* min-height: 30px; */ + .flow { /* min-height: 30px; */ padding: 1px 10px; -moz-user-select: none; -khtml-user-select: none; @@ -27,7 +27,6 @@ } .iconLeft { - } .iconRight { @@ -38,13 +37,14 @@ } </ui:style> <ui:with field='res' - type='cc.kune.gspace.client.tool.selector.ToolResources' /> + type='cc.kune.gspace.client.tool.selector.ToolResources'/> <g:FocusPanel ui:field="self" stylePrimaryName="k-tool-item"> <g:FlowPanel styleName="{style.flow}" ui:field="flow"> - <g:Image ui:field="iconLeft" styleName="{style.iconLeft}" /> - <g:Image ui:field="iconRight" styleName="{style.iconRight}" />  - <g:InlineLabel ui:field="label" styleName="{style.label}" /> - <g:HTMLPanel ui:field="arrow" addStyleNames="k-tool-item-selected-arrow, k-fr" /> + <g:Image ui:field="iconLeft" styleName="{style.iconLeft}"/> + <g:Image ui:field="iconRight" styleName="{style.iconRight}"/>  + <g:InlineLabel ui:field="label" styleName="{style.label}"/> + <g:HTMLPanel ui:field="arrow" + addStyleNames="k-tool-item-selected-arrow, k-fr"/> </g:FlowPanel> </g:FocusPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -36,12 +37,13 @@ @Inject public ListsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(ROOT_NAME), i18n.t("Lists behave like a mailing list or a forum. You can subscribe and discuss about specific topics"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.lists(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_POST); Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; @@ -39,12 +40,13 @@ @Inject public TasksClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(ROOT_NAME), i18n.t("A collaborative TO-DO list for the group. Any group-member can participate in any proposed task, add others to a task, comment them, add info, etc"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.tasks(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_TASK); Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -38,13 +39,14 @@ @Inject public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t("wiki"), i18n.t( "Wiki-pages are Documents that can be edited by any visitor (in [%s]), instead of only by the group. This accelerates updating and construction", - i18n.getSiteCommonName()), toolSelector, cntCapRegistry, i18n, navResources); + i18n.getSiteCommonName()), icons.wikis(), toolSelector, cntCapRegistry, i18n, navResources); registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE); Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/resources/wave-server.properties 2012-02-13 09:24:34 UTC (rev 1681) @@ -103,7 +103,7 @@ disable_registration = false # Enable SSL for all address/port combinations listed (makes the next 2 settings non-optional) -enable_ssl = false +enable_ssl = true # Path to keystore containg the ssl certificates to server ssl_keystore_path = src/main/resources/wiab.ks

1 0

r1680 - in trunk/src/main/java/cc/kune: chat/client/actions core/client/rpcservices core/server/notifier core/server/rpc events/client/viewer
by Vicente J. Ruiz Jurado 11 Feb '12

11 Feb '12

Author: vjrj_ Date: 2012-02-11 22:13:06 +0100 (Sat, 11 Feb 2012) New Revision: 1680 Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java trunk/src/main/java/cc/kune/core/server/notifier/NotificationHtmlHelper.java trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java Log: CLOSED - # 188: Add an email notification to "Add as buddie" action http://kune.ourproject.org/issues/ticket/188 Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddieHeaderButton.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -33,6 +33,8 @@ import cc.kune.core.client.events.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.client.ws.entheader.EntityHeader; @@ -43,20 +45,24 @@ import com.calclab.emite.im.client.roster.events.RosterRetrievedEvent; import com.calclab.emite.im.client.roster.events.RosterRetrievedHandler; import com.google.inject.Inject; +import com.google.inject.Provider; public class AddAsBuddieHeaderButton { public static class AddAsBuddieHeaderAction extends AbstractExtendedAction { private final ChatClient chatEngine; private final Session session; + private final Provider<SocialNetworkServiceAsync> snService; @Inject public AddAsBuddieHeaderAction(final ChatClient chatEngine, final Session session, final ChatInstances chatInstances, final StateManager stateManager, - final I18nTranslationService i18n, final CoreResources img) { + final I18nTranslationService i18n, final CoreResources img, + final Provider<SocialNetworkServiceAsync> snService) { super(); this.chatEngine = chatEngine; this.session = session; + this.snService = snService; stateManager.onStateChanged(true, new StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { @@ -81,9 +87,14 @@ @Override public void actionPerformed(final ActionEvent event) { - chatEngine.addNewBuddy(session.getCurrentState().getGroup().getShortName()); - // NotifyUser.info("Added as buddy. Waiting buddy response"); + final String username = session.getCurrentState().getGroup().getShortName(); + chatEngine.addNewBuddy(username); setEnabled(false); + snService.get().addAsBuddie(session.getUserHash(), username, new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + } + }); } private boolean currentGroupsIsAsPerson(final StateAbstractDTO state) { Modified: trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/chat/client/actions/AddAsBuddyAction.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -27,20 +27,29 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserSimpleDTO; import com.google.inject.Inject; +import com.google.inject.Provider; public class AddAsBuddyAction extends AbstractExtendedAction { private final ChatClient chatEngine; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snService; @Inject public AddAsBuddyAction(final ChatClient chatEngine, final ChatInstances chatInstances, - final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img) { + final StateManager stateManager, final I18nTranslationService i18n, final CoreResources img, + final Provider<SocialNetworkServiceAsync> snService, final Session session) { super(); this.chatEngine = chatEngine; + this.snService = snService; + this.session = session; putValue(Action.NAME, i18n.t(CoreMessages.ADD_AS_A_BUDDY)); putValue(Action.SMALL_ICON, img.addGreen()); } @@ -55,8 +64,12 @@ } if (username != null) { chatEngine.addNewBuddy(username); - // NotifyUser.info("Added as buddy. Waiting buddy response"); setEnabled(false); + snService.get().addAsBuddie(session.getUserHash(), username, new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + } + }); } } } Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -36,6 +36,8 @@ SocialNetworkDataDTO addAdminMember(String hash, StateToken groupToken, String groupToAddShortName) throws DefaultException; + void addAsBuddie(String hash, String userName) throws DefaultException; + SocialNetworkDataDTO addCollabMember(String hash, StateToken groupToken, String groupToAddShortName) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -33,6 +33,8 @@ void addAdminMember(String hash, StateToken groupToken, String groupToAddShortName, AsyncCallback<SocialNetworkDataDTO> callback); + void addAsBuddie(String hash, String userName, AsyncCallback<Void> callback); + void addCollabMember(String hash, StateToken groupToken, String groupToAddShortName, AsyncCallback<SocialNetworkDataDTO> callback); Modified: trunk/src/main/java/cc/kune/core/server/notifier/NotificationHtmlHelper.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotificationHtmlHelper.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotificationHtmlHelper.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -35,6 +35,14 @@ this.fileDownloadUtils = fileDownloadUtils; } + private FormatedString entityNotification(final String groupName, final boolean hasLogo, + final String message, final boolean isPersonal) { + final String groupUrl = fileDownloadUtils.getUrl(groupName); + return FormatedString.build(false, GROUP_TEMPLATE, groupUrl, + fileDownloadUtils.getLogoAvatarHtml(groupName, hasLogo, isPersonal, 50, 5), groupUrl, groupName, + message); + } + /** * Generates a group notification in html like [logo|message] * @@ -50,13 +58,28 @@ */ public FormatedString groupNotification(final String groupName, final boolean hasLogo, final String message) { - final String groupUrl = fileDownloadUtils.getUrl(groupName); - return FormatedString.build(false, GROUP_TEMPLATE, groupUrl, - fileDownloadUtils.getLogoAvatarHtml(groupName, hasLogo, false, 50, 5), groupUrl, groupName, - message); + return entityNotification(groupName, hasLogo, message, false); } /** + * Generates a user notification in html like [logo|message] + * + * @param userName + * the user name you want to get the notification + * @param hasLogo + * the has logo? + * @param message + * the message to show close to the logo + * @param readMoreMsg + * the read more msg + * @return the html string + */ + public FormatedString userNotification(final String userName, final boolean hasLogo, + final String message) { + return entityNotification(userName, hasLogo, message, true); + } + + /** * Format a user notification with an additional link. The first an unique %s * in body is changed by the site name. * Modified: trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -80,6 +80,12 @@ notifyToAll(groupSender, subject, message, adminMembers); } + public void notifyGroupToUser(final Group group, final User to, final String subject, + final String message) { + sender.add(NotificationType.email, createPlainSubject(subject), + helper.groupNotification(group.getShortName(), group.hasLogo(), message), true, false, to); + } + private void notifyToAll(final Group groupSender, final String subject, final String message, final Collection<User> users) { for (final User to : users) { @@ -89,14 +95,14 @@ } } - public void notifyUser(final User to, final Group group, final String subject, final String message) { + public void notifyUserToUser(final User from, final User to, final String subject, final String message) { sender.add(NotificationType.email, createPlainSubject(subject), - helper.groupNotification(group.getShortName(), group.hasLogo(), message), true, true, to); + helper.userNotification(from.getShortName(), from.hasLogo(), message), true, false, to); } /** - * Send email to an User with a link.The first an unique %s in body is changed - * by the site name. + * Send email to an User with a link. The first an unique %s in body is + * changed by the site name. * * @param to * the User to send the notification Modified: trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -35,6 +35,7 @@ import cc.kune.core.shared.dto.SocialNetworkRequestResult; import cc.kune.domain.Group; import cc.kune.domain.User; +import cc.kune.domain.finders.UserFinder; import com.google.inject.Inject; import com.google.inject.persist.Transactional; @@ -45,16 +46,18 @@ private final Mapper mapper; private final NotificationService notifyService; private final SocialNetworkManager socialNetworkManager; + private final UserFinder userFinder; private final UserSessionManager userSessionManager; @Inject public SocialNetworkRPC(final UserSessionManager userSessionManager, final GroupManager groupManager, - final SocialNetworkManager socialNetworkManager, final Mapper mapper, + final SocialNetworkManager socialNetworkManager, final Mapper mapper, final UserFinder userFinder, final NotificationService notifyService) { this.userSessionManager = userSessionManager; this.groupManager = groupManager; this.socialNetworkManager = socialNetworkManager; this.mapper = mapper; + this.userFinder = userFinder; this.notifyService = notifyService; } @@ -92,6 +95,15 @@ @Override @Authenticated + @Transactional + public void addAsBuddie(final String hash, final String userName) throws DefaultException { + final User userLogged = userSessionManager.getUser(); + final User toUser = userFinder.findByShortName(userName); + notifyService.notifyUserToUser(userLogged, toUser, "Added as buddie", "He/she added you as buddie"); + } + + @Override + @Authenticated @Authorizated(actionLevel = ActionLevel.group, accessRolRequired = AccessRol.Administrator) @Transactional public SocialNetworkDataDTO addCollabMember(final String hash, final StateToken groupToken, @@ -232,5 +244,4 @@ notifyService.notifyGroupAdmins(group, userLogged.getUserGroup(), "Some member left this group", "Some member have left this group"); } - } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2012-02-11 20:34:43 UTC (rev 1679) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2012-02-11 21:13:06 UTC (rev 1680) @@ -116,7 +116,7 @@ getView().addTimeBlockClickHandler(new TimeBlockClickHandler<Date>() { @Override public void onTimeBlockClick(final TimeBlockClickEvent<Date> event) { - NotifyUser.info("on time block"); + // NotifyUser.info("on time block"); appToEdit = NO_APPOINT; onOverDate = event.getTarget(); updateMenuItems(); @@ -138,14 +138,14 @@ } event.setCancelled(!editable); // event.setCancelled(true); - NotifyUser.info("updated handler"); + // NotifyUser.info("updated handler"); hideMenu(); } }); getView().addOpenHandler(new OpenHandler<Appointment>() { @Override public void onOpen(final OpenEvent<Appointment> event) { - NotifyUser.info("open handler"); + // NotifyUser.info("open handler"); } }); getView().addSelectionHandler(new SelectionHandler<Appointment>() { @@ -153,7 +153,7 @@ public void onSelection(final SelectionEvent<Appointment> event) { appToEdit = event.getSelectedItem(); onOverDate = event.getSelectedItem().getStart(); - NotifyUser.info("on selection"); + // NotifyUser.info("on selection"); updateMenuItems(); showMenu(); }

1 0

r1679 - in trunk: . img/screenshots src/main/java/cc/kune/chat/client/actions src/main/java/cc/kune/gspace/client/tool src/main/java/cc/kune/gspace/client/tool/selector src/main/resources src/test/java/cc/kune/selenium/login src/test/java/cc/kune/selenium/spaces
by Vicente J. Ruiz Jurado 11 Feb '12

11 Feb '12

Author: vjrj_ Date: 2012-02-11 21:34:43 +0100 (Sat, 11 Feb 2012) New Revision: 1679 Added: trunk/src/main/resources/wiab.ks Modified: trunk/.classpath trunk/TODO trunk/img/screenshots/kune-home-stats.png trunk/img/screenshots/kune-inbox.png trunk/img/screenshots/kune-newgroup.png trunk/img/screenshots/kune-register.png trunk/img/screenshots/kune-social-net.png trunk/pom.xml trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/resources/wave-server.properties trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java Log: NEW - # 127: Generate some screencast while doing automate testing http://kune.ourproject.org/issues/ticket/127 CLOSED - # 101: HTTPS support & by default in Kune http://kune.ourproject.org/issues/ticket/101 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/.classpath 2012-02-11 20:34:43 UTC (rev 1679) @@ -13,19 +13,19 @@ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.10/box-0.3.10.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.10/box-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.10/box-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.11/box-0.3.11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.11/box-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.11/box-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.10/client-0.3.10.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.10/client-common-0.3.10.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.10/client-common-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.10/client-common-src-0.3.10-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.10/client-scheduler-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.10/client-scheduler-src-0.3.10-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.10/client-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.10/client-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.11/client-0.3.11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.11/client-common-0.3.11.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.11/client-common-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.11/client-common-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.11/client-scheduler-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.11/client-scheduler-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.11/client-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.11/client-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.10/common-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.10/common-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.11/common-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.11/common-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -34,8 +34,8 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.10/communication-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.10/communication-src-0.3.10-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.10/concurrencycontrol-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.10/concurrencycontrol-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.11/communication-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.11/communication-src-0.3.11-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.11/concurrencycontrol-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.11/concurrencycontrol-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -57,7 +57,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.10/gwt-util-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.10/gwt-util-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.11/gwt-util-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.11/gwt-util-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -114,16 +114,16 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.10/media-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.10/media-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.11/media-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.11/media-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.10/model-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.10/model-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.11/model-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.11/model-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.10/proto-msg-0.3.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.11/proto-msg-0.3.11.jar"/> <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> @@ -148,9 +148,9 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.10/util-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.10/util-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.11/util-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.11/util-src-0.3.11-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.10/waveinabox-server-0.3-0.3.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.11/waveinabox-server-0.3-0.3.11.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/TODO 2012-02-11 20:34:43 UTC (rev 1679) @@ -12,10 +12,12 @@ nick == assigned to * SHORT-TERM (URGENT) -** Connection persistence -java.io.NotSerializableException: org.eclipse.jetty.websocket.WebSocketConnectionD13$WSFrameConnection -java.io.NotSerializableException: com.glines.socketio.server.transport.jetty.JettyContinuationTransportHandler - +** deploy automatize (update) +*** copy jar +*** copy via rsync gwt compilation (no delete to prevent code fail message) +*** copy the jar and the compilation to other sites in the same lan +*** update /etc/kune (if needed) +*** migrate the database (if needed) ** group.inexistentTool nasty error ** calendar support *** gwt-cal + http://ical4j.sourceforge.net/introduction.html Modified: trunk/img/screenshots/kune-home-stats.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-inbox.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-newgroup.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-register.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-social-net.png =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/pom.xml 2012-02-11 20:34:43 UTC (rev 1679) @@ -19,7 +19,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> - <wiab.version>0.3.10</wiab.version> + <wiab.version>0.3.11</wiab.version> <skipTests>true</skipTests> </properties> <repositories> Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2012-02-11 20:34:43 UTC (rev 1679) @@ -21,7 +21,7 @@ import cc.kune.chat.client.ChatClient; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.SimpleResponseCallback; import cc.kune.common.shared.i18n.I18nTranslationService; @@ -30,11 +30,12 @@ import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import com.google.inject.Inject; import com.google.inject.Provider; -public class ChatAboutContentBtn extends ButtonDescriptor { +public class ChatAboutContentBtn extends MenuItemDescriptor { public static class ChatAboutContentAction extends RolAction { @@ -78,9 +79,9 @@ @Inject public ChatAboutContentBtn(final ChatAboutContentAction action, final CoreResources res, - final I18nTranslationService i18n) { + final ContentViewerOptionsMenu optionsMenu, final I18nTranslationService i18n) { super(action); this.withIcon(res.emiteRoom()).withToolTip(i18n.t("Chat and comment on this")).withText( - i18n.t("Chat about")).withStyles("k-def-docbtn, k-fl").withId(ID); + i18n.t("Chat about")).withStyles("k-def-docbtn, k-fl").withId(ID).withParent(optionsMenu, false); } } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-02-11 20:34:43 UTC (rev 1679) @@ -29,7 +29,7 @@ final ToolSelector toolSelector) { final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, tooltip, toolSelector); - final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(); + final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(shortName); presenter.init(panel); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-02-11 20:34:43 UTC (rev 1679) @@ -43,6 +43,8 @@ interface ToolSelectorItemPanelUiBinder extends UiBinder<Widget, ToolSelectorItemPanel> { } + public static final String TOOL_ID_PREFIX = "k-tool-item-"; + private static ToolSelectorItemPanelUiBinder uiBinder = GWT.create(ToolSelectorItemPanelUiBinder.class); @UiField @@ -58,8 +60,9 @@ @UiField FocusPanel self; - public ToolSelectorItemPanel() { + public ToolSelectorItemPanel(final String shortName) { initWidget(uiBinder.createAndBindUi(this)); + ensureDebugId(TOOL_ID_PREFIX + shortName); setVisibleImpl(false); iconLeft.setVisible(false); } @@ -131,4 +134,5 @@ self.addStyleDependentName("nofocus"); self.removeStyleDependentName("focus"); } + } Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/src/main/resources/wave-server.properties 2012-02-11 20:34:43 UTC (rev 1679) @@ -106,7 +106,7 @@ enable_ssl = false # Path to keystore containg the ssl certificates to server -ssl_keystore_path = ./wiab.ks +ssl_keystore_path = src/main/resources/wiab.ks #Password to the keystore -ssl_keystore_password = changer_me +ssl_keystore_password = fafafa Added: trunk/src/main/resources/wiab.ks =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/wiab.ks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/src/test/java/cc/kune/selenium/login/ScreenCastsViaSeleniumTests.java 2012-02-11 20:34:43 UTC (rev 1679) @@ -133,6 +133,7 @@ * chat.getTalkBox(jids).sendKeys(Keys.chord(Keys.ALT, "C")); // * chat.close(); */ + // group space showTitleSlide(t("Group space (collaboration space)"), t("Here you can create groups and collaborate within them")); Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-02-09 19:53:42 UTC (rev 1678) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-02-11 20:34:43 UTC (rev 1679) @@ -22,12 +22,20 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.chat.shared.ChatConstants; import cc.kune.core.client.sitebar.search.EntitySearchPanel; import cc.kune.core.client.sn.actions.AddEntityToThisGroupAction; import cc.kune.core.client.sn.actions.AddNewBuddiesAction; import cc.kune.core.client.sn.actions.registry.UserSNConfActions; +import cc.kune.docs.shared.DocsConstants; +import cc.kune.events.shared.EventsConstants; +import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; +import cc.kune.lists.shared.ListsConstants; import cc.kune.selenium.PageObject; import cc.kune.selenium.SeleniumConstants; +import cc.kune.tasks.shared.TasksConstants; +import cc.kune.wiki.shared.WikiConstants; public class GroupSpacePageObject extends PageObject { @@ -37,27 +45,27 @@ public WebElement addNewBuddieTextBox; @FindBy(id = SeleniumConstants.GWTDEV + AddEntityToThisGroupAction.ADD_NEW_MEMBER_TEXTBOX) public WebElement addNewMemberTextBox; - @FindBy(xpath = "//div[2]/div/div[3]/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + BlogsConstants.NAME) public WebElement blogTool; - @FindBy(xpath = "//div[2]/div/div[4]/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + ChatConstants.NAME) public WebElement chatTool; - @FindBy(xpath = "//div[3]/div/div[2]/div/div/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + DocsConstants.NAME) public WebElement docTool; - @FindBy(xpath = "//div[2]/div/div[6]/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + EventsConstants.NAME) public WebElement eventTool; @FindBy(xpath = "//td/img") public WebElement firstAvatarOfGroup; @FindBy(xpath = "//td[2]/div/div/table/tbody/tr/td") public WebElement firstFromSuggestionBox; - @FindBy(xpath = "//div[2]/div/div[5]/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + ListsConstants.NAME) public WebElement listTool; @FindBy(id = SeleniumConstants.GWTDEV + EntitySearchPanel.OK_ID) public WebElement searchEntitiesOk; @FindBy(xpath = "//div[3]/div/button") public WebElement socialNetOptions; - @FindBy(xpath = "//div[2]/div/div[7]/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksConstants.NAME) public WebElement taskTool; - @FindBy(xpath = "//div[2]/div/div[7]/div/span") + @FindBy(id = ToolSelectorItemPanel.TOOL_ID_PREFIX + WikiConstants.NAME) public WebElement wikiTool; }

1 0

r1678 - trunk
by Vicente J. Ruiz Jurado 09 Feb '12

09 Feb '12

Author: vjrj_ Date: 2012-02-09 20:53:42 +0100 (Thu, 09 Feb 2012) New Revision: 1678 Modified: trunk/INSTALL Log: INSTALL improved thanks to the feedback or adavideo Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-02-09 02:29:55 UTC (rev 1677) +++ trunk/INSTALL 2012-02-09 19:53:42 UTC (rev 1678) @@ -230,19 +230,21 @@ Configure the 'Group chat service' (in Group Chat > Group Chat Settings tab) with "rooms" additionally or instead of "conference" (or change kune.chat.roomHost in <trunk>/src/main/resources/kune.properties) +In Server > Server Settings > HTTP Binding, enable "HTTP Bind Settings" and set the port to 5280. Check that port is not used by other service in your machine (we use 5280 as default, but if you want to use other change it your web.xml accordly) + +Because users are managed from the database of kune, we recommend to set: +In Server > Server Settings > Registration & Login > Inband Account Registration > Disabled +In Server > Server Settings > Registration & Login > Change Password > Disabled +so this will not conflict with kune users management. + Change in 'Server > Server Manager > System Properties': provider.auth.className to org.jivesoftware.openfire.auth.JDBCAuthProvider instead of org.jivesoftware.openfire.auth.DefaultAuthProvider provider.user.className to org.jivesoftware.openfire.user.JDBCUserProvider instead of org.jivesoftware.openfire.user.DefaultUserProvider -In Server > Server Settings > HTTP Binding, enable "HTTP Bind Settings" and set the port to 5280. Check that port is not used by other service in your machine (we use 5280 as default, but if you want to use other change it your web.xml accordly) +This is used to set the database of users of openfire to kune users database table. When you do that you have to follow the next step (or you will get authentication problems). -Because users are managed from the database of kune, we recommend to set: -In Server > Server Settings > Registration & Login > Inband Account Registration > Disabled -In Server > Server Settings > Registration & Login > Change Password > Disabled -so this will not conflict with kune users management. - Edit the openfire.xml in a terminal: * In debian (with a .deb installation) you can to edit the configuration in /etc/openfire directory. * In Mac: /usr/local/openfire/conf @@ -291,6 +293,8 @@ (Be sure that the password matches if you changed de default password 'db4kune', also the database name if you use another different like production one). +When you add this to the configuration and you restart, openfire will import (and remove) this part of the configuration to its database so you will see it in 'Server > Server Manager > System Properties'. + For more details: http://www.igniterealtime.org/builds/openfire/docs/latest/documentation/db-…

1 0

r1677 - in trunk: . src/main/java/cc/kune/core/client/state/impl src/main/java/cc/kune/wave/client src/main/resources
by Vicente J. Ruiz Jurado 09 Feb '12

09 Feb '12

Author: vjrj_ Date: 2012-02-09 03:29:55 +0100 (Thu, 09 Feb 2012) New Revision: 1677 Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/resources/wave-server.properties Log: wave updated Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-01-27 15:21:03 UTC (rev 1676) +++ trunk/.classpath 2012-02-09 02:29:55 UTC (rev 1677) @@ -13,19 +13,19 @@ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.9/box-0.3.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.9/box-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.9/box-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.10/box-0.3.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.10/box-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.10/box-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.9/client-0.3.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.9/client-common-0.3.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.9/client-common-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.9/client-common-src-0.3.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.9/client-scheduler-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.9/client-scheduler-src-0.3.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.9/client-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.9/client-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.10/client-0.3.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.10/client-common-0.3.10.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.10/client-common-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.10/client-common-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.10/client-scheduler-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.10/client-scheduler-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.10/client-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.10/client-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.9/common-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.9/common-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.10/common-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.10/common-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -34,8 +34,8 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.9/communication-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.9/communication-src-0.3.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.9/concurrencycontrol-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.9/concurrencycontrol-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.10/communication-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.10/communication-src-0.3.10-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.10/concurrencycontrol-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.10/concurrencycontrol-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -57,7 +57,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.9/gwt-util-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.9/gwt-util-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.10/gwt-util-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.10/gwt-util-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -114,16 +114,16 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.9/media-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.9/media-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.10/media-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.10/media-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.9/model-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.9/model-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.10/model-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.10/model-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.9/proto-msg-0.3.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.10/proto-msg-0.3.10.jar"/> <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> @@ -148,9 +148,9 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.9/util-src-0.3.9.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.9/util-src-0.3.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.10/util-src-0.3.10.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.10/util-src-0.3.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.9/waveinabox-server-0.3-0.3.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.10/waveinabox-server-0.3-0.3.10.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-27 15:21:03 UTC (rev 1676) +++ trunk/pom.xml 2012-02-09 02:29:55 UTC (rev 1677) @@ -19,7 +19,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> - <wiab.version>0.3.9</wiab.version> + <wiab.version>0.3.10</wiab.version> <skipTests>true</skipTests> </properties> <repositories> Modified: trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java 2012-01-27 15:21:03 UTC (rev 1676) +++ trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java 2012-02-09 02:29:55 UTC (rev 1677) @@ -382,6 +382,7 @@ } } } else if (!isSpecialHash) { + // FIXME This can be in the top of isWaveToken.... if (tokenMatcher.isGroupToken(newToken)) { SpaceConfEvent.fire(eventBus, Space.groupSpace, newToken); SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(newToken)); Modified: trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2012-01-27 15:21:03 UTC (rev 1676) +++ trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2012-02-09 02:29:55 UTC (rev 1677) @@ -1,4 +1,3 @@ -// @formatter:off /** * Copyright 2010 Google Inc. * @@ -16,7 +15,6 @@ * */ - package cc.kune.wave.client; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; @@ -38,9 +36,12 @@ import org.waveprotocol.wave.client.wavepanel.impl.edit.EditController; import org.waveprotocol.wave.client.wavepanel.impl.edit.EditSession; import org.waveprotocol.wave.client.wavepanel.impl.edit.KeepFocusInView; +import org.waveprotocol.wave.client.wavepanel.impl.focus.FocusBlipSelector; import org.waveprotocol.wave.client.wavepanel.impl.focus.FocusFramePresenter; +import org.waveprotocol.wave.client.wavepanel.impl.focus.ViewTraverser; import org.waveprotocol.wave.client.wavepanel.impl.indicator.ReplyIndicatorController; import org.waveprotocol.wave.client.wavepanel.impl.menu.MenuController; +import org.waveprotocol.wave.client.wavepanel.impl.reader.Reader; import org.waveprotocol.wave.client.wavepanel.impl.title.WaveTitleHandler; import org.waveprotocol.wave.client.wavepanel.impl.toolbar.ToolbarSwitcher; import org.waveprotocol.wave.client.wavepanel.view.BlipView; @@ -49,11 +50,8 @@ import org.waveprotocol.wave.client.wavepanel.view.dom.full.DomRenderer; import org.waveprotocol.wave.client.widget.popup.PopupChromeFactory; import org.waveprotocol.wave.client.widget.popup.PopupFactory; -import org.waveprotocol.wave.model.conversation.Conversation; -import org.waveprotocol.wave.model.conversation.ConversationBlip; import org.waveprotocol.wave.model.conversation.ConversationView; import org.waveprotocol.wave.model.id.IdGenerator; -import org.waveprotocol.wave.model.id.ModernIdSerialiser; import org.waveprotocol.wave.model.wave.ParticipantId; import org.waveprotocol.wave.model.waveref.WaveRef; @@ -64,49 +62,67 @@ /** * Stages for loading the undercurrent Wave Panel - * + * * @author zdwang(a)google.com (David Wang) */ public class KuneStagesProvider extends Stages { private final static AsyncHolder<Object> HALT = new AsyncHolder<Object>() { @Override - public void call(Accessor<Object> accessor) { + public void call(final Accessor<Object> accessor) { // Never ready, so never notify the accessor. } }; - private final Element wavePanelElement; - private final LogicalPanel rootPanel; - private final WaveRef waveRef; + /** + * Finds the blip that should receive the focus and selects it. + */ + private static void selectAndFocusOnBlip(final Reader reader, final ModelAsViewProvider views, + final ConversationView wave, final FocusFramePresenter focusFrame, final WaveRef waveRef) { + final FocusBlipSelector blipSelector = FocusBlipSelector.create(wave, views, reader, + new ViewTraverser()); + final BlipView blipUi = blipSelector.selectBlipByWaveRef(waveRef); + // Focus on the selected blip. + if (blipUi != null) { + focusFrame.focus(blipUi); + } + } private final RemoteViewServiceMultiplexer channel; + private boolean closed; private final I18nTranslationService i18n; private final IdGenerator idGenerator; - private final ProfileManager profiles; - private final WaveStore waveStore; private final boolean isNewWave; private final String localDomain; - - private final boolean showParticipantsPanel; - private boolean closed; private StageOne one; - private StageTwo two; + private final ProfileManager profiles; + private final LogicalPanel rootPanel; + private final boolean showParticipantsPanel; + private StageThree three; + private StageTwo two; private WaveContext wave; + private final Element wavePanelElement; + private final WaveRef waveRef; + private final WaveStore waveStore; /** - * @param wavePanelElement The dom element to become the wave panel - * @param rootPanel A panel that this an ancestor of wavePanelElement. This is - * used for adopting to the GWT widget tree. - * @param waveRef the id of the wave to open. If null, it means, create a new - * wave. - * @param channel communication channel. - * @param isNewWave true if the wave is a new client-created wave + * @param wavePanelElement + * The dom element to become the wave panel + * @param rootPanel + * A panel that this an ancestor of wavePanelElement. This is used + * for adopting to the GWT widget tree. + * @param waveRef + * the id of the wave to open. If null, it means, create a new wave. + * @param channel + * communication channel. + * @param isNewWave + * true if the wave is a new client-created wave * @param idGenerator */ - public KuneStagesProvider(Element wavePanelElement, LogicalPanel rootPanel, WaveRef waveRef, - RemoteViewServiceMultiplexer channel, IdGenerator idGenerator, ProfileManager profiles, - WaveStore store, boolean isNewWave, String localDomain, boolean showParticipantsPanel, I18nTranslationService i18n) { + public KuneStagesProvider(final Element wavePanelElement, final LogicalPanel rootPanel, + final WaveRef waveRef, final RemoteViewServiceMultiplexer channel, final IdGenerator idGenerator, + final ProfileManager profiles, final WaveStore store, final boolean isNewWave, + final String localDomain, final boolean showParticipantsPanel, final I18nTranslationService i18n) { this.wavePanelElement = wavePanelElement; this.rootPanel = rootPanel; this.waveRef = waveRef; @@ -121,43 +137,17 @@ } @Override - protected AsyncHolder<StageZero> createStageZeroLoader() { - return haltIfClosed(super.createStageZeroLoader()); - } - - @Override - protected AsyncHolder<StageOne> createStageOneLoader(StageZero zero) { + protected AsyncHolder<StageOne> createStageOneLoader(final StageZero zero) { return haltIfClosed(new StageOne.DefaultProvider(zero) { @Override - protected Element createWaveHolder() { - return wavePanelElement; - } - - @Override protected LogicalPanel createWaveContainer() { return rootPanel; } - }); - } - @Override - protected AsyncHolder<StageTwo> createStageTwoLoader(StageOne one) { - return haltIfClosed(new StageTwoProvider( - this.one = one, waveRef.getWaveId(), channel, isNewWave, idGenerator, profiles) { - // Kune patch @Override - protected DomRenderer createRenderer() { - return KuneFullDomWaveRendererImpl.create(getConversations(), getProfileManager(), - getBlipDetailer(), getViewIdMapper(), getBlipQueue(), getThreadReadStateMonitor(), - createViewFactories(), showParticipantsPanel); + protected Element createWaveHolder() { + return wavePanelElement; } - - // Warning: this run into issue #73 - // @Override - // protected void installFeatures() { - // WavePanelResourceLoader.loadCss(); - // // KuneWavePanelResourceLoader.loadCss(); - // } }); } @@ -169,7 +159,7 @@ // Prepend an init wave flow onto the stage continuation. super.create(new Accessor<StageThree>() { @Override - public void use(StageThree x) { + public void use(final StageThree x) { onStageThreeLoaded(x, whenReady); } }); @@ -179,6 +169,7 @@ protected String getLocalDomain() { return localDomain; } + @Override protected void install() { EditorStaticDeps.setPopupProvider(PopupFactory.getProvider()); @@ -199,71 +190,38 @@ WaveTitleHandler.install(edit, models); ReplyIndicatorController.install(actions, edit, panel); EditController.install(focus, actions, panel); - KuneParticipantController.install(panel, models, profiles, getLocalDomain(), i18n); + KuneParticipantController.install(panel, models, profiles, getLocalDomain(), i18n); KeepFocusInView.install(edit, panel); stageTwo.getDiffController().upgrade(edit); } }); } - private void onStageThreeLoaded(StageThree x, Accessor<StageThree> whenReady) { - if (closed) { - // Stop the loading process. - return; - } - three = x; - if (isNewWave) { - initNewWave(x); - } else { - handleExistingWave(x); - } - wave = new WaveContext( - two.getWave(), two.getConversations(), two.getSupplement(), two.getReadMonitor()); - waveStore.add(wave); - whenReady.use(x); - } + @Override + protected AsyncHolder<StageTwo> createStageTwoLoader(final StageOne one) { + return haltIfClosed(new StageTwoProvider(this.one = one, waveRef, channel, isNewWave, idGenerator, + profiles) { + // Kune patch + @Override + protected DomRenderer createRenderer() { + return KuneFullDomWaveRendererImpl.create(getConversations(), getProfileManager(), + getBlipDetailer(), getViewIdMapper(), getBlipQueue(), getThreadReadStateMonitor(), + createViewFactories(), showParticipantsPanel); + } - private void initNewWave(StageThree three) { - // Do the new-wave flow. - ModelAsViewProvider views = two.getModelAsViewProvider(); - BlipQueueRenderer blipQueue = two.getBlipQueue(); - ConversationView wave = two.getConversations(); - - // Force rendering to finish. - blipQueue.flush(); - BlipView blipUi = views.getBlipView(wave.getRoot().getRootThread().getFirstBlip()); - three.getEditActions().startEditing(blipUi); + // Warning: this run into issue #73 + // @Override + // protected void installFeatures() { + // WavePanelResourceLoader.loadCss(); + // // KuneWavePanelResourceLoader.loadCss(); + // } + }); } - private void handleExistingWave(StageThree three) { - // If there's blip reference then focus on that blip. - String documentId = waveRef.getDocumentId(); - if (documentId != null) { - ModelAsViewProvider views = two.getModelAsViewProvider(); - BlipQueueRenderer blipQueue = two.getBlipQueue(); - ConversationView wave = two.getConversations(); - blipQueue.flush(); - // Find conversation - Conversation conversation; - if (waveRef.hasWaveletId()) { - String id = ModernIdSerialiser.INSTANCE.serialiseWaveletId(waveRef.getWaveletId()); - conversation = wave.getConversation(id); - } else { - // Unspecified wavelet means root. - conversation = wave.getRoot(); - } - if (conversation != null) { - // Find selected blip. - ConversationBlip blip = wave.getRoot().getBlip(documentId); - if (blip != null) { - BlipView blipUi = views.getBlipView(blip); - if (blipUi != null) { - two.getStageOne().getFocusFrame().focus(blipUi); + @Override + protected AsyncHolder<StageZero> createStageZeroLoader() { + return haltIfClosed(super.createStageZeroLoader()); } - } - } - } - } public void destroy() { if (wave != null) { @@ -280,7 +238,7 @@ } if (two != null) { try { - two.getConnector().close(); + two.getConnector().close(); } catch (final Exception e) { Log.info("Some exception closing connector", e); } @@ -288,7 +246,7 @@ } if (one != null) { try { - one.getWavePanel().destroy(); + one.getWavePanel().destroy(); } catch (final Exception e) { Log.info("Some exception destroying panel", e); } @@ -301,8 +259,47 @@ * @return a halting provider if this stage is closed. Otherwise, returns the * given provider. */ - @SuppressWarnings("unchecked") // HALT is safe as a holder for any type - private <T> AsyncHolder<T> haltIfClosed(AsyncHolder<T> provider) { + @SuppressWarnings("unchecked") + // HALT is safe as a holder for any type + private <T> AsyncHolder<T> haltIfClosed(final AsyncHolder<T> provider) { return closed ? (AsyncHolder<T>) HALT : provider; } + + private void handleExistingWave(final StageThree three) { + if (waveRef.hasDocumentId()) { + final BlipQueueRenderer blipQueue = two.getBlipQueue(); + blipQueue.flush(); + selectAndFocusOnBlip(two.getReader(), two.getModelAsViewProvider(), two.getConversations(), + one.getFocusFrame(), waveRef); + } + } + + private void initNewWave(final StageThree three) { + // Do the new-wave flow. + final ModelAsViewProvider views = two.getModelAsViewProvider(); + final BlipQueueRenderer blipQueue = two.getBlipQueue(); + final ConversationView wave = two.getConversations(); + + // Force rendering to finish. + blipQueue.flush(); + final BlipView blipUi = views.getBlipView(wave.getRoot().getRootThread().getFirstBlip()); + three.getEditActions().startEditing(blipUi); + } + + private void onStageThreeLoaded(final StageThree x, final Accessor<StageThree> whenReady) { + if (closed) { + // Stop the loading process. + return; + } + three = x; + if (isNewWave) { + initNewWave(x); + } else { + handleExistingWave(x); + } + wave = new WaveContext(two.getWave(), two.getConversations(), two.getSupplement(), + two.getReadMonitor()); + waveStore.add(wave); + whenReady.use(x); + } } Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2012-01-27 15:21:03 UTC (rev 1676) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2012-02-09 02:29:55 UTC (rev 1677) @@ -378,11 +378,12 @@ } /** - * Returns <code>ws://yourhost[:port]/</code>. + * Returns <code>ws(s)://yourhost[:port]/</code>. */ // XXX check formatting wrt GPE private native String getWebSocketBaseUrl(String moduleBase) /*-{ - return "ws" + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; + return ((window.location.protocol == "https:") ? "wss" : "ws") + + /:\/\/[^\/]+/.exec(moduleBase)[0] + "/"; }-*/; @Override Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-01-27 15:21:03 UTC (rev 1676) +++ trunk/src/main/resources/wave-server.properties 2012-02-09 02:29:55 UTC (rev 1677) @@ -96,3 +96,17 @@ # Set true to disable the verification of signers (certificates) waveserver_disable_signer_verification = true + +# Set true to prevent anyone registering on your server. +# When true, only the admin user can use the RegistrationRobot to add new accounts +# Default value: false +disable_registration = false + +# Enable SSL for all address/port combinations listed (makes the next 2 settings non-optional) +enable_ssl = false + +# Path to keystore containg the ssl certificates to server +ssl_keystore_path = ./wiab.ks + +#Password to the keystore +ssl_keystore_password = changer_me

1 0