Author: vjrj_ Date: 2011-08-16 21:07:23 +0200 (Tue, 16 Aug 2011) New Revision: 1496 Added: trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java trunk/src/main/java/cc/kune/core/shared/dto/ReservedWordsRegistryDTO.java trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java trunk/src/main/resources/db/update-0016-meetings.sql Removed: trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java Modified: trunk/.classpath trunk/pom.xml trunk/script/liquibase-migrate.sh trunk/script/liquibase-rollback.sh trunk/src/main/java/cc/kune/common/client/actions/AbstractAction.java trunk/src/main/java/cc/kune/common/client/actions/Action.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java trunk/src/main/java/cc/kune/core/server/InitData.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java trunk/src/main/java/cc/kune/meets/client/MeetingsClientTool.java trunk/src/main/java/cc/kune/meets/shared/MeetingsConstants.java trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java trunk/src/main/resources/db/liquibase_changelog.xml trunk/src/main/resources/kune.properties trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java Log: CLOSED - # 95: Rename "Meets" for "Events" http://kune.ourproject.org/issues/ticket/95 CLOSED - # 43: Server side Reserved Words (thanks to Alfredo Alvarez) http://kune.ourproject.org/issues/ticket/43 NEW - # 93: List tool http://kune.ourproject.org/issues/ticket/93 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/.classpath 2011-08-16 19:07:23 UTC (rev 1496) @@ -1,155 +1,154 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/> - <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> - <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/com/google/appengine/appengine-api-1.0-sdk/1.3.1/appengine-api-1.0-sdk-1.3.1.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/org/waveprotocol/box/0.3.1-SNAPSHOT/box-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.1-SNAPSHOT/box-src-0.3.1-SNAPSHOT.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/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.1-SNAPSHOT/client-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.1-SNAPSHOT/client-common-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.1-SNAPSHOT/client-common-src-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.1-SNAPSHOT/client-scheduler-src-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.1-SNAPSHOT/client-src-0.3.1-SNAPSHOT.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.1-SNAPSHOT/common-src-0.3.1-SNAPSHOT.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"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> - <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.1-SNAPSHOT/communication-src-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.1-SNAPSHOT/concurrencycontrol-src-0.3.1-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/crawl_htmlunit/r5662-gae/crawl_htmlunit-r5662-gae.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"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/dnd/gwt-dnd/gwt-dnd/3.0.1/gwt-dnd-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> - <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.1-SNAPSHOT/gwt-util-src-0.3.1-SNAPSHOT.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/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.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"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> - <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> - <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.7/htmlunit-2.7.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.7/htmlunit-2.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.7/htmlunit-core-js-2.7.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.7/htmlunit-core-js-2.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12.jar" sourcepath="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> - <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/3.2.2/jna-3.2.2.jar" sourcepath="M2_REPO/net/java/dev/jna/jna/3.2.2/jna-3.2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar" sourcepath="M2_REPO/org/json/json/20080701/json-20080701-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2.jar" sourcepath="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.7.0.0/liquibase-plugin-1.7.0.0.jar"/> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> - <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.1-SNAPSHOT/media-src-0.3.1-SNAPSHOT.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.1-SNAPSHOT/model-src-0.3.1-SNAPSHOT.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.14/nekohtml-1.9.14.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.14/nekohtml-1.9.14-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.1-SNAPSHOT/proto-msg-0.3.1-SNAPSHOT.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/2.0a4/selenium-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a4/selenium-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a4/selenium-chrome-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a4/selenium-chrome-driver-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a4/selenium-common-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a4/selenium-common-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.0a4/selenium-firefox-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.0a4/selenium-firefox-driver-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.0a4/selenium-htmlunit-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.0a4/selenium-htmlunit-driver-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.0a4/selenium-ie-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.0a4/selenium-ie-driver-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-client/2.0a4/selenium-remote-client-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-client/2.0a4/selenium-remote-client-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-common/2.0a4/selenium-remote-common-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-common/2.0a4/selenium-remote-common-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-support/2.0a4/selenium-support-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-support/2.0a4/selenium-support-2.0a4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.1.0/smack-3.1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/jivesoftware/smackx/3.1.0/smackx-3.1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar"/> - <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.0.1/testng-6.0.1.jar" sourcepath="M2_REPO/org/testng/testng/6.0.1/testng-6.0.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.1-SNAPSHOT/util-src-0.3.1-SNAPSHOT.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.1-SNAPSHOT/waveinabox-server-0.3-0.3.1-SNAPSHOT.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"/> - <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> - <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> - <classpathentry kind="output" path="target/kune-0.1.0-SNAPSHOT/WEB-INF/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/kune-0.1.0-SNAPSHOT/WEB-INF/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <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/com/google/appengine/appengine-api-1.0-sdk/1.3.1/appengine-api-1.0-sdk-1.3.1.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/org/waveprotocol/box/0.3.1-SNAPSHOT/box-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.1-SNAPSHOT/box-src-0.3.1-SNAPSHOT.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/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.1-SNAPSHOT/client-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.1-SNAPSHOT/client-common-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.1-SNAPSHOT/client-common-src-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.1-SNAPSHOT/client-scheduler-src-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.1-SNAPSHOT/client-src-0.3.1-SNAPSHOT.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.1-SNAPSHOT/common-src-0.3.1-SNAPSHOT.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"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <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.1-SNAPSHOT/communication-src-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.1-SNAPSHOT/concurrencycontrol-src-0.3.1-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/crawl_htmlunit/r5662-gae/crawl_htmlunit-r5662-gae.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"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar" sourcepath="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite/r1694/emite-r1694.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-persist/3.0/guice-persist-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar" sourcepath="M2_REPO/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/dnd/gwt-dnd/gwt-dnd/3.0.1/gwt-dnd-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/adamtacy/gwt-fx/r464/gwt-fx-r464.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-gin/1.0-r137/gwt-gin-1.0-r137.jar"/> + <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.1-SNAPSHOT/gwt-util-src-0.3.1-SNAPSHOT.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/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtextux/gwtextux/0.4.0.924/gwtextux-0.4.0.924.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"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-crawler/0.5/gwtp-crawler-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-client/0.5/gwtp-dispatch-client-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-server/0.5/gwtp-dispatch-server-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-dispatch-shared/0.5/gwtp-dispatch-shared-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-mvp-client/0.5/gwtp-mvp-client-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> + <classpathentry kind="var" path="M2_REPO/com/calclab/emite/hablar/r1697/hablar-r1697.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-all/1.1/hamcrest-all-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-c3p0/3.3.1.GA/hibernate-c3p0-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga.jar" sourcepath="M2_REPO/org/hibernate/hibernate-commons-annotations/3.3.0.ga/hibernate-commons-annotations-3.3.0.ga-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-search/3.1.0.GA/hibernate-search-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-tools/3.2.3.GA/hibernate-tools-3.2.3.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA.jar" sourcepath="M2_REPO/org/hibernate/hibernate-validator/3.1.0.GA/hibernate-validator-3.1.0.GA-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.7/htmlunit-2.7.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit/2.7/htmlunit-2.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.7/htmlunit-core-js-2.7.jar" sourcepath="M2_REPO/net/sourceforge/htmlunit/htmlunit-core-js/2.7/htmlunit-core-js-2.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12.jar" sourcepath="M2_REPO/com/beust/jcommander/1.12/jcommander-1.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2.jar" sourcepath="M2_REPO/org/codehaus/jettison/jettison/1.0-RC2/jettison-1.0-RC2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jmagick/jmagick/6.2.6-0/jmagick-6.2.6-0.jar"/> + <classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/3.2.2/jna-3.2.2.jar" sourcepath="M2_REPO/net/java/dev/jna/jna/3.2.2/jna-3.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/jruby-complete/1.2.0/jruby-complete-1.2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jruby/rack/jruby-rack/0.9.4/jruby-rack-0.9.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar" sourcepath="M2_REPO/org/json/json/20080701/json-20080701-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2.jar" sourcepath="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.8.1.0/liquibase-plugin-1.8.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.4.0/lucene-core-2.4.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/> + <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.1-SNAPSHOT/media-src-0.3.1-SNAPSHOT.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.1-SNAPSHOT/model-src-0.3.1-SNAPSHOT.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.14/nekohtml-1.9.14.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.14/nekohtml-1.9.14-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.1-SNAPSHOT/proto-msg-0.3.1-SNAPSHOT.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/2.0a4/selenium-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium/2.0a4/selenium-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a4/selenium-chrome-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.0a4/selenium-chrome-driver-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a4/selenium-common-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-common/2.0a4/selenium-common-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.0a4/selenium-firefox-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.0a4/selenium-firefox-driver-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.0a4/selenium-htmlunit-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.0a4/selenium-htmlunit-driver-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.0a4/selenium-ie-driver-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.0a4/selenium-ie-driver-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-client/2.0a4/selenium-remote-client-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-client/2.0a4/selenium-remote-client-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-common/2.0a4/selenium-remote-common-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-common/2.0a4/selenium-remote-common-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-support/2.0a4/selenium-support-2.0a4.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-support/2.0a4/selenium-support-2.0a4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jivesoftware/smack/3.1.0/smack-3.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/jivesoftware/smackx/3.1.0/smackx-3.1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jivesoftware/smackx/debugger/smackx-debugger/3.0.4/smackx-debugger-3.0.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar" sourcepath="M2_REPO/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar"/> + <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.0.1/testng-6.0.1.jar" sourcepath="M2_REPO/org/testng/testng/6.0.1/testng-6.0.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.1-SNAPSHOT/util-src-0.3.1-SNAPSHOT.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.1-SNAPSHOT/waveinabox-server-0.3-0.3.1-SNAPSHOT.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"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> + <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar" sourcepath="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1.jar" sourcepath="M2_REPO/org/xwiki/platform/xwiki-web-gwt-dom/2.3-rc-1/xwiki-web-gwt-dom-2.3-rc-1-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path=".apt_generated" including="**/*.java"/> <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/> +</classpath> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/pom.xml 2011-08-16 19:07:23 UTC (rev 1496) @@ -492,12 +492,12 @@ <dependency> <groupId>org.liquibase</groupId> <artifactId>liquibase-core</artifactId> - <version>1.7.0</version> + <version>1.8.1</version> </dependency> <dependency> <groupId>org.liquibase</groupId> <artifactId>liquibase-plugin</artifactId> - <version>1.7.0.0</version> + <version>1.8.1.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: trunk/script/liquibase-migrate.sh =================================================================== --- trunk/script/liquibase-migrate.sh 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/script/liquibase-migrate.sh 2011-08-16 19:07:23 UTC (rev 1496) @@ -1,12 +1,13 @@ . script/mvn-vars.sh -java -jar $M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar \ +java -jar $M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar \ --driver=com.mysql.jdbc.Driver \ --classpath=$M2_REPO/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \ --changeLogFile=src/main/resources/db/liquibase_changelog.xml \ --url="jdbc:mysql://localhost/kune_dev" \ --username=kune \ --password=db4kune \ - migrate + migrate + #clearCheckSums #java -jar $M2_REPO/org/liquibase/liquibase-core/1.4.1/liquibase-core-1.4.1.jar \ # --defaultsFile=src/main/resources/db/liquibase.properties \ Modified: trunk/script/liquibase-rollback.sh =================================================================== --- trunk/script/liquibase-rollback.sh 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/script/liquibase-rollback.sh 2011-08-16 19:07:23 UTC (rev 1496) @@ -1,5 +1,5 @@ . script/mvn-vars.sh -java -jar $M2_REPO/org/liquibase/liquibase-core/1.7.0/liquibase-core-1.7.0.jar \ +java -jar $M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar \ --driver=com.mysql.jdbc.Driver \ --classpath=$M2_REPO/mysql/mysql-connector-java/5.0.5/mysql-connector-java-5.0.5.jar \ --changeLogFile=src/main/resources/db/liquibase_changelog.xml \ Modified: trunk/src/main/java/cc/kune/common/client/actions/AbstractAction.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/AbstractAction.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/common/client/actions/AbstractAction.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -47,111 +47,111 @@ */ public abstract class AbstractAction extends ChangeableObject implements Action { - public final static AbstractAction NO_ACTION = new NoAction(); + public final static AbstractAction NO_ACTION = new NoAction(); - /** - * Creates a new action with no properties set. - */ - public AbstractAction() { - // Nothing to do. - } + /** + * Creates a new action with no properties set. + */ + public AbstractAction() { + // Nothing to do. + } - /** - * Copy constructor used as a substitute of clone - */ - @SuppressWarnings("unchecked") - public AbstractAction(final AbstractAction action) { - store = (HashMap<String, Object>) action.store.clone(); - } + /** + * Copy constructor used as a substitute of clone + */ + @SuppressWarnings("unchecked") + public AbstractAction(final AbstractAction action) { + store = (HashMap<String, Object>) action.store.clone(); + } - /** - * Creates a new action with the specified name. The name is stored as a - * property with the key {@link Action#NAME}, and no other properties are - * initialised. - * - * @param name - * the name (<code>null</code> permitted). - */ - public AbstractAction(final String name) { - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 - // 15:19 - putValue(NAME, name); - } + /** + * Creates a new action with the specified name. The name is stored as a + * property with the key {@link Action#NAME}, and no other properties are + * initialised. + * + * @param name + * the name (<code>null</code> permitted). + */ + public AbstractAction(final String name) { + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 15:19 + putValue(NAME, name); + } - /** - * Creates a new action with the specified name and icon. The name is stored - * as a property with the key {@link Action#NAME}, the icon is stored as a - * property with the key {@link Action#SMALL_ICON}, and no other properties - * are initialised. - * - * @param name - * the name (<code>null</code> permitted). - * @param icon - * the icon (<code>null</code> permitted). - */ - public AbstractAction(final String name, final String icon) { - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 - // 15:19 - putValue(NAME, name); - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 - // 15:19 - putValue(SMALL_ICON, icon); - } + /** + * Creates a new action with the specified name and icon. The name is stored + * as a property with the key {@link Action#NAME}, the icon is stored as a + * property with the key {@link Action#SMALL_ICON}, and no other properties + * are initialised. + * + * @param name + * the name (<code>null</code> permitted). + * @param icon + * the icon (<code>null</code> permitted). + */ + public AbstractAction(final String name, final String icon) { + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 15:19 + putValue(NAME, name); + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 15:19 + putValue(SMALL_ICON, icon); + } - /** - * Returns the flag that indicates whether or not the action is enabled. - * - * @return The flag. - * - * @see #setEnabled(boolean) - */ - @Override - public boolean isEnabled() { - return (Boolean) super.getValue(ENABLED); - } + /** + * Returns the flag that indicates whether or not the action is enabled. + * + * @return The flag. + * + * @see #setEnabled(boolean) + */ + @Override + public boolean isEnabled() { + return (Boolean) super.getValue(ENABLED); + } - @Override - /** - * Sets the value associated with the specified key and sends a - * {@link java.beans.PropertyChangeEvent} to all registered listeners. The - * standard keys are: - * <ul> - * <li>{@link #NAME}</li> - * <li>{@link #SHORT_DESCRIPTION}</li> - * <li>{@link #LONG_DESCRIPTION}</li> - * <li>{@link #SMALL_ICON}</li> - * <li>{@link #ACTION_COMMAND_KEY}</li> - * <li>{@link #ACCELERATOR_KEY}</li> - * <li>{@link #MNEMONIC_KEY}</li> - * </ul> - * Any existing value associated with the key will be overwritten. - * - * @param key - * the key (not <code>null</code>). - * @param value - * the value (<code>null</code> permitted). - */ - public void putValue(final String key, final Object value) { - super.putValue(key, value); - } + @Override + /** + * Sets the value associated with the specified key and sends a + * {@link java.beans.PropertyChangeEvent} to all registered listeners. The + * standard keys are: + * <ul> + * <li>{@link #NAME}</li> + * <li>{@link #SHORT_DESCRIPTION}</li> + * <li>{@link #LONG_DESCRIPTION}</li> + * <li>{@link #SMALL_ICON}</li> + * <li>{@link #ACTION_COMMAND_KEY}</li> + * <li>{@link #ACCELERATOR_KEY}</li> + * <li>{@link #MNEMONIC_KEY}</li> + * </ul> + * Any existing value associated with the key will be overwritten. + * + * @param key + * the key (not <code>null</code>). + * @param value + * the value (<code>null</code> permitted). + */ + public void putValue(final String key, final Object value) { + super.putValue(key, value); + } - /** - * Sets the flag that indicates whether or not the action is enabled and, if - * the value of the flag changed from the previous setting, sends a - * {@link java.beans.PropertyChangeEvent} to all registered listeners (using - * the property name 'enabled'). - * - * @param enabled - * the new flag value. - * - * @see #isEnabled() - */ - @Override - public void setEnabled(final boolean enabled) { - putValue(ENABLED, enabled); - } + /** + * Sets the flag that indicates whether or not the action is enabled and, if + * the value of the flag changed from the previous setting, sends a + * {@link java.beans.PropertyChangeEvent} to all registered listeners (using + * the property name 'enabled'). + * + * @param enabled + * the new flag value. + * + * @see #isEnabled() + */ + @Override + public void setEnabled(final boolean enabled) { + putValue(ENABLED, enabled); + } - public void setShortcut(final KeyStroke key) { - putValue(Action.ACCELERATOR_KEY, key); - } + public void setShortcut(final KeyStroke key) { + putValue(Action.ACCELERATOR_KEY, key); + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/Action.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/Action.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/common/client/actions/Action.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -48,117 +48,116 @@ */ public interface Action extends ActionListener { - /** - * A key to access the KeyStroke used as the accelerator for the action. - */ - String ACCELERATOR_KEY = "AcceleratorKey"; + /** + * A key to access the KeyStroke used as the accelerator for the action. + */ + String ACCELERATOR_KEY = "AcceleratorKey"; - /** - * A key to access the action command string for the action. - */ - String ACTION_COMMAND_KEY = "ActionCommandKey"; + /** + * A key to access the action command string for the action. + */ + String ACTION_COMMAND_KEY = "ActionCommandKey"; - /** - * A key to access the default property for the action (this is not used). - */ - String DEFAULT = "Default"; + /** + * A key to access the default property for the action (this is not used). + */ + String DEFAULT = "Default"; - /** - * A key to access the enabled property for the action. - */ - String ENABLED = "enabled"; + /** + * A key to access the enabled property for the action. + */ + String ENABLED = "enabled"; - /** - * A key to access the long description for the action. - */ - String LONG_DESCRIPTION = "LongDescription"; + /** + * A key to access the long description for the action. + */ + String LONG_DESCRIPTION = "LongDescription"; - /** - * A key to access the mnemonic for the action. - */ - String MNEMONIC_KEY = "MnemonicKey"; + /** + * A key to access the mnemonic for the action. + */ + String MNEMONIC_KEY = "MnemonicKey"; - /** - * A key to access the name for the action. - */ - String NAME = "Name"; + /** + * A key to access the name for the action. + */ + String NAME = "Name"; - /** - * A key to access the short description for the action (the short - * description is typically used as the tool tip text). - */ - String SHORT_DESCRIPTION = "ShortDescription"; + /** + * A key to access the short description for the action (the short description + * is typically used as the tool tip text). + */ + String SHORT_DESCRIPTION = "ShortDescription"; - /** - * A key to access the icon for the action. - */ - String SMALL_ICON = "SmallIcon"; + /** + * A key to access the icon for the action. + */ + String SMALL_ICON = "SmallIcon"; - /** - * A key to access the mnemonic for the action. - */ - String STYLES = "Styles"; + /** + * A key to access the mnemonic for the action. + */ + String STYLES = "Styles"; - /** - * Registers a listener to receive notification whenever one of the action's - * properties is modified. - * - * @param listener - * the listener. - */ - void addPropertyChangeListener(PropertyChangeListener listener); + /** + * Registers a listener to receive notification whenever one of the action's + * properties is modified. + * + * @param listener + * the listener. + */ + void addPropertyChangeListener(PropertyChangeListener listener); - /** - * Returns the value associated with the specified key. - * - * @param key - * the key (not <code>null</code>). - * - * @return The value associated with the specified key, or <code>null</code> - * if the key is not found. - */ - Object getValue(String key); + /** + * Returns the value associated with the specified key. + * + * @param key + * the key (not <code>null</code>). + * + * @return The value associated with the specified key, or <code>null</code> + * if the key is not found. + */ + Object getValue(String key); - /** - * Returns the flag that indicates whether or not this action is enabled. - * - * @return The flag. - */ - boolean isEnabled(); + /** + * Returns the flag that indicates whether or not this action is enabled. + * + * @return The flag. + */ + boolean isEnabled(); - /** - * Sets the value associated with the specified key and sends a - * {@link PropertyChangeEvent} to all registered listeners. The standard - * keys are defined in this interface: {@link #NAME}, - * {@link #SHORT_DESCRIPTION}, {@link #LONG_DESCRIPTION}, - * {@link #SMALL_ICON}, {@link #ACTION_COMMAND_KEY}, - * {@link #ACCELERATOR_KEY} and {@link #MNEMONIC_KEY}. Any existing value - * associated with the key will be overwritten. - * - * @param key - * the key (not <code>null</code>). - * @param value - * the value (<code>null</code> permitted). - */ - void putValue(String key, Object value); + /** + * Sets the value associated with the specified key and sends a + * {@link PropertyChangeEvent} to all registered listeners. The standard keys + * are defined in this interface: {@link #NAME}, {@link #SHORT_DESCRIPTION}, + * {@link #LONG_DESCRIPTION}, {@link #SMALL_ICON}, {@link #ACTION_COMMAND_KEY} + * , {@link #ACCELERATOR_KEY} and {@link #MNEMONIC_KEY}. Any existing value + * associated with the key will be overwritten. + * + * @param key + * the key (not <code>null</code>). + * @param value + * the value (<code>null</code> permitted). + */ + void putValue(String key, Object value); - /** - * Deregisters a listener so that it no longer receives notification of - * changes to the action's properties. - * - * @param listener - * the listener. - */ - void removePropertyChangeListener(PropertyChangeListener listener); + /** + * Deregisters a listener so that it no longer receives notification of + * changes to the action's properties. + * + * @param listener + * the listener. + */ + void removePropertyChangeListener(PropertyChangeListener listener); - /** - * Sets the flag that indicates whether or not this action is enabled. If - * the value changes, a {@link java.beans.PropertyChangeEvent} is sent to - * all registered listeners. - * - * @param b - * the new value of the flag. - */ - void setEnabled(boolean b); + /** + * Sets the flag that indicates whether or not this action is enabled. If the + * value changes, a {@link java.beans.PropertyChangeEvent} is sent to all + * registered listeners. + * + * @param b + * the new value of the flag. + */ + void setEnabled(boolean b); } // Action Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -92,7 +92,6 @@ import cc.kune.core.client.state.ContentCacheDefault; import cc.kune.core.client.state.HistoryWrapper; import cc.kune.core.client.state.HistoryWrapperDefault; -import cc.kune.core.client.state.ReservedWordsRegistry; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SessionDefault; import cc.kune.core.client.state.SiteTokenListeners; @@ -105,6 +104,7 @@ import cc.kune.core.client.ws.entheader.EntityHeader; import cc.kune.core.client.ws.entheader.EntityHeaderPanel; import cc.kune.core.client.ws.entheader.EntityHeaderPresenter; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.msgs.client.UserMessagesPanel; import cc.kune.msgs.client.UserMessagesPresenter; @@ -200,7 +200,7 @@ s(BeforeSignOut.class); eagle(SiteTokenListeners.class); s(SiteTokens.class); - s(ReservedWordsRegistry.class); + s(ReservedWordsRegistryDTO.class); eagle(TokenMatcher.class); s(ActionRegistryByType.class); s(ContentCapabilitiesRegistry.class); Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -38,6 +38,7 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.I18nCountryDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; import cc.kune.core.shared.dto.SubscriptionMode; import cc.kune.core.shared.dto.TimeZoneDTO; import cc.kune.core.shared.dto.UserDTO; @@ -88,7 +89,6 @@ } private final Provider<SignIn> signInProvider; - private final Provider<UserServiceAsync> userServiceProvider; @Inject @@ -148,9 +148,16 @@ }); } - public void onFormRegister() { + private void onFormRegister() { getView().hideMessages(); - if (getView().isRegisterFormValid()) { + final ReservedWordsRegistryDTO reservedWords = session.getInitData().getReservedWords(); + if (reservedWords.contains(getView().getShortName())) { + getView().setShortNameFailed(i18n.t(CoreMessages.NAME_RESTRICTED)); + getView().setErrorMessage(i18n.t(CoreMessages.NAME_RESTRICTED), NotifyLevel.error); + } else if (reservedWords.contains(getView().getLongName())) { + getView().setLongNameFailed(i18n.t(CoreMessages.NAME_RESTRICTED)); + getView().setErrorMessage(i18n.t(CoreMessages.NAME_RESTRICTED), NotifyLevel.error); + } else if (getView().isRegisterFormValid()) { getView().maskProcessing(); final I18nLanguageDTO language = new I18nLanguageDTO(); Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -36,6 +36,7 @@ import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.options.GroupOptions; @@ -155,9 +156,16 @@ stateManager.redirectOrRestorePreviousToken(); } - public void onRegister() { + private void onRegister() { getView().hideMessage(); - if (getView().isFormValid()) { + final ReservedWordsRegistryDTO reservedWords = session.getInitData().getReservedWords(); + if (reservedWords.contains(getView().getShortName())) { + getView().setShortNameFailed(i18n.t(CoreMessages.NAME_RESTRICTED)); + getView().setMessage(i18n.t(CoreMessages.NAME_RESTRICTED), NotifyLevel.error); + } else if (reservedWords.contains(getView().getLongName())) { + getView().setLongNameFailed(i18n.t(CoreMessages.NAME_RESTRICTED)); + getView().setMessage(i18n.t(CoreMessages.NAME_RESTRICTED), NotifyLevel.error); + } else if (getView().isFormValid()) { getView().maskProcessing(); final String shortName = getView().getShortName(); final String longName = getView().getLongName(); Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -28,9 +28,11 @@ public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers"; public final static String FIELD_MUST_BE_BETWEEN_3_AND_15_NO_CHARS = "The name must be between 3 and 15 lowercase characters."; public final static String GROUP_OPTIONS_DIALOG_TITLE = "Group options"; + public final static String GROUPNAME_RESTRICTED = "This group name can not be used. Please try with a different name"; public final static String INCORRECT_NICKNAME_EMAIL_OR_PASSWORD = "The username/password is incorrect"; public final static String MEMBERS_NOT_PUBLIC = "The members of this group are not public"; public final static String NAME_IN_ALREADY_IN_USE = "This name is already in use. Please try with a different name"; + public final static String NAME_RESTRICTED = "This user name can not be used. Please try with a different name"; public final static String NAME_IN_USE = "This name in already in use. Please try with a different name"; public final static String PASSWD_MUST_BE_BETWEEN_6_AND_40 = "The password must be between 6 and 40 characters"; public final static String REGISTER_A_NEW_GROUP_TITLE = "Register a new Group"; Deleted: trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -1,27 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.state; - -import java.util.ArrayList; - -@SuppressWarnings("serial") -public class ReservedWordsRegistry extends ArrayList<String> { - -} Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -19,6 +19,8 @@ */ package cc.kune.core.client.state; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; + import com.google.inject.Inject; /** @@ -37,7 +39,7 @@ public final static String WAVEINBOX = "inbox"; @Inject - public SiteTokens(final ReservedWordsRegistry reserverdWords) { + public SiteTokens(final ReservedWordsRegistryDTO reserverdWords) { reserverdWords.add(ABOUTKUNE); reserverdWords.add(GROUP_HOME); reserverdWords.add(HOME); Modified: trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/client/state/TokenMatcher.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -24,16 +24,17 @@ import cc.kune.common.client.utils.Pair; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; import com.google.inject.Inject; public class TokenMatcher { private WaverefEncoder encoder; - private final ReservedWordsRegistry reservedWordsRegistry; + private final ReservedWordsRegistryDTO reservedWordsRegistry; @Inject - public TokenMatcher(final ReservedWordsRegistry reservedWordsRegistry) { + public TokenMatcher(final ReservedWordsRegistryDTO reservedWordsRegistry) { this.reservedWordsRegistry = reservedWordsRegistry; } Modified: trunk/src/main/java/cc/kune/core/server/InitData.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/InitData.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/server/InitData.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -26,6 +26,7 @@ import cc.kune.core.server.tool.ToolSimple; import cc.kune.core.server.users.UserInfo; import cc.kune.core.shared.dto.GSpaceTheme; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; import cc.kune.domain.ExtMediaDescrip; import cc.kune.domain.I18nCountry; import cc.kune.domain.I18nLanguage; @@ -55,6 +56,7 @@ private String maxFileSizeInMb; private String mp3EmbedObject; private String oggEmbedObject; + private ReservedWordsRegistryDTO reservedWords; private String siteDomain; private String siteLogoUrl; private String siteUrl; @@ -150,6 +152,10 @@ return oggEmbedObject; } + public ReservedWordsRegistryDTO getReservedWords() { + return this.reservedWords; + } + @Deprecated public String getSiteDomain() { return siteDomain; @@ -263,6 +269,10 @@ this.oggEmbedObject = oggEmbedObject; } + public void setReservedWords(final ReservedWordsRegistryDTO reservedWords) { + this.reservedWords = reservedWords; + } + @Deprecated public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -34,6 +34,7 @@ String IMAGES_THUMBSIZE = "kune.images.thumbsize"; String MP3_EMBEDED_OBJECT = "kune.media.mp3embededobject"; String OGG_EMBEDED_OBJECT = "kune.media.oggembededobject"; + String RESERVED_WORDS = "kune.server.names.reservedwords"; String SITE_ADMIN_EMAIL = "kune.admin.email"; String SITE_ADMIN_NAME = "kune.admin.name"; String SITE_ADMIN_PASSWD = "kune.admin.password"; Added: trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/properties/ReservedWordsRegistry.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -0,0 +1,34 @@ +package cc.kune.core.server.properties; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import cc.kune.core.client.errors.DefaultException; + +import com.google.inject.Inject; +import com.google.inject.Singleton; + +@Singleton +public class ReservedWordsRegistry extends ArrayList<String> { + + private static final long serialVersionUID = 7455756500618858360L; + + public static List<String> fromList(final KuneProperties kuneProperties) { + return Arrays.asList(kuneProperties.get(KuneProperties.RESERVED_WORDS, "root").replaceAll(" ", "").split( + ",")); + } + + @Inject + public ReservedWordsRegistry(final KuneProperties kuneProperties) { + super(fromList(kuneProperties)); + } + + public void check(final String... names) { + for (final String name : names) { + if (this.contains(name) || this.contains(name.toLowerCase())) { + throw new DefaultException("This name is a reserved word and cannot be used"); + } + } + } +} Modified: trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/server/rpc/GroupRPC.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -28,6 +28,7 @@ import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.properties.ReservedWordsRegistry; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.SocialNetworkVisibility; @@ -49,18 +50,21 @@ private final I18nTranslationService i18n; private final KuneWaveManagerDefault kuneWaveManager; private final Mapper mapper; + private final ReservedWordsRegistry reserverdWords; private final Provider<UserSession> userSessionProvider; @Inject public GroupRPC(final Provider<UserSession> userSessionProvider, final GroupManager groupManager, final ContentManager contentManager, final Mapper mapper, - final KuneWaveManagerDefault kuneWaveManager, final I18nTranslationService i18n) { + final KuneWaveManagerDefault kuneWaveManager, final I18nTranslationService i18n, + final ReservedWordsRegistry reserverdWords) { this.userSessionProvider = userSessionProvider; this.groupManager = groupManager; this.contentManager = contentManager; this.mapper = mapper; this.kuneWaveManager = kuneWaveManager; this.i18n = i18n; + this.reserverdWords = reserverdWords; } @Override @@ -101,6 +105,7 @@ public StateToken createNewGroup(final String userHash, final GroupDTO groupDTO, final String publicDesc, final String tags, final String[] enabledTools) throws DefaultException { final User user = getUserLogged(); + reserverdWords.check(groupDTO.getShortName(), groupDTO.getLongName()); final Group group = mapper.map(groupDTO, Group.class); final Group newGroup = groupManager.createGroup(group, user, publicDesc); // This is necessary? Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -34,10 +34,14 @@ import cc.kune.core.server.mapper.Mapper; import cc.kune.core.server.properties.ChatProperties; import cc.kune.core.server.properties.KuneProperties; +import cc.kune.core.server.properties.ReservedWordsRegistry; import cc.kune.core.server.tool.ServerToolRegistry; +import cc.kune.core.server.users.UserInfo; import cc.kune.core.server.users.UserInfoService; import cc.kune.core.shared.dto.GSpaceTheme; import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; +import cc.kune.core.shared.dto.UserInfoDTO; import com.google.inject.Inject; import com.google.inject.Provider; @@ -46,14 +50,16 @@ public class SiteRPC implements RPC, SiteService { private final ChatProperties chatProperties; private final I18nCountryManager countryManager; + private InitData data; private final ExtMediaDescripManager extMediaDescManager; private final KuneProperties kuneProperties; private final I18nLanguageManager languageManager; private final LicenseManager licenseManager; private final Mapper mapper; + private final ReservedWordsRegistryDTO reservedWords; private final ServerToolRegistry serverToolRegistry; + private final HashMap<String, GSpaceTheme> siteThemes; private final UserInfoService userInfoService; - private final UserManager userManager; private final Provider<UserSession> userSessionProvider; // TODO: refactor: too many parameters! refactor to Facade Pattern @@ -64,7 +70,6 @@ final I18nLanguageManager languageManager, final I18nCountryManager countryManager, final ServerToolRegistry serverToolRegistry, final ExtMediaDescripManager extMediaDescManager) { this.userSessionProvider = userSessionProvider; - this.userManager = userManager; this.userInfoService = userInfoService; this.licenseManager = licenseManager; this.mapper = mapper; @@ -74,6 +79,9 @@ this.countryManager = countryManager; this.serverToolRegistry = serverToolRegistry; this.extMediaDescManager = extMediaDescManager; + data = loadInitData(); + siteThemes = getSiteThemes(this.kuneProperties.get(KuneProperties.WS_THEMES).split(",")); + reservedWords = new ReservedWordsRegistryDTO(ReservedWordsRegistry.fromList(kuneProperties)); } private String[] getColors(final String key) { @@ -83,15 +91,45 @@ @Override @Transactional public InitDataDTO getInitData(final String userHash) throws DefaultException { - final InitData data = new InitData(); + final InitDataDTO dataMapped = mapper.map(data, InitDataDTO.class); final UserSession userSession = getUserSession(); + final UserInfo userInfo = userInfoService.buildInfo(userSession.getUser(), userSession.getHash()); + if (userInfo != null) { + dataMapped.setUserInfo(mapper.map(userInfo, UserInfoDTO.class)); + } + + dataMapped.setgSpaceThemes(siteThemes); + dataMapped.setReservedWords(reservedWords); + return dataMapped; + } + + private HashMap<String, GSpaceTheme> getSiteThemes(final String[] themes) { + final HashMap<String, GSpaceTheme> map = new HashMap<String, GSpaceTheme>(); + for (final String theme : themes) { + map.put(theme, getThemeFromProperties(theme)); + } + return map; + } + + private GSpaceTheme getThemeFromProperties(final String themeName) { + final GSpaceTheme theme = new GSpaceTheme(themeName); + theme.setBackColors(getColors(KuneProperties.WS_THEMES + "." + theme.getName() + ".backgrounds")); + theme.setColors(getColors(KuneProperties.WS_THEMES + "." + theme.getName() + ".colors")); + return theme; + } + + private UserSession getUserSession() { + return userSessionProvider.get(); + } + + private InitData loadInitData() { + data = new InitData(); data.setSiteUrl(kuneProperties.get(KuneProperties.SITE_URL)); data.setLicenses(licenseManager.getAll()); data.setLanguages(languageManager.getAll()); data.setCountries(countryManager.getAll()); data.setTimezones(TimeZone.getAvailableIDs()); - data.setUserInfo(userInfoService.buildInfo(userSession.getUser(), userSession.getHash())); data.setChatHttpBase(chatProperties.getHttpBase()); data.setChatDomain(chatProperties.getDomain()); data.setSiteDomain(kuneProperties.get(KuneProperties.SITE_DOMAIN)); @@ -113,27 +151,6 @@ data.setOggEmbedObject(kuneProperties.get(KuneProperties.OGG_EMBEDED_OBJECT)); data.setAviEmbedObject(kuneProperties.get(KuneProperties.AVI_EMBEDED_OBJECT)); data.setExtMediaDescrips(extMediaDescManager.getAll()); - final InitDataDTO map = mapper.map(data, InitDataDTO.class); - map.setgSpaceThemes(getSiteThemes(this.kuneProperties.get(KuneProperties.WS_THEMES).split(","))); - return map; + return data; } - - private HashMap<String, GSpaceTheme> getSiteThemes(final String[] themes) { - final HashMap<String, GSpaceTheme> map = new HashMap<String, GSpaceTheme>(); - for (final String theme : themes) { - map.put(theme, getThemeFromProperties(theme)); - } - return map; - } - - private GSpaceTheme getThemeFromProperties(final String themeName) { - final GSpaceTheme theme = new GSpaceTheme(themeName); - theme.setBackColors(getColors(KuneProperties.WS_THEMES + "." + theme.getName() + ".backgrounds")); - theme.setColors(getColors(KuneProperties.WS_THEMES + "." + theme.getName() + ".colors")); - return theme; - } - - private UserSession getUserSession() { - return userSessionProvider.get(); - } } Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -39,6 +39,7 @@ import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.UserManager; import cc.kune.core.server.mapper.Mapper; +import cc.kune.core.server.properties.ReservedWordsRegistry; import cc.kune.core.server.users.UserInfo; import cc.kune.core.server.users.UserInfoService; import cc.kune.core.shared.domain.AccessRol; @@ -63,6 +64,7 @@ private final GroupManager groupManager; private final I18nTranslationService i18n; private final Mapper mapper; + private final ReservedWordsRegistry reserverdWords; private final Provider<SessionService> sessionServiceProvider; private final UserInfoService userInfoService; private final UserManager userManager; @@ -77,7 +79,8 @@ @Named(CoreSettings.USE_SOCKETIO) final Boolean useSocketIO, final GroupManager groupManager, final UserInfoService userInfoService, final Mapper mapper, final SessionManager waveSessionManager, final CustomWaveClientServlet waveClientServlet, - final I18nTranslationService i18n, final ContentManager contentManager) { + final I18nTranslationService i18n, final ContentManager contentManager, + final ReservedWordsRegistry reserverdWords) { this.sessionServiceProvider = sessionServiceProvider; this.userSessionProvider = userSessionProvider; this.userManager = userManager; @@ -89,20 +92,17 @@ this.waveClientServlet = waveClientServlet; this.i18n = i18n; this.contentManager = contentManager; + this.reserverdWords = reserverdWords; } @Override @Transactional(rollbackOn = DefaultException.class) public void createUser(final UserDTO userDTO, final boolean wantPersonalHomepage) throws DefaultException { + reserverdWords.check(userDTO.getShortName(), userDTO.getName()); userManager.createUser(userDTO.getShortName(), userDTO.getName(), userDTO.getEmail(), userDTO.getPassword(), userDTO.getLanguage().getCode(), userDTO.getCountry().getCode(), userDTO.getTimezone().getId(), wantPersonalHomepage); - // final Group userGroup = groupManager.createUserGroup(user, - // wantPersonalHomepage); - // // Is this necessary? try to remove (used when we were setting the def - // // content - // contentManager.save(userGroup.getDefaultContent()); } @Override Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -50,6 +50,7 @@ private String maxFileSizeInMb; private String mp3EmbedObject; private String oggEmbedObject; + private ReservedWordsRegistryDTO reservedWords; private String siteDomain; private String siteLogoUrl; private String siteUrl; @@ -148,6 +149,10 @@ return oggEmbedObject; } + public ReservedWordsRegistryDTO getReservedWords() { + return this.reservedWords; + } + @Deprecated public String getSiteDomain() { return siteDomain; @@ -265,6 +270,10 @@ this.oggEmbedObject = oggEmbedObject; } + public void setReservedWords(final ReservedWordsRegistryDTO reservedWords) { + this.reservedWords = reservedWords; + } + @Deprecated public void setSiteDomain(final String siteDomain) { this.siteDomain = siteDomain; Copied: trunk/src/main/java/cc/kune/core/shared/dto/ReservedWordsRegistryDTO.java (from rev 1489, trunk/src/main/java/cc/kune/core/client/state/ReservedWordsRegistry.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ReservedWordsRegistryDTO.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/dto/ReservedWordsRegistryDTO.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -0,0 +1,38 @@ +/* + * + * 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.shared.dto; + +import java.util.ArrayList; +import java.util.List; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class ReservedWordsRegistryDTO extends ArrayList<String> implements IsSerializable { + + private static final long serialVersionUID = 4560973224792765637L; + + public ReservedWordsRegistryDTO() { + } + + public ReservedWordsRegistryDTO(final List<String> list) { + super(list); + } + +} Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -54,6 +54,7 @@ final Provider<OpenFolderMenuItem> openContentMenuItem, final Provider<RefreshListMenuItem> refresh, final Provider<SubscribeToListBtn> subscribeBtn, final Provider<OptionsListMenu> optionsMenuContent, + final Provider<ShowSubscribersOfListBtn> subscribersCount, final Provider<SetListOpenessMenuItem> listOpenessMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final ListsNewMenu listNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, final Provider<ChatAboutContentBtn> chatAbout, @@ -63,15 +64,16 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, listNewMenu, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribeBtn, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, listOpenessMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostIconBtn, noRoot); + actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribeBtn, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, newListMenuItem, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, newListBtn, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribersCount, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); Added: trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java (rev 0) +++ trunk/src/main/java/cc/kune/lists/client/actions/ShowSubscribersOfListBtn.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -0,0 +1,23 @@ +package cc.kune.lists.client.actions; + +import cc.kune.common.client.actions.AbstractAction; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; + +public class ShowSubscribersOfListBtn extends ButtonDescriptor { + + @Inject + public ShowSubscribersOfListBtn(final I18nTranslationService i18n, final Session session, + final CoreResources res) { + super(AbstractAction.NO_ACTION); + final int subscribers = session.getContainerState().getAccessLists().getEditors().getList().size(); + final int posts = session.getContainerState().getContainer().getContents().size(); + withText(i18n.t("[%d] subscribed, [%d] posts", subscribers, posts)); + // withToolTip(i18n.t("Subscribe to this list")); + withStyles("k-def-docbtn, k-fl, k-noborder, k-no-backimage, k-nobackcolor"); + } +} Modified: trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/lists/client/actions/SubscribeToListBtn.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -17,6 +17,7 @@ && session.getContainerState().getAccessLists().getEditors().getList().contains( session.getCurrentUserInfo().getUserGroup()); action.putValue(SubscriteToListAction.ISMEMBER, areYouMember); + withStyles("k-fl"); if (!areYouMember) { withText(i18n.t("Subscribe")); withIcon(res.add()); Modified: trunk/src/main/java/cc/kune/meets/client/MeetingsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/meets/client/MeetingsClientTool.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/meets/client/MeetingsClientTool.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -20,6 +20,7 @@ package cc.kune.meets.client; import static cc.kune.meets.shared.MeetingsConstants.NAME; +import static cc.kune.meets.shared.MeetingsConstants.ROOT_NAME; import static cc.kune.meets.shared.MeetingsConstants.TYPE_MEETING; import static cc.kune.meets.shared.MeetingsConstants.TYPE_ROOT; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -35,7 +36,7 @@ @Inject public MeetingsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t("meets"), toolSelector, cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(ROOT_NAME), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_MEETING); Modified: trunk/src/main/java/cc/kune/meets/shared/MeetingsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/meets/shared/MeetingsConstants.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/meets/shared/MeetingsConstants.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -21,9 +21,9 @@ public final class MeetingsConstants { - public static final String NAME = "meets"; - public static final String ROOT_NAME = "meetings"; - public static final String TYPE_MEETING = NAME + "." + "meet"; + public static final String NAME = "events"; + public static final String ROOT_NAME = "events"; + public static final String TYPE_MEETING = NAME + "." + "meeting"; public static final String TYPE_ROOT = NAME + "." + "root"; private MeetingsConstants() { Modified: trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/java/cc/kune/wave/server/KuneWaveManagerDefault.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -87,9 +87,7 @@ // See: DocumentModifyServiceTest private static final String NO_ANNOTATION_KEY = null; private static final List<BundledAnnotation> NO_BUNDLED_ANNOTATIONS = Collections.emptyList(); - private static final List<Element> NO_ELEMENTS = Collections.emptyList(); private static final String NO_TITLE = ""; - private static final List<String> NO_VALUES = Collections.<String> emptyList(); private static final String NO_WAVE_TO_COPY = null; Modified: trunk/src/main/resources/db/liquibase_changelog.xml =================================================================== --- trunk/src/main/resources/db/liquibase_changelog.xml 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/resources/db/liquibase_changelog.xml 2011-08-16 19:07:23 UTC (rev 1496) @@ -131,4 +131,10 @@ encoding="utf8" stripComments="1" /> <rollback>SELECT * FROM globalize_countries;</rollback> </changeSet> + <changeSet id="20" author="vjrj"> + <comment>Meetings id migration</comment> + <sqlFile path="src/main/resources/db/update-0016-meetings.sql" + encoding="utf8" stripComments="1" /> + <rollback>SELECT * FROM globalize_countries;</rollback> + </changeSet> </databaseChangeLog> Added: trunk/src/main/resources/db/update-0016-meetings.sql =================================================================== --- trunk/src/main/resources/db/update-0016-meetings.sql (rev 0) +++ trunk/src/main/resources/db/update-0016-meetings.sql 2011-08-16 19:07:23 UTC (rev 1496) @@ -0,0 +1,5 @@ +BEGIN WORK; +UPDATE `contents` SET typeId='events.meeting' WHERE typeId='meets.meet'; +UPDATE `containers` SET typeId='events.root', toolName='events', name='events' WHERE typeId='meets.root'; +UPDATE `groups_tool_configurations` SET mapkey='events' WHERE mapkey='meets'; +COMMIT; \ No newline at end of file Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/main/resources/kune.properties 2011-08-16 19:07:23 UTC (rev 1496) @@ -34,6 +34,9 @@ ### Other params +# Reserved words to avoid it's use in the client side for user and group names +kune.server.names.reservedwords = root,adm,kune,fuck + # If defined create a copy of this wave as welcome to new users # kune.site.welcomewave = w+rtackLTkDCA kune.site.welcomewave = Modified: trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java 2011-08-14 11:54:12 UTC (rev 1495) +++ trunk/src/test/java/cc/kune/core/client/state/TokenMatcherTest.java 2011-08-16 19:07:23 UTC (rev 1496) @@ -27,6 +27,8 @@ import org.junit.Test; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; +import cc.kune.core.shared.dto.ReservedWordsRegistryDTO; + public class TokenMatcherTest { private static final String DEF_SITE_TOKEN = ""; @@ -45,7 +47,7 @@ @Before public void before() { - final ReservedWordsRegistry reservedWords = new ReservedWordsRegistry(); + final ReservedWordsRegistryDTO reservedWords = new ReservedWordsRegistryDTO(); reservedWords.add(SIGNIN_TOKEN); tokenMatcher = new TokenMatcher(reservedWords); tokenMatcher.init(JavaWaverefEncoder.INSTANCE);