Author: vjrj_ Date: 2011-03-18 23:56:27 +0100 (Fri, 18 Mar 2011) New Revision: 1284 Modified: trunk/DEV-GUIDE trunk/TODO trunk/pom.xml trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java Log: Some tests fixed, more doc Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2011-03-18 09:12:42 UTC (rev 1283) +++ trunk/DEV-GUIDE 2011-03-18 22:56:27 UTC (rev 1284) @@ -4,23 +4,9 @@ '''Note:''' Please edit trunk/DEV-GUIDE instead of this wiki page. -==Get in touch== - -===Mailing lists=== - -We use mainly two lists: -* [https://lists.ourproject.org/cgi-bin/mailman/listinfo/kune-devel kune-devel] for all development related topics -* [https://lists.ourproject.org/cgi-bin/mailman/listinfo/kune-commits kune-commits] where the svn sends the commit logs and summaries - -It's recommended to be subscribed to both if you want to participate in the development. - -===Twitter/identica=== - -Follow @kuneproject in twitter and @kune in identica. - ==Development Environment== -===Initial steps for get a Dev environment=== +===Initial steps=== Install some basic tools (if don't have it). In debian and derivatives: @@ -30,11 +16,11 @@ sudo apt-get install openjdk-6-jdk -Note: we use subversion for our code, maven for ints dependencies, and Wave in a box (WIAB) uses mercurial. Also you will need a modern browser like firefox or chromium, and some extensions to live happier: +Note: we use subversion for our code, maven for its dependencies, and Wave In a Box (WIAB) uses mercurial. Also you will need a modern browser like firefox or chromium, and some extensions to live happier: http://ourproject.org/moin/Contributors#Recommended_Firefox_Extensions -the previous page has also other more general information (texts and references) the interest for contributors. +the previous page has also other more general information (texts and references) of interest for contributors. ===Get the code: How to checkout the Kune code=== @@ -61,6 +47,8 @@ Ensure Eclipse is configured to use Java 1.6. +Of course, you can use other IDEs (and please help us to improve this doc in this case). + ===Optional maven-eclipse integration === Check: @@ -89,19 +77,20 @@ * Google Plugin for Eclipse https://code.google.com/intl/en/eclipse/docs/getting_started.html * Subversive or Subclipse -====Some recomended & suggested plugins for Eclipse==== +====Some other recomended & suggested plugins for Eclipse==== Also from the Marketplace: +* The GWT Designer GUI Builder plugin (a great helper to work with GWT UiBinder) * The PMD Eclipse plugin * The FindBugs plugin -* The GWT Designer GUI Builder plugin -* The Mylyn Trac Connector (to integrate our trac issues system from http://kune.ourproject.org/issues/) +* The Mylyn Trac Connector (to integrate our trac issues system: http://kune.ourproject.org/issues/) Also maybe it's interesting some other plugins like: + * Quick Junit * JUnitHelper -* AnyEditTools (for remove tabs and so on) +* AnyEditTools (to remove tabs and so on) * MercurialEclipse (if you wanna play with the WIAB code) ====Other eclipse info==== @@ -115,11 +104,11 @@ ===GWT's Hosted Mode=== -FIXME (this is outdated) For start the hosted mode, you can both execute from command line: +To start the hosted mode, you can both execute the launch 'kune client -no-server' from your Eclipse or run from command line: - mvn gwt-maven:gwt + mvn gwt:run -Also, you can generate a hosted mode launch configuration in eclipse. We have a "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.GWTShell", with this program arguments (or similar): "-noserver -out gwt-out /ws/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": +You can create a custom launch also at "Run configuration" (Run > Open Run Dialog) in eclipse with Project: "org.ourproject.kune" with Main class: "com.google.gwt.dev.DevMode", with this program arguments (or similar): "-noserver -out gwt-out /ws/?locale=en&log_level=INFO -port 8080" and in the "Classpath User Entries": * gwt-dev-[linux|mac|windows].jar (Add External Jar and choose it from your gwt installation directory) * java - /kune/src/main * kune (default classpath) @@ -361,3 +350,17 @@ * */ </pre> + +==Get in touch== + +===Mailing lists=== + +We use mainly two lists: +* [https://lists.ourproject.org/cgi-bin/mailman/listinfo/kune-devel kune-devel] for all development related topics +* [https://lists.ourproject.org/cgi-bin/mailman/listinfo/kune-commits kune-commits] where the svn sends the commit logs and summaries + +It's recommended to be subscribed to both if you want to participate in the development. + +===Twitter/identica=== + +Follow @kuneproject in twitter and @kune in identica. Modified: trunk/TODO =================================================================== --- trunk/TODO 2011-03-18 09:12:42 UTC (rev 1283) +++ trunk/TODO 2011-03-18 22:56:27 UTC (rev 1284) @@ -283,6 +283,7 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** Enable two Waves per doc: 1 for the doc (no comments enabled), other for comments. Similar to docs.google.com comments approach. ** TODO start/stop init scripts https://groups.google.com/group/wave-protocol/browse_thread/thread/d9cdcea0d... ./platforms/ubuntu/server-wrapper.sh Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-18 09:12:42 UTC (rev 1283) +++ trunk/pom.xml 2011-03-18 22:56:27 UTC (rev 1284) @@ -910,6 +910,7 @@ <compileReport>true</compileReport> <logLevel>INFO</logLevel> <style>OBF</style> + <noServer>true</noServer> <gwtVersion>${gwt.version}</gwtVersion> <runTarget>/ws/ws.html?log_level=DEBUG</runTarget> <hostedWebapp>${project.build.directory}/${project.build.finalName}</hostedWebapp> Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-03-18 09:12:42 UTC (rev 1283) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2011-03-18 22:56:27 UTC (rev 1284) @@ -40,6 +40,7 @@ import org.ourproject.kune.platf.server.properties.ChatProperties; import org.waveprotocol.box.server.authentication.PasswordDigest; +import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.UserRegistrationException; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -95,7 +96,14 @@ } final PasswordDigest passwdDigest = new PasswordDigest(passwd.toCharArray()); - createWaveAccount(shortName, passwdDigest); + try { + createWaveAccount(shortName, passwdDigest); + } catch (UserRegistrationException e) { + if (finder.getByShortName(shortName) != null) + throw new GroupNameInUseException(); + else + throw e; + } // if (userPropGroup == null) { // userPropGroup = propGroupManager.find(User.PROPS_ID); // } Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2011-03-18 09:12:42 UTC (rev 1283) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTestHelper.java 2011-03-18 22:56:27 UTC (rev 1284) @@ -31,7 +31,9 @@ import org.ourproject.kune.platf.server.properties.PropertiesFileName; import org.ourproject.kune.wiki.server.WikiServerModule; import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.persistence.PersistenceModule; +import org.waveprotocol.wave.federation.noop.NoOpFederationModule; import cc.kune.wave.server.CustomSettingsBinder; @@ -51,11 +53,11 @@ injector = Guice.createInjector(CustomSettingsBinder.bindSettings(TestConstants.WAVE_TEST_PROPFILE, CoreSettings.class)); final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); - + final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); final Injector childInjector = injector.createChildInjector(wavePersistModule, FinderRegistry.init(new JpaPersistModule(TestConstants.PERSISTENCE_UNIT)), - new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), - new WikiServerModule(), new AbstractModule() { + new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule( + false), federationModule, new WikiServerModule(), new AbstractModule() { @Override protected void configure() { bindScope(SessionScoped.class, Scopes.SINGLETON); Modified: trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java 2011-03-18 09:12:42 UTC (rev 1283) +++ trunk/src/test/java/org/ourproject/kune/platf/server/TestHelper.java 2011-03-18 22:56:27 UTC (rev 1284) @@ -26,10 +26,12 @@ import org.ourproject.kune.platf.server.init.FinderRegistry; import org.ourproject.kune.platf.server.properties.PropertiesFileName; import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.authentication.AccountStoreHolder; import org.waveprotocol.box.server.persistence.AccountStore; import org.waveprotocol.box.server.persistence.PersistenceException; import org.waveprotocol.box.server.persistence.PersistenceModule; +import org.waveprotocol.wave.federation.noop.NoOpFederationModule; import cc.kune.wave.server.CustomSettingsBinder; @@ -50,8 +52,9 @@ final Injector injector = Guice.createInjector(CustomSettingsBinder.bindSettings( TestConstants.WAVE_TEST_PROPFILE, CoreSettings.class)); final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); - final Injector childInjector = injector.createChildInjector(wavePersistModule, - FinderRegistry.init(new JpaPersistModule(persistenceUnit)), module, new Module() { + final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); + final Injector childInjector = injector.createChildInjector(wavePersistModule, new ServerModule(false), + federationModule, FinderRegistry.init(new JpaPersistModule(persistenceUnit)), module, new Module() { @Override public void configure(final Binder binder) { binder.bindScope(SessionScoped.class, Scopes.SINGLETON);