- kune-commits - lists.ourproject.org

[kune issues] #104: Welcome like Tumblr, in the first visit
by kune issues 18 Apr '12

18 Apr '12

#104: Welcome like Tumblr, in the first visit ---------------------------+------------------- Reporter: sam <samer@…> | Owner: vjrj Type: enhancement | Status: new Priority: critical | Milestone: Component: Group space | Version: Keywords: | Blocked By: Blocking: | ---------------------------+------------------- No one reads the first welcome document that explains Kune behaviour. Thus, when a new user arrives, faces several issues: 1) cannot edit anything 2) cannot do much neither create new stuff. Even if he/she discovers how to sign up, the user doesn't know yet how to edit anything. 3) doesn't realize that the top-left icons exist, so the experience is very limited. [Bastien tried it for 30 seconds and George for dont know how long, both with similar results.] Proposal: highlight the initial experience, such as Tumblr (or Flattr) does. Guide users to sign-up, guide users to the personal space... give for granted no one reads the welcoming doc and introduce Kune's first visit with a practical basic interactive tutorial. Idea: start Kune in a task list with the tasks that are left to do: "sign up", "visit personal space", "create a poll gadget", etc. I consider it maximum priority, as it can kick out many initial testers, that don't manage in 30 seconds to understand its behaviour. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/104> kune issues <http://kune.ourproject.org/issues/>

1 3

[kune issues] #244: start-stop-daemon don't shows all the logs
by kune issues 18 Apr '12

18 Apr '12

#244: start-stop-daemon don't shows all the logs --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: defect | Status: new Priority: minor | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Solution, to come back to the wrapper: http://askubuntu.com/a/35675 -- Ticket URL: <http://kune.ourproject.org/issues/ticket/244> kune issues <http://kune.ourproject.org/issues/>

1 1

[kune issues] #243: Don't show closed groups to others
by kune issues 18 Apr '12

18 Apr '12

#243: Don't show closed groups to others ---------------------+------------------ Reporter: vjrj | Owner: vjrj Type: defect | Status: new Priority: major | Milestone: Component: Common | Version: Resolution: | Keywords: Blocked By: | Blocking: ---------------------+------------------ Closed groups, should not be present in Social Network to non participant users, searches, etc. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/243> kune issues <http://kune.ourproject.org/issues/>

1 0

[kune issues] #241: Email notifications should be send also in plain text
by kune issues 17 Apr '12

17 Apr '12

#241: Email notifications should be send also in plain text --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Commented by Roxu. -- Ticket URL: <http://kune.ourproject.org/issues/ticket/241> kune issues <http://kune.ourproject.org/issues/>

1 1

r1854 - in trunk/core/kune-cli: . src/main/java/cc/kune/kunecli
by Vicente J. Ruiz Jurado 17 Apr '12

17 Apr '12

Author: vjrj_ Date: 2012-04-17 03:47:11 +0200 (Tue, 17 Apr 2012) New Revision: 1854 Added: trunk/core/kune-cli/README Modified: trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java Log: NEW - # 240: Add a command cli to kune http://kune.ourproject.org/issues/ticket/240 Added: trunk/core/kune-cli/README =================================================================== --- trunk/core/kune-cli/README (rev 0) +++ trunk/core/kune-cli/README 2012-04-17 01:47:11 UTC (rev 1854) @@ -0,0 +1 @@ +mvn exec:java -Dexec.args="hello" Modified: trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java =================================================================== --- trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java 2012-04-17 00:58:51 UTC (rev 1853) +++ trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java 2012-04-17 01:47:11 UTC (rev 1854) @@ -60,7 +60,13 @@ MalformedURLException { initServices(); - + + // TODO: integrate jline or similar + // http://jline.sourceforge.net/index.html + + //http://sourceforge.net/projects/javacurses/ + //http://massapi.com/class/jcurses/widgets/Button.java.html + Command showDateCommand = new Command("hello world [<name:string>]", "Says hello to the world and, may be, especially to some one.", new ICommandExecutor() { public void execute(ParseResult pr) { @@ -132,6 +138,8 @@ } private static void initServices() throws MalformedURLException { + // http://code.google.com/p/gwtrpccommlayer/wiki/GettingStarted + // http://googlewebtoolkit.blogspot.com.es/2010/07/gwtrpccommlayer-extending-g… Injector injector = Guice.createInjector(new Module()); GwtRpcService service = injector.getInstance(GwtRpcService.class);

1 0

r1853 - in trunk: . core core/kune-cli core/kune-cli/.settings core/kune-cli/src/main/java/cc/kune/kunecli core/kune-cli/src/test/java core/kune-cli/src/test/java/cc core/kune-cli/src/test/java/cc/kune core/kune-cli/src/test/java/cc/kune/kunecli
by Vicente J. Ruiz Jurado 17 Apr '12

17 Apr '12

