Wed Dec 29 04:33:32 CET 2010

Author: vjrj_
Date: 2010-12-29 04:33:31 +0100 (Wed, 29 Dec 2010)
New Revision: 1174

Added:
   trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java
   trunk/src/main/java/cc/kune/core/public/images/lic/
   trunk/src/main/webapp/images
   trunk/src/main/webapp/javascripts
   trunk/src/main/webapp/stylesheets
   trunk/src/main/webapp/templates
Removed:
   trunk/src/main/java/org/ourproject/kune/app/public/images/lic/
   trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveContainerListener.java
   trunk/src/main/java/org/ourproject/kune/app/server/wave/WaveInterceptorModule.java
   trunk/src/main/java/org/ourproject/kune/app/server/wave/WavePropertiesParser.java
   trunk/war/WEB-INF/gems/
   trunk/war/WEB-INF/publicspace/
   trunk/war/images
   trunk/war/javascripts
   trunk/war/stylesheets
   trunk/war/templates
Modified:
   trunk/TODO
   trunk/pom.xml
   trunk/script/mvn-eclipse.sh
   trunk/src/main/java/cc/kune/Kune.gwt.xml
   trunk/src/main/java/cc/kune/core/client/CoreGinjector.java
   trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java
   trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
   trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java
   trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java
   trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java
   trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java
   trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java
   trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java
   trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java
   trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java
   trunk/src/main/java/cc/kune/core/public/ws.css
   trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java
   trunk/src/main/java/org/ourproject/kune/rack/RackServletFilter.java
   trunk/src/main/resources/kune.properties
Log:
gwt wave server update

