r1145 - in trunk: . dev-utils src/main/java/org src/main/java/org/ourproject/kune/app src/main/java/org/ourproject/kune/platf src/main/java/org/ourproject/kune/platf/client/actions src/main/java/org/ourproject/kune/platf/client/actions/ui src/main/java/org/ourproject/kune/platf/client/dto src/main/java/org/ourproject/kune/platf/client/services src/main/java/org/ourproject/kune/platf/client/state src/main/java/org/ourproject/kune/platf/client/ui/download src/main/java/org/ourproject/kune/platf
Author: vjrj Date: 2009-12-26 07:18:15 +0100 (Sat, 26 Dec 2009) New Revision: 1145 Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java trunk/src/main/java/org/xwiki/ trunk/src/main/java/org/xwiki/gwt/ Removed: trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java Modified: trunk/INSTALL trunk/TODO trunk/dev-utils/ trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkExecutableUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/DefCssResource.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java trunk/war/WEB-INF/lib/gwt-servlet.jar Log: gwt 2.0.0 partial Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/INSTALL 2009-12-26 06:18:15 UTC (rev 1145) @@ -100,7 +100,7 @@ Run jetty: - mvn jetty:run -Dliquibase.should.run=false + mvn jetty:run -Dliquibase.should.run=false -Dgwt.compiler.skip=true Once started (and initialized the db), you should stop (Ctrl-C). In the next start the db migrator will run and insert the initial data. @@ -109,7 +109,7 @@ or directly (w$): - mvn jetty:run -Dorg.mortbay.util.FileResource.checkAliases=False + mvn jetty:run -Dorg.mortbay.util.FileResource.checkAliases=False -Dgwt.compiler.skip=true TODO: put the aliases stuff into a jetty config file Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/TODO 2009-12-26 06:18:15 UTC (rev 1145) @@ -11,6 +11,7 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** Compilation in target... resolve ** tag, resolve last implementation complexity. Summary: recover the: [Tag] <-m--m-> [Content] Property changes on: trunk/dev-utils ___________________________________________________________________ Name: svn:ignore - gwt.importorder gwt-checkstyle-tests.xml gwt-checkstyle.xml + gwt.importorder gwt-checkstyle-tests.xml gwt-checkstyle.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/pom.xml 2009-12-26 06:18:15 UTC (rev 1145) @@ -12,8 +12,11 @@ <name>kune</name> <url>http://kune.ourproject.org</url> <properties> - <!-- <gwtVersion>2.0.0-SNAPSHOT</gwtVersion> --> - <gwtVersion>1.7.0</gwtVersion> + <!-- + Available versions: + http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ + --> + <gwt.version>2.0.0</gwt.version> </properties> <dependencies> <!-- guice --> @@ -33,40 +36,19 @@ <version>1.0</version> </dependency> - <!-- GWT deps (from central repo) --> + <!-- GWT dependencies (from maven "central" repo) --> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${gwtVersion}</version> - <scope>runtime</scope> + <version>${gwt.version}</version> + <scope>compile</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwtVersion}</version> + <version>${gwt.version}</version> <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwtVersion}</version> - <classifier>${platform}-libs</classifier> - <type>zip</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwtVersion}</version> - <classifier>${platform}</classifier> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-incubator</artifactId> - <version>march-02-2009</version> - <scope>provided</scope> - </dependency> + </dependency> <!-- <dependency> <groupId>com.extjs</groupId> <artifactId>gxt</artifactId> <version>1.0-beta2</version> @@ -119,13 +101,14 @@ <artifactId>jmagick</artifactId> <version>6.2.6-0</version> </dependency> - <dependency> - <groupId>org.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt-dom</artifactId> - <version>2.0-SNAPSHOT-g164</version> - <!-- <version>2.0-SNAPSHOT</version> --> - <!-- <version>2.0-SNAPSHOT-g20s</version> --> - </dependency> + <!-- + <dependency> <groupId>org.xwiki.platform</groupId> + <artifactId>xwiki-web-gwt-dom</artifactId> <version>2.2</version> + --> + <!-- <version>2.0-SNAPSHOT-g164</version> --> + <!-- <version>2.0-SNAPSHOT</version> --> + <!-- <version>2.0-SNAPSHOT-g20s</version> --> + <!-- </dependency> --> <!-- xmpp --> <dependency> @@ -281,26 +264,24 @@ </dependency> <!-- jetty dependencies --> + <!-- <dependency>--> + <!-- <groupId>org.mortbay.jetty</groupId>--> + <!-- <artifactId>jetty-util</artifactId>--> + <!-- <version>6.1.11</version>--> + <!-- --> + <!-- <version>7.0.0.pre5</version>--> + <!-- --> + <!-- <scope>provided</scope>--> + <!-- </dependency>--> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> +<!-- <artifactId>jetty-maven-plugin</artifactId>--> +<!-- <version>7.0.0.1beta0</version>--> + <version>6.1.11</version> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>6.1.5</version> - <!-- - <version>7.0.0.pre5</version> - --> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <!-- - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.0.1beta0</version> - --> - <version>6.1.5</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> @@ -343,9 +324,9 @@ <!-- wave --> <dependency> - <groupId>org.waveprotocol</groupId> - <artifactId>kune-wave-server</artifactId> - <version>0.0.2.1</version> + <groupId>org.waveprotocol</groupId> + <artifactId>kune-wave-server</artifactId> + <version>0.0.2.2</version> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -422,30 +403,29 @@ <version>1.0-rc2</version> </dependency> </dependencies> - <distributionManagement> <repository> <id>kune.ourproject.org</id> - <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> + <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> </repository> </distributionManagement> - <!-- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/inde... --> <pluginRepositories> - <pluginRepository> - <id>gwt-maven</id> + <!-- + <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> + </pluginRepository> + --> <pluginRepository> <id>Codehaus Snapshots</id> <url>http://snapshots.repository.codehaus.org/</url> <snapshots> - <enabled>false</enabled> + <enabled>true</enabled> </snapshots> <releases> - <enabled>false</enabled> <!-- Workaround for MNG-2974, see note below --> + <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below --> </releases> </pluginRepository> </pluginRepositories> @@ -565,8 +545,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> <!-- Uncomment and run mvn with -X -e if we have same compile problems <compilerArgument>-verbose</compilerArgument> @@ -575,47 +555,30 @@ </configuration> </plugin> <plugin> - <groupId>com.totsp.gwt</groupId> - <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-RC1</version> - <configuration> - <logLevel>INFO</logLevel> - <!-- <style>OBF or PRETTY</style> --> - <style>PRETTY</style> - <!-- - <output>${project.build.directory}/gwt/www</output> - --> - <logLevel>INFO</logLevel> - <noServer>true</noServer> - <extraJvmArgs>-Xmx640m</extraJvmArgs> - <gwtVersion>${gwtVersion}</gwtVersion> - <output>war/</output> - <runTarget>ws/Kune.html</runTarget> - <compileTargets> - <compileTarget>org.ourproject.kune.app.Kune</compileTarget> - </compileTargets> - <generatorRootClasses> - <value>org.ourproject.kune.MyBean</value> - </generatorRootClasses> - <generatorDestinationPackage> org.ourproject.kune.app.Kune </generatorDestinationPackage> - <generateGettersAndSetters> true </generateGettersAndSetters> - <generatePropertyChangeSupport> true </generatePropertyChangeSupport> - </configuration> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <!-- http://mojo.codehaus.org/gwt-maven-plugin/index.html --> + <version>1.2-SNAPSHOT</version> <executions> <execution> + <configuration> + <!-- <extraJvmArgs>-Xmx512M</extraJvmArgs> --> + <soyc>false</soyc> + <style>OBF</style> + </configuration> <goals> - <!-- <goal>mergewebxml</goal> --> - <!-- <goal>compile</goal> --> + <!-- gwt:* goals to be executed during build --> + <goal>compile</goal> + <!-- + http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html + --> + <goal>resources</goal> </goals> </execution> </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> <configuration> - <webXml>${project.build.directory}/WEB-INF/web.xml</webXml> + <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget> + <gwt.module>org.ourproject.kune.app.Kune</gwt.module> </configuration> </plugin> <plugin> @@ -629,19 +592,17 @@ </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> - <!-- - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.0.1beta0</version> - --> + <!-- + <artifactId>jetty-maven-plugin</artifactId> + <version>7.0.0.1beta0</version> + --> <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.5</version> - <configuration> - <contextPath>/</contextPath> - <webAppSourceDirectory>war</webAppSourceDirectory> - <reload>manual</reload> - <scanIntervalSeconds>0</scanIntervalSeconds> - </configuration> - </plugin> + <version>6.1.11</version> <configuration> + <contextPath>/</contextPath> + <webAppSourceDirectory>war</webAppSourceDirectory> + <reload>manual</reload> + <scanIntervalSeconds>0</scanIntervalSeconds> </configuration> + </plugin> <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId> @@ -787,32 +748,6 @@ <followSymlinks>false</followSymlinks> </includes> </fileset> </filesets> </configuration> </plugin> --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwtVersion}</version> - <classifier>${platform}-libs</classifier> - <type>zip</type> - <overWrite>false</overWrite> - <outputDirectory>${settings.localRepository}/com/google/gwt/gwt-dev/${gwtVersion}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> </plugins> <outputDirectory>war/WEB-INF/classes</outputDirectory> <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> @@ -825,11 +760,11 @@ </resource> </resources> <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-beta-2</version> - </extension> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>1.0-beta-2</version> + </extension> </extensions> </build> <reporting> @@ -877,63 +812,4 @@ </plugin> </plugins> </reporting> - - <!-- profiles (with activation per platform) --> - <profiles> - <profile> - <id>gwt-dev-windows</id> - <properties> - <platform>windows</platform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>windows</family> - </os> - </activation> - <!-- FIXME: put here a similar temp directory to linux/unix systems --> - <build> - <directory>target/</directory> - </build> - <reporting> - <outputDirectory>target/</outputDirectory> - </reporting> - </profile> - <profile> - <id>gwt-dev-mac</id> - <properties> - <platform>mac</platform> - </properties> - <activation> - <activeByDefault>false</activeByDefault> - <os> - <family>mac</family> - </os> - </activation> - <build> - <directory>/var/tmp/kune-target/</directory> - </build> - <reporting> - <outputDirectory>/var/tmp/kune-target/</outputDirectory> - </reporting> - </profile> - <profile> - <id>gwt-dev-linux</id> - <properties> - <platform>linux</platform> - </properties> - <activation> - <activeByDefault>true</activeByDefault> - <os> - <name>linux</name> - </os> - </activation> - <build> - <directory>/var/tmp/kune-target/</directory> - </build> - <reporting> - <outputDirectory>/var/tmp/kune-target/</outputDirectory> - </reporting> - </profile> - </profiles> </project> Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,7 +1,8 @@ <!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/src/gwt-module.dtd"> -<module rename-to='ws'> - <inherits name='com.google.gwt.i18n.I18N' /> - <inherits name='com.google.gwt.user.User' /> +<module rename-to="ws"> + <inherits name="com.google.gwt.i18n.I18N" /> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.google.gwt.resources.Resources" /> <!-- for automated testing (see UIObject.ensureDebugId()) --> <inherits name="com.google.gwt.user.Debug"/> @@ -11,20 +12,19 @@ <inherits name="com.calclab.suco.Suco" /> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.docs.KuneDocs' /> - <inherits name='org.ourproject.kune.blogs.KuneBlogs' /> - <inherits name='org.ourproject.kune.wiki.KuneWiki' /> - <inherits name='org.ourproject.kune.chat.KuneChat' /> - <inherits name='org.ourproject.kune.gallery.KuneGallery' /> + <inherits name="org.ourproject.kune.platf.KunePlatform" /> + <inherits name="org.ourproject.kune.docs.KuneDocs" /> + <inherits name="org.ourproject.kune.blogs.KuneBlogs" /> + <inherits name="org.ourproject.kune.wiki.KuneWiki" /> + <inherits name="org.ourproject.kune.chat.KuneChat" /> + <inherits name="org.ourproject.kune.gallery.KuneGallery" /> - <inherits name="com.google.gwt.libideas.ImmutableResources" /> - <inherits name="com.google.gwt.libideas.StyleInjector" /> + <inherits name="org.xwiki.gwt.dom.DOM" /> - <inherits name='org.cobogw.gwt.user.User' /> + <inherits name="org.cobogw.gwt.user.User" /> <!-- gwt-ext --> - <inherits name='com.gwtext.GwtExt' /> + <inherits name="com.gwtext.GwtExt" /> <script src="js/ext/adapter/ext/ext-base.js" /> <script src="js/ext/ext-all.js" /> @@ -54,13 +54,13 @@ <extend-property name="locale" values="ar" /> --> - <!-- Specify the app entry point class. --> - <entry-point class='org.ourproject.kune.app.client.KuneEntryPoint' /> - <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 --> <!-- <set-property name="user.agent" value="gecko" /> --> - <inherits name='com.google.gwt.wave.Wave' /> + <inherits name="com.google.gwt.wave.Wave" /> + <!-- Specify the app entry point class. --> + <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" /> + </module> Modified: trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2009-12-26 06:18:15 UTC (rev 1145) @@ -5,52 +5,50 @@ <inherits name='com.google.gwt.i18n.I18N' /> <inherits name="com.google.gwt.user.UserAgent" /> <inherits name="org.ourproject.kune.platf.RichText" /> + <inherits name="com.google.gwt.resources.Resources" /> <public path="public" /> + <inherits name="com.google.gwt.user.UserAgent" /> + <!-- RTE css inject --> + <!-- See gwt-user: com/google/gwt/user/RichText.gwt.xml --> - <inherits name="com.google.gwt.user.UserAgent" /> - <!-- RTE css inject --> - <!-- See gwt-user: com/google/gwt/user/RichText.gwt.xml --> + <!-- IE-specific implementation --> + <replace-with + class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplIE6"> + <when-type-is + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> + <when-property-is name="user.agent" value="ie6" /> + <when-property-is name="user.agent" value="ie8" /> + </replace-with> - <!-- IE-specific implementation --> - <replace-with - class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplIE6"> - <when-type-is - class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <when-property-is name="user.agent" value="ie6" /> - <when-property-is name="user.agent" value="ie8" /> - </replace-with> + <!-- Mozilla-specific implementation --> + <replace-with + class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplMozilla"> + <when-type-is + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> + <any> + <when-property-is name="user.agent" value="gecko1_8" /> + <when-property-is name="user.agent" value="gecko" /> + </any> + </replace-with> - <!-- Mozilla-specific implementation --> - <replace-with - class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplMozilla"> - <when-type-is - class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <any> - <when-property-is name="user.agent" value="gecko1_8" /> - <when-property-is name="user.agent" value="gecko" /> - </any> - </replace-with> + <!-- Safari-specific implementation --> + <replace-with + class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplSafari"> + <when-type-is + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> + <any> + <when-property-is name="user.agent" value="safari" /> + </any> + </replace-with> - <!-- Safari-specific implementation --> - <replace-with - class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplSafari"> - <when-type-is - class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <any> - <when-property-is name="user.agent" value="safari" /> - </any> - </replace-with> - - <!-- Opera-specific implementation --> - <replace-with - class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplOpera"> - <when-type-is - class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <any> - <when-property-is name="user.agent" value="opera" /> - </any> - </replace-with> - - -</module> + <!-- Opera-specific implementation --> + <replace-with + class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplOpera"> + <when-type-is + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> + <any> + <when-property-is name="user.agent" value="opera" /> + </any> + </replace-with> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractAction.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -39,7 +39,7 @@ import java.util.HashMap; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; /** * A base class for implementing the {@link Action} interface. Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/AbstractExtendedAction.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.client.actions; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; public abstract class AbstractExtendedAction extends AbstractAction { public static final String NO_TEXT = null; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractGuiItem.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -7,7 +7,7 @@ import org.ourproject.kune.platf.client.actions.PropertyChangeListener; import org.ourproject.kune.platf.client.ui.img.ImgConstants; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; public abstract class AbstractGuiItem extends Composite implements View { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -4,8 +4,10 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; + public class BaseAction extends AbstractAction { public BaseAction(final String text, final String tooltip) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuDescriptor.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.actions.AbstractAction; import org.ourproject.kune.platf.client.actions.Action; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; public class MenuDescriptor extends GuiActionDescrip { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -139,6 +139,7 @@ return oggEmbedObject; } + @Deprecated public String getSiteDomain() { return siteDomain; } @@ -255,6 +256,7 @@ this.oggEmbedObject = oggEmbedObject; } + @Deprecated public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -110,7 +110,7 @@ import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; import com.google.gwt.core.client.GWT; -import com.google.gwt.libideas.client.StyleInjector; +import com.google.gwt.dom.client.StyleInjector; public class PlatformModule extends AbstractExtendedModule { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -43,6 +43,7 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; +import com.google.gwt.core.client.GWT; public class SessionDefault implements Session { private String userHash; @@ -171,7 +172,8 @@ } public String getSiteUrl() { - return initData.getSiteUrl(); + final String baseURL = GWT.getModuleBaseURL(); + return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName())); } public Object[][] getTimezones() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -26,13 +26,14 @@ import org.ourproject.kune.platf.client.utils.Url; import org.ourproject.kune.platf.client.utils.UrlParam; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.RootPanel; public class FileDownloadUtils { - private static final String DOWNLOADSERVLET = "/ws/servlets/FileDownloadManager"; - private static final String LOGODOWNLOADSERVLET = "/ws/servlets/EntityLogoDownloadManager"; + private static final String DOWNLOADSERVLET = "servlets/FileDownloadManager"; + private static final String LOGODOWNLOADSERVLET = "servlets/EntityLogoDownloadManager"; private final Session session; private final ImageUtils imageUtils; @@ -67,7 +68,8 @@ } public String getLogoImageUrl(final StateToken token) { - return new Url(LOGODOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString())).toString(); + return new Url(GWT.getModuleBaseURL() + LOGODOWNLOADSERVLET, + new UrlParam(FileConstants.TOKEN, token.toString())).toString(); } public String getUrl(final StateToken token) { @@ -75,12 +77,13 @@ } private String calculateUrl(final StateToken token, final boolean download, final boolean useHash) { - Url url = new Url(DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, token.toString())); + final Url url = new Url(GWT.getModuleBaseURL() + DOWNLOADSERVLET, new UrlParam(FileConstants.TOKEN, + token.toString())); if (download) { url.add(new UrlParam(FileConstants.DOWNLOAD, download)); } if (useHash) { - String hash = session.getUserHash(); + final String hash = session.getUserHash(); if (hash != null) { url.add(new UrlParam(FileConstants.HASH, hash)); } Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/IconCssResource.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -0,0 +1,7 @@ +package org.ourproject.kune.platf.client.ui.img; + +import com.google.gwt.resources.client.CssResource; + +public interface IconCssResource extends CssResource { + String iconSpriteClass(); +} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgConstants.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.client.ui.img; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; public final class ImgConstants { Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgCssResource.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -0,0 +1,33 @@ +package org.ourproject.kune.platf.client.ui.img; + +import com.google.gwt.resources.client.CssResource; + +public interface ImgCssResource extends CssResource { + + @ClassName("k-icon-addGreen") + String kIconAddGreen(); + + @ClassName("k-icon-bug") + String kIconBug(); + + @ClassName("k-icon-groupHome") + String kIconGroupHome(); + + @ClassName("k-icon-info") + String kIconInfo(); + + @ClassName("k-icon-kuneIcon16") + String kIconKuneIcon16(); + + @ClassName("k-icon-language") + String kIconLanguage(); + + @ClassName("k-icon-maximize") + String kIconMaximize(); + + @ClassName("k-icon-minimize") + String kIconMinimize(); + + @ClassName("k-icon-prefs") + String kIconPrefs(); +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,41 +1,42 @@ package org.ourproject.kune.platf.client.ui.img; -import com.google.gwt.libideas.resources.client.CssResource; -import com.google.gwt.libideas.resources.client.ImageResource; -import com.google.gwt.libideas.resources.client.ImmutableResourceBundle; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.resources.client.CssResource.Strict; -public interface ImgResources extends ImmutableResourceBundle { +public interface ImgResources extends ClientBundle { - @Resource("add-green.png") + @Source("add-green.png") ImageResource addGreen(); - @Resource("bug.png") + @Source("bug.png") ImageResource bug(); - @Resource("kimg.css") - CssResource css(); + @Source("kimg.css") + @Strict + ImgCssResource css(); - @Resource("del-green.png") + @Source("del-green.png") ImageResource delGreen(); - @Resource("group-home.png") + @Source("group-home.png") ImageResource groupHome(); - @Resource("info.png") + @Source("info.png") ImageResource info(); - @Resource("kune-icon16.png") + @Source("kune-icon16.png") ImageResource kuneIcon16(); - @Resource("language.png") + @Source("language.png") ImageResource language(); - @Resource("arrow_out.png") + @Source("arrow_out.png") ImageResource maximize(); - @Resource("arrow_in.png") + @Source("arrow_in.png") ImageResource minimize(); - @Resource("prefs.png") + @Source("prefs.png") ImageResource prefs(); -} \ No newline at end of file +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,35 +1,36 @@ + @sprite div .k-icon-info { - gwt-image: 'info'; + gwt-image: "info"; } @sprite div .k-icon-language { - gwt-image: 'language'; + gwt-image: "language"; } @sprite div .k-icon-kuneIcon16 { - gwt-image: 'kuneIcon16'; + gwt-image: "kuneIcon16"; } @sprite div .k-icon-bug { - gwt-image: 'bug'; + gwt-image: "bug"; } @sprite div .k-icon-prefs { - gwt-image: 'prefs'; + gwt-image: "prefs"; } @sprite div .k-icon-groupHome { - gwt-image: 'groupHome'; + gwt-image: "groupHome"; } @sprite div .k-icon-addGreen { - gwt-image: 'addGreen'; + gwt-image: "addGreen"; } @sprite div .k-icon-maximize { - gwt-image: 'maximize'; + gwt-image: "maximize"; } @sprite div .k-icon-minimize { - gwt-image: 'minimize'; + gwt-image: "minimize"; } \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -50,7 +50,7 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Event; public class RTEditorPresenter extends AbstractActionExtensiblePresenter implements RTEditor { Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -0,0 +1,111 @@ +package org.ourproject.kune.platf.client.ui.rte.img; + +import com.google.gwt.resources.client.CssResource; + +public interface RTEImgCssResource extends CssResource { + + @ClassName("k-icon-alignleft") + String kIconAlignleft(); + + @ClassName("k-icon-alignright") + String kIconAlignright(); + + @ClassName("k-icon-backcolor") + String kIconBackcolor(); + + @ClassName("k-icon-bold") + String kIconBold(); + + @ClassName("k-icon-centerpara") + String kIconCenterpara(); + + @ClassName("k-icon-charfontname") + String kIconCharfontname(); + + @ClassName("k-icon-copy") + String kIconCopy(); + + @ClassName("k-icon-cut") + String kIconCut(); + + @ClassName("k-icon-decrementindent") + String kIconDecrementindent(); + + @ClassName("k-icon-defaultbullet") + String kIconDefaultbullet(); + + @ClassName("k-icon-defaultnumbering") + String kIconDefaultnumbering(); + + @ClassName("k-icon-edithtml") + String kIconEdithtml(); + + @ClassName("k-icon-film") + String kIconFilm(); + + @ClassName("k-icon-fontcolor") + String kIconFontcolor(); + + @ClassName("k-icon-fontheight") + String kIconFontheight(); + + @ClassName("k-icon-hfixedline") + String kIconHfixedline(); + + @ClassName("k-icon-images") + String kIconImages(); + + @ClassName("k-icon-incrementindent") + String kIconIncrementindent(); + + @ClassName("k-icon-insertspreadsheet") + String kIconInsertspreadsheet(); + + @ClassName("k-icon-insertsymbol") + String kIconInsertsymbol(); + + @ClassName("k-icon-inserttable") + String kIconInserttable(); + + @ClassName("k-icon-italic") + String kIconItalic(); + + @ClassName("k-icon-link") + String kIconLink(); + + @ClassName("k-icon-linkbreak") + String kIconLinkbreak(); + + @ClassName("k-icon-paste") + String kIconPaste(); + + @ClassName("k-icon-redo") + String kIconRedo(); + + @ClassName("k-icon-removeFormat") + String kIconRemoveFormat(); + + @ClassName("k-icon-save") + String kIconSave(); + + @ClassName("k-icon-selectall") + String kIconSelectall(); + + @ClassName("k-icon-specialchars") + String kIconSpecialchars(); + + @ClassName("k-icon-strikeout") + String kIconStrikeout(); + + @ClassName("k-icon-subscript") + String kIconSubscript(); + + @ClassName("k-icon-superscript") + String kIconSuperscript(); + + @ClassName("k-icon-underline") + String kIconUnderline(); + + @ClassName("k-icon-undo") + String kIconUndo(); +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,118 +1,119 @@ package org.ourproject.kune.platf.client.ui.rte.img; -import com.google.gwt.libideas.resources.client.CssResource; -import com.google.gwt.libideas.resources.client.ImageResource; -import com.google.gwt.libideas.resources.client.ImmutableResourceBundle; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; +import com.google.gwt.resources.client.CssResource.Strict; // @PMD:REVIEWED:TooManyMethods: by vjrj on 27/05/09 0:06 -public interface RTEImgResources extends ImmutableResourceBundle { +public interface RTEImgResources extends ClientBundle { - @Resource("alignleft.png") + @Source("alignleft.png") ImageResource alignleft(); - @Resource("alignright.png") + @Source("alignright.png") ImageResource alignright(); - @Resource("backcolor.png") + @Source("backcolor.png") ImageResource backcolor(); - @Resource("bold.png") + @Source("bold.png") ImageResource bold(); - @Resource("centerpara.png") + @Source("centerpara.png") ImageResource centerpara(); - @Resource("charfontname.png") + @Source("charfontname.png") ImageResource charfontname(); - @Resource("copy.png") + @Source("copy.png") ImageResource copy(); - @Resource("rteimg.css") - CssResource css(); + @Source("rteimg.css") + @Strict + RTEImgCssResource css(); - @Resource("cut.png") + @Source("cut.png") ImageResource cut(); - @Resource("decrementindent.png") + @Source("decrementindent.png") ImageResource decrementindent(); - @Resource("defaultbullet.png") + @Source("defaultbullet.png") ImageResource defaultbullet(); - @Resource("defaultnumbering.png") + @Source("defaultnumbering.png") ImageResource defaultnumbering(); - @Resource("edithtml.png") + @Source("edithtml.png") ImageResource edithtml(); - @Resource("film.png") + @Source("film.png") ImageResource film(); - @Resource("fontcolor.png") + @Source("fontcolor.png") ImageResource fontcolor(); - @Resource("fontheight.png") + @Source("fontheight.png") ImageResource fontheight(); - @Resource("hfixedline.png") + @Source("hfixedline.png") ImageResource hfixedline(); - @Resource("images.png") + @Source("images.png") ImageResource images(); - @Resource("incrementindent.png") + @Source("incrementindent.png") ImageResource incrementindent(); - @Resource("insertspreadsheet.png") + @Source("insertspreadsheet.png") ImageResource insertspreadsheet(); - @Resource("insertsymbol.png") + @Source("insertsymbol.png") ImageResource insertsymbol(); - @Resource("inserttable.png") + @Source("inserttable.png") ImageResource inserttable(); - @Resource("italic.png") + @Source("italic.png") ImageResource italic(); - @Resource("link.png") + @Source("link.png") ImageResource link(); - @Resource("linkbreak.png") + @Source("linkbreak.png") ImageResource linkbreak(); - @Resource("paste.png") + @Source("paste.png") ImageResource paste(); - @Resource("redo.png") + @Source("redo.png") ImageResource redo(); - @Resource("removeFormat.png") + @Source("removeFormat.png") ImageResource removeFormat(); - @Resource("save.png") + @Source("save.png") ImageResource save(); - @Resource("selectall.png") + @Source("selectall.png") ImageResource selectall(); - @Resource("specialchars.png") + @Source("specialchars.png") ImageResource specialchars(); - @Resource("strikeout.png") + @Source("strikeout.png") ImageResource strikeout(); - @Resource("subscript.png") + @Source("subscript.png") ImageResource subscript(); - @Resource("superscript.png") + @Source("superscript.png") ImageResource superscript(); - @Resource("underline.png") + @Source("underline.png") ImageResource underline(); - @Resource("undo.png") + @Source("undo.png") ImageResource undo(); -} \ No newline at end of file +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,139 +1,139 @@ @sprite div .k-icon-underline { - gwt-image: 'underline'; + gwt-image: "underline"; } @sprite div .k-icon-superscript { - gwt-image: 'superscript'; + gwt-image: "superscript"; } @sprite div .k-icon-subscript { - gwt-image: 'subscript'; + gwt-image: "subscript"; } @sprite div .k-icon-film { - gwt-image: 'film'; + gwt-image: "film"; } @sprite div .k-icon-strikeout { - gwt-image: 'strikeout'; + gwt-image: "strikeout"; } @sprite div .k-icon-removeFormat { - gwt-image: 'removeFormat'; + gwt-image: "removeFormat"; } @sprite div .k-icon-link { - gwt-image: 'link'; + gwt-image: "link"; } @sprite div .k-icon-linkbreak { - gwt-image: 'linkbreak'; + gwt-image: "linkbreak"; } @sprite div .k-icon-italic { - gwt-image: 'italic'; + gwt-image: "italic"; } @sprite div .k-icon-incrementindent { - gwt-image: 'incrementindent'; + gwt-image: "incrementindent"; } @sprite div .k-icon-images { - gwt-image: 'images'; + gwt-image: "images"; } @sprite div .k-icon-hfixedline { - gwt-image: 'hfixedline'; + gwt-image: "hfixedline"; } @sprite div .k-icon-fontheight { - gwt-image: 'fontheight'; + gwt-image: "fontheight"; } @sprite div .k-icon-fontcolor { - gwt-image: 'fontcolor'; + gwt-image: "fontcolor"; } @sprite div .k-icon-edithtml { - gwt-image: 'edithtml'; + gwt-image: "edithtml"; } @sprite div .k-icon-defaultnumbering { - gwt-image: 'defaultnumbering'; + gwt-image: "defaultnumbering"; } @sprite div .k-icon-defaultbullet { - gwt-image: 'defaultbullet'; + gwt-image: "defaultbullet"; } @sprite div .k-icon-decrementindent { - gwt-image: 'decrementindent'; + gwt-image: "decrementindent"; } @sprite div .k-icon-charfontname { - gwt-image: 'charfontname'; + gwt-image: "charfontname"; } @sprite div .k-icon-centerpara { - gwt-image: 'centerpara'; + gwt-image: "centerpara"; } @sprite div .k-icon-bold { - gwt-image: 'bold'; + gwt-image: "bold"; } @sprite div .k-icon-backcolor { - gwt-image: 'backcolor'; + gwt-image: "backcolor"; } @sprite div .k-icon-alignright { - gwt-image: 'alignright'; + gwt-image: "alignright"; } @sprite div .k-icon-alignleft { - gwt-image: 'alignleft'; + gwt-image: "alignleft"; } @sprite div .k-icon-specialchars { - gwt-image: 'specialchars'; + gwt-image: "specialchars"; } @sprite div .k-icon-copy { - gwt-image: 'copy'; + gwt-image: "copy"; } @sprite div .k-icon-cut { - gwt-image: 'cut'; + gwt-image: "cut"; } @sprite div .k-icon-insertspreadsheet { - gwt-image: 'insertspreadsheet'; + gwt-image: "insertspreadsheet"; } @sprite div .k-icon-insertsymbol { - gwt-image: 'insertsymbol'; + gwt-image: "insertsymbol"; } @sprite div .k-icon-inserttable { - gwt-image: 'inserttable'; + gwt-image: "inserttable"; } @sprite div .k-icon-paste { - gwt-image: 'paste'; + gwt-image: "paste"; } @sprite div .k-icon-redo { - gwt-image: 'redo'; + gwt-image: "redo"; } @sprite div .k-icon-save { - gwt-image: 'save'; + gwt-image: "save"; } @sprite div .k-icon-selectall { - gwt-image: 'selectall'; + gwt-image: "selectall"; } @sprite div .k-icon-undo { - gwt-image: 'undo'; + gwt-image: "undo"; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkExecutableUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkExecutableUtils.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/LinkExecutableUtils.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -59,13 +59,13 @@ * the rich text area whose selection to test * @return the anchor in which the current selection is found */ - public static Element getSelectedAnchor(RichTextArea rta) { + public static Element getSelectedAnchor(final RichTextArea rta) { // there is no wrapping anchor if there is no selection if (rta.getDocument().getSelection().getRangeCount() == 0) { return null; } // Find the selected anchor by the following algorithm: - Range range = rta.getDocument().getSelection().getRangeAt(0); + final Range range = rta.getDocument().getSelection().getRangeAt(0); // if the selection is collapsed, we have our answer already if (range.isCollapsed()) { return (Element) DOMUtils.getInstance().getFirstAncestor(range.getStartContainer(), ANCHOR_TAG_NAME); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -30,8 +30,9 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; + public class RTESavingEditorPresenter extends RTEditorPresenter implements RTESavingEditor { public class AutoSaveAction extends AbstractExtendedAction { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -148,6 +148,7 @@ return oggEmbedObject; } + @Deprecated public String getSiteDomain() { return siteDomain; } @@ -260,6 +261,7 @@ this.oggEmbedObject = oggEmbedObject; } + @Deprecated public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -34,7 +34,7 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; import com.google.gwt.user.client.Window.ClosingHandler; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -12,7 +12,7 @@ import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; public class MaxMinWorkspacePresenter implements MaxMinWorkspace { public class MaximizeAction extends AbstractExtendedAction { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/DefCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/DefCssResource.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/DefCssResource.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,11 +1,11 @@ package org.ourproject.kune.workspace.client.site; -import com.google.gwt.libideas.resources.client.CssResource; -import com.google.gwt.libideas.resources.client.ImmutableResourceBundle; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; -public interface DefCssResource extends ImmutableResourceBundle { +public interface DefCssResource extends ClientBundle { - @Resource("defCssResource.css") + @Source("defCssResource.css") CssResource css(); } Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -1,13 +0,0 @@ -package org.ourproject.kune.workspace.client.site; - -import com.google.gwt.libideas.resources.client.ImmutableResourceBundle; -import com.google.gwt.libideas.resources.client.TextResource; - -public interface SiteResources extends ImmutableResourceBundle { - - @Deprecated - // not used now, only here for future use - @Resource("about.html") - public TextResource aboutKune(); - -} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -10,7 +10,7 @@ import org.ourproject.kune.platf.client.state.StateManager; import com.calclab.suco.client.events.Listener2; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; public abstract class RolAction extends AbstractExtendedAction { Property changes on: trunk/src/main/java/org/xwiki ___________________________________________________________________ Name: svn:externals + gwt http://svn.xwiki.org/svnroot/xwiki/platform/web/trunk/xwiki-gwt-dom/src/main... Property changes on: trunk/src/main/java/org/xwiki/gwt ___________________________________________________________________ Name: svn:externals + dom http://svn.xwiki.org/svnroot/xwiki/platform/web/trunk/xwiki-gwt-dom/src/main... Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java 2009-11-27 22:48:03 UTC (rev 1144) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java 2009-12-26 06:18:15 UTC (rev 1145) @@ -18,7 +18,7 @@ import com.calclab.suco.client.events.Listener0; import com.calclab.suco.testing.events.MockedListener; import com.calclab.suco.testing.events.MockedListener0; -import com.google.gwt.libideas.resources.client.ImageResource; +import com.google.gwt.resources.client.ImageResource; public class RTESavingEditorPresenterTest { Modified: trunk/war/WEB-INF/lib/gwt-servlet.jar =================================================================== (Binary files differ)
participants (1)
-
vjrj