Author: vjrj_ Date: 2012-04-17 02:58:51 +0200 (Tue, 17 Apr 2012) New Revision: 1853 Added: trunk/core/kune-cli/bin/ trunk/core/kune-cli/src/test/java/cc/ trunk/core/kune-cli/src/test/java/cc/kune/ trunk/core/kune-cli/src/test/java/cc/kune/kunecli/ trunk/core/kune-cli/src/test/java/cc/kune/kunecli/KuneCliMainTest.java Removed: trunk/core/kune-cli/.settings/org.eclipse.jdt.core.prefs Modified: trunk/core/kune-cli/.classpath trunk/core/kune-cli/.project trunk/core/kune-cli/pom.xml trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java trunk/core/pom.xml trunk/pom.xml Log: NEW - # 240: Add a command cli to kune Modified: trunk/core/kune-cli/.classpath =================================================================== --- trunk/core/kune-cli/.classpath 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/core/kune-cli/.classpath 2012-04-17 00:58:51 UTC (rev 1853) @@ -1,9 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> <classpathentry kind="output" path="target/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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="M2_REPO/org/naturalcli/naturalcli/1.2.3/naturalcli-1.2.3.jar" sourcepath="M2_REPO/org/naturalcli/naturalcli/1.2.3/naturalcli-1.2.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtrpccommlayer/0.0.1/gwtrpccommlayer-0.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/cc/kune/kune-services/0.2.0-SNAPSHOT/kune-services-0.2.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-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/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/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0-no_aop.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"/> </classpath> \ No newline at end of file Modified: trunk/core/kune-cli/.project =================================================================== --- trunk/core/kune-cli/.project 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/core/kune-cli/.project 2012-04-17 00:58:51 UTC (rev 1853) @@ -1,17 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>kune-cli</name> - <comment>Kune command line interface</comment> + <comment>Kune command line interface. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> <projects/> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> </natures> </projectDescription> \ No newline at end of file Deleted: trunk/core/kune-cli/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/core/kune-cli/.settings/org.eclipse.jdt.core.prefs 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/core/kune-cli/.settings/org.eclipse.jdt.core.prefs 2012-04-17 00:58:51 UTC (rev 1853) @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/core/kune-cli/pom.xml =================================================================== --- trunk/core/kune-cli/pom.xml 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/core/kune-cli/pom.xml 2012-04-17 00:58:51 UTC (rev 1853) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>kune-core</artifactId> @@ -8,6 +9,12 @@ </parent> <artifactId>kune-cli</artifactId> <description>Kune command line interface</description> + <repositories> + <repository> + <id>kune-maven</id> + <url>http://kune.ourproject.org/mavenrepo/</url> + </repository> + </repositories> <dependencies> <dependency> <groupId>org.naturalcli</groupId> @@ -15,5 +22,68 @@ <version>1.2.3</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>com.googlecode</groupId> + <artifactId>gwtrpccommlayer</artifactId> + <version>0.0.1</version> + </dependency> + <dependency> + <groupId>cc.kune</groupId> + <artifactId>kune-services</artifactId> + <version>0.2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.9</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.0.1</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + <classifier>no_aop</classifier> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>exec</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>cc.kune.kunecli.KuneCliMain</mainClass> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java =================================================================== --- trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/core/kune-cli/src/main/java/cc/kune/kunecli/KuneCliMain.java 2012-04-17 00:58:51 UTC (rev 1853) @@ -20,9 +20,13 @@ package cc.kune.kunecli; +import java.net.MalformedURLException; +import java.net.URL; import java.util.HashSet; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.naturalcli.Command; import org.naturalcli.ExecutionException; import org.naturalcli.ICommandExecutor; @@ -34,41 +38,106 @@ import org.naturalcli.commands.HelpCommand; import org.naturalcli.commands.SleepCommand; +import cc.kune.core.client.rpcservices.SiteServiceAsync; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.googlecode.gwtrpccommlayer.client.GwtRpcService; +import com.googlecode.gwtrpccommlayer.client.Module; + public class KuneCliMain { - public static void main(String[] args) throws InvalidSyntaxException, ExecutionException { - Command showDateCommand = - new Command( - "hello world [<name:string>]", - "Says hello to the world and, may be, especially to some one.", - new ICommandExecutor () - { - public void execute(ParseResult pr) - { - System.out.print("Hello world!"); - String p0 = pr.getParameterValue(0).toString(); - if (p0 == null) - System.out.println(); - else - System.out.println(" And hello especially to "+p0); - } - } - ); + private static final String SERVICE_PREFFIX = "http://127.0.0.1/ws/"; + public static final Log LOG = LogFactory.getLog(KuneCliMain.class); + private static UserServiceAsync userService; + private static SiteServiceAsync siteService; + + public static void main(String[] args) throws InvalidSyntaxException, ExecutionException, + MalformedURLException { + + initServices(); + + Command showDateCommand = new Command("hello world [<name:string>]", + "Says hello to the world and, may be, especially to some one.", new ICommandExecutor() { + public void execute(ParseResult pr) { + System.out.print("Hello world!"); + String p0 = pr.getParameterValue(0).toString(); + if (p0 == null) + System.out.println(); + else + System.out.println(" And hello especially to " + p0); + } + }); + + Command auth = new Command("auth <user:string> <pass:string>", "auth to kune", + new ICommandExecutor() { + + public void execute(ParseResult pr) throws ExecutionException { + String user = pr.getParameterValue(0).toString(); + String pass = pr.getParameterValue(1).toString(); + userService.login(user, pass, "FIXME", new AsyncCallback<UserInfoDTO>() { + + @Override + public void onSuccess(UserInfoDTO result) { + // TODO Auto-generated method stub + } + + @Override + public void onFailure(Throwable caught) { + // TODO Auto-generated method stub + } + }); + } + }); + + Command init = new Command("siteGetInitData", "gets the initial data", new ICommandExecutor() { + public void execute(ParseResult parseResult) throws ExecutionException { + siteService.getInitData("", new AsyncCallback<InitDataDTO>() { + @Override + public void onFailure(Throwable caught) { + // TODO Auto-generated method stub + } + + @Override + public void onSuccess(InitDataDTO result) { + // TODO Auto-generated method stub + } + }); + } + }); + // Create an empty command set Set<Command> cs = new HashSet<Command>(); - + // Create the interpreter NaturalCLI nc = new NaturalCLI(cs); - + // Add the commands that can be understood cs.add(showDateCommand); cs.add(new HelpCommand(cs)); // help cs.add(new HTMLHelpCommand(cs)); // htmlhelp - cs.add(new SleepCommand()); // sleep <seconds:number> + cs.add(new SleepCommand()); // sleep <seconds:number> + + // A script can be useful for kune cs.add(new ExecuteFileCommand(nc)); // execute file <filename:string> - - // Execute the command line + + cs.add(init); + cs.add(auth); + // Execute the command line nc.execute(args, 0); - } + + private static void initServices() throws MalformedURLException { + Injector injector = Guice.createInjector(new Module()); + + GwtRpcService service = injector.getInstance(GwtRpcService.class); + + // TODO javadoc of this services + userService = service.create(new URL(SERVICE_PREFFIX + "UserService"), UserServiceAsync.class); + siteService = service.create(new URL(SERVICE_PREFFIX + "SiteService"), SiteServiceAsync.class); + } } Added: trunk/core/kune-cli/src/test/java/cc/kune/kunecli/KuneCliMainTest.java =================================================================== --- trunk/core/kune-cli/src/test/java/cc/kune/kunecli/KuneCliMainTest.java (rev 0) +++ trunk/core/kune-cli/src/test/java/cc/kune/kunecli/KuneCliMainTest.java 2012-04-17 00:58:51 UTC (rev 1853) @@ -0,0 +1,42 @@ +/* + * + * Copyright (C) 2007-2012 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.kunecli; + +import java.net.MalformedURLException; + +import org.junit.Test; +import org.naturalcli.ExecutionException; +import org.naturalcli.InvalidSyntaxException; + +public class KuneCliMainTest { + + @Test + public void basicHelp() throws InvalidSyntaxException, ExecutionException, MalformedURLException { + KuneCliMain cli = new KuneCliMain(); + String[] args = new String[] {"auth", "admin", "easyeasy"}; + cli.main(args); + } + + +} Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/core/pom.xml 2012-04-17 00:58:51 UTC (rev 1853) @@ -5,13 +5,20 @@ <artifactId>kune-core</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <wiab.version>0.3.13</wiab.version> + <gwt.version>2.1.1</gwt.version> + </properties> <modules> <module>kune-cli</module> </modules> - - - - - - +  +  +  +  +  +  </project> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-16 23:22:33 UTC (rev 1852) +++ trunk/pom.xml 2012-04-17 00:58:51 UTC (rev 1853) @@ -1070,6 +1070,7 @@ <classifier>services</classifier> <includes> <include>**/rpcservices/UserService**</include> + <include>**/rpcservices/SiteService**</include> <include>**/shared/domain/*</include> <include>**/shared/domain/utils/*</include> <include>**/shared/dto/*</include>