/svnroot/kune/hooks/commit-email.pl: `/usr/bin/svnlook diff /svnroot/kune -r 1174' failed with this output:
Modified: trunk/TODO
===================================================================

--- trunk/TODO	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/TODO	2010-12-29 03:33:31 UTC (rev 1174)
@@ -11,9 +11,15 @@
    Use org-mode in emacs to easy manage this file
 
 * SHORT-TERM (URGENT)
+** Wave integration
+   [ ] org.waveprotocol.box.webclient.WebClientProd
+   [ ] src/org/waveprotocol/box/server/ServerMain.java
+   [ ] pom.xml dep references
 ** Update Dev Guide
 *** Annotations generation http://code.google.com/p/gwt-platform/wiki/BoilerplateGeneration#Eclipse
 *** Add -startupUrl to your GWT Run launch with /ws/?locale=en&log_level=INFO (or similar)
+*** When you compile/run gwt web-app from eclipse, select target/kune-CURRENT-VERSION as War directory selection
+*** src/main/webapp in GWTDesigner???
 ** new UI library (gwt-ext is dead)
 - mosaic, 
 - gtx

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/pom.xml	2010-12-29 03:33:31 UTC (rev 1174)
@@ -205,7 +205,7 @@
     <dependency>
       <groupId>com.google.code.guice</groupId>
       <artifactId>guice</artifactId>
-      <version>2.0.1</version>
+      <version>2.1-SNAPSHOT-r1160</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.gwt.inject</groupId>
@@ -237,7 +237,7 @@
     <dependency>
       <groupId>cc.kune.core.ws.armor</groupId>
       <artifactId>ws-armor</artifactId>
-      <version>0.0.8</version>
+      <version>0.0.9</version>
     </dependency>
     <dependency>
       <groupId>com.gwtplatform</groupId>
@@ -499,9 +499,8 @@
     <!-- wave -->
     <dependency>
       <groupId>org.waveprotocol</groupId>
-      <artifactId>kune-wave-server</artifactId>
-      <!-- <version>0.0.3.1</version> -->
-      <version>0.0.2.2</version>
+      <artifactId>waveinabox-server</artifactId>
+       <version>0.0.3.2</version> 
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -521,62 +520,62 @@
     <!-- <version>1.6.1</version> -->
     <!-- <type>jar</type> -->
     <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>com.google.code.guice</groupId> -->
+    <!--   <artifactId>guice-assistedinject</artifactId> -->
+    <!--   <version>2.0</version> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>jline<!/groupId> -->
+    <!--   <artifactId>jline</artifactId> -->
+    <!--   <version>0.9.94</version> -->
+    <!--   <type>jar</type> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>org.gnu.inet</groupId> -->
+    <!--   <artifactId>libidn</artifactId> -->
+    <!--   <version>1.15</version> -->
+    <!--   <type>jar</type> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>com.google.protobuf</groupId> -->
+    <!--   <artifactId>protobuf-java</artifactId> -->
+    <!--   <version>2.3.0</version> -->
+    <!--   <type>jar</type> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>xpp3</groupId> -->
+    <!--   <artifactId>xpp3</artifactId> -->
+    <!--   <version>1.1.4c</version> -->
+    <!--   <type>jar</type> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>xpp3</groupId> -->
+    <!--   <artifactId>xpp3_xpath</artifactId> -->
+    <!--   <version>1.1.4c</version> -->
+    <!--   <type>jar</type> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>aopalliance</groupId> -->
+    <!--   <artifactId>aopalliance</artifactId> -->
+    <!--   <version>1.0</version> -->
+    <!--   <type>jar</type> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>org.wave-protocol</groupId> -->
+    <!--   <artifactId>xmpp</artifactId> -->
+    <!--   <version>1.0.0</version> -->
+    <!-- </dependency> -->
+    <!-- <dependency> -->
+    <!--   <groupId>org.wave-protocol</groupId> -->
+    <!--   <artifactId>whack</artifactId> -->
+    <!--   <version>1.0.0</version> -->
+    <!-- </dependency> -->
     <dependency>
-      <groupId>com.google.code.guice</groupId>
-      <artifactId>guice-assistedinject</artifactId>
-      <version>2.0</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r07</version>
     </dependency>
-    <dependency>
-      <groupId>jline</groupId>
-      <artifactId>jline</artifactId>
-      <version>0.9.94</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.gnu.inet</groupId>
-      <artifactId>libidn</artifactId>
-      <version>1.15</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.1.0</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <version>1.1.4c</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3_xpath</artifactId>
-      <version>1.1.4c</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>aopalliance</groupId>
-      <artifactId>aopalliance</artifactId>
-      <version>1.0</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.wave-protocol</groupId>
-      <artifactId>xmpp</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.wave-protocol</groupId>
-      <artifactId>whack</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.common</groupId>
-      <artifactId>collect</artifactId>
-      <version>1.0-rc2</version>
-    </dependency>
   </dependencies>
   <distributionManagement>
     <repository>
@@ -714,8 +713,8 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
         <version>1.0</version>
-<configuration>
-                <path>/</path>
+        <configuration>
+          <path>/</path>
         </configuration>
       </plugin>
       <plugin>
@@ -726,9 +725,7 @@
         <!-- <version>7.2.1.v20101111</version> -->
         <configuration>
           <webAppConfig>
-            <!-- FIXME: ws? 
-            <contextPath>/${project.name}</contextPath>
-						-->
+            <!-- FIXME: ws? <contextPath>/${project.name}</contextPath> -->
             <contextPath>/</contextPath>
           </webAppConfig>
           <reload>manual</reload>
@@ -815,39 +812,39 @@
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.2</version>
         <executions>
-<!--          <execution>-->
-<!--            <id>core</id>-->
-<!--            <phase>package</phase>-->
-<!--            <goals>-->
-<!--              <goal>jar</goal>-->
-<!--            </goals>-->
-<!--            <configuration>-->
-<!--              <classifier>core</classifier>-->
-<!--              <includes>-->
-<!--                <include>**/KunePlatform.gwt.xml**</include>-->
-<!--                <include>**/i18n/I18nTranslationService.**</include>-->
-<!--                <include>**/i18n/I18nTranslationServiceMocked.** </include>-->
-<!--                <include>**/TextUtils.**</include>-->
-<!--                <include>**/IconLabelEditable.**</include>-->
-<!--                <include>**/QuickTipsHelper.**</include>-->
-<!--                <include>**/RichText.gwt.xml**</include>-->
-<!--                <include>**/BasicDialog.**</include>-->
-<!--                <include>**/HorizontalLine.**</include>-->
-<!--                <include>**/AbstractLabel.**</include>-->
-<!--                <include>**/IconLabel.**</include>-->
-<!--                <include> **/EditableIconLabel.**</include>-->
-<!--                <include> **/EditableClickListener.**</include>-->
-<!--                <include>**/KuneStringUtils.**</include>-->
-<!--                <include>**/IconHyperlink*.**</include>-->
-<!--                <include>**/LabelWrapper*.**</include>-->
-<!--                <include>**/KuneUiUtils.**</include>-->
-<!--                <include>**/View.**</include>-->
-<!--                 <include>**/platf/**</include> <include>**/platf/client/extend/**</include> -->
-<!--                  <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include> -->
-<!--                  <include>**/platf/client/dispatch/**</include> -->
-<!--              </includes>-->
-<!--            </configuration>-->
-<!--          </execution>-->
+          <!-- <execution> -->
+          <!-- <id>core</id> -->
+          <!-- <phase>package</phase> -->
+          <!-- <goals> -->
+          <!-- <goal>jar</goal> -->
+          <!-- </goals> -->
+          <!-- <configuration> -->
+          <!-- <classifier>core</classifier> -->
+          <!-- <includes> -->
+          <!-- <include>**/KunePlatform.gwt.xml**</include> -->
+          <!-- <include>**/i18n/I18nTranslationService.**</include> -->
+          <!-- <include>**/i18n/I18nTranslationServiceMocked.** </include> -->
+          <!-- <include>**/TextUtils.**</include> -->
+          <!-- <include>**/IconLabelEditable.**</include> -->
+          <!-- <include>**/QuickTipsHelper.**</include> -->
+          <!-- <include>**/RichText.gwt.xml**</include> -->
+          <!-- <include>**/BasicDialog.**</include> -->
+          <!-- <include>**/HorizontalLine.**</include> -->
+          <!-- <include>**/AbstractLabel.**</include> -->
+          <!-- <include>**/IconLabel.**</include> -->
+          <!-- <include> **/EditableIconLabel.**</include> -->
+          <!-- <include> **/EditableClickListener.**</include> -->
+          <!-- <include>**/KuneStringUtils.**</include> -->
+          <!-- <include>**/IconHyperlink*.**</include> -->
+          <!-- <include>**/LabelWrapper*.**</include> -->
+          <!-- <include>**/KuneUiUtils.**</include> -->
+          <!-- <include>**/View.**</include> -->
+          <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include> -->
+          <!-- <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include> -->
+          <!-- <include>**/platf/client/dispatch/**</include> -->
+          <!-- </includes> -->
+          <!-- </configuration> -->
+          <!-- </execution> -->
           <execution>
             <id>helloworldmodule</id>
             <phase>package</phase>
@@ -890,14 +887,14 @@
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <!-- <outputDirectory>war/WEB-INF/classes</outputDirectory> -->
     <!-- <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> -->
-  <!-- <resources> -->
-  <!-- <resource> -->
-  <!-- <directory>src/main/resources</directory> -->
-  <!-- </resource> -->
-  <!-- <resource> -->
-  <!-- <directory>src/main/java</directory> -->
-  <!-- </resource> -->
-  <!-- </resources> -->
+    <!-- <resources> -->
+    <!-- <resource> -->
+    <!-- <directory>src/main/resources</directory> -->
+    <!-- </resource> -->
+    <!-- <resource> -->
+    <!-- <directory>src/main/java</directory> -->
+    <!-- </resource> -->
+    <!-- </resources> -->
     <extensions>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>

Modified: trunk/script/mvn-eclipse.sh
===================================================================
--- trunk/script/mvn-eclipse.sh	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/script/mvn-eclipse.sh	2010-12-29 03:33:31 UTC (rev 1174)
@@ -1,3 +1,3 @@
-mvn eclipse:eclipse
+mvn eclipse:eclipse -Dgwt.compiler.skip=true
 perl -p -i -e 's/<\/classpath>//g' .classpath
 echo -en "  <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath

Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/Kune.gwt.xml	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/Kune.gwt.xml	2010-12-29 03:33:31 UTC (rev 1174)
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/src/gwt-module.dtd">
 <module rename-to="ws">
-	<inherits name="com.google.gwt.user.User" />
-	<inherits name='com.google.gwt.logging.Logging' />
-	<inherits name="cc.kune.core.Core" />
-	<source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/>
-	<!-- <source path='shared'/> -->
-	<!-- <public path="public"/> -->
-
-	<!-- Logging Configuration -->
-	<set-property name="gwt.logging.enabled" value="TRUE" />
-	<set-property name="gwt.logging.logLevel" value="INFO" />
-	<set-property name="gwt.logging.consoleHandler" value="ENABLED" />
-	<set-property name="gwt.logging.developmentModeHandler"
-		value="ENABLED" />
-	<set-property name="gwt.logging.firebugHandler" value="ENABLED" />
-	<set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" />
-	<set-property name="gwt.logging.popupHandler" value="DISABLED" />
-	<set-property name="gwt.logging.systemHandler" value="ENABLED" />
-	<set-property name="gwt.logging.simpleRemoteHandler"
-		value="DISABLED" />
-
-	<!-- Uncomment if you are enabling server side deobfuscation of StackTraces 
-		<set-property name="compiler.emulatedStack" value="true" /> <set-configuration-property 
-		name="compiler.emulatedStack.recordLineNumbers" value="true" /> <set-configuration-property 
-		name="compiler.emulatedStack.recordFileNames" value="true" /> -->
-
-	<!-- NOTE: this only compiles for chromium/safari ============= -->
-	<!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
-	<!-- <set-property name="user.agent" value="gecko1_8" /> -->
-	<set-property name="user.agent" value="safari,gecko1_8" />
-</module>
+  <inherits name="com.google.gwt.user.User" />
+  <inherits name='com.google.gwt.logging.Logging' />
+  <inherits name="cc.kune.core.Core" />
+  <inherits name="com.calclab.suco.Suco" />
+  <source path='client'
+    excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
+  <!-- <source path='shared'/> -->
+  <!-- <public path="public"/> -->
+  <!-- Logging Configuration -->
+  <set-property name="gwt.logging.enabled" value="TRUE" />
+  <set-property name="gwt.logging.logLevel" value="INFO" />
+  <set-property name="gwt.logging.consoleHandler" value="ENABLED" />
+  <set-property name="gwt.logging.developmentModeHandler"
+    value="ENABLED" />
+  <set-property name="gwt.logging.firebugHandler" value="ENABLED" />
+  <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" />
+  <set-property name="gwt.logging.popupHandler" value="DISABLED" />
+  <set-property name="gwt.logging.systemHandler" value="ENABLED" />
+  <set-property name="gwt.logging.simpleRemoteHandler"
+    value="DISABLED" />
+  <!-- Uncomment if you are enabling server side deobfuscation of StackTraces 
+    <set-property name="compiler.emulatedStack" value="true" /> <set-configuration-property 
+    name="compiler.emulatedStack.recordLineNumbers" value="true" /> <set-configuration-property 
+    name="compiler.emulatedStack.recordFileNames" value="true" /> -->
+  <!-- NOTE: this only compiles for chromium/safari ============= -->
+  <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
+  <!-- <set-property name="user.agent" value="gecko1_8" /> -->
+  <set-property name="user.agent" value="safari,gecko1_8" />
+</module>
\ No newline at end of file

Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -1,10 +1,13 @@
 package cc.kune.core.client;
 
 import cc.kune.core.client.cookies.CookiesManager;
+import cc.kune.core.client.errors.ErrorHandler;
 import cc.kune.core.client.notify.SpinerPresenter;
 import cc.kune.core.client.notify.UserNotifierPresenter;
 import cc.kune.core.client.sitebar.logo.SiteLogoPresenter;
+import cc.kune.core.client.state.StateManager;
 import cc.kune.core.client.ws.CorePresenter;
+import cc.kune.core.shared.i18n.I18nTranslationService;
 
 import com.google.gwt.inject.client.AsyncProvider;
 import com.google.gwt.inject.client.GinModules;
@@ -16,6 +19,8 @@
 @GinModules({ CoreGinModule.class })
 public interface CoreGinjector extends Ginjector {
 
+    ErrorHandler getErrorHandler();
+
     AsyncProvider<CorePresenter> getCorePresenter();
 
     AsyncProvider<CookiesManager> getCookiesManager();
@@ -32,4 +37,8 @@
 
     AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter();
 
+    I18nTranslationService getI18n();
+
+    StateManager getStateManager();
+
 }
\ No newline at end of file

Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -1,5 +1,7 @@
 package cc.kune.core.client;
 
+import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.GWT.UncaughtExceptionHandler;
@@ -18,6 +20,7 @@
      * 
      * @see com.google.gwt.core.client.EntryPoint#onModuleLoad()
      */
+    @Override
     public void onModuleLoad() {
         GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
             @Override
@@ -28,6 +31,7 @@
         });
 
         Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+            @Override
             public void execute() {
                 onModuleLoadCont();
             }
@@ -39,7 +43,11 @@
      */
     public void onModuleLoadCont() {
         DelayedBindRegistry.bind(ginjector);
+        AsyncCallbackSimple.init(ginjector.getErrorHandler());
         ginjector.getPlaceManager().revealCurrentPlace();
+        ginjector.getI18n();
+        ginjector.getUserNotifierPresenter();
+        ginjector.getSpinerPresenter();
+        ginjector.getStateManager();
     }
-
 }

Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -37,6 +37,7 @@
 import com.gwtplatform.mvp.client.proxy.PlaceManager;
 
 public class ErrorHandler {
+
     private final Session session;
     private final I18nTranslationService i18n;
     private final Event0 onSessionExpired;

Modified: trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/init/AppStarterDefault.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -97,7 +97,6 @@
                     @Override
                     public void execute() {
                         hideInitialPanels();
-                        eventBus.fireEvent(new ProgressHideEvent());
                     }
                 });
             }

Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -26,7 +26,7 @@
         widget = uiBinder.createAndBindUi(this);
         popup = new PopupPanel(false, false);
         popup.add(widget);
-        popup.setPopupPosition(7, 0);
+        popup.setPopupPosition(0, 0);
         popup.setStyleName("k-spiner-popup");
         popup.show();
     }
@@ -57,7 +57,7 @@
     @Override
     public void show(String message) {
         if (message == null || message.isEmpty()) {
-            label.setText("Fixme");
+            label.setText("");
         } else {
             label.setText(message);
         }

Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -22,15 +22,18 @@
 import cc.kune.core.client.errors.ErrorHandler;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.inject.Inject;
 
 public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> {
 
-    @Inject
-    private ErrorHandler errorHandler;
+    private static ErrorHandler errorHandler;
 
+    @Override
     public void onFailure(final Throwable caught) {
         errorHandler.process(caught);
     }
 
+    public static void init(ErrorHandler kuneErrorHandler) {
+        errorHandler = kuneErrorHandler;
+    }
+
 }

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -1,9 +1,13 @@
 package cc.kune.core.client.sitebar.logo;
 
 import cc.kune.core.client.init.AppStartEvent;
+import cc.kune.core.client.ws.CorePlaceManager;
 
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.inject.Inject;
 import com.gwtplatform.mvp.client.EventBus;
+import com.gwtplatform.mvp.client.HasUiHandlers;
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.client.View;
 import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
@@ -11,9 +15,12 @@
 import com.gwtplatform.mvp.client.proxy.Proxy;
 import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent;
 
-public class SiteLogoPresenter extends Presenter<SiteLogoPresenter.SiteLogoView, SiteLogoPresenter.SiteLogoProxy> {
+public class SiteLogoPresenter extends Presenter<SiteLogoPresenter.SiteLogoView, SiteLogoPresenter.SiteLogoProxy>
+        implements SiteLogoUiHandlers {
 
-    public interface SiteLogoView extends View {
+    private final CorePlaceManager placeManager;
+
+    public interface SiteLogoView extends View, HasUiHandlers<SiteLogoUiHandlers> {
         void setSiteLogoUrl(String siteLogoUrl);
     }
 
@@ -22,8 +29,10 @@
     }
 
     @Inject
-    public SiteLogoPresenter(EventBus eventBus, SiteLogoView view, SiteLogoProxy proxy) {
+    public SiteLogoPresenter(EventBus eventBus, SiteLogoView view, SiteLogoProxy proxy, CorePlaceManager placeManager) {
         super(eventBus, view, proxy);
+        this.placeManager = placeManager;
+        getView().setUiHandlers(this);
     }
 
     @Override
@@ -35,4 +44,14 @@
     public void onAppStart(AppStartEvent event) {
         getView().setSiteLogoUrl(event.getInitData().getSiteLogoUrl());
     }
+
+    @Override
+    public void onClick() {
+        Scheduler.get().scheduleDeferred(new ScheduledCommand() {
+            @Override
+            public void execute() {
+                // placeManager.revealDefaultPlace();
+            }
+        });
+    }
 }
\ No newline at end of file

Modified: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java	2010-12-20 02:20:51 UTC (rev 1173)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java	2010-12-29 03:33:31 UTC (rev 1174)
@@ -1,49 +1,48 @@
-/*
- *
- * Copyright (C) 2007-2009 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.sitebar.logo;
 
+import cc.kune.core.client.sitebar.logo.SiteLogoPresenter.SiteLogoView;
 import cc.kune.core.ws.armor.client.WsArmor;
 
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
-import com.gwtplatform.mvp.client.ViewImpl;
+import com.gwtplatform.mvp.client.ViewWithUiHandlers;
+import com.gwtplatform.mvp.client.proxy.PlaceManager;
 
-public class SiteLogoViewImpl extends ViewImpl implements SiteLogoPresenter.SiteLogoView {
+public class SiteLogoViewImpl extends ViewWithUiHandlers<SiteLogoUiHandlers> implements SiteLogoView {
 
-    private final Image siteLogoImg;
+    private static SiteLogoViewImplUiBinder uiBinder = GWT.create(SiteLogoViewImplUiBinder.class);
 
+    interface SiteLogoViewImplUiBinder extends UiBinder<Widget, SiteLogoViewImpl> {
+    }
+
     @Inject
-    public SiteLogoViewImpl(WsArmor armor) {
-        siteLogoImg = new Image();
-        siteLogoImg.addStyleName("k-floatright");
-        armor.getSitebar().add(siteLogoImg);
+    public SiteLogoViewImpl(WsArmor armor, PlaceManager placeManager) {
+        armor.getSitebar().add(uiBinder.createAndBindUi(this));
     }
 
-    @Override
-    public void setSiteLogoUrl(final String siteLogoUrl) {
-        siteLogoImg.setUrl(siteLogoUrl);
+    @UiField
+    Image logo;
+
+    @UiHandler("logo")
+    void onLogoClick(ClickEvent event) {
+        if (getUiHandlers() != null) {
+            getUiHandlers().onClick();
+        }
     }
 
     @Override
     public Widget asWidget() {
-        return siteLogoImg;
+        return logo;
     }
+
+    @Override
+    public void setSiteLogoUrl(String siteLogoUrl) {
+        logo.setUrl(siteLogoUrl);
+    }
 }

Copied: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java (from rev 1172, trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java)
===================================================================
svnlook: Can't convert string from 'UTF-8' to native encoding:
svnlook: --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java	                        (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl2?\195?\167.java	2010-12-29 03:33:31 UTC (rev 1174)


