[kune-commits] 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

• Previous message: [kune-commits] [kune issues] #181: Username: accept uppercase
• Next message: [kune-commits] r1852 - in trunk: debian src/main/java/cc/kune/gspace/client/actions
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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 at 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/ vjrj at kune.beta.iepala.es:/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&amp;log_level=INFO -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -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&amp;log_level=INFO -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -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-to-the-bash-command-line
+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>
-    <!-- <fileSet> -->
-    <!-- ${module.groupId}-${module.artifactId}-${module.version}.${module.extension} -->
-    <!-- <directory>target/kune-0.1.0-SNAPSHOT/ws/</directory> <outputDirectory>META-INF/resources/ws</outputDirectory> 
-      </fileSet> -->
-    <!-- <fileSet> -->
-    <!-- <directory>${project.basedir}/src/main/webapp/</directory> -->
-    <!-- <outputDirectory>META-INF/resources/webapp</outputDirectory> -->
-    <!-- <filtered>true</filtered> -->
-    <!-- </fileSet> -->
-  </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
 ###

• Previous message: [kune-commits] [kune issues] #181: Username: accept uppercase
• Next message: [kune-commits] r1852 - in trunk: debian src/main/java/cc/kune/gspace/client/actions
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]