1 0

[kune issues] #240: Add a command cli to kune
by kune issues 17 Apr '12

17 Apr '12

#240: Add a command cli to kune --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: major | Milestone: Component: Server side | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ Started, see trunk/core/kune-cli -- Ticket URL: <http://kune.ourproject.org/issues/ticket/240> kune issues <http://kune.ourproject.org/issues/>

1 0

r1852 - in trunk: debian src/main/java/cc/kune/gspace/client/actions
by Vicente J. Ruiz Jurado 16 Apr '12

16 Apr '12

Author: vjrj_ Date: 2012-04-17 01:22:33 +0200 (Tue, 17 Apr 2012) New Revision: 1852 Modified: trunk/debian/changelog trunk/debian/files trunk/debian/kune.debhelper.log trunk/debian/kune.init trunk/debian/kune.postinst.debhelper trunk/debian/rules trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java Log: CLOSED - # 238: Limit Share button in Personal space http://kune.ourproject.org/issues/ticket/238 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/debian/changelog 2012-04-16 23:22:33 UTC (rev 1852) @@ -1,3 +1,10 @@ +kune (0.2.0+b1) precise; urgency=low + + * Kune version via scripts. User and group short-name forced to lowercase. + Openfire optional in debian start-up + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Mon, 16 Apr 2012 20:10:07 +0200 + kune (0.1.0+b14) unstable; urgency=low * Fix wave multiple operations errors Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/debian/files 2012-04-16 23:22:33 UTC (rev 1852) @@ -1 +1 @@ -kune_0.1.0+b13_all.deb java optional +kune_0.2.0+b1_all.deb java optional Modified: trunk/debian/kune.debhelper.log =================================================================== --- trunk/debian/kune.debhelper.log 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/debian/kune.debhelper.log 2012-04-16 23:22:33 UTC (rev 1852) @@ -32,3 +32,4 @@ dh_gencontrol dh_md5sums dh_builddeb +dh_builddeb Modified: trunk/debian/kune.init =================================================================== --- trunk/debian/kune.init 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/debian/kune.init 2012-04-16 23:22:33 UTC (rev 1852) @@ -1,8 +1,8 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: kune -# Required-Start: $local_fs $remote_fs $network $syslog $named openfire -# Required-Stop: $local_fs $remote_fs $network $syslog $named openfire +# Required-Start: $local_fs $remote_fs $network $syslog $named +# Required-Stop: $local_fs $remote_fs $network $syslog $named # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start/stop kune web server Modified: trunk/debian/kune.postinst.debhelper =================================================================== --- trunk/debian/kune.postinst.debhelper 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/debian/kune.postinst.debhelper 2012-04-16 23:22:33 UTC (rev 1852) @@ -1,6 +1,8 @@ # Automatically added by dh_installinit if [ -x "/etc/init.d/kune" ]; then - update-rc.d kune defaults >/dev/null + if [ ! -e "/etc/init/kune.conf" ]; then + update-rc.d kune defaults >/dev/null + fi invoke-rc.d kune start || exit $? fi # End automatically added section Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/debian/rules 2012-04-16 23:22:33 UTC (rev 1852) @@ -12,25 +12,27 @@ #include /usr/share/cdbs/1/class/maven.mk -KUNE_VERSION:=$(shell $(CURDIR)/script/kune-version) +#KUNE_VERSION:=$(shell $(CURDIR)/script/kune-version) +KUNE_VERSION:=0.2.0-SNAPSHOT DEST := $(CURDIR)/debian/kune TARGET := $(CURDIR)/target RESOURCES := $(CURDIR)/src/main/resources WEBAPP := $(CURDIR)/src/main/webapp -TARGETC := $(TARGET)/$(KUNE_VERSION) +TARGETC := $(TARGET)/kune-$(KUNE_VERSION) KUNE := $(DEST)/usr/share/kune ETCDIR := $(DEST)/etc/kune LOGDIR := $(DEST)/var/log/kune VARDIR := $(DEST)/var/lib/kune - +TARGETJAR := $(TARGET)/kune-$(KUNE_VERSION)-complete.jar NO_GWT=true JAVA_HOME := /usr/lib/jvm/java-6-openjdk kune-version: @echo $(KUNE_VERSION) + @echo $(TARGETJAR) build/kune:: @@ -47,7 +49,7 @@ install/kune:: # FIXME make this via http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles - cp $(TARGET)/kune-$(KUNE_VERSION)-complete.jar $(KUNE)/lib/kune-complete.jar + cp $(TARGETJAR) $(KUNE)/lib/kune-complete.jar cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties cp $(RESOURCES)/server.federation.config.example $(ETCDIR) cp $(RESOURCES)/jaas.config $(ETCDIR) Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java 2012-04-16 23:22:33 UTC (rev 1852) @@ -21,6 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAGroupCondition; import cc.kune.core.shared.dto.SocialNetworkSubGroup; import com.google.inject.Inject; @@ -29,8 +30,11 @@ @Inject public AddAdminMembersToContentMenuItem(final I18nTranslationService i18n, - final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { + final AddMembersToContentAction action, final IsCurrentStateAGroupCondition isAGroupCondition, + final ContentViewerShareMenu menu, final CoreResources res) { super(i18n.t("Share with admins"), SocialNetworkSubGroup.ADMINS, action, menu, res); + add(isAGroupCondition); + } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java 2012-04-16 23:22:33 UTC (rev 1852) @@ -21,6 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAGroupCondition; import cc.kune.core.shared.dto.SocialNetworkSubGroup; import com.google.inject.Inject; @@ -29,8 +30,11 @@ @Inject public AddAllMembersToContentMenuItem(final I18nTranslationService i18n, - final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { - super(i18n.t("Share with all group members"), SocialNetworkSubGroup.ALL_GROUP_MEMBERS, action, menu, res); + final IsCurrentStateAGroupCondition isAGroupCondition, final AddMembersToContentAction action, + final ContentViewerShareMenu menu, final CoreResources res) { + super(i18n.t("Share with all group members"), SocialNetworkSubGroup.ALL_GROUP_MEMBERS, action, menu, + res); + add(isAGroupCondition); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java 2012-04-16 14:10:01 UTC (rev 1851) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java 2012-04-16 23:22:33 UTC (rev 1852) @@ -21,6 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.sn.actions.conditions.IsCurrentStateAGroupCondition; import cc.kune.core.shared.dto.SocialNetworkSubGroup; import com.google.inject.Inject; @@ -29,8 +30,10 @@ @Inject public AddCollabMembersToContentMenuItem(final I18nTranslationService i18n, - final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { + final AddMembersToContentAction action, final IsCurrentStateAGroupCondition isAGroupCondition, + final ContentViewerShareMenu menu, final CoreResources res) { super(i18n.t("Share with collaborators"), SocialNetworkSubGroup.COLLABS, action, menu, res); + add(isAGroupCondition); } }

1 0

[kune issues] #238: Limit Share button in Personal space
by kune issues 16 Apr '12

16 Apr '12

#238: Limit Share button in Personal space --------------------------+------------------ Reporter: vjrj | Owner: vjrj Type: enhancement | Status: new Priority: minor | Milestone: Component: Group space | Version: Resolution: | Keywords: Blocked By: | Blocking: --------------------------+------------------ -- Ticket URL: <http://kune.ourproject.org/issues/ticket/238> kune issues <http://kune.ourproject.org/issues/>

1 1

r1851 - in trunk: . debian script src/main/java/cc/kune/common/public src/main/java/cc/kune/common/shared/utils src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/client/groups/newgroup src/main/java/cc/kune/core/client/ws/entheader src/main/java/cc/kune/gspace/client/options/general src/main/resources
by Vicente J. Ruiz Jurado 16 Apr '12

16 Apr '12

Author: vjrj_ Date: 2012-04-16 16:10:01 +0200 (Mon, 16 Apr 2012) New Revision: 1851 Added: trunk/script/kune-init-functions trunk/script/kune-version Removed: trunk/script/demo-deploy.sh Modified: trunk/.classpath trunk/INSTALL trunk/debian/rules trunk/script/css-update.sh trunk/script/kune client -no-server.launch trunk/script/server.sh trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/common/shared/utils/TextUtils.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java trunk/src/main/resources/assembly.xml trunk/src/main/resources/wave-server-testing.properties trunk/src/main/resources/wave-server.properties Log: CLOSED - # 181: Username: accept uppercase http://kune.ourproject.org/issues/ticket/181 CLOSED - # 239: Extract kune version to some unique script/variable Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/.classpath 2012-04-16 14:10:01 UTC (rev 1851) @@ -2,7 +2,7 @@ <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="output" path="target/kune-0.2.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> <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"/> @@ -224,5 +224,4 @@ <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="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/INSTALL =================================================================== --- trunk/INSTALL 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/INSTALL 2012-04-16 14:10:01 UTC (rev 1851) @@ -14,23 +14,6 @@ ===MYSQL configuration=== -====Before db creation==== - -You have to configure mysql to support UTF8 by editing your c:\Windows\my.ini or /etc/mysql/my.cnf (on Unix) file and adding something like: - -[mysqld] -default-character-set=utf8 -default-collation=utf8_bin - -After this modification you have to restart the mysql database. In debian systems: - -/etc/init.d/mysql restart - -Optionalilly, you can also configure this per table (do it after the db creation) : - -ALTER DATABASE kune_dev CHARACTER SET utf8 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT COLLATE utf8_bin; -ALTER DATABASE kune_test CHARACTER SET utf8 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT COLLATE utf8_bin; - ====Db creation==== Make two databases in your mysql: @@ -55,6 +38,11 @@ GRANT ALL PRIVILEGES ON kune_openfire.* TO kune@localhost IDENTIFIED BY 'db4kune'; FLUSH PRIVILEGES; +ALTER DATABASE kune_dev CHARACTER SET utf8 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT COLLATE utf8_bin; +ALTER DATABASE kune_test CHARACTER SET utf8 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT COLLATE utf8_bin; +ALTER DATABASE kune_prod CHARACTER SET utf8 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT COLLATE utf8_bin; +ALTER DATABASE kune_openfire CHARACTER SET utf8 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin DEFAULT COLLATE utf8_bin; + Although using this password ('db4kune') is useful for a quick and dirty getting started installation (useful for development), you should consider seriously changing it to something different, since you are in high risk! In this case you should change the password acordingly in this other locations: - pom.xml @@ -197,6 +185,13 @@ debuild -b to sign the result package. +==Releasing kune== + +mvn release:prepare +mvn release:perform + +More info: http://maven.apache.org/plugins/maven-release-plugin/index.html + ===Customization: Adapting Kune to your site=== Copy and adapt as much as possible to your needs these files: Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/debian/rules 2012-04-16 14:10:01 UTC (rev 1851) @@ -11,11 +11,14 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk #include /usr/share/cdbs/1/class/maven.mk + +KUNE_VERSION:=$(shell $(CURDIR)/script/kune-version) + DEST := $(CURDIR)/debian/kune TARGET := $(CURDIR)/target RESOURCES := $(CURDIR)/src/main/resources WEBAPP := $(CURDIR)/src/main/webapp -TARGETC := $(TARGET)/kune-0.1.0-SNAPSHOT +TARGETC := $(TARGET)/$(KUNE_VERSION) KUNE := $(DEST)/usr/share/kune ETCDIR := $(DEST)/etc/kune @@ -26,6 +29,9 @@ JAVA_HOME := /usr/lib/jvm/java-6-openjdk +kune-version: + @echo $(KUNE_VERSION) + build/kune:: # mvn assembly:assembly -Dgwt.compiler.skip=$(NO_GWT) -P production @@ -41,7 +47,7 @@ install/kune:: # FIXME make this via http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles - cp $(TARGET)/kune-0.1.0-SNAPSHOT-complete.jar $(KUNE)/lib/kune-complete.jar + cp $(TARGET)/kune-$(KUNE_VERSION)-complete.jar $(KUNE)/lib/kune-complete.jar cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties cp $(RESOURCES)/server.federation.config.example $(ETCDIR) cp $(RESOURCES)/jaas.config $(ETCDIR) Modified: trunk/script/css-update.sh =================================================================== --- trunk/script/css-update.sh 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/script/css-update.sh 2012-04-16 14:10:01 UTC (rev 1851) @@ -9,14 +9,14 @@ #rsync -aC $APPPUB/css/ $WEBAPP/css #rsync -aC $APPPUB/images/ $WEBAPP/images -VERSION=0.1.0-SNAPSHOT +. script/kune-init-functions -cp src/main/java/cc/kune/chat/public/kune-chat.css target/kune-$VERSION/ws/ -cp src/main/java/cc/kune/chat/public/kune-hablar.css target/kune-$VERSION/ws/ -cp src/main/java/cc/kune/msgs/public/kune-message.css target/kune-$VERSION/ws/ -cp src/main/java/cc/kune/common/public/kune-common.css target/kune-$VERSION/ws/ -cp src/main/java/cc/kune/core/public/ws.css target/kune-$VERSION/ws/ -#cp src/main/java/cc/kune/core/public/ws.html target/kune-$VERSION/ -#cp src/main/webapp/templates/basic/basic.css target/kune-$VERSION/templates/basic/basic.css -#cp src/main/webapp/templates/basic/docs.liquid.html target/kune-$VERSION/templates/basic/ -cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-$VERSION/ws/gxt-custom/css/gxt-op-common.css +cp src/main/java/cc/kune/chat/public/kune-chat.css target/kune-$KUNE_VERSION/ws/ +cp src/main/java/cc/kune/chat/public/kune-hablar.css target/kune-$KUNE_VERSION/ws/ +cp src/main/java/cc/kune/msgs/public/kune-message.css target/kune-$KUNE_VERSION/ws/ +cp src/main/java/cc/kune/common/public/kune-common.css target/kune-$KUNE_VERSION/ws/ +cp src/main/java/cc/kune/core/public/ws.css target/kune-$KUNE_VERSION/ws/ +#cp src/main/java/cc/kune/core/public/ws.html target/kune-$KUNE_VERSION/ +#cp src/main/webapp/templates/basic/basic.css target/kune-$KUNE_VERSION/templates/basic/basic.css +#cp src/main/webapp/templates/basic/docs.liquid.html target/kune-$KUNE_VERSION/templates/basic/ +cp src/main/java/cc/kune/common/public/gxt-custom/css/gxt-op-common.css target/kune-$KUNE_VERSION/ws/gxt-custom/css/gxt-op-common.css Deleted: trunk/script/demo-deploy.sh =================================================================== --- trunk/script/demo-deploy.sh 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/script/demo-deploy.sh 2012-04-16 14:10:01 UTC (rev 1851) @@ -1,4 +0,0 @@ -#!/bin/bash - -# from time to time use --delete -rsync --delete --progress -C -r -p target/kune-0.1.0-SNAPSHOT/ws/ [email protected]:/home/vjrj/kune-current/target-last/kune-0.1.0-SNAPSHOT/ws/ Modified: trunk/script/kune client -no-server.launch =================================================================== --- trunk/script/kune client -no-server.launch 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/script/kune client -no-server.launch 2012-04-16 14:10:01 UTC (rev 1851) @@ -20,7 +20,7 @@ </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war /home/vjrj/proyectos/dev/kune/trunk/target/kune-0.1.0-SNAPSHOT -startupUrl /?locale=en&log_level=INFO -noserver -remoteUI "${gwt_remote_ui_server_port}:${unique_id}" -logLevel INFO -codeServerPort 9997 cc.kune.KuneDev"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war /home/vjrj/proyectos/dev/kune/trunk/target/kune-0.2.0-SNAPSHOT -startupUrl /?locale=en&log_level=INFO -noserver -remoteUI "${gwt_remote_ui_server_port}:${unique_id}" -logLevel INFO -codeServerPort 9997 cc.kune.KuneDev"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="kune"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/> </launchConfiguration> Added: trunk/script/kune-init-functions =================================================================== --- trunk/script/kune-init-functions (rev 0) +++ trunk/script/kune-init-functions 2012-04-16 14:10:01 UTC (rev 1851) @@ -0,0 +1,2 @@ +#!/bin/bash +KUNE_VERSION=`script/kune-version` Property changes on: trunk/script/kune-init-functions ___________________________________________________________________ Name: svn:executable + * Added: trunk/script/kune-version =================================================================== --- trunk/script/kune-version (rev 0) +++ trunk/script/kune-version 2012-04-16 14:10:01 UTC (rev 1851) @@ -0,0 +1,3 @@ +#!/bin/bash +# http://stackoverflow.com/questions/3545292/how-to-get-maven-project-version… +mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }' Property changes on: trunk/script/kune-version ___________________________________________________________________ Name: svn:executable + * Modified: trunk/script/server.sh =================================================================== --- trunk/script/server.sh 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/script/server.sh 2012-04-16 14:10:01 UTC (rev 1851) @@ -4,7 +4,7 @@ usage() { echo "$0 [-j <jar file>] [-k <kune-config>] [-w <wave-config>] [-s <jaas config>] [Debug options] [other options] - Example: $0 -j target/kune-0.1.0-SNAPSHOT-jar-with-dependencies.jar -l IGNORE -d -p -u 20000 + Example: $0 -j target/kune-0.2.0-SNAPSHOT-jar-with-dependencies.jar -l IGNORE -d -p -u 20000 Options: -j <jar file> : runs jar file generated via mvn assembly:assembly Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2012-04-16 14:10:01 UTC (rev 1851) @@ -766,4 +766,15 @@ overflow: hidden; } -/* END Menu separators */ \ No newline at end of file +/* END Menu separators */ + +/* upper and lower cases */ + +.k-upper, .k-upper input { + text-transform: uppercase; +} + +.k-lower, .k-lower input { + text-transform: lowercase; +} + Modified: trunk/src/main/java/cc/kune/common/shared/utils/TextUtils.java =================================================================== --- trunk/src/main/java/cc/kune/common/shared/utils/TextUtils.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/common/shared/utils/TextUtils.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -39,8 +39,10 @@ public static final String NUM_REGEXP = "^[0-9]+$"; + public static final String SHORTNAME_REGEXP = "^[a-z0-9]+$"; + + public static final String SHORTNAME_UPPER_REGEXP = "^[a-zA-Z0-9]+$"; public static final String UNIX_NAME = "^[a-z0-9_\\-]+$"; - // Original regexp from http://snippets.dzone.com/posts/show/452 public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -167,7 +167,7 @@ final boolean wantHomepage = true; - final UserDTO user = new UserDTO(getView().getShortName(), getView().getLongName(), + final UserDTO user = new UserDTO(getView().getShortName().toLowerCase(), getView().getLongName(), getView().getRegisterPassword(), getView().getEmail(), language, country, timezone, null, true, SubscriptionMode.manual, "blue"); super.saveAutocompleteLoginData(getView().getShortName(), getView().getRegisterPassword()); Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -80,6 +80,7 @@ loginNickOrEmailField.setValidationDelay(3000); loginNickOrEmailField.setId(USER_FIELD_ID); loginNickOrEmailField.setTabIndex(100); + loginNickOrEmailField.addStyleName("k-lower"); loginNickOrEmailField.render(RootPanel.get(LOGIN_ID).getElement()); ComponentHelper.doAttach(loginNickOrEmailField); super.add(loginNickOrEmailField); Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -113,7 +113,7 @@ public void doSignIn(final String nickOrEmail, final String passwd, final boolean gotoHomePage, final AsyncCallback<Void> extCallback) { final UserDTO user = new UserDTO(); - user.setShortName(nickOrEmail); + user.setShortName(nickOrEmail.toLowerCase()); user.setPassword(passwd); saveAutocompleteLoginData(nickOrEmail, passwd); waveClientAuthenticator.doLogin(nickOrEmail, passwd, new AsyncCallback<Void>() { Modified: trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/auth/UserFieldFactory.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -90,11 +90,12 @@ field.setAllowBlank(false); field.setMinLength(3); field.setMaxLength(15); - field.setRegex("^[a-z0-9]+$"); + field.setRegex(TextUtils.SHORTNAME_UPPER_REGEXP); field.getMessages().setMinLengthText(minMaxText); field.getMessages().setMaxLengthText(minMaxText); field.getMessages().setRegexText(minMaxText); field.setValidationDelay(1000); + field.addStyleName("k-lower"); return field; } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/GroupFieldFactory.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -20,6 +20,7 @@ package cc.kune.core.client.groups.newgroup; import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.ui.DefaultForm; import cc.kune.core.client.ui.DefaultFormUtils; @@ -61,6 +62,25 @@ return radio; } + public TextField<String> createGroupShortName(final String fieldId) { + final String minMaxText = i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15); + final TextField<String> field = new TextField<String>(); + field.setFieldLabel(i18n.t("Short name")); + field.setName(fieldId); + field.setId(fieldId); + field.setWidth(175); + field.setMinLength(3); + field.setMaxLength(15); /* Same in Group.java/shortName */ + field.setAllowBlank(false); + field.setRegex(TextUtils.SHORTNAME_UPPER_REGEXP); + field.getMessages().setMinLengthText(minMaxText); + field.getMessages().setMaxLengthText(minMaxText); + field.getMessages().setRegexText(minMaxText); + field.addStyleName("k-lower"); + field.setValidationDelay(1000); + return field; + } + public TextField<String> createLongName(final String fieldId) { final TextField<String> field = new TextField<String>(); field.setFieldLabel(i18n.t("Long name")); @@ -91,22 +111,4 @@ return radio; } - public TextField<String> createUserShortName(final String fieldId) { - final String minMaxText = i18n.t(CoreMessages.FIELD_MUST_BE_BETWEEN_3_AND_15); - final TextField<String> field = new TextField<String>(); - field.setFieldLabel(i18n.t("Short name")); - field.setName(fieldId); - field.setId(fieldId); - field.setWidth(175); - field.setMinLength(3); - field.setMaxLength(15); /* Same in Group.java/shortName */ - field.setAllowBlank(false); - field.setRegex("^[a-z0-9]+$"); - field.getMessages().setMinLengthText(minMaxText); - field.getMessages().setMaxLengthText(minMaxText); - field.getMessages().setRegexText(minMaxText); - field.setValidationDelay(1000); - return field; - } - } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -128,7 +128,7 @@ // intro.setStyleName("k-form-intro"); // form.add(intro); - shortNameField = groupFieldFactory.createUserShortName(SHORTNAME_FIELD); + shortNameField = groupFieldFactory.createGroupShortName(SHORTNAME_FIELD); shortNameField.setTabIndex(1); form.add(shortNameField); 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 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -169,7 +169,7 @@ getView().setMessage(i18n.t(CoreMessages.NAME_RESTRICTED), NotifyLevel.error); } else if (getView().isFormValid()) { getView().maskProcessing(); - final String shortName = getView().getShortName(); + final String shortName = getView().getShortName().toLowerCase(); final String longName = getView().getLongName(); final String publicDesc = getView().getPublicDesc(); final LicenseDTO license = session.getDefLicense(); Modified: trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/core/client/ws/entheader/EntityHeaderPresenter.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -86,6 +86,7 @@ public void onCurrentLogoChanged(final CurrentEntityChangedEvent event) { final GroupDTO group = session.getCurrentState().getGroup(); setGroupLogo(group, true); + setLogoText(group.getShortName()); } }); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPanel.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -53,7 +53,7 @@ public GroupOptGeneralPanel(final I18nTranslationService i18n, final CoreResources res, final MaskWidget maskWidget, final GroupFieldFactory groupFieldFactory) { super(maskWidget, res.emblemSystem(), i18n.t("General"), i18n.t("Change this values:")); - shortName = groupFieldFactory.createUserShortName(SHORT_NAME_FIELD); + shortName = groupFieldFactory.createGroupShortName(SHORT_NAME_FIELD); longName = groupFieldFactory.createLongName(LONG_NAME_FIELD); add(shortName); add(longName); Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java 2012-04-16 14:10:01 UTC (rev 1851) @@ -82,7 +82,7 @@ final GroupDTO group = session.getCurrentState().getGroup(); final String previousGroupName = group.getShortName(); final StateToken token = group.getStateToken().copy(); - group.setShortName(groupView.getShortName()); + group.setShortName(groupView.getShortName().toLowerCase()); group.setLongName(groupView.getLongName()); group.setGroupType(groupView.getGroupType()); groupService.get().updateGroup(session.getUserHash(), token, group, Modified: trunk/src/main/resources/assembly.xml =================================================================== --- trunk/src/main/resources/assembly.xml 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/resources/assembly.xml 2012-04-16 14:10:01 UTC (rev 1851) @@ -15,15 +15,4 @@ <scope>runtime</scope> </dependencySet> </dependencySets> - <fileSets> -  -  -  -  -  -  -  -  - </fileSets> -</assembly> \ No newline at end of file +</assembly> Modified: trunk/src/main/resources/wave-server-testing.properties =================================================================== --- trunk/src/main/resources/wave-server-testing.properties 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/resources/wave-server-testing.properties 2012-04-16 14:10:01 UTC (rev 1851) @@ -15,7 +15,7 @@ # A comma separated list of webApp source directories # Default value: ./war -resource_bases = target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ +resource_bases = target/kune-0.2.0-SNAPSHOT/,src/main/webapp/ ### Server-specific variables ### Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-04-13 14:09:03 UTC (rev 1850) +++ trunk/src/main/resources/wave-server.properties 2012-04-16 14:10:01 UTC (rev 1851) @@ -15,7 +15,7 @@ # A comma separated list of webApp source directories # Default value: ./war -resource_bases = target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ +resource_bases = target/kune-0.2.0-SNAPSHOT/,src/main/webapp/ ### Server-specific variables ###

1 0