April 2012 - kune-commits - lists.ourproject.org

r1822 - in trunk: debian src/main/java/cc/kune/core/client/rpcservices src/main/java/cc/kune/core/public src/main/java/cc/kune/core/server/rack/filters/gwts src/main/java/cc/kune/core/server/rpc src/main/java/com/google/wave/splash/text src/main/java/com/google/wave/splash/web/template
by Vicente J. Ruiz Jurado 03 Apr '12

03 Apr '12

Author: vjrj_ Date: 2012-04-03 02:06:45 +0200 (Tue, 03 Apr 2012) New Revision: 1822 Modified: trunk/debian/changelog trunk/debian/files trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java trunk/src/main/java/com/google/wave/splash/text/ContentRenderer.java trunk/src/main/java/com/google/wave/splash/web/template/ThreadedWaveRenderer.java Log: NEW - # 210: Many issues with public waves seen from anonymous user http://kune.ourproject.org/issues/ticket/210 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/debian/changelog 2012-04-03 00:06:45 UTC (rev 1822) @@ -1,3 +1,9 @@ +kune (0.1.0+b7) oneiric; urgency=low + + * Improved openfire connection. Improved debian init + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Mon, 02 Apr 2012 22:51:59 +0200 + kune (0.1.0+b6) oneiric; urgency=low * Several bug fixes (trash, access list,...) Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/debian/files 2012-04-03 00:06:45 UTC (rev 1822) @@ -1 +1 @@ -kune_0.1.0+b6_all.deb java optional +kune_0.1.0+b7_all.deb java optional Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2012-04-03 00:06:45 UTC (rev 1822) @@ -46,6 +46,15 @@ void changePasswd(String userHash, String oldPassword, String newPassword) throws DefaultException; + /** + * Check user and hash (this is only used for external auth, like the openfire + * chat) + * + * @param username + * the username + * @param userHash + * the user hash + */ void checkUserAndHash(String username, String userHash); void createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-04-03 00:06:45 UTC (rev 1822) @@ -1604,3 +1604,9 @@ width: auto !important; } +/* Wave public (not logged) render (splash) */ + +div.docEditorContainer div.docEditor div.thread { + padding: 0 10px !important; +} + Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java 2012-04-03 00:06:45 UTC (rev 1822) @@ -35,6 +35,11 @@ import com.googlecode.gwtrpccommlayer.server.GwtRpcCommLayerServlet; import com.googlecode.gwtrpccommlayer.shared.GwtRpcCommLayerPojoRequest; +/** + * The Class DelegatedRemoteServlet extends GwtRpcCommLayerServlet so allow to + * call GWT RPC calls from other systems different than the browser. Check : + * http://googlewebtoolkit.blogspot.com.es/2010_07_01_archive.html + */ public class DelegatedRemoteServlet extends GwtRpcCommLayerServlet { public static final Log LOG = LogFactory.getLog(DelegatedRemoteServlet.class); private static final long serialVersionUID = -7646054921925214953L; @@ -46,7 +51,19 @@ super(servlet); } + /* + * (non-Javadoc) + * + * @see com.googlecode.gwtrpccommlayer.server.GwtRpcCommLayerServlet# + * allowGwtRpcPojoRequest() + */ @Override + protected boolean allowGwtRpcPojoRequest() { + // If we want to restrict the external rpc calls per method or classs + return super.allowGwtRpcPojoRequest(); + } + + @Override protected void doUnexpectedFailure(final Throwable except) { except.printStackTrace(); super.doUnexpectedFailure(except); @@ -64,6 +81,7 @@ } final Class[] arrParameterClasses = lstParameterClasses.toArray(new Class[0]); + // patched here for kune return service.getClass().getMethod(stressTestRequest.getMethodName(), arrParameterClasses); } Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2012-04-03 00:06:45 UTC (rev 1822) @@ -134,6 +134,13 @@ userManager.changePasswd(userId, oldPassword, newPassword, true); } + /* + * (non-Javadoc) + * + * @see + * cc.kune.core.client.rpcservices.UserService#checkUserAndHash(java.lang. + * String, java.lang.String) + */ @Override @KuneTransactional public void checkUserAndHash(final String username, final String passwdOrToken) { Modified: trunk/src/main/java/com/google/wave/splash/text/ContentRenderer.java =================================================================== --- trunk/src/main/java/com/google/wave/splash/text/ContentRenderer.java 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/src/main/java/com/google/wave/splash/text/ContentRenderer.java 2012-04-03 00:06:45 UTC (rev 1822) @@ -22,6 +22,8 @@ import java.util.SortedSet; import java.util.TreeSet; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.waveprotocol.wave.client.editor.content.paragraph.DefaultParagraphHtmlRenderer; import org.waveprotocol.wave.client.editor.content.paragraph.Paragraph; import org.waveprotocol.wave.client.editor.content.paragraph.Paragraph.Alignment; @@ -44,7 +46,6 @@ * @author dhanji(a)gmail.com (Dhanji R. Prasanna) */ public class ContentRenderer { - /** * Represents a marker in content that is either the start or end of an * annotation or a single element. @@ -97,6 +98,7 @@ return this.element != null; } } + public static final Log LOG = LogFactory.getLog(ContentRenderer.class); private final GadgetRenderer gadgetRenderer; private boolean identing; @@ -149,6 +151,7 @@ private void renderElement(final Element element, final int index, final List<String> contributors, final StringBuilder builder) { final ElementType type = element.getType(); + switch (type) { case LINE: final String t = element.getProperty(Line.LINE_TYPE); @@ -167,6 +170,8 @@ builder.append("</div> "); inheader = false; } + // NOTE: if there exists problems with <br/> or newlines check the + // "TODO expensive and silly" comment below if (t != null && t.equals(Paragraph.LIST_TYPE)) { // type-0 to 2, margin 22px * i <li class="bullet-type-0" @@ -199,6 +204,7 @@ fontWeight).append(";\">"); inheader = true; } + // TODO(anthonybaxter): need to handle <line t="li"> and <line t="li" // i="3"> // TODO(anthonybaxter): also handle H1 &c @@ -317,6 +323,7 @@ } // Replace empty paragraphs. (TODO expensive and silly) - return builder.append("</ul>").toString().replace("<p>\n</p>", "<p><br/></p>"); + return builder.append("</ul>").toString().replaceAll("<p>\n</p>", "<p><br/></p>").replaceAll( + "<p>\n<div style=\"font-size", "<p><br/><div style=\"font-size"); } } Modified: trunk/src/main/java/com/google/wave/splash/web/template/ThreadedWaveRenderer.java =================================================================== --- trunk/src/main/java/com/google/wave/splash/web/template/ThreadedWaveRenderer.java 2012-04-02 20:21:41 UTC (rev 1821) +++ trunk/src/main/java/com/google/wave/splash/web/template/ThreadedWaveRenderer.java 2012-04-03 00:06:45 UTC (rev 1822) @@ -391,35 +391,39 @@ final StringBuilder authorString = new StringBuilder(); final int numberOfAuthors = authors.size(); final int len = Math.min(3, numberOfAuthors); - for (int i = 0; i < len; i++) { - authorString.append("<div class='authorbar "); - if (i == 0) { - authorString.append("first"); + if (blipData.isRoot()) { + blip.put("authorCountClass", "author-count-root"); + } else { + for (int i = 0; i < len; i++) { + authorString.append("<div class='authorbar "); + if (i == 0) { + authorString.append("first"); + } + authorString.append("'><div class=\"avatar\"><img src=\""); + final ParticipantProfile author = authors.get(i); + authorString.append(author.getImageUrl()); + authorString.append("\" alt=\""); + + final String name = author.getName(); + authorString.append(name); + authorString.append("\"><span class=\"name\" title=\""); + authorString.append(name); + authorString.append("\">"); + authorString.append(name); + authorString.append("</span></div></div>"); } - authorString.append("'><div class=\"avatar\"><img src=\""); - final ParticipantProfile author = authors.get(i); - authorString.append(author.getImageUrl()); - authorString.append("\" alt=\""); - final String name = author.getName(); - authorString.append(name); - authorString.append("\"><span class=\"name\" title=\""); - authorString.append(name); - authorString.append("\">"); - authorString.append(name); - authorString.append("</span></div></div>"); - } + if (numberOfAuthors > 3) { + authorString.append("<div class=\"authorbar\">"); + authorString.append("<div class=\"author-more\">+"); + authorString.append(numberOfAuthors); + authorString.append(" others</div>"); + authorString.append("</div>"); - if (numberOfAuthors > 3) { - authorString.append("<div class=\"authorbar\">"); - authorString.append("<div class=\"author-more\">+"); - authorString.append(numberOfAuthors); - authorString.append(" others</div>"); - authorString.append("</div>"); - - blip.put("authorCountClass", "author-count-many"); - } else { - blip.put("authorCountClass", "author-count-" + contributors.size()); + blip.put("authorCountClass", "author-count-many"); + } else { + blip.put("authorCountClass", "author-count-" + contributors.size()); + } } blip.put("authorString", authorString.toString());

1 0

r1821 - in trunk: . debian script src/main/java/cc/kune/core/client/rpcservices src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/auth src/main/java/cc/kune/core/server/rack/filters/gwts src/main/java/cc/kune/core/server/rpc
by Vicente J. Ruiz Jurado 02 Apr '12

02 Apr '12

Author: vjrj_ Date: 2012-04-02 22:21:41 +0200 (Mon, 02 Apr 2012) New Revision: 1821 Added: trunk/script/kune server via mvn with debug.launch Removed: trunk/src/main/java/cc/kune/core/server/auth/openfire/ Modified: trunk/.classpath trunk/TODO trunk/debian/files trunk/debian/kune.default trunk/debian/kune.dirs trunk/debian/kune.init trunk/debian/rules trunk/pom.xml trunk/script/server.sh trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java trunk/src/main/java/cc/kune/core/server/UserSessionManager.java trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java Log: Init start/stop fixed Better method for openfire auth provider Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/.classpath 2012-04-02 20:21:41 UTC (rev 1821) @@ -77,6 +77,7 @@ <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-processors/0.5/gwtp-processors-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-tester/0.5/gwtp-tester-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtquery/gwtquery/1.1.0/gwtquery-1.1.0-2.1.0.jar" sourcepath="M2_REPO/com/googlecode/gwtquery/gwtquery/1.1.0/gwtquery-1.1.0-2.1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtrpccommlayer/0.0.1-SNAPSHOT/gwtrpccommlayer-0.0.1-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat.jar" sourcepath="M2_REPO/com/googlecode/gwtupload/gwtupload/0.6.3-compat/gwtupload-0.6.3-compat-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/extjs/gxt/2.2.1/gxt-2.2.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070617/h2-1.0.20070617.jar"/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/TODO 2012-04-02 20:21:41 UTC (rev 1821) @@ -63,7 +63,6 @@ |------------+--------+---------+---------+-----------| - ** setui/root/port 80 [ ] http://wiki.eclipse.org/Jetty/Howto/Port80#Configuring_Jetty.27s_SetUID_Fea… [ ] https://github.com/disconnect/apache-websocket Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/debian/files 2012-04-02 20:21:41 UTC (rev 1821) @@ -1 +1 @@ -kune_0.1.0+b5_all.deb java optional +kune_0.1.0+b6_all.deb java optional Modified: trunk/debian/kune.default =================================================================== --- trunk/debian/kune.default 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/debian/kune.default 2012-04-02 20:21:41 UTC (rev 1821) @@ -10,4 +10,13 @@ START=no # Additional options that are passed to the Daemon. -DAEMON_OPTS="" +# Options: +# -l LOGLEVEL : IGNORE|DEBUG|INFO|WARN +# -x: -Xmx memory value +# -m: -Xms memory value +# Debug Options: +# -d: debug +# -u: Suspend the start (useful for debug the boot) +# -p: port of debugger +KUNE_DEFAULT_ARGS="-l INFO" + Modified: trunk/debian/kune.dirs =================================================================== --- trunk/debian/kune.dirs 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/debian/kune.dirs 2012-04-02 20:21:41 UTC (rev 1821) @@ -1,6 +1,5 @@ /etc/kune/ /usr/share/kune/ -/usr/share/kune/bin/ /usr/share/kune/lib/ /usr/share/kune/custom/ /usr/share/kune/webapp/ Modified: trunk/debian/kune.init =================================================================== --- trunk/debian/kune.init 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/debian/kune.init 2012-04-02 20:21:41 UTC (rev 1821) @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ### BEGIN INIT INFO # Provides: kune # Required-Start: $local_fs $remote_fs $network $syslog $named openfire @@ -13,9 +13,6 @@ DESC="kune server" NAME=kune USER=kune -DAEMON=/usr/share/kune/bin/server.sh -# Arguments to run the daemon with (see server.sh -h) -DAEMON_ARGS="-j /usr/share/kune/lib/kune-complete.jar -a" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME @@ -32,6 +29,119 @@ # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. . /lib/lsb/init-functions +usage() { + echo "Set KUNE_DEFAULT_ARGS in /etc/default/kune + KUNE_DEFAULT_ARGS=[-k <kune-config>] [-w <wave-config>] [-s <jaas config>] [Debug options] [other options] + Example: KUNE_DEFAULT_ARGS=-l IGNORE -d -p -u 20000 + +Options: +-l LOGLEVEL : IGNORE|DEBUG|INFO|WARN +-x: -Xmx memory value +-m: -Xms memory value + +Debug Options: +-d: debug +-u: Suspend the start (useful for debug the boot) +-p: port of debugger +" +} + +init_kune_vars() { + if [ -z $KUNE_HOME ] + then + KUNE_HOME=/etc/kune + fi + + # See src/main/resources/kune.properties in svn + KUNE_CONFIG=$KUNE_HOME/kune.properties + # See src/main/resources/wave-server.properties in svn + WAVE_CONFIG=$KUNE_HOME/wave-server.properties + # See src/main/resources/jaas.config in svn + JAAS_CONFIG=$KUNE_HOME/jaas.config + # See src/main/resources/log4j.properties in svn + LOGJ4_CONFIG=file://$KUNE_HOME/log4j.properties + + JAR=/usr/share/kune/lib/kune-complete.jar + LOGFILE=/var/log/kune/kune.log + + # Attempt to locate JAVA_HOME, code borrowed from jabref package + if [ -z $JAVA_HOME ] + then + t=/usr/lib/jvm/java-1.6.0-openjdk && test -d $t && JAVA_HOME=$t + t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t + t=/usr/lib/jvm/java-1.7.0-openjdk && test -d $t && JAVA_HOME=$t + fi + + PATH=$PATH:${JAVA_HOME}/bin + JAVA=${JAVA_HOME}/bin/java + DAEMON=$JAVA + + while getopts “hm:x:k:w:s:up:l:d” OPTION $KUNE_DEFAULT_ARGS + do + case $OPTION in + h) + usage + exit 1 + ;; + k) + KUNE_CONFIG=$OPTARG + ;; + w) + WAVE_CONFIG=$OPTARG + ;; + s) + JAAS_CONFIG=$OPTARG + ;; + x) + MX="-Xmx"$OPTARG + ;; + m) + MS="-Xms"$OPTARG + ;; + p) + # Debug port + PORT=$OPTARG + if ! [[ $PORT =~ ^[0-9]+$ ]] + then + usage + exit 1 + fi + DEBUG_PORT=",address=$PORT" + ;; + u) + SUSPEND="y" + ;; + l) + LOG_LEVEL=$OPTARG + ;; + d) + DEBUG="y" + ;; + ?) + usage + exit + ;; + esac + done + + if [[ $LOG_LEVEL != "IGNORE" && $LOG_LEVEL != "DEBUG" && $LOG_LEVEL != "INFO" && $LOG_LEVEL != "WARN" ]] + then + usage + exit 1 + fi + + DAEMON_ARGS="$DEBUG_FLAGS \ + -Dorg.eclipse.jetty.util.log.$LOG_LEVEL=true \ + -Djava.security.auth.login.config=$JAAS_CONFIG \ + -Dlog4j.configuration=$LOGJ4_CONFIG \ + -Dkune.server.config=$KUNE_CONFIG \ + -Dwave.server.config=$WAVE_CONFIG \ + $MS \ + $MX \ + -jar $JAR >> $LOGFILE 2>&1" + +} + # check if param is true/yes/0 is_true() { if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then @@ -46,23 +156,26 @@ # do_start() { - if is_true "$START" ; then + if is_true "$START" ; then + init_kune_vars + # FIXME This should go in limits.conf + ulimit -n 65000 log_daemon_msg "Starting kune" # Return # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $USER:$USER -b --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $USER:$USER -b --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 + start-stop-daemon --start -b -m --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $USER:$USER --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start -b -m --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $USER:$USER --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend # on this one. As a last resort, sleep for some time. - else - log_daemon_msg "Skipping start of kune (see /etc/default/kune)" - fi + else + log_daemon_msg "Skipping start of kune (see /etc/default/kune)" + fi } # @@ -70,65 +183,65 @@ # do_stop() { - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - log_daemon_msg "Stopping kune" - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --pidfile $PIDFILE - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + log_daemon_msg "Stopping kune" + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --pidfile $PIDFILE + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" } # # Function that sends a SIGHUP to the daemon/service # do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - log_daemon_msg "Reloading kune" - # Seems that dont works if the user/group is not the same: - # http://stackoverflow.com/questions/4147288/how-to-trap-a-signal-in-a-java-a… - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --user $USER --group $USER --name $NAME - return 0 + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + log_daemon_msg "Reloading kune" + # Seems that dont works if the user/group is not the same: + # http://stackoverflow.com/questions/4147288/how-to-trap-a-signal-in-a-java-a… + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --user $USER --group $USER --name $NAME + return 0 } case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac - ;; - stop) + ;; + stop) [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" do_stop case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; esac ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - reload|force-reload) + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + reload|force-reload) # # If do_reload() is not implemented then leave this commented out # and leave 'force-reload' as an alias for 'restart'. @@ -136,7 +249,7 @@ do_reload log_end_msg $? ;; - restart|force-reload) + restart|force-reload) # # If the "reload" option is implemented then remove the # 'force-reload' alias @@ -144,21 +257,21 @@ log_daemon_msg "Restarting $DESC" "$NAME" do_stop case "$?" in - 0|1) + 0|1) do_start case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start esac ;; - *) + *) # Failed to stop log_end_msg 1 ;; esac ;; - *) + *) echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 exit 3 ;; Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/debian/rules 2012-04-02 20:21:41 UTC (rev 1821) @@ -41,7 +41,6 @@ install/kune:: # FIXME make this via http://www.debian.org/doc/manuals/maint-guide/dother.en.html#conffiles - cp $(CURDIR)/script/server.sh $(KUNE)/bin/ cp $(TARGET)/kune-0.1.0-SNAPSHOT-complete.jar $(KUNE)/lib/kune-complete.jar cp $(RESOURCES)/wave-server-production.properties $(ETCDIR)/wave-server.properties cp $(RESOURCES)/server.federation.config.example $(ETCDIR) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/pom.xml 2012-04-02 20:21:41 UTC (rev 1821) @@ -78,17 +78,6 @@ <url>http://gwt-maven-rewraps.googlecode.com/hg/</url> </repository>  -  -  -  -  -  -  <repository> <id>openqa.org</id> <name>Openqa Release Repository</name> @@ -253,9 +242,6 @@ <scope>provided</scope> <version>r464</version> </dependency> -   <dependency> <groupId>com.allen_sauer.gwt.log.gwt-log</groupId> @@ -510,14 +496,7 @@ <version>3.3.5</version>  </dependency> -  -  -  -  -  -  - +  <dependency> <groupId>org.jruby.rack</groupId> @@ -729,101 +708,12 @@ <classifier>2.1.0</classifier> <scope>provided</scope> </dependency> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  + <dependency> + <groupId>com.googlecode</groupId> + <artifactId>gwtrpccommlayer</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> </dependencies> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  <distributionManagement> <repository> <id>kune.ourproject.org</id> @@ -1177,7 +1067,8 @@ </modules> <copyWebapp>true</copyWebapp> <compileReport>false</compileReport> - <localWorkers>1</localWorkers> <extraJvmArgs>-Xmx1024m</extraJvmArgs> </configuration> @@ -1266,7 +1157,6 @@ </dependency> </dependencies> </plugin> - </plugins> </build> </profile> Added: trunk/script/kune server via mvn with debug.launch =================================================================== --- trunk/script/kune server via mvn with debug.launch (rev 0) +++ trunk/script/kune server via mvn with debug.launch 2012-04-02 20:21:41 UTC (rev 1821) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="MAVEN_OPTS" value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8001"/> +</mapAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> +</listAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/mvn"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="exec:java"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/kune}"/> +</launchConfiguration> Modified: trunk/script/server.sh =================================================================== --- trunk/script/server.sh 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/script/server.sh 2012-04-02 20:21:41 UTC (rev 1821) @@ -89,7 +89,6 @@ DAEMON="y" ;; l) - # TODO: use/configure src/main/resources/log4j.properties LOG_LEVEL=$OPTARG ;; d) @@ -116,7 +115,7 @@ USER=`id -u -n` if [[ -n $DAEMON && USER -ne "root" ]] then - echo "Error: Only root user can run kune as a deamon" + echo "Error: Only root user can run kune as a daemon" usage exit 1 fi Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2012-04-02 20:21:41 UTC (rev 1821) @@ -46,6 +46,8 @@ void changePasswd(String userHash, String oldPassword, String newPassword) throws DefaultException; + void checkUserAndHash(String username, String userHash); + void createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException; String getUserAvatarBaser64(String userHash, StateToken userToken) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2012-04-02 20:21:41 UTC (rev 1821) @@ -37,6 +37,8 @@ void changePasswd(String userHash, String oldPassword, String newPassword, AsyncCallback<Void> callback); + void checkUserAndHash(String username, String userHash, AsyncCallback<Void> callback); + void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<Void> asyncCallback); void getUserAvatarBaser64(String userHash, StateToken userToken, AsyncCallback<String> asyncCallback); Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-04-02 20:21:41 UTC (rev 1821) @@ -46,6 +46,7 @@ this.userSessionProv = userSessionProv; final HashSessionManager hSessionManager = (HashSessionManager) jettySessionManager; hSessionManager.setMaxInactiveInterval(-1); + // this prevent saving the session?? hSessionManager.setUsingCookies(true); hSessionManager.setSavePeriod(5); // For now the implementation of this can be very inaccurate (if we Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/DelegatedRemoteServlet.java 2012-04-02 20:21:41 UTC (rev 1821) @@ -19,46 +19,86 @@ */ package cc.kune.core.server.rack.filters.gwts; +import java.lang.reflect.Method; +import java.util.LinkedList; + import javax.servlet.ServletContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.server.rpc.RPC; import com.google.gwt.user.server.rpc.RPCRequest; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; +import com.googlecode.gwtrpccommlayer.server.GwtRpcCommLayerServlet; +import com.googlecode.gwtrpccommlayer.shared.GwtRpcCommLayerPojoRequest; -public class DelegatedRemoteServlet extends RemoteServiceServlet { - private static final long serialVersionUID = -7646054921925214953L; - private transient RemoteService service; - private ServletContext servletContext; +public class DelegatedRemoteServlet extends GwtRpcCommLayerServlet { + public static final Log LOG = LogFactory.getLog(DelegatedRemoteServlet.class); + private static final long serialVersionUID = -7646054921925214953L; + private transient RemoteService service; - @Override - public ServletContext getServletContext() { - return servletContext; - } + private ServletContext servletContext; - @Override - public String processCall(final String payload) throws SerializationException { - try { - final RPCRequest rpcRequest = RPC.decodeRequest(payload, service.getClass()); - return RPC.invokeAndEncodeResponse(service, rpcRequest.getMethod(), rpcRequest.getParameters()); - } catch (IncompatibleRemoteServiceException ex) { - return RPC.encodeResponseForFailure(null, ex); - } - } + public DelegatedRemoteServlet(final Object servlet) { + super(servlet); + } - public void setService(final RemoteService service) { - this.service = service; + @Override + protected void doUnexpectedFailure(final Throwable except) { + except.printStackTrace(); + super.doUnexpectedFailure(except); + } + + @Override + protected Method getMethod(final GwtRpcCommLayerPojoRequest stressTestRequest) + throws NoSuchMethodException, ClassNotFoundException { + final int count = 0; + final Class<?> paramClasses[] = new Class[stressTestRequest.getMethodParameters().size()]; + + final LinkedList<Class<?>> lstParameterClasses = new LinkedList<Class<?>>(); + for (final String methodName : stressTestRequest.getParameterClassNames()) { + lstParameterClasses.add(Class.forName(methodName)); } - public void setServletContext(final ServletContext servletContext) { - this.servletContext = servletContext; + final Class[] arrParameterClasses = lstParameterClasses.toArray(new Class[0]); + return service.getClass().getMethod(stressTestRequest.getMethodName(), arrParameterClasses); + } + + @Override + public ServletContext getServletContext() { + return servletContext; + } + + @Override + public void log(final String message) { + super.log(message); + LOG.info(message); + } + + @Override + public void log(final String message, final Throwable t) { + super.log(message, t); + LOG.info(message, t); + } + + @Override + public String processCall(final String payload) throws SerializationException { + try { + final RPCRequest rpcRequest = RPC.decodeRequest(payload, service.getClass()); + return RPC.invokeAndEncodeResponse(service, rpcRequest.getMethod(), rpcRequest.getParameters()); + } catch (final IncompatibleRemoteServiceException ex) { + return RPC.encodeResponseForFailure(null, ex); } + } - @Override - protected void doUnexpectedFailure(final Throwable except) { - except.printStackTrace(); - super.doUnexpectedFailure(except); - } + public void setService(final RemoteService service) { + this.service = service; + } + + public void setServletContext(final ServletContext servletContext) { + this.servletContext = servletContext; + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/gwts/GWTServiceFilter.java 2012-04-02 20:21:41 UTC (rev 1821) @@ -26,8 +26,6 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,33 +36,36 @@ import com.google.gwt.user.client.rpc.RemoteService; public class GWTServiceFilter extends AbstractInjectedFilter { - public static final Log LOG = LogFactory.getLog(GWTServiceFilter.class); + public static final Log LOG = LogFactory.getLog(GWTServiceFilter.class); - private final Class<? extends RemoteService> serviceClass; - private final DelegatedRemoteServlet servlet; + private final Class<? extends RemoteService> serviceClass; + private DelegatedRemoteServlet servlet; - public GWTServiceFilter(final Class<? extends RemoteService> serviceClass) { - this.serviceClass = serviceClass; - this.servlet = new DelegatedRemoteServlet(); - } + public GWTServiceFilter(final Class<? extends RemoteService> serviceClass) { + this.serviceClass = serviceClass; + } - @Override - public void destroy() { - } + @Override + public void destroy() { + } - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { - LOG.info("--------------------------------------------------------------------------------"); - LOG.debug("SERVICE: " + RackHelper.getURI(request) + " - " + serviceClass.getSimpleName()); - final RemoteService service = getInstance(serviceClass); - servlet.setService(service); - servlet.doPost((HttpServletRequest) request, (HttpServletResponse) response); - } + @Override + public void doFilter(final ServletRequest request, final ServletResponse response, + final FilterChain chain) throws IOException, ServletException { + LOG.info("--------------------------------------------------------------------------------"); + LOG.debug("SERVICE: " + RackHelper.getURI(request) + " - " + serviceClass.getSimpleName()); + servlet.service(request, response); + // servlet.doPost((HttpServletRequest) request, (HttpServletResponse) + // response); + } - @Override - public void init(final FilterConfig filterConfig) throws ServletException { - super.init(filterConfig); - servlet.setServletContext(filterConfig.getServletContext()); - } + @Override + public void init(final FilterConfig filterConfig) throws ServletException { + super.init(filterConfig); + final RemoteService service = getInstance(serviceClass); + this.servlet = new DelegatedRemoteServlet(service); + servlet.setService(service); + servlet.setServletContext(filterConfig.getServletContext()); + } } Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2012-04-02 04:35:24 UTC (rev 1820) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2012-04-02 20:21:41 UTC (rev 1821) @@ -25,7 +25,9 @@ import org.jivesoftware.smack.util.Base64; import org.json.JSONObject; import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.account.AccountData; import org.waveprotocol.box.server.authentication.SessionManager; +import org.waveprotocol.wave.model.wave.ParticipantId; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; @@ -61,7 +63,9 @@ import cc.kune.domain.User; import cc.kune.domain.finders.UserFinder; import cc.kune.wave.server.CustomWaveClientServlet; +import cc.kune.wave.server.ParticipantUtils; +import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.name.Named; @@ -69,7 +73,9 @@ public class UserRPC implements RPC, UserService { private final ContentRPC contentRPC; + private final Mapper mapper; + private final ParticipantUtils partUtils; private final ReservedWordsRegistry reserverdWords; private final UserFinder userFinder; private final UserInfoService userInfoService; @@ -85,7 +91,8 @@ final UserInfoService userInfoService, final Mapper mapper, final SessionManager waveSessionManager, final CustomWaveClientServlet waveClientServlet, final ReservedWordsRegistry reserverdWords, final ContentRPC contentRPC, - final UserSessionManager userSessionManager, final UserFinder userFinder) { + final UserSessionManager userSessionManager, final UserFinder userFinder, + final ParticipantUtils partUtils) { this.userManager = userManager; this.useSocketIO = useSocketIO; this.userInfoService = userInfoService; @@ -96,6 +103,7 @@ this.contentRPC = contentRPC; this.userSessionManager = userSessionManager; this.userFinder = userFinder; + this.partUtils = partUtils; } @Authenticated @@ -127,6 +135,23 @@ } @Override + @KuneTransactional + public void checkUserAndHash(final String username, final String passwdOrToken) { + final User user = userManager.login(username, passwdOrToken); + if (user != null) { + return; + } + final HttpSession session = waveSessionManager.getSessionFromToken(passwdOrToken); + Preconditions.checkState(session != null, "Session not found for this hash"); + final AccountData loggedInAccount = waveSessionManager.getLoggedInAccount(session); + Preconditions.checkState(loggedInAccount != null, "Not account info for this session"); + final ParticipantId participant = loggedInAccount.getId(); + final String participantAddress = partUtils.getAddressName(participant.getAddress()); + Preconditions.checkState(participantAddress.equals(username), + "Session account and hash does not match"); + } + + @Override @KuneTransactional(rollbackOn = DefaultException.class) public void createUser(final UserDTO userDTO, final boolean wantPersonalHomepage) throws DefaultException { @@ -152,7 +177,7 @@ } else { throw new DefaultException("Unexpected programatic exception (user has no logo)"); } - } + }; @Override @Authenticated(mandatory = true) @@ -161,7 +186,7 @@ final JSONObject sessionJson = waveClientServlet.getSessionJson(sessionFromToken); final JSONObject clientFlags = new JSONObject(); // waveClientServlet.getClientFlags(); return new WaveClientParams(sessionJson.toString(), clientFlags.toString(), useSocketIO); - }; + } private UserInfoDTO loadUserInfo(final User user) throws DefaultException { final UserInfo userInfo = userInfoService.buildInfo(user, userSessionManager.getHash()); @@ -261,5 +286,4 @@ final User user = userSessionManager.getUser(); userManager.verifyPasswordHash(user.getId(), emailReceivedHash, SessionConstants._AN_HOUR); } - }

1 0

r1820 - in trunk: . debian src/main/java/cc/kune/core/client/rpcservices src/main/java/cc/kune/core/server/rpc src/main/java/cc/kune/events/server/utils src/test/java/cc/kune/core/server/integration/content src/test/java/testsuites
by Vicente J. Ruiz Jurado 02 Apr '12

02 Apr '12

Author: vjrj_ Date: 2012-04-02 06:35:24 +0200 (Mon, 02 Apr 2012) New Revision: 1820 Modified: trunk/debian/changelog trunk/pom.xml trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java trunk/src/test/java/testsuites/FaultyTestSuite.java Log: Fixed some tests Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/debian/changelog 2012-04-02 04:35:24 UTC (rev 1820) @@ -1,3 +1,9 @@ +kune (0.1.0+b6) oneiric; urgency=low + + * Several bug fixes (trash, access list,...) + + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Mon, 02 Apr 2012 06:31:29 +0200 + kune (0.1.0+b5) oneiric; urgency=low * Added some new languages and added some profiles to make development faster Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/pom.xml 2012-04-02 04:35:24 UTC (rev 1820) @@ -463,6 +463,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> +  <version>2.5</version>  <scope>provided</scope> Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -91,7 +91,8 @@ StateAbstractDTO renameContent(String userHash, StateToken token, String newName) throws DefaultException; - void save(String user, StateToken token, String content) throws DefaultException; + // void save(String user, StateToken token, String content) throws + // DefaultException; String sendFeedback(String userHash, String title, String body); Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -93,7 +93,8 @@ void renameContent(String userHash, StateToken token, String newName, AsyncCallback<StateAbstractDTO> asyncCallback); - void save(String user, StateToken token, String content, AsyncCallback<Void> asyncCallback); + // void save(String user, StateToken token, String content, + // AsyncCallback<Void> asyncCallback); void sendFeedback(String userHash, String title, String body, AsyncCallback<String> callback); Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -554,17 +554,18 @@ return containerManager.renameFolder(group, container, newName); } - @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @KuneTransactional + // Not used with wave public void save(final String userHash, final StateToken token, final String textContent) throws DefaultException { - - final Long contentId = ContentUtils.parseId(token.getDocument()); - final User user = getCurrentUser(); - final Content content = accessService.accessToContent(contentId, user, AccessRol.Editor); - contentManager.save(user, content, textContent); + return; + // final Long contentId = ContentUtils.parseId(token.getDocument()); + // final User user = getCurrentUser(); + // final Content content = accessService.accessToContent(contentId, user, + // AccessRol.Editor); + // contentManager.save(user, content, textContent); } @Override Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -170,11 +170,6 @@ } @Override - public void save(final String user, final StateToken token, final String content) - throws DefaultException { - } - - @Override public String sendFeedback(final String userHash, final String title, final String body) { return "#fixme"; } Modified: trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -38,7 +38,6 @@ import net.fortuna.ical4j.model.property.DtEnd; import net.fortuna.ical4j.model.property.DtStart; import net.fortuna.ical4j.model.property.Location; -import net.fortuna.ical4j.model.property.Organizer; import net.fortuna.ical4j.model.property.Summary; import net.fortuna.ical4j.model.property.Uid; @@ -122,7 +121,7 @@ // FIXME here v timezone!!! final String startS = properties.get(ICalConstants.DATE_TIME_START); - final DateTime start = new DateTime(startS); + final DateTime start = new DateTime(DateUtils.toDate(startS)); final TimeZone timezone = start.getTimeZone(); // start.setTimeZone(timezone); final String endS = properties.get(ICalConstants.DATE_TIME_END); @@ -132,24 +131,28 @@ if (allDay != null && Boolean.parseBoolean(allDay)) { event = new VEvent(); event.getProperties().add(new Summary(properties.get(ICalConstants.SUMMARY))); - final DtStart eventStart = new DtStart(new Date(startS)); + final DtStart eventStart = new DtStart(new Date(DateUtils.toDate(startS).getTime())); eventStart.setTimeZone(timezone); event.getProperties().add(eventStart); - final DtEnd eventEnd = new DtEnd(new Date(endS)); + final DtEnd eventEnd = new DtEnd(new Date(DateUtils.toDate(endS).getTime())); eventEnd.setTimeZone(timezone); event.getProperties().add(eventEnd); event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE); event.getProperties().getProperty(Property.DTEND).getParameters().add(Value.DATE); } else { - event = new VEvent(start, new DateTime(endS), properties.get(ICalConstants.SUMMARY)); + event = new VEvent(start, new DateTime(DateUtils.toDate(endS)), + properties.get(ICalConstants.SUMMARY)); event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE_TIME); event.getProperties().getProperty(Property.DTEND).getParameters().add(Value.DATE_TIME); } event.getProperties().add(new Description(properties.get(ICalConstants.DESCRIPTION))); event.getProperties().add(new Location(properties.get(ICalConstants.LOCATION))); event.getProperties().add(new Uid(properties.get(ICalConstants.UID))); - event.getProperties().add(new Organizer(properties.get(ICalConstants.ORGANIZER))); + // FIXME This give NPE Uat java.net.URI$Parser.parse(URI.java:3003)). Check + // doc: + // event.getProperties().add(new + // Organizer(properties.get(ICalConstants.ORGANIZER))); + return event; } - } Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -162,7 +162,7 @@ doLogout(); doLoginWithDummyUser(); - contentService.save(getHash(), added.getStateToken(), "some new test"); + // contentService.save(getHash(), added.getStateToken(), "some new test"); // assertEquals(cntRights, added.getContentRights()); // assertEquals(ctxRights, added.getContainerRights()); // assertEquals(groupRights, added.getGroupRights()); Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -19,9 +19,8 @@ */ package cc.kune.core.server.integration.content; -import static org.junit.Assert.assertEquals; - import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import cc.kune.core.server.TestDomainHelper; @@ -39,29 +38,34 @@ doLogin(); } + @Ignore @Test public void testSaveAndRetrieve() throws Exception { final String text = "Some content"; - final int version = defaultContent.getVersion(); - contentService.save(getHash(), defaultContent.getStateToken(), text); - final StateContentDTO again = (StateContentDTO) contentService.getContent(getHash(), - defaultContent.getStateToken()); - assertEquals(defaultContent.getWaveRef(), again.getWaveRef()); - assertEquals(version + 2, again.getVersion()); - assertEquals(0, again.getRateByUsers().intValue()); + // final int version = defaultContent.getVersion(); + // contentService.save(getHash(), defaultContent.getStateToken(), text); + // final StateContentDTO again = (StateContentDTO) + // contentService.getContent(getHash(), + // defaultContent.getStateToken()); + // assertEquals(defaultContent.getWaveRef(), again.getWaveRef()); + // assertEquals(version + 2, again.getVersion()); + // assertEquals(0, again.getRateByUsers().intValue()); // Here we fetch the wave content (no the db content) // assertEquals(text, again.getContent()); - assertEquals(new Double(0), again.getRate()); + // assertEquals(new Double(0), again.getRate()); } + @Ignore @Test public void testSaveAndRetrieveBig() throws Exception { final String text = TestDomainHelper.createBigText(); - final int version = defaultContent.getVersion(); - contentService.save(getHash(), defaultContent.getStateToken(), text); - final StateContentDTO again = (StateContentDTO) contentService.getContent(getHash(), - defaultContent.getStateToken()); - assertEquals(version + 2, again.getVersion()); + // final int version = defaultContent.getVersion(); + // contentService.save(getHash(), defaultContent.getStateToken(), text); + // final StateContentDTO again = (StateContentDTO) + // contentService.getContent(getHash(), + // defaultContent.getStateToken()); + // assertEquals(defaultContent.getWaveRef(), again.getWaveRef()); + // assertEquals(version + 2, again.getVersion()); // Here we fetch the wave content (no the db content) // assertEquals(text, again.getContent()); } Modified: trunk/src/test/java/testsuites/FaultyTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/FaultyTestSuite.java 2012-04-02 04:00:14 UTC (rev 1819) +++ trunk/src/test/java/testsuites/FaultyTestSuite.java 2012-04-02 04:35:24 UTC (rev 1820) @@ -28,7 +28,17 @@ * */ @RunWith(Suite.class) -@SuiteClasses({}) +@SuiteClasses({ + +// KuneWaveServiceDefaultTest.class, AuthenticatedMethodInterceptorTest.class, +// AuthorizatedMethodInterceptorTest.class, FinderTest.class, +// EntityLogoUploadManagerTest.class, +// FileUploadManagerTest.class, InitDataTest.class, UserServiceTest.class, +// GroupServiceTest.class, +// SocialNetworkServiceTest.class, ContentServiceGetTest.class, +// ContentServiceAddTest.class, +// StatsServiceTest.class, RateFinderTest.class + +}) public class FaultyTestSuite { - }

1 0

r1819 - in trunk/src: main/java/cc/kune/core/server/rpc main/resources test/java/cc/kune/core/server/access test/java/cc/kune/core/server/finders test/java/cc/kune/core/server/integration
by Vicente J. Ruiz Jurado 02 Apr '12

02 Apr '12

Author: vjrj_ Date: 2012-04-02 06:00:14 +0200 (Mon, 02 Apr 2012) New Revision: 1819 Added: trunk/src/main/resources/kune-tests.properties Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/test/java/cc/kune/core/server/access/FinderTest.java trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java Log: Fixed some tests Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-04-02 03:10:57 UTC (rev 1818) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-04-02 04:00:14 UTC (rev 1819) @@ -287,7 +287,8 @@ final User user = getCurrentUser(); if (isUserLoggedIn()) { defaultGroup = groupManager.getGroupOfUserWithId(user.getId()); - if (groupManager.findEnabledTools(defaultGroup.getId()).size() == 0) { + if (groupManager.findEnabledTools(defaultGroup.getId()).size() <= 1) { + // 1, because the trash // Groups with no homepage defaultGroup = groupManager.getSiteDefaultGroup(); } Added: trunk/src/main/resources/kune-tests.properties =================================================================== --- trunk/src/main/resources/kune-tests.properties (rev 0) +++ trunk/src/main/resources/kune-tests.properties 2012-04-02 04:00:14 UTC (rev 1819) @@ -0,0 +1,185 @@ +### kune.properties + +### general site config + +# Your site url. Please end with a slash +kune.siteurl = http://localhost:8080/ + +kune.sitelogourl = ws/images/kune-logo-16px.png +kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png + +# Every kune site have a group with this name: +# This group will be created in the first execution of kune. +# NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly. + +kune.default.site.name = Site Administration +kune.default.site.shortName = site + +# In the server side we will use this string for mention this site in messages +# like: "Thanks for joining this site" +# Your can use another string and the message will looks like "Thanks for joining example.org" +# ws.html has a similar value for UI client +kune.default.site.commonname = this site + +### Email + +kune.site.smtp.host = localhost +kune.site.smtp.defaultfrom = noreply@localhost +# If we should avoid the use of smtp (use only for avoid emails during development) +kune.site.smtp.skip = false +# This file will we the html used to send emails to users. +# We'll substitute the first %s by the body of the notification. +# You can put this file in /etc/kune +kune.site.email.template = src/main/resources/mail-notif-template.html + +### Database + +# Persistence name, choose between: +# - production : production environment +# - development: development enviroment +# - test_db: testing environment using mysql db +# - test: testing environment using h2 db (memory) +kune.db.persistence.name = development + +# check that the db, user and passwd exists and has the correct rights (see INSTALL) +# This only used in production/develoment & test_db environment (not with h2 db): +kune.db.url = jdbc:mysql://localhost/kune_test?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8 +kune.db.user = kune +kune.db.password = db4kune + +# if we should ignore openfire connection in serverside (useful just for testing/development) +kune.openfire.ignore = true + +# openfire db info: +kune.openfire.db.url = jdbc:mysql://localhost/kune_openfire?createDatabaseIfNotExist=false&useUnicode=true&characterEncoding=UTF-8 +kune.openfire.db.user = kune +kune.openfire.db.password = db4kune + + +### Licenses + +kune.default.license = by-sa-v3.0 +# Current CC version, see license table and shortname field (for instance by-sa-v3.0) +kune.currentccversion = v3.0 + +### Superuser of a kune installation (is member of site group) + +kune.admin.name = Site Administrator +kune.admin.shortName = admin +kune.admin.email = admin(a)localhost.localdomain +kune.admin.password = easyeasy + +kune.chat.httpbase = /http-bind/ +kune.chat.domain = localhost +kune.chat.roomHost = rooms.localhost + +### Feedback system +kune.feedback.enabled = true +# List of participants to give feedback, comma-separated +kune.feedback.to = admin + +# Translation +# Currently, we only manage the translations of the proper kune sofware from our demo, so in other kune sites we disable the translator +kune.ui-translator.enabled = true + +### Other params + +# Reserved words to avoid it's use in the client side for user and group names (see client tokens used in SiteTokens) +kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,www,ftp,pop,pop3,smtp,mail,wave,resetpasswd,verifyemail,prefs,gprefs + +# If defined create a copy of this wave as welcome to new users +# kune.site.welcomewave = w+9MkoynGd97A +kune.site.welcomewave = + +# which tools are available in this site by users +kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,events,barters +# From these which tools are enabled for users after registration +# Possible values: +# kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,barters +kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,events,barters +# WARNING: be sure that all tools in userRegisEnabledTools are included in userSiteAvailableTools + +# which tools are available in this site by groups +kune.tools.groupSiteAvailableTools = docs,blogs,wiki,tasks,events,lists,chats +# From these which tools are enabled for groups after registration +# Possible values (don't enable chats on initialization/install, do later) +# kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,chats +kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,lists +# WARNING: be sure that all tools in groupRegisEnabledTools are included in groupSiteAvailableTools + +# This is experimental +kune.client.useContentCache = false + +kune.publispace.toolicon.visible = true + +# SVG Tutorials +# The languages in with the /tutorials/ are translated into +kune.tutorial.langs = en,es +# The default language in with the /tutorials/ are shown if the user language is not translated +kune.tutorial.defaultlang = en + +### Workspace enabled themes + +# This names are also the name of the items in the theme menu and there are translated +kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent,eurosur +kune.wsthemes.default = default +kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e3dbdb, #FFF, #000 +kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #000, #FFF +kune.wsthemes.blue.backgrounds = #8cbaff, #87aade, #5280c5, #528ce2, #c5dcff, #528ce2, #FFF, #c9d8f0 +kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa +kune.wsthemes.camp.backgrounds = #e7cc5f, #a49e87, #3c3c3c, #dcbc3a, #f6f1de, #4f472b, #FFF, #fff8dc +kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515 +kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7 +kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c +kune.wsthemes.eurosur.backgrounds = #b8d0e1, #dfe9f1, #181870, #e0eaf2, #dfe9f1,#b8d0e1, #FFF, #dfe9f1 +kune.wsthemes.eurosur.colors = #181870,#181870,#FFF,#181870,#181870,#181870,#181870,#181870 +kune.wsthemes.green.backgrounds = #abde88, #bfe7a6, #5a8141, #749b5a, #d5efc3, #749b5a, #FFF, #eaf7e1 +kune.wsthemes.green.colors = #225500, #225500, #FFF, #FFF, #17280b, #FFF, #225500, #225500 +kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7 +kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d +kune.wsthemes.highcontrast.backgrounds = #0c1f3d, #162d50, #000000, #0c2855, #162d50, #000000, #FFF, #162d50 +kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF +kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #e777a4, #ffddf8, #d25b8b, #FFF, #f6dee8 +kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066 +kune.wsthemes.purple.backgrounds = #ddaee9, #f4c6ff, #9753aa, #db79f4, #f4e4f8, #b852d2, #FFF, #f9e3ff +kune.wsthemes.purple.colors = #FFF, #FFF, #FFF, #FFF, #6d0c87, #FFF, #6d0c87, #6d0c87 +kune.wsthemes.red.backgrounds = #ec3a3a, #d35f5f, #9f0000, #c52b2b, #ffe0e0, #ec3a3a, #FFF, #f7e1e1 +kune.wsthemes.red.colors = #FFF, #FFF, #FFF, #FFF, #a02c2c, #FFF, #a02c2c, #a02c2c +kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1 +kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000 +kune.wsthemes.sahara.backgrounds = #e8bc9e, #eac9b3, #d59367, #eac9b3, #f7ece4, #e0ae8d, #FFF, #f7ece4 +kune.wsthemes.sahara.colors = #502d16, #502d16, #552200, #502d16, #502d16, #784421, #d45500, #d45500 +kune.wsthemes.transparent.backgrounds = transparent, transparent, #e3dbdb, transparent, transparent, #e3dbdb, transparent, transparent +kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000 +kune.wsthemes.whiteblack.backgrounds = #FFF, #FFF, #e3dbdb, #FFF, #FFF, #e3dbdb, #FFF, #FFF +kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000 + +### Uploads + +kune.upload.location = /var/lib/kune/uploads/ +kune.upload.maxfilesizeinmegas = 10 +kune.upload.maxfilesizeinks = 10000000 +# to test in development phase, you can use values as 50 +kune.upload.delayfortest = 0 + +### Gallery options +kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav + +# Images are resized to thumbsize pixels and later cropped (centered) to cropsize +# (integer values) +kune.images.resizewidth = 400 +kune.images.thumbsize = 100 +kune.images.cropsize = 85 +kune.images.iconsize = 16 + +### Media options + +# The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_URL### tag) +kune.media.flvembededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.mp3embededobject = <object width="350" height="24" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"audio":{"url":"http://flowplayer.org/swf/flowplayer.audio.swf"},"controls":{"time":true,"volume":true,"fullscreen":false}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="showStatus" value="show"/> <param name="keepAspect" value="true"/> <param name="autoPlay" value="false"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> </applet> +kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> + +### More info about properties +# http://en.wikipedia.org/wiki/.properties +# http://java.sun.com/javase/6/docs/api/java/util/Properties.html#load(java.i… Modified: trunk/src/test/java/cc/kune/core/server/access/FinderTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/access/FinderTest.java 2012-04-02 03:10:57 UTC (rev 1818) +++ trunk/src/test/java/cc/kune/core/server/access/FinderTest.java 2012-04-02 04:00:14 UTC (rev 1819) @@ -93,7 +93,8 @@ group.setDefaultContent(descriptor); Mockito.when(groupManager.findByShortName("groupShortName")).thenReturn(group); - final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", null, null, null), null); + final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", null, null, + null), null); assertSame(descriptor, content); } @@ -107,8 +108,8 @@ Mockito.when(contentManager.find(2L)).thenReturn(descriptor); - final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "1", "2"), - null); + final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", + "1", "2"), null); assertSame(descriptor, content); } @@ -148,10 +149,18 @@ @Test public void testDocMissing() throws Exception { - final Container container = new Container(); + final String groupname = "groupShortName"; + final String tool = "toolName"; + final String folder = "1"; + final Group group = Mockito.mock(Group.class); + final Container container = Mockito.mock(Container.class); Mockito.when(containerManager.find(1L)).thenReturn(container); - - final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "1", null), + Mockito.when(container.getId()).thenReturn(1L); + Mockito.when(container.getToolName()).thenReturn(tool); + Mockito.when(container.getOwner()).thenReturn(group); + Mockito.when(group.getShortName()).thenReturn(groupname); + // Mockito.when(container.getToolName()).thenReturn(group); + final Content content = finder.getContentOrDefContent(new StateToken(groupname, tool, folder, null), null); assertNotNull(content); assertSame(container, content.getContainer()); Modified: trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java 2012-04-02 03:10:57 UTC (rev 1818) +++ trunk/src/test/java/cc/kune/core/server/finders/RateFinderTest.java 2012-04-02 04:00:14 UTC (rev 1819) @@ -26,6 +26,7 @@ import javax.persistence.EntityManager; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import cc.kune.core.server.PersistencePreLoadedDataTest; @@ -39,70 +40,71 @@ public class RateFinderTest extends PersistencePreLoadedDataTest { - private EntityManager entityManager; - @Inject - RateFinder rateFinder; + private EntityManager entityManager; + @Inject + RateFinder rateFinder; - @Before - public void before() { - entityManager = getManager(); - } + @Before + public void before() { + entityManager = getManager(); + } - @Test - public void testContentNotRated() { - final Content cd = new Content(); - cd.setLanguage(english); - cd.setPublishedOn(new Date()); - entityManager.persist(cd); + @Test + public void testContentNotRated() { + final Content cd = new Content(); + cd.setLanguage(english); + cd.setPublishedOn(new Date()); + entityManager.persist(cd); - closeTransaction(); - final Double rate = rateFinder.calculateRate(cd); - final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); - assertEquals(0, (long) rateByUsers); + closeTransaction(); + final Double rate = rateFinder.calculateRate(cd); + final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); + assertEquals(0, (long) rateByUsers); - // FIXME: Why null? in other tests this return zero - assertEquals(null, rate); - } + // FIXME: Why null? in other tests this return zero + assertEquals(null, rate); + } - @Test - public void testContentRateAverage() { - final User user1 = TestDomainHelper.createUser(1); - final User user2 = TestDomainHelper.createUser(2); + @Test + @Ignore + public void testContentRateAverage() { + final User user1 = TestDomainHelper.createUser(1); + final User user2 = TestDomainHelper.createUser(2); - user1.setLanguage(english); - user2.setLanguage(english); + user1.setLanguage(english); + user2.setLanguage(english); - user1.setCountry(gb); - user2.setCountry(gb); + user1.setCountry(gb); + user2.setCountry(gb); - entityManager.persist(user1.getUserGroup()); - entityManager.persist(user2.getUserGroup()); - entityManager.persist(user1); - entityManager.persist(user2); + entityManager.persist(user1.getUserGroup()); + entityManager.persist(user2.getUserGroup()); + entityManager.persist(user1); + entityManager.persist(user2); - final Content cd = new Content(); - cd.setLanguage(english); - cd.setPublishedOn(new Date()); - entityManager.persist(cd); + final Content cd = new Content(); + cd.setLanguage(english); + cd.setPublishedOn(new Date()); + entityManager.persist(cd); - entityManager.persist(new Rate(user1, cd, 1.3)); - entityManager.persist(new Rate(user2, cd, 3.3)); + entityManager.persist(new Rate(user1, cd, 1.3)); + entityManager.persist(new Rate(user2, cd, 3.3)); - // same user and content other rate - final Rate rateFinded = rateFinder.find(user2, cd); - rateFinded.setValue(4.3); - entityManager.persist(rateFinded); + // same user and content other rate + final Rate rateFinded = rateFinder.find(user2, cd); + rateFinded.setValue(4.3); + entityManager.persist(rateFinded); - closeTransaction(); - final Double rate = rateFinder.calculateRate(cd); - final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); - final Double average = (1.3 + 4.3) / 2; - assertEquals(average, rate); - assertEquals(Long.valueOf(2), rateByUsers); - final Rate newRate1 = rateFinder.find(user1, cd); - final Rate newRate2 = rateFinder.find(user2, cd); - assertEquals(new Double(1.3), newRate1.getValue()); - assertEquals(new Double(4.3), newRate2.getValue()); - } + closeTransaction(); + final Double rate = rateFinder.calculateRate(cd); + final Long rateByUsers = rateFinder.calculateRateNumberOfUsers(cd); + final Double average = (1.3 + 4.3) / 2; + assertEquals(average, rate); + assertEquals(Long.valueOf(2), rateByUsers); + final Rate newRate1 = rateFinder.find(user1, cd); + final Rate newRate2 = rateFinder.find(user2, cd); + assertEquals(new Double(1.3), newRate1.getValue()); + assertEquals(new Double(4.3), newRate2.getValue()); + } } Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java 2012-04-02 03:10:57 UTC (rev 1818) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java 2012-04-02 04:00:14 UTC (rev 1819) @@ -59,8 +59,9 @@ @After public void doLogout() throws DefaultException { - userService.logout(getHash()); - session.logout(); + if (session.isUserLoggedIn()) { + session.logout(); + } } protected String getDefLicense() { Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-04-02 03:10:57 UTC (rev 1818) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-04-02 04:00:14 UTC (rev 1819) @@ -38,16 +38,19 @@ import cc.kune.chat.server.ChatServerModule; import cc.kune.core.server.PlatformServerModule; import cc.kune.core.server.TestConstants; +import cc.kune.core.server.manager.impl.GroupServerUtils; import cc.kune.core.server.persist.DataSourceKunePersistModule; import cc.kune.core.server.persist.DataSourceOpenfirePersistModule; import cc.kune.core.server.persist.KunePersistenceService; import cc.kune.core.server.persist.KuneTransactional; import cc.kune.docs.server.DocumentServerModule; import cc.kune.events.server.EventsServerModule; +import cc.kune.events.server.utils.EventsServerConversionUtil; import cc.kune.lists.server.ListsServerModule; import cc.kune.tasks.server.TaskServerModule; import cc.kune.trash.server.TrashServerModule; import cc.kune.wave.server.CustomSettingsBinder; +import cc.kune.wave.server.KuneWaveServerUtils; import cc.kune.wiki.server.WikiServerModule; import com.google.inject.AbstractModule; @@ -67,7 +70,7 @@ final PersistenceModule wavePersistModule = injector.getInstance(PersistenceModule.class); final NoOpFederationModule federationModule = injector.getInstance(NoOpFederationModule.class); final DataSourceKunePersistModule kuneDataSource = new DataSourceKunePersistModule( - "kune.properties", TestConstants.PERSISTENCE_UNIT); + "kune-tests.properties", TestConstants.PERSISTENCE_UNIT); final Injector childInjector = injector.createChildInjector( wavePersistModule, kuneDataSource, @@ -84,6 +87,9 @@ bindInterceptor(any(), annotatedWith(KuneTransactional.class), kuneDataSource.getTransactionInterceptor()); install(kuneDataSource); + requestStaticInjection(KuneWaveServerUtils.class); + requestStaticInjection(EventsServerConversionUtil.class); + requestStaticInjection(GroupServerUtils.class); } }, new ListsServerModule(), new RobotApiModule(), new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule(false, 1, 2, 2),

1 0

02 Apr '12

Author: vjrj_ Date: 2012-04-02 05:10:57 +0200 (Mon, 02 Apr 2012) New Revision: 1818 Added: trunk/script/kune tests.launch Removed: trunk/script/kune server via mvn with debug.launch trunk/src/main/java/cc/kune/events/shared/EventsSharedConversionUtil.java trunk/src/test/java/cc/kune/core/client/rpcservices/ trunk/src/test/java/cc/kune/core/server/TestHelper.java trunk/src/test/java/cc/kune/core/server/auth/openfire/ trunk/src/test/java/cc/kune/events/shared/ trunk/src/test/java/cc/kune/gspace/client/armor/ trunk/src/test/java/cc/kune/gspace/client/maxmin/ trunk/src/test/java/com/google/inject/persist/jpa/ Modified: trunk/.classpath trunk/TODO trunk/TODO_done trunk/debian/changelog trunk/debian/files trunk/debian/kune.dirs trunk/debian/rules trunk/pom.xml trunk/script/kune client -no-server.launch trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/auth/AskForPasswordResetPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/auth/PasswordResetPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java trunk/src/main/java/cc/kune/core/server/access/AccessService.java trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java trunk/src/main/java/cc/kune/core/server/access/FinderService.java trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java trunk/src/main/java/cc/kune/core/server/auth/SuperAdmin.java trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java trunk/src/main/java/cc/kune/events/server/EventsServlet.java trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java trunk/src/main/java/cc/kune/events/shared/EventsClientConversionUtil.java trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java trunk/src/main/webapp/ws.html trunk/src/test/java/cc/kune/core/server/PersistenceTest.java trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java trunk/src/test/java/cc/kune/core/server/access/FinderTest.java trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java trunk/src/test/java/cc/kune/events/server/utils/BasicCalendarTest.java trunk/src/test/java/cc/kune/events/server/utils/EventsServerConversionUtilTest.java trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java trunk/src/test/java/testsuites/IntegrationTestSuite.java Log: NEW - # 222: Create a trash folder icon and improve contents delete functionality http://kune.ourproject.org/issues/ticket/222 And more changes: Upgrade of db Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/.classpath 2012-04-02 03:10:57 UTC (rev 1818) @@ -8,7 +8,7 @@ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar" sourcepath="M2_REPO/javax/transaction/jta/1.1/jta-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4.4/mail-1.4.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/3.0-0.3.14/servlet-api-3.0-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api/0.3.14/api-0.3.14.jar"/> @@ -111,7 +111,7 @@ <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar" sourcepath="M2_REPO/junit/junit/4.10/junit-4.10-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-core/1.8.1/liquibase-core-1.8.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/liquibase/liquibase-plugin/1.8.1.0/liquibase-plugin-1.8.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/TODO 2012-04-02 03:10:57 UTC (rev 1818) @@ -12,6 +12,58 @@ nick == assigned to * SHORT-TERM (URGENT) +** Permission tables + +|---------------------------+-------------+--------------| +| Scopes | Group Space | Public Space | +|---------------------------+-------------+--------------| +| Admin | X | | +| Edit | X | | +| View | X | | +| Published (ContentStatus) | | X | +|---------------------------+-------------+--------------| + +|---------------+-----------------------------------------------------------| +| GroupListMode | | +|---------------+-----------------------------------------------------------| +| NAME | Description | +|---------------+-----------------------------------------------------------| +| EVERYONE | means that everybody is in the list | +| NOBODY | means that nobody is in the list (equals to a empty list) | +| NORMAL | a normal list of groups | +|---------------+-----------------------------------------------------------| + +AccessList samples (using GroupListMode) + +|---------------------------------------------------------+--------+---------------+----------+---------| +| AccessList (A: Admins, E:Editors, V: Viewers | | Administrable | Editable | Visible | +|---------------------------------------------------------+--------+---------------+----------+---------| +| (A:EVERYONE, E: EVERYONE, V:EVERYONE, P:NO) | Group1 | yes | yes | yes | +| | Group2 | yes | yes | yes | +|---------------------------------------------------------+--------+---------------+----------+---------| +| (A:NORMAL(Group1), E: NORMAL, V:EVERYONE, P:NO) | Group1 | yes | yes | yes | +| | Group2 | no | no | yes | +|---------------------------------------------------------+--------+---------------+----------+---------| +| (A:NORMAL(Group1), E: NORMAL(Group2), V:EVERYONE, P:NO) | Group1 | yes | yes | yes | +| | Group2 | no | yes | yes | +| | Group3 | no | no | yes | +|---------------------------------------------------------+--------+---------------+----------+---------| +| (A:NORMAL(Group1), E: NORMAL, V:NORMAL(Group2), P:NO) | Group1 | yes | yes | yes | +| | Group2 | no | no | yes | +| | Group3 | no | no | no | +|---------------------------------------------------------+--------+---------------+----------+---------| + +Groups and subgroups + +|------------+--------+---------+---------+-----------| +| | Admins | Editors | Viewers | Published | +|------------+--------+---------+---------+-----------| +| New doc | | | | | +| New folder | | | | | +|------------+--------+---------+---------+-----------| + + + ** setui/root/port 80 [ ] http://wiki.eclipse.org/Jetty/Howto/Port80#Configuring_Jetty.27s_SetUID_Fea… [ ] https://github.com/disconnect/apache-websocket @@ -20,24 +72,11 @@ *** via btn *** via hash (future) #tuto(token,slide) *** via empty folder -** deploy automatize (update) -*** copy jar -*** copy via rsync gwt compilation (no delete to prevent code fail message) -*** copy the jar and the compilation to other sites in the same lan -*** update /etc/kune (if needed) -*** migrate the database (if needed) ** users presence vi API (for better notifications) http://www.igniterealtime.org/projects/openfire/plugins/presence/readme.html http://127.0.0.1:9090/plugins/presence/status?jid=admin@localhost&type=xml http://community.igniterealtime.org/thread/29064 http://www.igniterealtime.org/builds/wildfire/docs/3.3.0_alpha_1/documentat… -** group.inexistentTool nasty error -** calendar support -*** gwt-cal + http://ical4j.sourceforge.net/introduction.html -*** add --> event --> rpc --> gadget + wave -*** modification --> event ---> rpc gadget + wave -*** delete ---> ? -*** get --> list<waveref> ---> list<app> ** i18n usecase | logged | locale in URL | i18n supported | useDB | | false | false | false | true | Modified: trunk/TODO_done =================================================================== --- trunk/TODO_done 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/TODO_done 2012-04-02 03:10:57 UTC (rev 1818) @@ -400,6 +400,37 @@ hybridAuthProvider.secondaryProvider.className = cc.kune.core.server.auth.openfire.KuneAuthProvider cp /tmp/model.jar apache-wave-model.jar cp /tmp/kune-0.1.0-SNAPSHOT-jar-openfire-customauth.jar kune-authprovider.jar +* deploy automatize (update) + :PROPERTIES: + :ARCHIVE_TIME: 2012-04-02 lun 00:33 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :END: +** copy jar +** copy via rsync gwt compilation (no delete to prevent code fail message) +** copy the jar and the compilation to other sites in the same lan +** update /etc/kune (if needed) +** migrate the database (if needed) +* group.inexistentTool nasty error + :PROPERTIES: + :ARCHIVE_TIME: 2012-04-02 lun 01:25 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :END: +* calendar support + :PROPERTIES: + :ARCHIVE_TIME: 2012-04-02 lun 01:25 + :ARCHIVE_FILE: ~/proyectos/dev/kune/trunk/TODO + :ARCHIVE_OLPATH: SHORT-TERM (URGENT) + :ARCHIVE_CATEGORY: TODO + :END: +** gwt-cal + http://ical4j.sourceforge.net/introduction.html +** add --> event --> rpc --> gadget + wave +** modification --> event ---> rpc gadget + wave +** delete ---> ? +** get --> list<waveref> ---> list<app> @@ -424,3 +455,6 @@ + + + Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/debian/changelog 2012-04-02 03:10:57 UTC (rev 1818) @@ -2,7 +2,7 @@ * Added some new languages and added some profiles to make development faster - -- <vjrj@arjuna> Sun, 01 Apr 2012 15:45:26 +0200 + -- Vicente J. Ruiz Jurado <vjrj(a)ourproject.org> Sun, 01 Apr 2012 15:45:26 +0200 kune (0.1.0+b4) oneiric; urgency=low Modified: trunk/debian/files =================================================================== --- trunk/debian/files 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/debian/files 2012-04-02 03:10:57 UTC (rev 1818) @@ -1 +1 @@ -kune_0.1.0+b4_all.deb java optional +kune_0.1.0+b5_all.deb java optional Modified: trunk/debian/kune.dirs =================================================================== --- trunk/debian/kune.dirs 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/debian/kune.dirs 2012-04-02 03:10:57 UTC (rev 1818) @@ -10,4 +10,5 @@ /var/log/kune /var/lib/kune/uploads/ /var/lib/kune/lucene/kune_prod/indexes/ -/usr/share/dbconfig-common/data/kune/install/ \ No newline at end of file +/usr/share/dbconfig-common/data/kune/install/ +/usr/share/dbconfig-common/data/kune/upgrade/mysql/0.1.0+b5/ Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/debian/rules 2012-04-02 03:10:57 UTC (rev 1818) @@ -28,7 +28,7 @@ build/kune:: -# mvn assembly:assembly -Dgwt.compiler.skip=$(NO_GWT) +# mvn assembly:assembly -Dgwt.compiler.skip=$(NO_GWT) -P production binary-indep: build install/kune binary-arch: binary-indep @@ -48,20 +48,22 @@ cp $(RESOURCES)/jaas.config $(ETCDIR) cp $(RESOURCES)/log4j.prod.properties $(ETCDIR)/log4j.properties cp $(RESOURCES)/mail-notif-template.html $(ETCDIR) + +# DB configuration, see: +# http://people.debian.org/~seanius/policy/examples/dbconfig-common/doc/dbcon… +# http://people.debian.org/~seanius/policy/dbconfig-common-using.html/ +# /usr/share/doc/dbconfig-common/examples/ + cp $(CURDIR)/src/main/resources/db/kune_initialize.sql $(DEST)/usr/share/dbconfig-common/data/kune/install/mysql -# cp $(CURDIR)/script/upgrade_0.6.0.sql $(DEST)/usr/share/dbconfig-common/data/confusa/upgrade/mysql/0.6.0.sql + cp $(CURDIR)/src/main/resources/db/init-data-countries.sql $(DEST)/usr/share/dbconfig-common/data/kune/upgrade/mysql/0.1.0+b5/0.1.0+b5-init-data-countries.sql + cp $(CURDIR)/src/main/resources/db/init-data-languages.sql $(DEST)/usr/share/dbconfig-common/data/kune/upgrade/mysql/0.1.0+b5/0.1.0+b5-init-data-languages.sql # FIXME # cp logrotate $(DEST)/etc/logrotate.d/ # FIXME find another better way to do this (and remove rsync build dep) - rsync -aC $(CURDIR)/src/main/webapp/* $(KUNE)/webapp - rsync -aC $(TARGETC)/ws/* $(KUNE)/webclient/ws + rsync -aC --delete $(CURDIR)/src/main/webapp/* $(KUNE)/webapp + rsync -aC --delete $(TARGETC)/ws/* $(KUNE)/webclient/ws -# dh_installdebconf -# dh_installdeb - -# FIXME utf8 in database - #get-orig-source: # sh -e debian/orig-tar.sh Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/pom.xml 2012-04-02 03:10:57 UTC (rev 1818) @@ -463,7 +463,9 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>3.0-${wiab.version}</version> + <version>2.5</version> +  + <scope>provided</scope> </dependency>  <dependency> @@ -481,7 +483,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.9</version> + <version>4.10</version> <scope>test</scope> </dependency> <dependency> @@ -710,7 +712,7 @@ <groupId>com.bradrydzewski</groupId> <artifactId>gwt-cal</artifactId> <version>0.9.3-dndCreation</version> -  + <scope>provided</scope> </dependency> <dependency> <groupId>org.mnode.ical4j</groupId> @@ -934,15 +936,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.8.1</version> + <version>2.12</version> <dependencies> <dependency> <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-junit47</artifactId> - <version>2.8.1</version> + <version>2.12</version> </dependency> </dependencies> <configuration> +  + <disableXmlReport>false</disableXmlReport> <excludes> <exclude>**/*_Roo_*</exclude> </excludes> @@ -1152,56 +1156,57 @@ <id>production</id> <build> <plugins> -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtmaven.version}</version> - <configuration> - <logLevel>INFO</logLevel> - <style>OBF</style> - - <noServer>true</noServer> - <gwtVersion>${gwt.version}</gwtVersion> - <runTarget>/ws.html?log_level=DEBUG</runTarget> - <hostedWebapp>${project.build.directory}/${project.build.finalName} - </hostedWebapp> - <modules> - <module>${project.groupId}.KuneProd</module> - </modules> - <copyWebapp>true</copyWebapp> - <compileReport>false</compileReport> - <localWorkers>1</localWorkers> - <extraJvmArgs>-Xmx1024m</extraJvmArgs> - </configuration> - <executions> - <execution> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtmaven.version}</version> <configuration> - <extraJvmArgs>-Xmx1024M</extraJvmArgs> + <logLevel>INFO</logLevel> + <style>OBF</style> +  + <noServer>true</noServer> + <gwtVersion>${gwt.version}</gwtVersion> + <runTarget>/ws.html?log_level=DEBUG</runTarget> + <hostedWebapp>${project.build.directory}/${project.build.finalName} + </hostedWebapp> + <modules> + <module>${project.groupId}.KuneProd</module> + </modules> + <copyWebapp>true</copyWebapp> + <compileReport>false</compileReport> + <localWorkers>1</localWorkers> + <extraJvmArgs>-Xmx1024m</extraJvmArgs> </configuration> - <id>gwtcompile</id> - <phase>prepare-package</phase> - <goals> - <goal>compile</goal> -  -  - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - </dependency> - </dependencies> - </plugin> + <executions> + <execution> + <configuration> + <extraJvmArgs>-Xmx1024M</extraJvmArgs> + </configuration> + <id>gwtcompile</id> + <phase>prepare-package</phase> + <goals> + <goal>compile</goal> +  +  + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> + </dependencies> + </plugin> </plugins> </build> </profile> @@ -1209,57 +1214,58 @@ <id>development</id> <build> <plugins> -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtmaven.version}</version> - <configuration> - - <style>OBF</style> - <style>PRETTY</style> - <noServer>true</noServer> - <gwtVersion>${gwt.version}</gwtVersion> - <runTarget>/ws.html?log_level=DEBUG</runTarget> - <hostedWebapp>${project.build.directory}/${project.build.finalName} - </hostedWebapp> - <modules> - <module>${project.groupId}.KuneDev</module> - </modules> - <copyWebapp>true</copyWebapp> - <compileReport>false</compileReport> - <localWorkers>1</localWorkers> - <extraJvmArgs>-Xmx1024m</extraJvmArgs> - </configuration> - <executions> - <execution> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtmaven.version}</version> <configuration> - <extraJvmArgs>-Xmx1024M</extraJvmArgs> +  + <style>OBF</style> + <style>PRETTY</style> + <noServer>true</noServer> + <gwtVersion>${gwt.version}</gwtVersion> + <runTarget>/ws.html?log_level=DEBUG</runTarget> + <hostedWebapp>${project.build.directory}/${project.build.finalName} + </hostedWebapp> + <modules> + <module>${project.groupId}.KuneDev</module> + </modules> + <copyWebapp>true</copyWebapp> + <compileReport>false</compileReport> + <localWorkers>1</localWorkers> + <extraJvmArgs>-Xmx1024m</extraJvmArgs> </configuration> - <id>gwtcompile</id> - <phase>prepare-package</phase> - <goals> - <goal>compile</goal> -  -  - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - </dependency> - </dependencies> - </plugin> - + <executions> + <execution> + <configuration> + <extraJvmArgs>-Xmx1024M</extraJvmArgs> + </configuration> + <id>gwtcompile</id> + <phase>prepare-package</phase> + <goals> + <goal>compile</goal> +  +  + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> </build> </profile> Modified: trunk/script/kune client -no-server.launch =================================================================== --- trunk/script/kune client -no-server.launch 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/script/kune client -no-server.launch 2012-04-02 03:10:57 UTC (rev 1818) @@ -5,7 +5,7 @@ <stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.GWTShell"/> <booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/> <listAttribute key="com.google.gwt.eclipse.core.ENTRY_POINT_MODULES"> -<listEntry value="cc.kune.Kune"/> +<listEntry value="cc.kune.KuneDev"/> </listAttribute> <stringAttribute key="com.google.gwt.eclipse.core.URL" value="/?locale=en&log_level=INFO"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -15,12 +15,12 @@ <listEntry value="4"/> </listAttribute> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/> <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.Kune"/> +<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.PROJECT_ATTR" value="kune"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/> </launchConfiguration> Deleted: trunk/script/kune server via mvn with debug.launch =================================================================== --- trunk/script/kune server via mvn with debug.launch 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/script/kune server via mvn with debug.launch 2012-04-02 03:10:57 UTC (rev 1818) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> -<mapAttribute key="org.eclipse.debug.core.environmentVariables"> -<mapEntry key="MAVEN_OPTS" value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8001"/> -</mapAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> -</listAttribute> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/mvn"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="exec:java"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/kune}"/> -</launchConfiguration> Added: trunk/script/kune tests.launch =================================================================== --- trunk/script/kune tests.launch (rev 0) +++ trunk/script/kune tests.launch 2012-04-02 03:10:57 UTC (rev 1818) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> +</listAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/mvn"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="test -DskipTests=false -Dliquibase.should.run=false -Djava.security.auth.login.config=src/main/resources/jaas.config"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/kune}"/> +</launchConfiguration> Modified: trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/actions/RolActionAutoUpdated.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -29,7 +29,6 @@ import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.core.shared.dto.AccessRolDTO; -import com.google.gwt.event.shared.HandlerRegistration; import com.google.inject.Inject; /** @@ -39,7 +38,6 @@ * */ public abstract class RolActionAutoUpdated extends AbstractExtendedAction { - private final HandlerRegistration handlerReg; protected final Session session; protected final StateManager stateManager; @@ -49,7 +47,7 @@ final boolean authNeed, final boolean visibleForNonMemb, final boolean visibleForMembers) { this.stateManager = stateManager; this.session = session; - handlerReg = rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { + rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { @Override public void onAccessRightsChanged(final AccessRightsChangedEvent event) { refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers, visibleForNonMemb, @@ -58,12 +56,6 @@ }); } - @Override - public void onDettach() { - super.onDettach(); - handlerReg.removeHandler(); - } - public void refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed, final boolean isLogged, final boolean visibleForMembers, final boolean visibleForNonMemb, final AccessRights newRights) { Modified: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -48,6 +48,7 @@ @Override public native void clickFormLogin() /*-{ $doc.getElementById("loginsubmit").click(); + $doc.getElementById("login").submit(); }-*/; @Override Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPanel.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -49,7 +49,7 @@ i18n.t(CoreMessages.REGISTER_TITLE), REGISTER_BUTTON_ID, i18n.tWithNT("Cancel", "used in button"), CANCEL_BUTTON_ID, images, ERRMSG, 4); registerForm = new RegisterForm(i18n, userFieldFactory); - registerForm.setWidth(330); + registerForm.setWidth(DEF_SIGN_IN_FORM_SIZE); registerForm.getFormPanel().setId(REGISTER_FORM); messageErrorBar = new MessageToolbar(images, errorLabelId); registerForm.add(messageErrorBar); Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPanel.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -35,7 +35,7 @@ import com.gwtplatform.mvp.client.ViewImpl; public abstract class SignInAbstractPanel extends ViewImpl { - + public static final int DEF_SIGN_IN_FORM_SIZE = 340; private final BasicTopDialog dialog; protected final String errorLabelId; protected final I18nTranslationService i18n; Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPanel.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -55,7 +55,7 @@ images, ERROR_MSG, 102); signInForm = new SignInForm(i18n); - signInForm.setWidth(330); + signInForm.setWidth(DEF_SIGN_IN_FORM_SIZE); signInForm.add(createRegisterAndForgotPasswd()); messageErrorBar = new MessageToolbar(images, errorLabelId); signInForm.add(messageErrorBar); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/auth/AskForPasswordResetPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/auth/AskForPasswordResetPanel.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/sitebar/auth/AskForPasswordResetPanel.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -66,9 +66,10 @@ CANCEL_BUTTON_ID, images, ERRMSG, 1); this.stateManager = stateManager; final DefaultForm form = new DefaultForm(); + form.setWidth(DEF_SIGN_IN_FORM_SIZE); final Label desc = new Label( i18n.t("Please enter your email address. You will receive a link to create a new password via email.")); - desc.setWidth("300px"); + desc.setWidth("320px"); resetEmail = userFieldFactory.createUserEmail(EMAIL_RESET_ID); resetEmail.setFieldLabel(i18n.t("email")); resetEmail.setTabIndex(1); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/auth/PasswordResetPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/auth/PasswordResetPanel.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/sitebar/auth/PasswordResetPanel.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -71,13 +71,14 @@ this.stateManager = stateManager; final DefaultForm form = new DefaultForm(); final Label desc = new Label(i18n.t("Enter your new password below.")); - desc.setWidth("300px"); + desc.setWidth("310px"); newPasswdField = userFieldFactory.createUserPasswd(PASSWD_RESET_ID, i18n.t("New password")); newPasswdField.setTabIndex(1); confirmPasswdField = userFieldFactory.createUserPasswd(PASSWD_RESET_ID, i18n.t("Confirm")); confirmPasswdField.setTabIndex(1); messageErrorBar = new MessageToolbar(images, errorLabelId); + form.setWidth(DEF_SIGN_IN_FORM_SIZE); form.add(newPasswdField); form.add(confirmPasswdField); form.add(messageErrorBar); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -23,9 +23,9 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.common.shared.utils.SimpleResponseCallback; import cc.kune.core.client.contacts.SimpleContactManager; +import cc.kune.core.client.i18n.I18n; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.sitebar.search.EntitySearchPanel; import cc.kune.core.client.sitebar.search.OnEntitySelectedInSearch; @@ -38,16 +38,16 @@ private final EntitySearchPanel searchPanel; @Inject - public AddNewBuddiesAction(final I18nTranslationService i18n, final CoreResources res, - final AddBuddieSearchPanel searchPanel, final SimpleContactManager contactsManager) { + public AddNewBuddiesAction(final CoreResources res, final AddBuddieSearchPanel searchPanel, + final SimpleContactManager contactsManager) { this.searchPanel = searchPanel; - putValue(Action.NAME, i18n.t("Add a new buddy")); + putValue(Action.NAME, I18n.t("Add a new buddy")); putValue(Action.SMALL_ICON, res.addGreen()); searchPanel.init(true, ADD_NEW_BUDDIES_TEXTBOX, new OnEntitySelectedInSearch() { @Override public void onSeleted(final String shortName) { - NotifyUser.askConfirmation(i18n.t("Are you sure?"), - i18n.t("Do you want to add '[%s]' to your contacts?", shortName), + NotifyUser.askConfirmation(I18n.t("Are you sure?"), + I18n.t("Do you want to add '[%s]' to your contacts?", shortName), new SimpleResponseCallback() { @Override public void onCancel() { @@ -56,7 +56,7 @@ @Override public void onSuccess() { contactsManager.addNewBuddy(shortName); - NotifyUser.info("Added as buddy in your contacts. If your buddie adds you also, it will be visible in your network"); + NotifyUser.info(I18n.t("Added as buddy in your contacts. If your buddie adds you also, it will be visible in your network")); } }); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/SessionAction.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -25,17 +25,16 @@ import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; import cc.kune.core.client.state.Session; -import com.google.gwt.event.shared.HandlerRegistration; import com.google.inject.Inject; public abstract class SessionAction extends AbstractExtendedAction { - private final HandlerRegistration hadlerReg; protected final Session session; @Inject public SessionAction(final Session session, final boolean authNeed) { this.session = session; - hadlerReg = session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { + // Don't need to unregister + session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { @Override public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { refreshStatus(authNeed, event.isLogged()); @@ -43,12 +42,6 @@ }); } - @Override - public void onDettach() { - super.onDettach(); - hadlerReg.removeHandler(); - } - public void refreshStatus(final boolean authNeed, final boolean isLogged) { boolean visible = false; final boolean noLogged = !isLogged; Modified: trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/client/ui/DefaultForm.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -37,7 +37,7 @@ public class DefaultForm { public static final int BIG_FIELD_WIDTH = 280; - public static final int DEF_FIELD_LABEL_WITH = 75; + public static final int DEF_FIELD_LABEL_WITH = 85; public static final int DEF_FIELD_WIDTH = 200; public static final int DEF_MEDIUM_FIELD_WIDTH = 150; public static final int DEF_SMALL_FIELD_WIDTH = 100; Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-04-02 03:10:57 UTC (rev 1818) @@ -422,6 +422,10 @@ } +div.gwt-TabLayoutPanelTabInner { + padding-top:3px; +} + .k-link { text-decoration: underline; color: green; Modified: trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/access/AccessRightsServiceDefault.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -23,6 +23,7 @@ import java.util.HashSet; import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Group; @@ -34,51 +35,53 @@ @Singleton public class AccessRightsServiceDefault implements AccessRightsService { - // TODO: check performance + // TODO: check performance - public AccessRights get(final Group userGroup, final AccessLists accessList) { - boolean isAdministrable = false; - boolean isEditable = false; - boolean isVisible = false; + private boolean canAccess(final Group searchedGroup, final AccessLists lists, final AccessRol rol) { + final GroupList list = lists.getList(rol); + return depthFirstSearch(new HashSet<Group>(), searchedGroup, list, rol); + } - // FIXME, future: admin users can admin, edit, view everything - // (not now while we are doing tests) - isVisible = isEditable = isAdministrable = canAccess(userGroup, accessList, AccessRol.Administrator); - if (!isEditable) { - isVisible = isEditable = canAccess(userGroup, accessList, AccessRol.Editor); - } - if (!isVisible) { - isVisible = accessList.getViewers().isEmpty() || canAccess(userGroup, accessList, AccessRol.Viewer); - } - - return new AccessRights(isAdministrable, isEditable, isVisible); + /* + * http://en.wikipedia.org/wiki/Depth-first_search + */ + private boolean depthFirstSearch(final HashSet<Group> visited, final Group searchedGroup, + final GroupList list, final AccessRol rol) { + if (list.includes(searchedGroup)) { + return true; } - - public AccessRights get(final User user, final AccessLists lists) { - return get(user.getUserGroup(), lists); + final ArrayList<Group> noVisitedYet = list.duplicate(); + noVisitedYet.removeAll(visited); + for (final Group group : noVisitedYet) { + visited.add(group); + final SocialNetwork socialNetwork = group.getSocialNetwork(); + final GroupList groupList = socialNetwork.getAccessLists().getList(rol); + return depthFirstSearch(visited, searchedGroup, groupList, rol); } + return false; + } - private boolean canAccess(final Group searchedGroup, final AccessLists lists, final AccessRol rol) { - final GroupList list = lists.getList(rol); - return depthFirstSearch(new HashSet<Group>(), searchedGroup, list, rol); + public AccessRights get(final Group userGroup, final AccessLists accessList) { + boolean isAdministrable = false; + boolean isEditable = false; + boolean isVisible = false; + + // FIXME, future: admin users can admin, edit, view everything + // (not now while we are doing tests) + isVisible = isEditable = isAdministrable = canAccess(userGroup, accessList, AccessRol.Administrator); + if (!isEditable) { + isVisible = isEditable = canAccess(userGroup, accessList, AccessRol.Editor); } + if (!isVisible) { + isVisible = (accessList.getViewers().getMode().equals(GroupListMode.EVERYONE)) + || canAccess(userGroup, accessList, AccessRol.Viewer); + } - /* - * http://en.wikipedia.org/wiki/Depth-first_search - */ - private boolean depthFirstSearch(final HashSet<Group> visited, final Group searchedGroup, final GroupList list, - final AccessRol rol) { - if (list.includes(searchedGroup)) { - return true; - } - final ArrayList<Group> noVisitedYet = list.duplicate(); - noVisitedYet.removeAll(visited); - for (final Group group : noVisitedYet) { - visited.add(group); - final SocialNetwork socialNetwork = group.getSocialNetwork(); - final GroupList groupList = socialNetwork.getAccessLists().getList(rol); - return depthFirstSearch(visited, searchedGroup, groupList, rol); - } - return false; - } + return new AccessRights(isAdministrable, isEditable, isVisible); + } + + @Override + public AccessRights get(final User user, final AccessLists lists) { + return get(user.getUserGroup(), lists); + } } Modified: trunk/src/main/java/cc/kune/core/server/access/AccessService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/AccessService.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/access/AccessService.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,7 +19,6 @@ */ package cc.kune.core.server.access; - import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.domain.AccessRol; import cc.kune.domain.Container; @@ -28,8 +27,12 @@ public interface AccessService { - Container accessToContainer(Long folderId, User user, AccessRol accessRol) throws DefaultException; + Container accessToContainer(Container container, User user, AccessRol accessRol); - Content accessToContent(Long contentId, User user, AccessRol accessRol) throws DefaultException; + Container accessToContainer(Long folderId, User user, AccessRol accessRol) throws DefaultException; + Content accessToContent(Content content, User user, AccessRol accessRol); + + Content accessToContent(Long contentId, User user, AccessRol accessRol) throws DefaultException; + } Modified: trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/access/AccessServiceDefault.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,14 +19,14 @@ */ package cc.kune.core.server.access; - import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.utils.AccessRights; -import cc.kune.domain.AccessLists; import cc.kune.domain.Container; import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; import cc.kune.domain.User; import com.google.inject.Inject; @@ -35,47 +35,69 @@ @Singleton public class AccessServiceDefault implements AccessService { - private final FinderService finder; - private final AccessRightsService accessRightsService; + private final AccessRightsService accessRightsService; + private final FinderService finder; - @Inject - public AccessServiceDefault(final FinderService finder, final AccessRightsService accessRightsService) { - this.finder = finder; - this.accessRightsService = accessRightsService; - } + @Inject + public AccessServiceDefault(final FinderService finder, final AccessRightsService accessRightsService) { + this.finder = finder; + this.accessRightsService = accessRightsService; + } - public Container accessToContainer(final Long folderId, final User user, final AccessRol accessRol) - throws DefaultException { - final Container container = finder.getFolder(folderId); - check(accessRightsService.get(user, container.getAccessLists()), accessRol); - return container; - } + @Override + public Container accessToContainer(final Container container, final User user, + final AccessRol accessRol) { + checkToolIsEnabled(container.getOwner(), container.getToolName()); + check(accessRightsService.get(user, container.getAccessLists()), accessRol); + return container; + } - public Content accessToContent(final Long contentId, final User user, final AccessRol accessRol) - throws DefaultException { - final Content content = finder.getContent(contentId); - AccessLists accessLists = content.getAccessLists(); - check(accessRightsService.get(user, accessLists), accessRol); - return content; + @Override + public Container accessToContainer(final Long folderId, final User user, final AccessRol accessRol) + throws DefaultException { + final Container container = finder.getFolder(folderId); + return accessToContainer(container, user, accessRol); + } + + @Override + public Content accessToContent(final Content content, final User user, final AccessRol accessRol) { + checkToolIsEnabled(content.getContainer().getOwner(), content.getContainer().getToolName()); + check(accessRightsService.get(user, content.getAccessLists()), accessRol); + return content; + } + + @Override + public Content accessToContent(final Long contentId, final User user, final AccessRol accessRol) + throws DefaultException { + final Content content = finder.getContent(contentId); + return accessToContent(content, user, accessRol); + } + + private void check(final AccessRights rights, final AccessRol accessRol) + throws AccessViolationException { + if (!isValid(accessRol, rights)) { + throw new AccessViolationException(); } + } - private void check(final AccessRights rights, final AccessRol accessRol) throws AccessViolationException { - if (!isValid(accessRol, rights)) { - throw new AccessViolationException(); - } + private void checkToolIsEnabled(final Group group, final String toolName) { + final ToolConfiguration toolConf = group.getToolConfiguration(toolName); + if (toolConf == null || !toolConf.isEnabled()) { + throw new AccessViolationException(); } + } - private boolean isValid(final AccessRol accessRol, final AccessRights rights) { - switch (accessRol) { - case Viewer: - return rights.isVisible(); - case Editor: - return rights.isEditable(); - case Administrator: - return rights.isAdministrable(); - default: - return false; - } + private boolean isValid(final AccessRol accessRol, final AccessRights rights) { + switch (accessRol) { + case Viewer: + return rights.isVisible(); + case Editor: + return rights.isEditable(); + case Administrator: + return rights.isAdministrable(); + default: + return false; } + } } Modified: trunk/src/main/java/cc/kune/core/server/access/FinderService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/FinderService.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/access/FinderService.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -38,7 +38,7 @@ Content getContent(Long contentId) throws DefaultException; - Content getContent(StateToken token, Group defaultGroup) throws DefaultException; + Content getContentOrDefContent(StateToken token, Group defaultGroup) throws DefaultException; Content getContent(String contentId) throws ContentNotFoundException; Modified: trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -69,33 +69,51 @@ return null; } - private Content findByContentReference(final String groupName, final String toolName, - final Long folderId, final Long contentId) throws ContentNotFoundException { - final Content content = contentManager.find(contentId); - if (content == null) { + private void checkFolderId(final Long folderId, final Container container) { + if (!container.getId().equals(folderId)) { throw new ContentNotFoundException(); } - final Container container = content.getContainer(); + } - if (!container.getId().equals(folderId)) { + private void checkGroup(final String groupName, final Container container) { + if (!container.getOwner().getShortName().equals(groupName)) { throw new ContentNotFoundException(); } + } + + private void checkTool(final String toolName, final Container container) { if (!container.getToolName().equals(toolName)) { throw new ContentNotFoundException(); } - if (!container.getOwner().getShortName().equals(groupName)) { + } + + private Content findByContentReference(final String groupName, final String toolName, + final Long folderId, final Long contentId) throws ContentNotFoundException { + final Content content = contentManager.find(contentId); + if (content == null) { throw new ContentNotFoundException(); } + final Container container = content.getContainer(); + + checkFolderId(folderId, container); + checkTool(toolName, container); + checkGroup(groupName, container); + return content; } - private Content findByFolderReference(final String groupName, final Long folderId) { + private Content findByFolderReference(final String groupName, final String toolName, + final Long folderId) { final Container container = containerManager.find(folderId); if (container == null) { throw new ContentNotFoundException(); - } else { - return generateFolderFakeContent(container); } + + checkFolderId(folderId, container); + checkTool(toolName, container); + checkGroup(groupName, container); + + return generateFolderFakeContent(container); } @Override @@ -153,17 +171,24 @@ } @Override - public Content getContent(final StateToken token, final Group defaultGroup) throws DefaultException { + public Content getContent(final String contentId) throws ContentNotFoundException { + return getContent(ContentUtils.parseId(contentId)); + } + + @Override + public Content getContentOrDefContent(final StateToken token, final Group defaultGroup) + throws DefaultException { final Long contentId = checkAndParse(token.getDocument()); final Long folderId = checkAndParse(token.getFolder()); final String group = token.getGroup(); + final String tool = token.getTool(); if (token.hasAll()) { - return findByContentReference(group, token.getTool(), folderId, contentId); + return findByContentReference(group, tool, folderId, contentId); } else if (token.hasGroupToolAndFolder()) { - return findByFolderReference(group, folderId); + return findByFolderReference(group, tool, folderId); } else if (token.hasGroupAndTool()) { - return findByRootOnGroup(group, token.getTool()); + return findByRootOnGroup(group, tool); } else if (token.hasGroup()) { return findDefaultContentOfGroup(group); } else if (token.hasNothing()) { @@ -174,11 +199,6 @@ } @Override - public Content getContent(final String contentId) throws ContentNotFoundException { - return getContent(ContentUtils.parseId(contentId)); - } - - @Override public Container getFolder(final Long folderId) throws ContentNotFoundException { try { return containerManager.find(folderId); Modified: trunk/src/main/java/cc/kune/core/server/auth/SuperAdmin.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/SuperAdmin.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/auth/SuperAdmin.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -22,8 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import cc.kune.core.shared.domain.AccessRol; - import com.google.inject.BindingAnnotation; /** @@ -35,6 +33,6 @@ @Retention(RetentionPolicy.RUNTIME) public @interface SuperAdmin { - AccessRol rol() default AccessRol.Administrator; + cc.kune.core.shared.domain.AccessRol rol() default cc.kune.core.shared.domain.AccessRol.Administrator; } Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -346,11 +346,22 @@ if (!TrashServerUtils.inTrash(content)) { throw new AccessViolationException("Trying to purge a not deleted content:" + content); } + final WaveRef waveRef = KuneWaveServerUtils.getWaveRef(content); if (content.isWave()) { - final WaveRef waveRef = KuneWaveServerUtils.getWaveRef(content); final String author = getContentAuthor(content); - final Participants participants = kuneWaveManager.getParticipants(waveRef, author); - kuneWaveManager.delParticipants(waveRef, author, participantUtils.arrayFrom(participants)); + try { + final Participants participants = kuneWaveManager.getParticipants(waveRef, author); + if (participants.contains(author)) { + kuneWaveManager.delParticipants(waveRef, author, + participantUtils.arrayFromOrdered(participants, author)); + } else { + // We cannot delete a wave we are not participating + } + } catch (final Exception e) { + LOG.error(String.format("Error accessing for deleting content %s and wave %s", + content.getStateToken(), waveRef.toString()), e); + // We delete the content anyway + } } content.authorsClear(); final Container container = content.getContainer(); Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -295,7 +295,10 @@ defaultGroup = groupManager.getSiteDefaultGroup(); } try { - final Content content = finderService.getContent(token, defaultGroup); + final Content content = finderService.getContentOrDefContent(token, defaultGroup); + // See AccessRol.Viewer in @Authorizated annotation of + // getContentorDefContentent + return getContentOrDefContent(userHash, content.getStateToken(), user, content); } catch (final NoResultException e) { throw new ContentNotFoundException(); @@ -308,17 +311,19 @@ } } - @Authenticated(mandatory = false) - @Authorizated(accessRolRequired = AccessRol.Viewer) private StateAbstractDTO getContentOrDefContent(final String userHash, final StateToken stateToken, final User user, final Content content) { final Long id = content.getId(); + if (id != null) { // Content + accessService.accessToContent(content, user, AccessRol.Viewer); return mapState(stateService.create(user, content), user); } else { // Container + // Dirty hack in finderService to pass only a content object final Container container = content.getContainer(); + accessService.accessToContainer(container, user, AccessRol.Viewer); return mapState(stateService.create(user, container), user); } } @@ -450,6 +455,7 @@ } } + @Override @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Administrator) @KuneTransactional Modified: trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,6 +19,7 @@ */ package cc.kune.core.shared.domain; + public enum AccessRol { - Administrator, Editor, Viewer + Administrator, Editor, Viewer } Modified: trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -21,15 +21,26 @@ import com.google.gwt.user.client.rpc.IsSerializable; -/** +/* * The Enum GroupListMode describe the group list behavior + * + * |---------------+-----------------------------------------------------------| + * | GroupListMode | | + * |---------------+-----------------------------------------------------------| + * | NAME | Description | + * |---------------+-----------------------------------------------------------| + * | EVERYONE | means that everybody is in the list | + * | NOBODY | means that nobody is in the list (equals to a empty list) | + * | NORMAL | a normal list of groups | + * |---------------+-----------------------------------------------------------| + * */ public enum GroupListMode implements IsSerializable { - /** EVERYONE: means that everybody is allowed */ + /** EVERYONE: means that everybody is in the list */ EVERYONE, - /** NOBODY: means that nobody is allowed */ + /** NOBODY: means that nobody is in the list (equals to a empty list) */ NOBODY, - /** NORMAL means that that only groups in this list are allowed */ + /** NORMAL a normal list of groups */ NORMAL; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -21,48 +21,71 @@ import com.google.gwt.user.client.rpc.IsSerializable; +/* + * AccessList samples (using GroupListMode) + * + * |---------------------------------------------------------+--------+---------------+----------+---------| + * | AccessList (A: Admins, E:Editors, V: Viewers | | Administrable | Editable | Visible | + * |---------------------------------------------------------+--------+---------------+----------+---------| + * | (A:EVERYONE, E: EVERYONE, V:EVERYONE, P:NO) | Group1 | yes | yes | yes | + * | | Group2 | yes | yes | yes | + * |---------------------------------------------------------+--------+---------------+----------+---------| + * | (A:NORMAL(Group1), E: NORMAL, V:EVERYONE, P:NO) | Group1 | yes | yes | yes | + * | | Group2 | no | no | yes | + * |---------------------------------------------------------+--------+---------------+----------+---------| + * | (A:NORMAL(Group1), E: NORMAL(Group2), V:EVERYONE, P:NO) | Group1 | yes | yes | yes | + * | | Group2 | no | yes | yes | + * | | Group3 | no | no | yes | + * |---------------------------------------------------------+--------+---------------+----------+---------| + * | (A:NORMAL(Group1), E: NORMAL, V:NORMAL(Group2), P:NO) | Group1 | yes | yes | yes | + * | | Group2 | no | no | yes | + * | | Group3 | no | no | no | + * |---------------------------------------------------------+--------+---------------+----------+---------| + * + */ + public class AccessListsDTO implements IsSerializable { - private GroupListDTO admins; - private GroupListDTO editors; - private GroupListDTO viewers; + private GroupListDTO admins; + private GroupListDTO editors; + private GroupListDTO viewers; - public AccessListsDTO() { - this(null, null, null); - } + public AccessListsDTO() { + this(null, null, null); + } - public AccessListsDTO(final GroupListDTO admins, final GroupListDTO editors, final GroupListDTO viewers) { - this.admins = admins; - this.editors = editors; - this.viewers = viewers; - } + public AccessListsDTO(final GroupListDTO admins, final GroupListDTO editors, final GroupListDTO viewers) { + this.admins = admins; + this.editors = editors; + this.viewers = viewers; + } - public GroupListDTO getAdmins() { - return admins; - } + public GroupListDTO getAdmins() { + return admins; + } - public GroupListDTO getEditors() { - return editors; - } + public GroupListDTO getEditors() { + return editors; + } - public GroupListDTO getViewers() { - return viewers; - } + public GroupListDTO getViewers() { + return viewers; + } - public void setAdmins(final GroupListDTO admins) { - this.admins = admins; - } + public void setAdmins(final GroupListDTO admins) { + this.admins = admins; + } - public void setEditors(final GroupListDTO editors) { - this.editors = editors; - } + public void setEditors(final GroupListDTO editors) { + this.editors = editors; + } - public void setViewers(final GroupListDTO viewers) { - this.viewers = viewers; - } + public void setViewers(final GroupListDTO viewers) { + this.viewers = viewers; + } - @Override - public String toString() { - return "AccessListDTO[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; - } + @Override + public String toString() { + return "AccessListDTO[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; + } } Modified: trunk/src/main/java/cc/kune/events/server/EventsServlet.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -91,7 +91,7 @@ final List<Map<String, String>> listOfProps = EventsServerConversionUtil.getAppointmentsUsingCache(cnt); for (final Map<String, String> props : listOfProps) { try { - final VEvent vEvent = EventsServerConversionUtil.toVEvent(EventsServerConversionUtil.toApp(props)); + final VEvent vEvent = EventsServerConversionUtil.toVEvent(props); events.add(vEvent); } catch (final Exception e) { LOG.warn("Invalid appointments in " + token, e); Modified: trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/events/server/utils/EventsServerConversionUtil.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,6 +19,8 @@ */ package cc.kune.events.server.utils; +import java.net.URISyntaxException; +import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,6 +38,7 @@ import net.fortuna.ical4j.model.property.DtEnd; import net.fortuna.ical4j.model.property.DtStart; import net.fortuna.ical4j.model.property.Location; +import net.fortuna.ical4j.model.property.Organizer; import net.fortuna.ical4j.model.property.Summary; import net.fortuna.ical4j.model.property.Uid; @@ -46,10 +49,8 @@ import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.events.server.EventsServerTool; -import cc.kune.events.shared.EventsSharedConversionUtil; import cc.kune.wave.server.kspecific.KuneWaveService; -import com.bradrydzewski.gwt.calendar.client.Appointment; import com.google.inject.Inject; import com.google.wave.api.Gadget; @@ -57,7 +58,7 @@ * The Class EventsConversionUtil is used to convert Appointments to Gadgets * properties and viceversa */ -public class EventsServerConversionUtil extends EventsSharedConversionUtil { +public class EventsServerConversionUtil { @Inject static EventsCache eventsCache; @@ -109,46 +110,9 @@ return getAppointments(container); } - public static Appointment to(final VEvent event) { - // http://build.mnode.org/projects/ical4j/apidocs/ - final Appointment app = new Appointment(); - // FIXME: see spec - app.setDescription(event.getDescription().getValue()); - app.setStart(new java.util.Date(event.getStartDate().getDate().getTime())); - app.setEnd(new java.util.Date(event.getEndDate().getDate().getTime())); + public static VEvent toVEvent(final Map<String, String> properties) throws URISyntaxException, + ParseException { - // FIXME: see spec - app.setLocation(event.getLocation().getValue()); - final Uid uid = event.getUid(); - if (uid != null) { - app.setId(uid.getValue()); - } - app.setAllDay(!(event.getStartDate().getDate() instanceof DateTime)); - app.setTitle(event.getSummary().getValue()); - return app; - } - - public static Appointment toApp(final Map<String, String> properties) throws Exception { - final Appointment app = EventsSharedConversionUtil.toApp(properties); - final String start = properties.get(ICalConstants.DATE_TIME_START); - if (start != null) { - app.setStart(DateUtils.toDate(start)); - } - final String end = properties.get(ICalConstants.DATE_TIME_END); - if (end != null) { - app.setEnd(DateUtils.toDate(end)); - } - return app; - } - - public static Map<String, String> toMap(final Appointment app) { - final Map<String, String> properties = EventsSharedConversionUtil.toMap(app); - properties.put(ICalConstants.DATE_TIME_START, DateUtils.toString(app.getStart())); - properties.put(ICalConstants.DATE_TIME_END, DateUtils.toString(app.getEnd())); - return properties; - } - - public static VEvent toVEvent(final Appointment app) { // http://build.mnode.org/projects/ical4j/apidocs/ // final TimeZoneRegistry registry = @@ -157,31 +121,34 @@ // final VTimeZone tz = timezone.getVTimeZone(); // FIXME here v timezone!!! - final DateTime start = new DateTime(app.getStart().getTime()); + final String startS = properties.get(ICalConstants.DATE_TIME_START); + final DateTime start = new DateTime(startS); final TimeZone timezone = start.getTimeZone(); // start.setTimeZone(timezone); - final DateTime end = new DateTime(app.getEnd().getTime()); + final String endS = properties.get(ICalConstants.DATE_TIME_END); // end.setTimeZone(timezone); VEvent event; - if (app.isAllDay()) { + final String allDay = properties.get(ICalConstants._ALL_DAY); + if (allDay != null && Boolean.parseBoolean(allDay)) { event = new VEvent(); - event.getProperties().add(new Summary(app.getTitle())); - final DtStart eventStart = new DtStart(new Date(app.getStart().getTime())); + event.getProperties().add(new Summary(properties.get(ICalConstants.SUMMARY))); + final DtStart eventStart = new DtStart(new Date(startS)); eventStart.setTimeZone(timezone); event.getProperties().add(eventStart); - final DtEnd eventEnd = new DtEnd(new Date(app.getEnd().getTime())); + final DtEnd eventEnd = new DtEnd(new Date(endS)); eventEnd.setTimeZone(timezone); event.getProperties().add(eventEnd); - // event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE); - // event.getProperties().getProperty(Property.DTEND).getParameters().add(Value.DATE); + event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE); + event.getProperties().getProperty(Property.DTEND).getParameters().add(Value.DATE); } else { - event = new VEvent(start, end, app.getTitle()); + event = new VEvent(start, new DateTime(endS), properties.get(ICalConstants.SUMMARY)); event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE_TIME); event.getProperties().getProperty(Property.DTEND).getParameters().add(Value.DATE_TIME); } - event.getProperties().add(new Description(app.getDescription())); - event.getProperties().add(new Location(app.getLocation())); - event.getProperties().add(new Uid(app.getId())); + event.getProperties().add(new Description(properties.get(ICalConstants.DESCRIPTION))); + event.getProperties().add(new Location(properties.get(ICalConstants.LOCATION))); + event.getProperties().add(new Uid(properties.get(ICalConstants.UID))); + event.getProperties().add(new Organizer(properties.get(ICalConstants.ORGANIZER))); return event; } Modified: trunk/src/main/java/cc/kune/events/shared/EventsClientConversionUtil.java =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsClientConversionUtil.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/events/shared/EventsClientConversionUtil.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,6 +19,7 @@ */ package cc.kune.events.shared; +import java.util.HashMap; import java.util.Map; import cc.kune.common.client.utils.DateUtils; @@ -30,10 +31,19 @@ * The Class EventsConversionUtil is used to convert Appointments to Gadgets * properties and viceversa */ -public class EventsClientConversionUtil extends EventsSharedConversionUtil { +public class EventsClientConversionUtil { public static Appointment toApp(final Map<String, String> properties) throws Exception { - final Appointment app = EventsSharedConversionUtil.toApp(properties); + final Appointment app = new Appointment(); + app.setDescription(properties.get(ICalConstants.DESCRIPTION)); + app.setTitle(properties.get(ICalConstants.SUMMARY)); + app.setLocation(properties.get(ICalConstants.LOCATION)); + app.setCreatedBy(properties.get(ICalConstants.ORGANIZER)); + final String allDay = properties.get(ICalConstants._ALL_DAY); + app.setId(properties.get(ICalConstants.UID)); + if (allDay != null) { + app.setAllDay(Boolean.parseBoolean(allDay)); + } final String start = properties.get(ICalConstants.DATE_TIME_START); if (start != null) { app.setStart(DateUtils.toDate(start)); @@ -46,7 +56,14 @@ } public static Map<String, String> toMap(final Appointment app) { - final Map<String, String> properties = EventsSharedConversionUtil.toMap(app); + final Map<String, String> properties = new HashMap<String, String>(); + properties.put(ICalConstants.SUMMARY, app.getTitle()); + properties.put(ICalConstants.DESCRIPTION, app.getDescription()); + properties.put(ICalConstants.LOCATION, app.getLocation()); + properties.put(ICalConstants.ORGANIZER, app.getCreatedBy()); + properties.put(ICalConstants._ALL_DAY, Boolean.toString(app.isAllDay())); + properties.put(ICalConstants.UID, app.getId()); + properties.put(ICalConstants.DATE_TIME_START, DateUtils.toString(app.getStart())); properties.put(ICalConstants.DATE_TIME_END, DateUtils.toString(app.getEnd())); return properties; Deleted: trunk/src/main/java/cc/kune/events/shared/EventsSharedConversionUtil.java =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsSharedConversionUtil.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/events/shared/EventsSharedConversionUtil.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -1,60 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.events.shared; - -import java.util.HashMap; -import java.util.Map; - -import cc.kune.common.shared.res.ICalConstants; - -import com.bradrydzewski.gwt.calendar.client.Appointment; - -/** - * The Class EventsSharedConversionUtil is used to convert Appointments to - * Gadgets properties and viceversa - */ -public abstract class EventsSharedConversionUtil { - - public static Appointment toApp(final Map<String, String> properties) throws Exception { - final Appointment app = new Appointment(); - app.setDescription(properties.get(ICalConstants.DESCRIPTION)); - app.setTitle(properties.get(ICalConstants.SUMMARY)); - app.setLocation(properties.get(ICalConstants.LOCATION)); - app.setCreatedBy(properties.get(ICalConstants.ORGANIZER)); - final String allDay = properties.get(ICalConstants._ALL_DAY); - app.setId(properties.get(ICalConstants.UID)); - if (allDay != null) { - app.setAllDay(Boolean.parseBoolean(allDay)); - } - return app; - } - - public static Map<String, String> toMap(final Appointment app) { - final Map<String, String> properties = new HashMap<String, String>(); - properties.put(ICalConstants.SUMMARY, app.getTitle()); - properties.put(ICalConstants.DESCRIPTION, app.getDescription()); - properties.put(ICalConstants.LOCATION, app.getLocation()); - properties.put(ICalConstants.ORGANIZER, app.getCreatedBy()); - properties.put(ICalConstants._ALL_DAY, Boolean.toString(app.isAllDay())); - properties.put(ICalConstants.UID, app.getId()); - return properties; - } - -} Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/PathToolbarUtils.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -98,13 +98,7 @@ iconsRegistry.getContentTypeIcon(container.getTypeId()), TextUtils.ellipsis(title, 15), i18n.t("Click to go here or drop contents here to move them"), container.getStateToken(), style, stateManager, eventBus); - final ButtonDescriptor btn = new ButtonDescriptor(action) { - @Override - public void onDetach() { - super.onDetach(); - action.onDettach(); - } - }; + final ButtonDescriptor btn = new ButtonDescriptor(action); if (title.length() > 15) { btn.withToolTip(title); Modified: trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,8 +19,8 @@ */ package cc.kune.trash.server; +import static cc.kune.trash.shared.TrashToolConstants.ROOT_NAME; import static cc.kune.trash.shared.TrashToolConstants.TOOL_NAME; -import static cc.kune.trash.shared.TrashToolConstants.ROOT_NAME; import static cc.kune.trash.shared.TrashToolConstants.TYPE_ROOT; import java.util.Arrays; @@ -76,7 +76,8 @@ wikiAcl.getAdmins().setMode(GroupListMode.NORMAL); wikiAcl.getAdmins().add(container.getOwner()); wikiAcl.getEditors().setMode(GroupListMode.NORMAL); - wikiAcl.getViewers().setMode(GroupListMode.NORMAL); + wikiAcl.getEditors().add(container.getOwner()); + wikiAcl.getViewers().setMode(GroupListMode.NOBODY); setAccessList(container, wikiAcl); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,8 +19,8 @@ */ package cc.kune.wave.server; -import java.util.ArrayList; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -52,11 +52,30 @@ } public String[] arrayFrom(final Participants parts) { - final List<String> list = new ArrayList<String>(); - // From the first in the list return parts.toArray(new String[parts.size()]); } + /** + * Array of participants but with lastParticipant at the end + * + * @param parts + * the parts + * @param lastParticipant + * the last participant + * @return the string[] + */ + public String[] arrayFromOrdered(final Participants parts, final String lastParticipant) { + final LinkedList<String> list = new LinkedList<String>(); + list.addAll(parts); + // we order the list, so we put lastParticipant at the end + if (list.contains(lastParticipant)) { + while (list.remove(lastParticipant)) { + } + list.add(lastParticipant); + } + return list.toArray(new String[list.size()]); + } + public String getAddressName(final String address) { return address.contains(ParticipantId.DOMAIN_PREFIX) ? address.split(ParticipantId.DOMAIN_PREFIX)[0] : address; Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/main/webapp/ws.html 2012-04-02 03:10:57 UTC (rev 1818) @@ -320,13 +320,13 @@ <div class="banner" id="banner"></div>   - <form id="loginrender" action="" style="display: none;"> + <form id="loginrender" action="javascript:;" style="display: none;"> <input type="text" id="usernamerender" name="usernamerender" value="" /> <input type="password" id="passwordrender" name="passwordrender" value="" /> </form>  - <form id="login" action="" style="display: none;"> + <form id="login" action="javascript:;" style="display: none;"> <input type="text" id="username" name="username" value="" /> <input type="password" id="password" name="password" value="" /> <input id="loginsubmit" type="submit" value="login"> Modified: trunk/src/test/java/cc/kune/core/server/PersistenceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistenceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/PersistenceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -24,6 +24,7 @@ import org.junit.Before; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.persist.DataSourceKune; import com.google.inject.Inject; @@ -78,8 +79,9 @@ @Transactional @Before public void prepare() { - final Injector injector = TestHelper.create(new PlatformServerModule(), persistenceUnit, - propetiesFileName); + final Injector injector = IntegrationTestHelper.createInjector(); + // (new PlatformServerModule(), persistenceUnit, + // propetiesFileName); // final PersistService persistence = // injector.getInstance(PersistService.class); // To Debug insert breakpoint here Deleted: trunk/src/test/java/cc/kune/core/server/TestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestHelper.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/TestHelper.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -1,112 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.server; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.configuration.ConfigurationException; -import org.mockito.Mockito; -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.box.server.robots.RobotApiModule; -import org.waveprotocol.box.server.waveserver.WaveServerException; -import org.waveprotocol.box.server.waveserver.WaveServerImpl; -import org.waveprotocol.wave.federation.noop.NoOpFederationModule; - -import cc.kune.barters.server.BarterServerModule; -import cc.kune.chat.server.ChatServerModule; -import cc.kune.core.server.persist.DataSourceKunePersistModule; -import cc.kune.core.server.persist.DataSourceOpenfirePersistModule; -import cc.kune.docs.server.DocumentServerModule; -import cc.kune.events.server.EventsServerModule; -import cc.kune.lists.server.ListsServerModule; -import cc.kune.tasks.server.TaskServerModule; -import cc.kune.trash.server.TrashServerModule; -import cc.kune.wave.server.CustomSettingsBinder; -import cc.kune.wiki.server.WikiServerModule; - -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.Scopes; -import com.google.inject.name.Names; -import com.google.inject.servlet.RequestScoped; -import com.google.inject.servlet.SessionScoped; - -public abstract class TestHelper { - public static Injector create(final Module module, final String persistenceUnit, - final String propetiesFileName) { - try { - final Injector 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 DataSourceKunePersistModule kuneDataSource = new DataSourceKunePersistModule( - "kune.properties", TestConstants.PERSISTENCE_UNIT); - final Injector childInjector = injector.createChildInjector(wavePersistModule, new ServerModule( - false, 1, 2, 2), new RobotApiModule(), federationModule, new ListsServerModule(), - new DocumentServerModule(), new ChatServerModule(), federationModule, new WikiServerModule(), - new TaskServerModule(), new BarterServerModule(), new EventsServerModule(), - new TrashServerModule(), kuneDataSource, - new DataSourceOpenfirePersistModule(kuneDataSource.getKuneProperties()), module, new Module() { - @Override - public void configure(final Binder binder) { - binder.bindScope(SessionScoped.class, Scopes.SINGLETON); - binder.bindScope(RequestScoped.class, Scopes.SINGLETON); - // binder.bind(KuneProperties.class).toInstance(new - // KunePropertiesDefault(propetiesFileName)); - // Used by I18nRPC to detect user lang - binder.bind(HttpServletRequest.class).toInstance(Mockito.mock(HttpServletRequest.class)); - } - }); - try { - childInjector.getInstance(WaveServerImpl.class).initialize(); - } catch (final WaveServerException e) { - e.printStackTrace(); - } - final AccountStore accountStore = childInjector.getInstance(AccountStore.class); - accountStore.initializeAccountStore(); - AccountStoreHolder.resetForTesting(); - AccountStoreHolder.init(accountStore, - childInjector.getInstance(Key.get(String.class, Names.named(CoreSettings.WAVE_SERVER_DOMAIN)))); - return childInjector; - } catch (final ConfigurationException e) { - e.printStackTrace(); - } catch (final PersistenceException e) { - e.printStackTrace(); - } - return null; - } - - public static void inject(final Object target) { - // test: use memory - // test_db: use mysql - // Also configurable ein PersistenceTest - TestHelper.create(new PlatformServerModule(), TestConstants.PERSISTENCE_UNIT, "kune.properties").injectMembers( - target); - } - -} Modified: trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/access/AccessRightsServiceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -26,110 +26,151 @@ import org.junit.Test; import cc.kune.core.server.TestDomainHelper; -import cc.kune.core.server.access.AccessRightsServiceDefault; import cc.kune.core.server.testhelper.ctx.DomainContext; +import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.domain.utils.AccessRights; import cc.kune.domain.AccessLists; import cc.kune.domain.Group; import cc.kune.domain.SocialNetwork; public class AccessRightsServiceTest { - private AccessRightsServiceDefault accessRightsManager; - private Group group1; - private Group group2; - private Group group3; + private AccessRightsServiceDefault accessRightsManager; + private Group group1; + private Group group2; + private Group group3; - @Before - public void init() { - accessRightsManager = new AccessRightsServiceDefault(); - group1 = TestDomainHelper.createGroup(1); - group2 = TestDomainHelper.createGroup(2); - group3 = TestDomainHelper.createGroup(3); - } + @Test + public void accessRightsShouldBeTransitive() { + final DomainContext ctx = new DomainContext(); + ctx.createUsers("user1", "user2", "user3"); + ctx.inSocialNetworkOf("user1").addAsCollaborator("user2"); + ctx.inSocialNetworkOf("user2").addAsCollaborator("user3"); + final AccessRights rights = accessRightsManager.get(ctx.getUser("user3"), + ctx.getDefaultAccessListOf("user1")); + assertTrue(rights.isEditable()); + } - @Test - public void checkUserAccessRightsViewNullEqualToTrue() { - AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, null); + @Test + public void adminRightsGivesEditAndViewRights() { + final DomainContext ctx = new DomainContext(); + ctx.createUsers("user1", "user2"); + ctx.inSocialNetworkOf("user1").addAsAdministrator("user2"); + final AccessRights rights = accessRightsManager.get(ctx.getUser("user2"), + ctx.getDefaultAccessListOf("user1")); + assertTrue(rights.isAdministrable()); + assertTrue(rights.isEditable()); + assertTrue(rights.isVisible()); + } - AccessRights response = accessRightsManager.get(group3, accessLists); - assertTrue(response.isVisible()); - } + @Test + public void checkUserAccessRightsAdminsAndEditAndViewFalse() { + final SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, + group3); + final SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group1, group1, group1, + group1); + group1.setSocialNetwork(socialNetwork); + group2.setSocialNetwork(socialNetwork2); + final AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, group2); - @Test - public void accessRightsShouldBeTransitive() { - DomainContext ctx = new DomainContext(); - ctx.createUsers("user1", "user2", "user3"); - ctx.inSocialNetworkOf("user1").addAsCollaborator("user2"); - ctx.inSocialNetworkOf("user2").addAsCollaborator("user3"); - AccessRights rights = accessRightsManager.get(ctx.getUser("user3"), ctx.getDefaultAccessListOf("user1")); - assertTrue(rights.isEditable()); - } + final AccessRights response = accessRightsManager.get(group3, accessLists); + assertFalse(response.isAdministrable()); + assertFalse(response.isEditable()); + assertFalse(response.isVisible()); + } - @Test - public void adminRightsGivesEditAndViewRights() { - DomainContext ctx = new DomainContext(); - ctx.createUsers("user1", "user2"); - ctx.inSocialNetworkOf("user1").addAsAdministrator("user2"); - AccessRights rights = accessRightsManager.get(ctx.getUser("user2"), ctx.getDefaultAccessListOf("user1")); - assertTrue(rights.isAdministrable()); - assertTrue(rights.isEditable()); - assertTrue(rights.isVisible()); - } + @Test + public void checkUserAccessRightsAdminsAndEditFalse() { + final SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, + group3); + final SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group1, group1, group3, + group1); + group1.setSocialNetwork(socialNetwork); + group2.setSocialNetwork(socialNetwork2); + final AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, group2); - @Test - public void checkUserAccessRightsTrueOld() { - SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, group3); - SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group3, group3, group3, group1); - group1.setSocialNetwork(socialNetwork); - group2.setSocialNetwork(socialNetwork2); - AccessLists accessLists = TestDomainHelper.createAccessLists(group3, group1, group2); + final AccessRights response = accessRightsManager.get(group3, accessLists); + assertFalse(response.isAdministrable()); + assertFalse(response.isEditable()); + assertTrue(response.isVisible()); + } - AccessRights response = accessRightsManager.get(group3, accessLists); - assertTrue(response.isAdministrable()); - assertTrue(response.isEditable()); - assertTrue(response.isVisible()); - } + @Test + public void checkUserAccessRightsAdminsFalse() { + final SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, + group3); + final SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group1, group3, group3, + group1); + group1.setSocialNetwork(socialNetwork); + group2.setSocialNetwork(socialNetwork2); + final AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, group2); - @Test - public void checkUserAccessRightsAdminsFalse() { - SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, group3); - SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group1, group3, group3, group1); - group1.setSocialNetwork(socialNetwork); - group2.setSocialNetwork(socialNetwork2); - AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, group2); + final AccessRights response = accessRightsManager.get(group3, accessLists); + assertFalse(response.isAdministrable()); + assertTrue(response.isEditable()); + assertTrue(response.isVisible()); + } - AccessRights response = accessRightsManager.get(group3, accessLists); - assertFalse(response.isAdministrable()); - assertTrue(response.isEditable()); - assertTrue(response.isVisible()); - } + @Test + public void checkUserAccessRightsInSN() { + final SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, + group3); + final SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group3, group3, group3, + group1); + group1.setSocialNetwork(socialNetwork); + group2.setSocialNetwork(socialNetwork2); + final AccessLists accessLists = TestDomainHelper.createAccessLists(group3, group1, group2); - @Test - public void checkUserAccessRightsAdminsAndEditFalse() { - SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, group3); - SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group1, group1, group3, group1); - group1.setSocialNetwork(socialNetwork); - group2.setSocialNetwork(socialNetwork2); - AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, group2); + AccessRights response = accessRightsManager.get(group3, accessLists); + assertTrue(response.isAdministrable()); + assertTrue(response.isEditable()); + assertTrue(response.isVisible()); + AccessRights responseGroup1 = accessRightsManager.get(group1, accessLists); + assertFalse(responseGroup1.isAdministrable()); + assertTrue(responseGroup1.isEditable()); + assertTrue(responseGroup1.isVisible()); + AccessRights responseGroup2 = accessRightsManager.get(group2, accessLists); + assertFalse(responseGroup2.isAdministrable()); + // Editable because group2 joins grupo1, and group 1 has edit perms + assertTrue(responseGroup2.isEditable()); + assertTrue(responseGroup2.isVisible()); - AccessRights response = accessRightsManager.get(group3, accessLists); - assertFalse(response.isAdministrable()); - assertFalse(response.isEditable()); - assertTrue(response.isVisible()); - } + final AccessLists accessLists2 = TestDomainHelper.createAccessLists(group2, group3, null); + response = accessRightsManager.get(group3, accessLists2); + assertTrue(response.isAdministrable()); + assertTrue(response.isEditable()); + assertTrue(response.isVisible()); + responseGroup1 = accessRightsManager.get(group1, accessLists2); + assertFalse(responseGroup1.isAdministrable()); + assertFalse(responseGroup1.isEditable()); + assertFalse(responseGroup1.isVisible()); + responseGroup2 = accessRightsManager.get(group2, accessLists2); + assertTrue(responseGroup2.isAdministrable()); + // Editable because group2 joins grupo1, and group 1 has edit perms + assertTrue(responseGroup2.isEditable()); + assertTrue(responseGroup2.isVisible()); + } - @Test - public void checkUserAccessRightsAdminsAndEditAndViewFalse() { - SocialNetwork socialNetwork = TestDomainHelper.createSocialNetwork(group2, group2, group2, group3); - SocialNetwork socialNetwork2 = TestDomainHelper.createSocialNetwork(group1, group1, group1, group1); - group1.setSocialNetwork(socialNetwork); - group2.setSocialNetwork(socialNetwork2); - AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, group2); + @Test + public void checkUserAccessRightsViewNullEqualToFalse() { + final AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, null); + final AccessRights response = accessRightsManager.get(group3, accessLists); + assertFalse(response.isVisible()); + } - AccessRights response = accessRightsManager.get(group3, accessLists); - assertFalse(response.isAdministrable()); - assertFalse(response.isEditable()); - assertFalse(response.isVisible()); - } + @Test + public void checkUserAccessRightsViewNullEqualToTrue() { + final AccessLists accessLists = TestDomainHelper.createAccessLists(group1, group1, null); + accessLists.getViewers().setMode(GroupListMode.EVERYONE); + final AccessRights response = accessRightsManager.get(group3, accessLists); + assertTrue(response.isVisible()); + } + @Before + public void init() { + accessRightsManager = new AccessRightsServiceDefault(); + group1 = TestDomainHelper.createGroup(1); + group2 = TestDomainHelper.createGroup(2); + group3 = TestDomainHelper.createGroup(3); + } + } Modified: trunk/src/test/java/cc/kune/core/server/access/FinderTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/access/FinderTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/access/FinderTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -53,7 +53,7 @@ descriptor.setContainer(container); Mockito.when(contentManager.find(1L)).thenReturn(descriptor); - finder.getContent(new StateToken("groupShortName", "toolName", "5", "1"), null); + finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "5", "1"), null); } @Test(expected = ContentNotFoundException.class) @@ -64,7 +64,7 @@ descriptor.setContainer(container); Mockito.when(contentManager.find(1L)).thenReturn(descriptor); - finder.getContent(new StateToken("groupShortName", "toolName", "5", "1"), null); + finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "5", "1"), null); } @Test(expected = ContentNotFoundException.class) @@ -74,7 +74,7 @@ descriptor.setContainer(container); Mockito.when(contentManager.find(1L)).thenReturn(descriptor); - finder.getContent(new StateToken("groupShortName", "toolName", "5", "1"), null); + finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "5", "1"), null); } @Before @@ -93,7 +93,7 @@ group.setDefaultContent(descriptor); Mockito.when(groupManager.findByShortName("groupShortName")).thenReturn(group); - final Content content = finder.getContent(new StateToken("groupShortName", null, null, null), null); + final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", null, null, null), null); assertSame(descriptor, content); } @@ -107,14 +107,14 @@ Mockito.when(contentManager.find(2L)).thenReturn(descriptor); - final Content content = finder.getContent(new StateToken("groupShortName", "toolName", "1", "2"), + final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "1", "2"), null); assertSame(descriptor, content); } @Test(expected = ContentNotFoundException.class) public void testContainerExistsButContentNotFound() throws Exception { - finder.getContent(new StateToken("groupShortName", "toolName", "1", "999"), null); + finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "1", "999"), null); } @Test @@ -123,7 +123,7 @@ final Content descriptor = TestDomainHelper.createDescriptor(1L, "title", "content"); userGroup.setDefaultContent(descriptor); - final Content content = finder.getContent(new StateToken(), userGroup); + final Content content = finder.getContentOrDefContent(new StateToken(), userGroup); assertSame(descriptor, content); } @@ -133,7 +133,7 @@ final Content descriptor = TestDomainHelper.createDescriptor(1L, "title", "content"); userGroup.setDefaultContent(descriptor); - final Content content = finder.getContent(new StateToken(), userGroup); + final Content content = finder.getContentOrDefContent(new StateToken(), userGroup); assertSame(userGroup.getDefaultLicense(), content.getLicense()); } @@ -142,7 +142,7 @@ final Content content = new Content(); final Group group = new Group(); group.setDefaultContent(content); - final Content response = finder.getContent(new StateToken(), group); + final Content response = finder.getContentOrDefContent(new StateToken(), group); assertSame(content, response); } @@ -151,7 +151,7 @@ final Container container = new Container(); Mockito.when(containerManager.find(1L)).thenReturn(container); - final Content content = finder.getContent(new StateToken("groupShortName", "toolName", "1", null), + final Content content = finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "1", null), null); assertNotNull(content); assertSame(container, content.getContainer()); @@ -165,7 +165,7 @@ Mockito.when(groupManager.findByShortName("groupShortName")).thenReturn(group); final StateToken token = new StateToken("groupShortName", "toolName", null, null); - final Content content = finder.getContent(token, null); + final Content content = finder.getContentOrDefContent(token, null); assertSame(container, content.getContainer()); } @@ -176,12 +176,12 @@ descriptor.setContainer(container); Mockito.when(contentManager.find(1L)).thenReturn(descriptor); - finder.getContent(new StateToken("groupShortName", "toolName", "5", "1a"), null); + finder.getContentOrDefContent(new StateToken("groupShortName", "toolName", "5", "1a"), null); } @Test(expected = ContentNotFoundException.class) public void voyAJoder() throws Exception { - finder.getContent(new StateToken(null, "toolName", "1", "2"), null); + finder.getContentOrDefContent(new StateToken(null, "toolName", "1", "2"), null); } } Modified: trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/auth/AuthenticatedMethodInterceptorTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -28,76 +28,74 @@ import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; -import cc.kune.core.server.auth.Authenticated; -import cc.kune.core.server.auth.AuthenticatedMethodInterceptor; import cc.kune.core.server.integration.IntegrationTest; import cc.kune.core.server.integration.IntegrationTestHelper; public class AuthenticatedMethodInterceptorTest extends IntegrationTest { - private AuthenticatedMethodInterceptor auth; - private MethodInvocation invocation; - private Authenticated authAnnotation; + private AuthenticatedMethodInterceptor auth; + private Authenticated authAnnotation; + private MethodInvocation invocation; - @Before - public void before() { - auth = new AuthenticatedMethodInterceptor(); - new IntegrationTestHelper(auth, this); - invocation = Mockito.mock(MethodInvocation.class); - final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); - Mockito.when(invocation.getMethod()).thenReturn(this.getClass().getMethods()[0]); - Mockito.when(invocation.getStaticPart()).thenReturn(accessibleObject); - authAnnotation = Mockito.mock(Authenticated.class); - Mockito.when(accessibleObject.getAnnotation(Authenticated.class)).thenReturn(authAnnotation); - } + @Before + public void before() { + auth = new AuthenticatedMethodInterceptor(); + new IntegrationTestHelper(true, auth, this); + invocation = Mockito.mock(MethodInvocation.class); + final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); + Mockito.when(invocation.getMethod()).thenReturn(this.getClass().getMethods()[0]); + Mockito.when(invocation.getStaticPart()).thenReturn(accessibleObject); + authAnnotation = Mockito.mock(Authenticated.class); + Mockito.when(accessibleObject.getAnnotation(Authenticated.class)).thenReturn(authAnnotation); + } - @Test(expected = UserMustBeLoggedException.class) - public void hashNullAndMandatoryMustDoNothing() throws Throwable { - Mockito.when(authAnnotation.mandatory()).thenReturn(true); - final Object[] arguments = { null }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test(expected = UserMustBeLoggedException.class) + public void hashNullAndMandatoryMustDoNothing() throws Throwable { + Mockito.when(authAnnotation.mandatory()).thenReturn(true); + final Object[] arguments = { null }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test - public void hashNullAndNotMandatoryMustDoNothing() throws Throwable { - Mockito.when(authAnnotation.mandatory()).thenReturn(false); - final Object[] arguments = { null }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test + public void hashNullAndNotMandatoryMustDoNothing() throws Throwable { + Mockito.when(authAnnotation.mandatory()).thenReturn(false); + final Object[] arguments = { null }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test - public void hashNullAsStringAndNotMandatoryMustDoNothing() throws Throwable { - Mockito.when(authAnnotation.mandatory()).thenReturn(false); - final Object[] arguments = { "null" }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test + public void hashNullAsStringAndNotMandatoryMustDoNothing() throws Throwable { + Mockito.when(authAnnotation.mandatory()).thenReturn(false); + final Object[] arguments = { "null" }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test(expected = SessionExpiredException.class) - public void otherHashAndMandatoryAndLoggedMustSessionExp() throws Throwable { - doLogin(); - Mockito.when(authAnnotation.mandatory()).thenReturn(true); - final Object[] arguments = { "other-hash" }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test(expected = SessionExpiredException.class) + public void otherHashAndMandatoryAndLoggedMustSessionExp() throws Throwable { + doLogin(); + Mockito.when(authAnnotation.mandatory()).thenReturn(true); + final Object[] arguments = { "other-hash" }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test - public void sameHashAndMandatoryAndLoggedMustSessionExp() throws Throwable { - doLogin(); - Mockito.when(authAnnotation.mandatory()).thenReturn(true); - final Object[] arguments = { getHash() }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test + public void sameHashAndMandatoryAndLoggedMustSessionExp() throws Throwable { + doLogin(); + Mockito.when(authAnnotation.mandatory()).thenReturn(true); + final Object[] arguments = { getHash() }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test(expected = SessionExpiredException.class) - public void someHashAndMandatoryAndNotLoggedMustSessionExp() throws Throwable { - Mockito.when(authAnnotation.mandatory()).thenReturn(true); - final Object[] arguments = { "some-hash" }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test(expected = SessionExpiredException.class) + public void someHashAndMandatoryAndNotLoggedMustSessionExp() throws Throwable { + Mockito.when(authAnnotation.mandatory()).thenReturn(true); + final Object[] arguments = { "some-hash" }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } } Modified: trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/auth/AuthorizatedMethodInterceptorTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -28,9 +28,6 @@ import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; -import cc.kune.core.server.auth.ActionLevel; -import cc.kune.core.server.auth.Authorizated; -import cc.kune.core.server.auth.AuthorizatedMethodInterceptor; import cc.kune.core.server.integration.IntegrationTest; import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.shared.domain.AccessRol; @@ -40,49 +37,49 @@ public class AuthorizatedMethodInterceptorTest extends IntegrationTest { - private AuthorizatedMethodInterceptor auth; - private MethodInvocation invocation; - private Authorizated authAnnotation; + private AuthorizatedMethodInterceptor auth; + private Authorizated authAnnotation; + private MethodInvocation invocation; - @Transactional - @Before - public void before() { - auth = new AuthorizatedMethodInterceptor(); - new IntegrationTestHelper(auth, this); - invocation = Mockito.mock(MethodInvocation.class); - final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); - Mockito.when(invocation.getMethod()).thenReturn(this.getClass().getMethods()[0]); - Mockito.when(invocation.getStaticPart()).thenReturn(accessibleObject); - authAnnotation = Mockito.mock(Authorizated.class); - Mockito.when(accessibleObject.getAnnotation(Authorizated.class)).thenReturn(authAnnotation); + @Transactional + @Before + public void before() { + auth = new AuthorizatedMethodInterceptor(); + new IntegrationTestHelper(true, auth, this); + invocation = Mockito.mock(MethodInvocation.class); + final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); + Mockito.when(invocation.getMethod()).thenReturn(this.getClass().getMethods()[0]); + Mockito.when(invocation.getStaticPart()).thenReturn(accessibleObject); + authAnnotation = Mockito.mock(Authorizated.class); + Mockito.when(accessibleObject.getAnnotation(Authorizated.class)).thenReturn(authAnnotation); - } + } - @Test(expected = ContentNotFoundException.class) - public void tesHashNullContainer() throws Throwable { - // Mockito.when(authAnnotation.accessRolRequired()).thenReturn(AccessRol.Administrator); - Mockito.when(authAnnotation.actionLevel()).thenReturn(ActionLevel.content); - final Object[] arguments = { getHash(), new StateToken("group.docs") }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test(expected = ContentNotFoundException.class) + public void tesHashNullContainer() throws Throwable { + // Mockito.when(authAnnotation.accessRolRequired()).thenReturn(AccessRol.Administrator); + Mockito.when(authAnnotation.actionLevel()).thenReturn(ActionLevel.content); + final Object[] arguments = { getHash(), new StateToken("group.docs") }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test(expected = ContentNotFoundException.class) - public void testHashNullContent() throws Throwable { - Mockito.when(authAnnotation.actionLevel()).thenReturn(ActionLevel.content); - final Object[] arguments = { getHash(), new StateToken("group.docs.1") }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test(expected = ContentNotFoundException.class) + public void testHashNullContent() throws Throwable { + Mockito.when(authAnnotation.actionLevel()).thenReturn(ActionLevel.content); + final Object[] arguments = { getHash(), new StateToken("group.docs.1") }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } - @Test(expected = AccessViolationException.class) - public void wrongGroupNameThrowsExcep() throws Throwable { - doLogin(); - Mockito.when(authAnnotation.accessRolRequired()).thenReturn(AccessRol.Administrator); - Mockito.when(authAnnotation.actionLevel()).thenReturn(ActionLevel.content); - final Object[] arguments = { getHash(), new StateToken("groupWRONG.docs.1.1") }; - Mockito.when(invocation.getArguments()).thenReturn(arguments); - auth.invoke(invocation); - } + @Test(expected = AccessViolationException.class) + public void wrongGroupNameThrowsExcep() throws Throwable { + doLogin(); + Mockito.when(authAnnotation.accessRolRequired()).thenReturn(AccessRol.Administrator); + Mockito.when(authAnnotation.actionLevel()).thenReturn(ActionLevel.content); + final Object[] arguments = { getHash(), new StateToken("groupWRONG.docs.1.1") }; + Mockito.when(invocation.getArguments()).thenReturn(arguments); + auth.invoke(invocation); + } } Modified: trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/auth/SuperAdminMethodInterceptorTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -43,7 +43,7 @@ @Before public void before() { superAdminInterceptor = new SuperAdminMethodInterceptor(); - new IntegrationTestHelper(this, superAdminInterceptor); + new IntegrationTestHelper(true, this, superAdminInterceptor); invocation = Mockito.mock(MethodInvocation.class); final AccessibleObject accessibleObject = Mockito.mock(AccessibleObject.class); Mockito.when(invocation.getMethod()).thenReturn(this.getClass().getMethods()[0]); Modified: trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -65,7 +65,7 @@ @KuneTransactional @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); defaultGroup = groupManager.getSiteDefaultGroup(); } Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -23,6 +23,8 @@ import java.io.IOException; +import org.junit.After; + import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.UserService; import cc.kune.core.server.UserSessionManager; @@ -55,8 +57,10 @@ return userService.login("dummy", properties.getAdminPassword(), token).getUserHash(); } - protected void doLogout() throws DefaultException { + @After + public void doLogout() throws DefaultException { userService.logout(getHash()); + session.logout(); } protected String getDefLicense() { Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -101,9 +101,11 @@ return null; } - public IntegrationTestHelper(final Object... tests) { + public IntegrationTestHelper(final boolean startPersistence, final Object... tests) { final Injector injector = createInjector(); - injector.getInstance(KunePersistenceService.class).start(); + if (startPersistence) { + injector.getInstance(KunePersistenceService.class).start(); + } for (final Object test : tests) { injector.injectMembers(test); } Modified: trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/StatsServiceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -52,7 +52,7 @@ @Transactional @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); } @Test Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -48,7 +48,7 @@ @Before public void init() throws Exception { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); } @Test(expected = UserMustBeLoggedException.class) Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceGetTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -57,7 +57,7 @@ @Before public void create() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); } @Test Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceSaveTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -34,7 +34,7 @@ @Before public void init() throws Exception { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); defaultContent = getSiteDefaultContent(); doLogin(); } Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -254,7 +254,7 @@ @Before public void init() throws Exception { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); doLogin(); defaultContent = getSiteDefaultContent(); groupShortName = defaultContent.getStateToken().getGroup(); Modified: trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/kuneservice/GroupServiceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -199,7 +199,7 @@ @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); } } Modified: trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/site/InitDataTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -60,7 +60,7 @@ @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); } @Test Modified: trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/site/UserServiceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -140,7 +140,7 @@ @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); lang = new I18nLanguageDTO(); lang.setCode("en"); simpleLang = new I18nLanguageSimpleDTO(lang.getCode(), lang.getEnglishName()); Modified: trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkMembersTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -52,7 +52,7 @@ @Transactional @Before public void init() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); group = groupFinder.findByShortName(getSiteAdminShortName()); } Modified: trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/integration/socialnet/SocialNetworkServiceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -36,40 +36,40 @@ import com.google.inject.Inject; public class SocialNetworkServiceTest extends IntegrationTest { - @Inject - UserSession session; - @Inject - SocialNetService socialNetworkService; + private StateToken groupToken; + @Inject + UserSession session; - private StateToken groupToken; + @Inject + SocialNetService socialNetworkService; - @Before - public void init() { - new IntegrationTestHelper(this); - groupToken = new StateToken(getDefSiteShortName()); - } + @Before + public void init() { + new IntegrationTestHelper(true, this); + groupToken = new StateToken(getDefSiteShortName()); + } - @Test - public void testGetGroupMembersNotLogged() throws Exception { - final SocialNetworkDataDTO sn = socialNetworkService.getSocialNetwork(null, groupToken); - assertNotNull(sn.getGroupMembers()); - } + @Test + public void testGetGroupMembersNotLogged() throws Exception { + final SocialNetworkDataDTO sn = socialNetworkService.getSocialNetwork(null, groupToken); + assertNotNull(sn.getGroupMembers()); + } - @Test - public void testGetParticipationNotLogged() throws Exception { - final SocialNetworkDataDTO sn = socialNetworkService.getSocialNetwork(null, groupToken); - assertNotNull(sn.getUserParticipation()); - } + @Test + public void testGetParticipationNotLogged() throws Exception { + final SocialNetworkDataDTO sn = socialNetworkService.getSocialNetwork(null, groupToken); + assertNotNull(sn.getUserParticipation()); + } - @Test(expected = UserMustBeLoggedException.class) - public void testRequestJoinNoLogged() throws Exception { - socialNetworkService.requestJoinGroup(session.getHash(), groupToken); - } + @Test(expected = UserMustBeLoggedException.class) + public void testRequestJoinNoLogged() throws Exception { + socialNetworkService.requestJoinGroup(session.getHash(), groupToken); + } - @Test(expected = AlreadyUserMemberException.class) - public void testRequestJoinPersonalGroup() throws Exception { - doLogin(); - socialNetworkService.requestJoinGroup(session.getHash(), groupToken); - } + @Test(expected = AlreadyUserMemberException.class) + public void testRequestJoinPersonalGroup() throws Exception { + doLogin(); + socialNetworkService.requestJoinGroup(session.getHash(), groupToken); + } } Modified: trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/manager/file/EntityLogoUploadManagerTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -37,45 +37,46 @@ public class EntityLogoUploadManagerTest extends ContentServiceIntegrationTest { - private static final String TEST_FILE = "src/test/java/cc/kune/core/server/manager/file/orig.png"; - @Inject - EntityLogoUploadManager manager; + private static final String TEST_FILE = "src/test/java/cc/kune/core/server/manager/file/orig.png"; + @Inject + EntityLogoUploadManager manager; - @Before - public void create() { - new IntegrationTestHelper(this); - } + @Before + public void create() { + new IntegrationTestHelper(true, this); + } - @Test - public void testCreateLogo() throws Exception { - manager.createUploadedFile(super.getSiteDefaultContent().getStateToken(), "image/png", new File(TEST_FILE)); - final StateContainerDTO defaultContent = super.getSiteDefaultContent(); - assertTrue(defaultContent.getGroup().hasLogo()); - } + @Test + public void testCreateLogo() throws Exception { + manager.createUploadedFile(super.getSiteDefaultContent().getStateToken(), "image/png", new File( + TEST_FILE)); + final StateContainerDTO defaultContent = super.getSiteDefaultContent(); + assertTrue(defaultContent.getGroup().hasLogo()); + } - @Ignore - public void testErrorResponse() { - // JSONObject expected = - // JSONObject.fromObject("{\"success\":false,\"errors\":[{\"id\":\"" - // + EntityLogoView.LOGO_FORM_FIELD + "\",\"msg\":\"Some message\"}]}"); - // assertEquals(expected, manager.createJsonResponse(false, - // "Some message")); - } + @Ignore + public void testErrorResponse() { + // JSONObject expected = + // JSONObject.fromObject("{\"success\":false,\"errors\":[{\"id\":\"" + // + EntityLogoView.LOGO_FORM_FIELD + "\",\"msg\":\"Some message\"}]}"); + // assertEquals(expected, manager.createJsonResponse(false, + // "Some message")); + } - @Test(expected = SessionExpiredException.class) - public void testSessionExp() throws Exception { - manager.createUploadedFile("otherhash", null, null, null, null); - } + @Test(expected = SessionExpiredException.class) + public void testSessionExp() throws Exception { + manager.createUploadedFile("otherhash", null, null, null, null); + } - @Ignore - public void testSuccessResponse() { - // JSONObject expected = - // JSONObject.fromObject("{\"success\":true,\"errors\":[{}]}"); - // assertEquals(expected, manager.createJsonResponse(true, null)); - } + @Ignore + public void testSuccessResponse() { + // JSONObject expected = + // JSONObject.fromObject("{\"success\":true,\"errors\":[{}]}"); + // assertEquals(expected, manager.createJsonResponse(true, null)); + } - @Test(expected = UserMustBeLoggedException.class) - public void testUserMustBeAuth() throws Exception { - manager.createUploadedFile(null, null, null, null, null); - } + @Test(expected = UserMustBeLoggedException.class) + public void testUserMustBeAuth() throws Exception { + manager.createUploadedFile(null, null, null, null, null); + } } Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileDownloadManagerTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -33,8 +33,6 @@ import cc.kune.core.client.services.ImageSize; import cc.kune.core.server.integration.IntegrationTestHelper; -import cc.kune.core.server.manager.file.FileDownloadManager; -import cc.kune.core.server.manager.file.FileUtils; import cc.kune.core.server.properties.KuneProperties; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.BasicMimeType; @@ -44,161 +42,172 @@ public class FileDownloadManagerTest { - private static final String SOMETITLE = "Sometitle"; + private static final String SOMETITLE = "Sometitle"; - @Inject - FileDownloadManager fileDownloadManager; + private Content content; - @Inject - KuneProperties kuneProperties; + @Inject + FileDownloadManager fileDownloadManager; - private HttpServletResponse resp; - private Content content; + private String filename; + private FileUtils fileUtils; - private String uploadLocation; + @Inject + KuneProperties kuneProperties; - private FileUtils fileUtils; + private HttpServletResponse resp; - private StateToken stateToken; + private StateToken stateToken; - private String filename; + private String uploadLocation; - @Before - public void create() throws IOException { - new IntegrationTestHelper(this); - content = Mockito.mock(Content.class); - resp = Mockito.mock(HttpServletResponse.class); - ServletOutputStream oStream = Mockito.mock(ServletOutputStream.class); + private void contentwhen(final BasicMimeType mimeType, final String filename, final String extension) { + Mockito.when(content.getMimeType()).thenReturn(mimeType); + Mockito.when(content.getFilename()).thenReturn(filename + extension); + } - Mockito.when(resp.getOutputStream()).thenReturn(oStream); - uploadLocation = kuneProperties.get(KuneProperties.UPLOAD_LOCATION); + @Before + public void create() throws IOException { + new IntegrationTestHelper(true, this); + content = Mockito.mock(Content.class); + resp = Mockito.mock(HttpServletResponse.class); + final ServletOutputStream oStream = Mockito.mock(ServletOutputStream.class); - fileUtils = Mockito.mock(FileUtils.class); - Mockito.when(fileUtils.exist(Mockito.anyString())).thenReturn(true); - stateToken = new StateToken("test.test.1.1"); - filename = "somefile"; + Mockito.when(resp.getOutputStream()).thenReturn(oStream); + uploadLocation = kuneProperties.get(KuneProperties.UPLOAD_LOCATION); - Mockito.when(content.getTitle()).thenReturn(SOMETITLE); - } + fileUtils = Mockito.mock(FileUtils.class); + Mockito.when(fileUtils.exist(Mockito.anyString())).thenReturn(true); + stateToken = new StateToken("test.test.1.1"); + filename = "somefile"; - @Ignore - public void fileWithNoExtensionDownloadTest() throws Exception { - throw new Exception("TODO"); - } + Mockito.when(content.getTitle()).thenReturn(SOMETITLE); + } - @Test - public void testJpgThumbDownload() throws IOException { - String extension = ".jpg"; - contentwhen(new BasicMimeType("image", "jpg"), filename, extension); - String subExt = ImageSize.thumb.toString(); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + extension, absFile); - Mockito.verify(resp).setContentType("image/jpg"); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension - + FileDownloadManager.RESP_HEADER_END); - } + @Ignore + public void fileWithNoExtensionDownloadTest() throws Exception { + throw new Exception("TODO"); + } - @Test - public void testPdfDownload1() throws IOException { - String extension = ".pdf"; - contentwhen(new BasicMimeType("application", "pdf"), filename, extension); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "true", ImageSize.ico.toString(), resp, - fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + extension, absFile); - Mockito.verify(resp).setContentType(FileDownloadManager.APPLICATION_X_DOWNLOAD); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testJpgThumbDownload() throws IOException { + final String extension = ".jpg"; + contentwhen(new BasicMimeType("image", "jpg"), filename, extension); + final String subExt = ImageSize.thumb.toString(); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, + fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + extension, + absFile); + Mockito.verify(resp).setContentType("image/jpg"); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension + + FileDownloadManager.RESP_HEADER_END); + } - @Test - public void testPdfDownload2() throws IOException { - String pngExtension = ".png"; - contentwhen(new BasicMimeType("application", "pdf"), filename, ".pdf"); - String subExt = ImageSize.ico.toString(); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + pngExtension, absFile); - Mockito.verify(resp).setContentType("image/png"); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + pngExtension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testPdfDownload1() throws IOException { + final String extension = ".pdf"; + contentwhen(new BasicMimeType("application", "pdf"), filename, extension); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "true", + ImageSize.ico.toString(), resp, fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + extension, absFile); + Mockito.verify(resp).setContentType(FileDownloadManager.APPLICATION_X_DOWNLOAD); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension + + FileDownloadManager.RESP_HEADER_END); + } - @Test - public void testPdfDownload3() throws IOException { - String pngExtension = ".png"; - contentwhen(new BasicMimeType("application", "pdf"), filename, ".pdf"); - String subExt = ImageSize.sized.toString(); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + pngExtension, absFile); - Mockito.verify(resp).setContentType("image/png"); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + pngExtension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testPdfDownload2() throws IOException { + final String pngExtension = ".png"; + contentwhen(new BasicMimeType("application", "pdf"), filename, ".pdf"); + final String subExt = ImageSize.ico.toString(); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, + fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + pngExtension, + absFile); + Mockito.verify(resp).setContentType("image/png"); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + pngExtension + + FileDownloadManager.RESP_HEADER_END); + } - @Test - public void testPdfDownload4() throws IOException { - String pngExtension = ".png"; - contentwhen(new BasicMimeType("application", "pdf"), filename, ".pdf"); - String subExt = ImageSize.thumb.toString(); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + pngExtension, absFile); - Mockito.verify(resp).setContentType("image/png"); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + pngExtension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testPdfDownload3() throws IOException { + final String pngExtension = ".png"; + contentwhen(new BasicMimeType("application", "pdf"), filename, ".pdf"); + final String subExt = ImageSize.sized.toString(); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, + fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + pngExtension, + absFile); + Mockito.verify(resp).setContentType("image/png"); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + pngExtension + + FileDownloadManager.RESP_HEADER_END); + } - @Test - public void testPdfDownloadNullMime() throws IOException { - String extension = ".pdf"; - contentwhen(null, filename, extension); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "true", ImageSize.ico.toString(), resp, - fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + extension, absFile); - Mockito.verify(resp).setContentType(FileDownloadManager.APPLICATION_X_DOWNLOAD); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testPdfDownload4() throws IOException { + final String pngExtension = ".png"; + contentwhen(new BasicMimeType("application", "pdf"), filename, ".pdf"); + final String subExt = ImageSize.thumb.toString(); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, + fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + pngExtension, + absFile); + Mockito.verify(resp).setContentType("image/png"); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + pngExtension + + FileDownloadManager.RESP_HEADER_END); + } - @Test - public void testPngDownload1() throws IOException { - String extension = ".png"; - contentwhen(new BasicMimeType("image", "png"), filename, extension); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "true", null, resp, fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + extension, absFile); - Mockito.verify(resp).setContentType(FileDownloadManager.APPLICATION_X_DOWNLOAD); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testPdfDownloadNullMime() throws IOException { + final String extension = ".pdf"; + contentwhen(null, filename, extension); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "true", + ImageSize.ico.toString(), resp, fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + extension, absFile); + Mockito.verify(resp).setContentType(FileDownloadManager.APPLICATION_X_DOWNLOAD); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension + + FileDownloadManager.RESP_HEADER_END); + } - @Test - public void testPngDownload2() throws IOException { - String extension = ".png"; - contentwhen(new BasicMimeType("image", "png"), filename, extension); - String subExt = ImageSize.thumb.toString(); - String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, fileUtils); - assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + extension, absFile); - Mockito.verify(resp).setContentType("image/png"); - Mockito.verify(resp).setHeader( - FileDownloadManager.RESP_HEADER_CONTEND_DISP, - FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension - + FileDownloadManager.RESP_HEADER_END); - } + @Test + public void testPngDownload1() throws IOException { + final String extension = ".png"; + contentwhen(new BasicMimeType("image", "png"), filename, extension); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "true", null, resp, + fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + extension, absFile); + Mockito.verify(resp).setContentType(FileDownloadManager.APPLICATION_X_DOWNLOAD); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension + + FileDownloadManager.RESP_HEADER_END); + } - private void contentwhen(BasicMimeType mimeType, String filename, String extension) { - Mockito.when(content.getMimeType()).thenReturn(mimeType); - Mockito.when(content.getFilename()).thenReturn(filename + extension); - } + @Test + public void testPngDownload2() throws IOException { + final String extension = ".png"; + contentwhen(new BasicMimeType("image", "png"), filename, extension); + final String subExt = ImageSize.thumb.toString(); + final String absFile = fileDownloadManager.buildResponse(content, stateToken, "false", subExt, resp, + fileUtils); + assertEquals(uploadLocation + FileUtils.toDir(stateToken) + filename + "." + subExt + extension, + absFile); + Mockito.verify(resp).setContentType("image/png"); + Mockito.verify(resp).setHeader( + FileDownloadManager.RESP_HEADER_CONTEND_DISP, + FileDownloadManager.RESP_HEADER_ATTACHMENT_FILENAME + SOMETITLE + extension + + FileDownloadManager.RESP_HEADER_END); + } } Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileManagerTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -29,55 +29,57 @@ import org.junit.Before; import org.junit.Test; -import cc.kune.core.server.TestHelper; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.manager.FileManager; -import cc.kune.core.server.manager.file.FileUtils; import com.google.inject.Inject; public class FileManagerTest { - @Inject - FileManager fileManager; - private String tempDir; + @Inject + FileManager fileManager; + private String tempDir; - @Before - public void inject() throws IOException { - TestHelper.inject(this); - tempDir = File.createTempFile("temp", "txt").getParent(); - } + @Before + public void inject() throws IOException { + new IntegrationTestHelper(false, this); + // TestHelper.inject(this); + tempDir = File.createTempFile("temp", "txt").getParent(); + } - @Test - public void test3FileCreationWithSeq() throws IOException { - final File tempFile = File.createTempFile("some file name", ".txt"); - final File newFile1 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - final File newFile2 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - final File newFile3 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - assertEquals(tempDir + File.separator + seq(seq(seq(tempFile.getName()))), newFile3.getAbsolutePath()); - newFile1.delete(); - newFile2.delete(); - newFile3.delete(); - } + private String seq(final String file) { + return FileUtils.getNextSequentialFileName(file, true); + } - @Test - public void testDirCreation() throws IOException { - final String newTestDir = tempDir + File.separator + "test1" + File.separator + "test2" + File.separator; - assertTrue(fileManager.mkdir(newTestDir)); - final File dir = new File(newTestDir); - assertTrue(dir.exists()); - fileManager.rmdir(newTestDir); - assertFalse(dir.exists()); - } + @Test + public void test3FileCreationWithSeq() throws IOException { + final File tempFile = File.createTempFile("some file name", ".txt"); + final File newFile1 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + final File newFile2 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + final File newFile3 = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + assertEquals(tempDir + File.separator + seq(seq(seq(tempFile.getName()))), + newFile3.getAbsolutePath()); + newFile1.delete(); + newFile2.delete(); + newFile3.delete(); + } - @Test - public void testFileCreationWithSeq() throws IOException { - final File tempFile = File.createTempFile("some file name", ".txt"); - final File newFile = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); - assertEquals(tempDir + File.separator + seq(tempFile.getName()), newFile.getAbsolutePath()); - newFile.delete(); - } + @Test + public void testDirCreation() throws IOException { + final String newTestDir = tempDir + File.separator + "test1" + File.separator + "test2" + + File.separator; + assertTrue(fileManager.mkdir(newTestDir)); + final File dir = new File(newTestDir); + assertTrue(dir.exists()); + fileManager.rmdir(newTestDir); + assertFalse(dir.exists()); + } - private String seq(final String file) { - return FileUtils.getNextSequentialFileName(file, true); - } + @Test + public void testFileCreationWithSeq() throws IOException { + final File tempFile = File.createTempFile("some file name", ".txt"); + final File newFile = fileManager.createFileWithSequentialName(tempDir, tempFile.getName()); + assertEquals(tempDir + File.separator + seq(tempFile.getName()), newFile.getAbsolutePath()); + newFile.delete(); + } } Modified: trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/manager/file/FileUploadManagerTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -26,27 +26,26 @@ import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.integration.content.ContentServiceIntegrationTest; -import cc.kune.core.server.manager.file.FileUploadManager; import com.google.inject.Inject; public class FileUploadManagerTest extends ContentServiceIntegrationTest { - @Inject - FileUploadManager fileUploadManager; + @Inject + FileUploadManager fileUploadManager; - @Before - public void create() { - new IntegrationTestHelper(this); - } + @Before + public void create() { + new IntegrationTestHelper(false, this); + } - @Test(expected = SessionExpiredException.class) - public void testSessionExp() throws Exception { - fileUploadManager.createUploadedFile("otherhash", null, null, null, null); - } + @Test(expected = SessionExpiredException.class) + public void testSessionExp() throws Exception { + fileUploadManager.createUploadedFile("otherhash", null, null, null, null); + } - @Test(expected = UserMustBeLoggedException.class) - public void testUserMustBeAuth() throws Exception { - fileUploadManager.createUploadedFile(null, null, null, null, null); - } + @Test(expected = UserMustBeLoggedException.class) + public void testUserMustBeAuth() throws Exception { + fileUploadManager.createUploadedFile(null, null, null, null, null); + } } Modified: trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/core/server/mapper/MapperTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -37,7 +37,7 @@ import cc.kune.core.server.InitData; import cc.kune.core.server.TestDomainHelper; -import cc.kune.core.server.TestHelper; +import cc.kune.core.server.integration.IntegrationTestHelper; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.state.StateContent; import cc.kune.core.server.state.StateEventContainer; @@ -179,7 +179,7 @@ @Before public void inject() { - TestHelper.inject(this); + new IntegrationTestHelper(false, this); } @Test Modified: trunk/src/test/java/cc/kune/events/server/utils/BasicCalendarTest.java =================================================================== --- trunk/src/test/java/cc/kune/events/server/utils/BasicCalendarTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/events/server/utils/BasicCalendarTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -26,24 +26,22 @@ import net.fortuna.ical4j.model.property.Version; import net.fortuna.ical4j.util.Dates; -import com.bradrydzewski.gwt.calendar.client.Appointment; - public class BasicCalendarTest { protected static final String DESCRIPTION = "some description"; protected static final String ID = "some id"; protected static final String TITLE = "some title"; - protected Appointment createAppointment(final boolean allDay) { - final Appointment initialApp = new Appointment(); - initialApp.setTitle(TITLE); - initialApp.setDescription(DESCRIPTION); - initialApp.setStart(getNow()); - initialApp.setEnd(getNow()); - initialApp.setId(ID); - initialApp.setAllDay(allDay); - return initialApp; - } + // protected Appointment createAppointment(final boolean allDay) { + // final Appointment initialApp = new Appointment(); + // initialApp.setTitle(TITLE); + // initialApp.setDescription(DESCRIPTION); + // initialApp.setStart(getNow()); + // initialApp.setEnd(getNow()); + // initialApp.setId(ID); + // initialApp.setAllDay(allDay); + // return initialApp; + // } protected Calendar createCal() { final Calendar calendar = new Calendar(); Modified: trunk/src/test/java/cc/kune/events/server/utils/EventsServerConversionUtilTest.java =================================================================== --- trunk/src/test/java/cc/kune/events/server/utils/EventsServerConversionUtilTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/events/server/utils/EventsServerConversionUtilTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -19,107 +19,99 @@ */ package cc.kune.events.server.utils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.io.OutputStream; -import java.util.Date; -import java.util.Map; - -import net.fortuna.ical4j.data.CalendarOutputter; -import net.fortuna.ical4j.model.Calendar; -import net.fortuna.ical4j.model.DateTime; -import net.fortuna.ical4j.model.ValidationException; -import net.fortuna.ical4j.model.component.VEvent; - -import org.junit.Ignore; -import org.junit.Test; - -import com.bradrydzewski.gwt.calendar.client.Appointment; - public class EventsServerConversionUtilTest extends BasicCalendarTest { protected static final String DESCRIPTION = "some description"; protected static final String ID = "some id"; protected static final String TITLE = "some title"; - @SuppressWarnings("deprecation") - private void checkConversionFromAndTo(final Appointment initialApp, final boolean allDay) - throws IOException, ValidationException { - final VEvent vevent = EventsServerConversionUtil.toVEvent(initialApp); - assertEquals(initialApp.getDescription(), vevent.getDescription().getValue()); - assertEquals(initialApp.getTitle(), vevent.getSummary().getValue()); - if (allDay) { - final Date start = initialApp.getStart(); - start.setHours(0); - start.setMinutes(0); - start.setSeconds(0); - assertEquals(start, new Date(vevent.getStartDate().getDate().getTime())); - assertEquals(initialApp.getEnd(), vevent.getEndDate().getDate()); - } else { - assertEquals(initialApp.getStart().getTime(), vevent.getStartDate().getDate().getTime()); - assertEquals(initialApp.getEnd().getTime(), vevent.getEndDate().getDate().getTime()); - } - assertEquals(allDay, initialApp.isAllDay()); - assertEquals(allDay, !(vevent.getStartDate().getDate() instanceof DateTime)); - assertEquals(initialApp.getId(), vevent.getUid().getValue()); - final Calendar cal = createCal(); - cal.getComponents().add(vevent); + // @SuppressWarnings("deprecation") + // private void checkConversionFromAndTo(final Appointment initialApp, final + // boolean allDay) + // throws IOException, ValidationException { + // final VEvent vevent = EventsServerConversionUtil.toVEvent(initialApp); + // assertEquals(initialApp.getDescription(), + // vevent.getDescription().getValue()); + // assertEquals(initialApp.getTitle(), vevent.getSummary().getValue()); + // if (allDay) { + // final Date start = initialApp.getStart(); + // start.setHours(0); + // start.setMinutes(0); + // start.setSeconds(0); + // assertEquals(start, new Date(vevent.getStartDate().getDate().getTime())); + // assertEquals(initialApp.getEnd(), vevent.getEndDate().getDate()); + // } else { + // assertEquals(initialApp.getStart().getTime(), + // vevent.getStartDate().getDate().getTime()); + // assertEquals(initialApp.getEnd().getTime(), + // vevent.getEndDate().getDate().getTime()); + // } + // assertEquals(allDay, initialApp.isAllDay()); + // assertEquals(allDay, !(vevent.getStartDate().getDate() instanceof + // DateTime)); + // assertEquals(initialApp.getId(), vevent.getUid().getValue()); + // final Calendar cal = createCal(); + // cal.getComponents().add(vevent); + // + // final OutputStream out = System.out; + // final CalendarOutputter outputter = new CalendarOutputter(); + // outputter.output(cal, out); - final OutputStream out = System.out; - final CalendarOutputter outputter = new CalendarOutputter(); - outputter.output(cal, out); + // Not using this in server side + // final Appointment reconvertedApp = EventsServerConversionUtil.to(vevent); + // assertEquals(initialApp.getTitle(), reconvertedApp.getTitle()); + // assertEquals(initialApp.getDescription(), + // reconvertedApp.getDescription()); + // assertEquals(initialApp.getId(), reconvertedApp.getId()); + // assertEquals(allDay, reconvertedApp.isAllDay()); + // assertEquals(initialApp.getStart().getTime(), + // reconvertedApp.getStart().getTime()); + // assertEquals(initialApp.getEnd().getTime(), + // reconvertedApp.getEnd().getTime()); + // assertTrue(initialApp.compareTo(reconvertedApp) == 0); + // } - final Appointment reconvertedApp = EventsServerConversionUtil.to(vevent); - assertEquals(initialApp.getTitle(), reconvertedApp.getTitle()); - assertEquals(initialApp.getDescription(), reconvertedApp.getDescription()); - assertEquals(initialApp.getId(), reconvertedApp.getId()); - assertEquals(allDay, reconvertedApp.isAllDay()); - assertEquals(initialApp.getStart().getTime(), reconvertedApp.getStart().getTime()); - assertEquals(initialApp.getEnd().getTime(), reconvertedApp.getEnd().getTime()); - assertTrue(initialApp.compareTo(reconvertedApp) == 0); - } + // private void convertAndTest(final Appointment app, final boolean allDay) + // throws Exception { + // final Map<String, String> map = EventsServerConversionUtil.toMap(app); + // final Appointment appReConverted = EventsServerConversionUtil.toApp(map); + // assertEquals(app.getStart(), appReConverted.getStart()); + // assertEquals(app.getEnd(), appReConverted.getEnd()); + // assertEquals(app.isAllDay(), appReConverted.isAllDay()); + // assertEquals(allDay, appReConverted.isAllDay()); + // assertEquals(app.getDescription(), appReConverted.getDescription()); + // assertEquals(app.getTitle(), appReConverted.getTitle()); + // assertEquals(app.getLocation(), appReConverted.getLocation()); + // assertEquals(app.getCreatedBy(), appReConverted.getCreatedBy()); + // assertEquals(app.getId(), appReConverted.getId()); + // } + // + // @Test + // public void testAllDay() throws Exception { + // final Appointment app = createAppointment(true); + // convertAndTest(app, true); + // } + // + // @Test + // public void testFromToFrom() throws IOException, ValidationException { + // final boolean allDay = false; + // final Appointment initialApp = createAppointment(allDay); + // initialApp.setAllDay(allDay); + // checkConversionFromAndTo(initialApp, allDay); + // } + // + // @Ignore + // @Test + // public void testFromToFromAllDay() throws IOException, ValidationException + // { + // final boolean allDay = true; + // final Appointment initialApp = createAppointment(allDay); + // checkConversionFromAndTo(initialApp, allDay); + // } + // + // @Test + // public void testToMap() throws Exception { + // final Appointment app = createAppointment(false); + // convertAndTest(app, false); + // } - private void convertAndTest(final Appointment app, final boolean allDay) throws Exception { - final Map<String, String> map = EventsServerConversionUtil.toMap(app); - final Appointment appReConverted = EventsServerConversionUtil.toApp(map); - assertEquals(app.getStart(), appReConverted.getStart()); - assertEquals(app.getEnd(), appReConverted.getEnd()); - assertEquals(app.isAllDay(), appReConverted.isAllDay()); - assertEquals(allDay, appReConverted.isAllDay()); - assertEquals(app.getDescription(), appReConverted.getDescription()); - assertEquals(app.getTitle(), appReConverted.getTitle()); - assertEquals(app.getLocation(), appReConverted.getLocation()); - assertEquals(app.getCreatedBy(), appReConverted.getCreatedBy()); - assertEquals(app.getId(), appReConverted.getId()); - } - - @Test - public void testAllDay() throws Exception { - final Appointment app = createAppointment(true); - convertAndTest(app, true); - } - - @Test - public void testFromToFrom() throws IOException, ValidationException { - final boolean allDay = false; - final Appointment initialApp = createAppointment(allDay); - initialApp.setAllDay(allDay); - checkConversionFromAndTo(initialApp, allDay); - } - - @Ignore - @Test - public void testFromToFromAllDay() throws IOException, ValidationException { - final boolean allDay = true; - final Appointment initialApp = createAppointment(allDay); - checkConversionFromAndTo(initialApp, allDay); - } - - @Test - public void testToMap() throws Exception { - final Appointment app = createAppointment(false); - convertAndTest(app, false); - } - } Modified: trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -56,7 +56,7 @@ @Before public void init() throws DefaultException, IOException { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); final UserInfoDTO userInfoDTO = doLogin(); userGroup = userInfoDTO.getUserGroup(); final StateAbstractDTO rootList = contentService.getContent(getHash(), new StateToken( Modified: trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/cc/kune/wave/server/KuneWaveServiceDefaultTest.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -235,7 +235,7 @@ @Before public void before() { - new IntegrationTestHelper(this); + new IntegrationTestHelper(true, this); } private void createTestWave(final SimpleArgCallback<WaveRef> callback) { Modified: trunk/src/test/java/testsuites/IntegrationTestSuite.java =================================================================== --- trunk/src/test/java/testsuites/IntegrationTestSuite.java 2012-04-01 13:47:28 UTC (rev 1817) +++ trunk/src/test/java/testsuites/IntegrationTestSuite.java 2012-04-02 03:10:57 UTC (rev 1818) @@ -27,18 +27,20 @@ * Rescan with : * * <pre> - * find src/test/java/org/ourproject/kune/platf/integration/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g' + * find src/test/java/cc/kune/core/server/integration/ -name '*.java' -exec basename \{} .java \;| paste -s - - | sed 's/ /.class, /g' * </pre> * */ @RunWith(Suite.class) @SuiteClasses({ -// UserServiceTest.class, SiteServiceTest.class, SocialNetworkServiceTest.class, -// SocialNetworkMembersTest.class, DatabaseInitializationTest.class, +// UserServiceTest.class, InitDataTest.class, GroupServiceTest.class, +// StatsServiceTest.class, SocialNetworkMembersTest.class, +// SocialNetworkServiceTest.class, +// DatabaseInitializerTest.class, ContentServiceVariousTest.class, +// ContentServiceSaveTest.class, +// ContentServiceIntegrationTest.class, ContentServiceGetTest.class, // ContentServiceAddTest.class, -// ContentCommentServiceTest.class, ContentServiceVariousTest.class, -// ContentServiceGetTest.class, -// ContentServiceSaveTest.class, GroupServiceTest.class +// IntegrationTest.class }) public class IntegrationTestSuite { }

1 0

Re: [kune-commits] [kune issues] #236: password in url?
by kune issues 01 Apr '12

01 Apr '12

#236: password in url? ----------------------+-------------------- Reporter: samer@… | Owner: vjrj Type: defect | Status: closed Priority: major | Milestone: Component: Others | Version: Resolution: fixed | Keywords: Blocked By: | Blocking: ----------------------+-------------------- Changes (by vjrj): * status: new => closed * resolution: => fixed -- Ticket URL: <http://kune.ourproject.org/issues/ticket/236#comment:2> kune issues <http://kune.ourproject.org/issues/>

1 0

Re: [kune-commits] [kune issues] #236: password in url?
by kune issues 01 Apr '12

01 Apr '12

#236: password in url? ----------------------+------------------ Reporter: samer@… | Owner: vjrj Type: defect | Status: new Priority: major | Milestone: Component: Others | Version: Resolution: | Keywords: Blocked By: | Blocking: ----------------------+------------------ Comment (by vjrj): My fault (trying to fix login remember in chrome) -- Ticket URL: <http://kune.ourproject.org/issues/ticket/236#comment:1> kune issues <http://kune.ourproject.org/issues/>

1 0

r1817 - in trunk: . debian script src/main/java/cc/kune src/main/java/cc/kune/core/client/i18n
by Vicente J. Ruiz Jurado 01 Apr '12

01 Apr '12

Author: vjrj_ Date: 2012-04-01 15:47:28 +0200 (Sun, 01 Apr 2012) New Revision: 1817 Added: trunk/script/i18n-all.sh trunk/src/main/java/cc/kune/KuneDev.gwt.xml trunk/src/main/java/cc/kune/KuneProd.gwt.xml trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_ca.properties trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_it.properties Modified: trunk/DEV-GUIDE trunk/INSTALL trunk/debian/changelog trunk/pom.xml trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_fr.properties Log: Added some new languages and added some maven profiles (-P development or -P production) to make development faster (gwt compilation in fact) Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/DEV-GUIDE 2012-04-01 13:47:28 UTC (rev 1817) @@ -133,7 +133,7 @@ ===GWT's Hosted Mode=== Before run hosted mode for the first time compile once with: - mvn compile -Dliquibase.should.run=false && mvn gwt:compile + mvn compile -Dliquibase.should.run=false && mvn gwt:compile -P development and deploy with: script/deploy_gwt.sh Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/INSTALL 2012-04-01 13:47:28 UTC (rev 1817) @@ -79,7 +79,7 @@ Compile with maven: # (in the trunk directory) - mvn compile -Dliquibase.should.run=false && mvn gwt:compile + mvn compile -Dliquibase.should.run=false && mvn gwt:compile -P development NOTE: If you change the previous db passwords after this compiling, you have to repeat the "mvn compile" because if not, probably you will use an old kune.properties. See TROUBLESHOOT for more details. @@ -180,18 +180,22 @@ ==Production environment instructions== With - mvn assembly:assembly + mvn assembly:assembly -P production an executable target/kune-VERSION-jar-with-dependencies.jar is generated in target directory. That you can use to start kune: bin/server.sh -j kune.jar -TODO: configure/select db via properties +bin/server.sh -h # for more options ==Debian package generation== + In trunk run: - mvn assembly:assembly -and generate the debian package with + mvn assembly:assembly -P production +(production profile generates a lot of permutations for each language and browser, you can use -P development if is only for test) and generate the debian package with debuild -us -uc -b +or + debuild -b +to sign the result package. ===Customization: Adapting Kune to your site=== Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/debian/changelog 2012-04-01 13:47:28 UTC (rev 1817) @@ -1,3 +1,9 @@ +kune (0.1.0+b5) oneiric; urgency=low + + * Added some new languages and added some profiles to make development faster + + -- <vjrj@arjuna> Sun, 01 Apr 2012 15:45:26 +0200 + kune (0.1.0+b4) oneiric; urgency=low * Improved trash funcionality, other minor changes Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/pom.xml 2012-04-01 13:47:28 UTC (rev 1817) @@ -291,9 +291,7 @@ <groupId>com.calclab.emite</groupId> <artifactId>emite</artifactId> <version>r1694</version> -  +  </dependency> <dependency> <groupId>com.calclab.emite</groupId> @@ -712,9 +710,7 @@ <groupId>com.bradrydzewski</groupId> <artifactId>gwt-cal</artifactId> <version>0.9.3-dndCreation</version> -  +  </dependency> <dependency> <groupId>org.mnode.ical4j</groupId> @@ -1090,55 +1086,6 @@ <goal>test-process</goal> </goals> </execution> </executions> </plugin> -->  <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtmaven.version}</version> - <configuration> - <logLevel>INFO</logLevel> - <style>OBF</style> -  - <noServer>true</noServer> - <gwtVersion>${gwt.version}</gwtVersion> - <runTarget>/ws.html?log_level=DEBUG</runTarget> - <hostedWebapp>${project.build.directory}/${project.build.finalName} - </hostedWebapp> - <modules> - <module>${project.groupId}.Kune</module> - </modules> - <copyWebapp>true</copyWebapp> - <compileReport>false</compileReport> - <localWorkers>1</localWorkers> - <extraJvmArgs>-Xmx1024m</extraJvmArgs> - </configuration> - <executions> - <execution> - <configuration> - <extraJvmArgs>-Xmx1024M</extraJvmArgs> - </configuration> - <id>gwtcompile</id> - <phase>prepare-package</phase> - <goals> - <goal>compile</goal> -  -  - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>org.liquibase</groupId> <artifactId>liquibase-plugin</artifactId> <version>1.7.0.0</version> @@ -1200,6 +1147,123 @@ </extension> </extensions> </build> + <profiles> + <profile> + <id>production</id> + <build> + <plugins> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtmaven.version}</version> + <configuration> + <logLevel>INFO</logLevel> + <style>OBF</style> + + <noServer>true</noServer> + <gwtVersion>${gwt.version}</gwtVersion> + <runTarget>/ws.html?log_level=DEBUG</runTarget> + <hostedWebapp>${project.build.directory}/${project.build.finalName} + </hostedWebapp> + <modules> + <module>${project.groupId}.KuneProd</module> + </modules> + <copyWebapp>true</copyWebapp> + <compileReport>false</compileReport> + <localWorkers>1</localWorkers> + <extraJvmArgs>-Xmx1024m</extraJvmArgs> + </configuration> + <executions> + <execution> + <configuration> + <extraJvmArgs>-Xmx1024M</extraJvmArgs> + </configuration> + <id>gwtcompile</id> + <phase>prepare-package</phase> + <goals> + <goal>compile</goal> +  +  + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>development</id> + <build> + <plugins> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtmaven.version}</version> + <configuration> + + <style>OBF</style> + <style>PRETTY</style> + <noServer>true</noServer> + <gwtVersion>${gwt.version}</gwtVersion> + <runTarget>/ws.html?log_level=DEBUG</runTarget> + <hostedWebapp>${project.build.directory}/${project.build.finalName} + </hostedWebapp> + <modules> + <module>${project.groupId}.KuneDev</module> + </modules> + <copyWebapp>true</copyWebapp> + <compileReport>false</compileReport> + <localWorkers>1</localWorkers> + <extraJvmArgs>-Xmx1024m</extraJvmArgs> + </configuration> + <executions> + <execution> + <configuration> + <extraJvmArgs>-Xmx1024M</extraJvmArgs> + </configuration> + <id>gwtcompile</id> + <phase>prepare-package</phase> + <goals> + <goal>compile</goal> +  +  + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + </build> + </profile> + </profiles> <reporting> <plugins> <plugin> Added: trunk/script/i18n-all.sh =================================================================== --- trunk/script/i18n-all.sh (rev 0) +++ trunk/script/i18n-all.sh 2012-04-01 13:47:28 UTC (rev 1817) @@ -0,0 +1,6 @@ +bin/i18n-db2gwt.sh -l en -j > KuneConstants.java +bin/i18n-db2gwt.sh -l en > KuneConstants.properties +bin/i18n-db2gwt.sh -l es > KuneConstants_es.properties +bin/i18n-db2gwt.sh -l fr > KuneConstants_fr.properties +bin/i18n-db2gwt.sh -l ca > KuneConstants_ca.properties +bin/i18n-db2gwt.sh -l it > KuneConstants_it.properties Property changes on: trunk/script/i18n-all.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2012-04-01 13:47:28 UTC (rev 1817) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/…"> -<module rename-to="ws"> +<module> <inherits name="com.google.gwt.user.User" /> <inherits name="com.google.gwt.i18n.I18N"/> <inherits name='com.google.gwt.logging.Logging' /> @@ -21,8 +21,7 @@ <inherits name="org.adamtacy.GWTEffects"></inherits> <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> -  -  +  <set-property name="gwt.logging.enabled" value="TRUE" /> <set-property name="gwt.logging.logLevel" value="INFO" /> @@ -35,15 +34,6 @@ <set-property name="gwt.logging.systemHandler" value="ENABLED" /> <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" /> -  -  -  -  - <set-property name="user.agent" value="safari,gecko1_8,ie6,ie8" /> - <set-property name="mobile.user.agent" value="not_mobile" />  <inherits name='com.gwtplatform.mvp.Mvp' /> @@ -51,27 +41,8 @@ is-multi-valued="false" /> <set-configuration-property name="gin.ginjector" value="cc.kune.client.KuneGinjector" /> -  -  - <inherits name="com.google.gwt.user.Debug" /> -  - <set-configuration-property name="CssResource.style" - value="pretty" /> -  -  - <extend-property name="locale" values="en,es,fr" /> - <set-property-fallback name="locale" value="en"/> - <set-property name="locale" value="en,es,fr"/> - -  -  -  -  - <set-property name="loglevel" value="none" /> -   <entry-point class="cc.kune.client.KuneEntryPoint" /> -  + </module> Added: trunk/src/main/java/cc/kune/KuneDev.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/KuneDev.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/KuneDev.gwt.xml 2012-04-01 13:47:28 UTC (rev 1817) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/…"> +<module rename-to="ws"> + + <inherits name="cc.kune.Kune"/> + +  +  +  +  + <set-property name="user.agent" value="gecko1_8"/> + + +  +  + <extend-property name="locale" values="en"/> + <set-property-fallback name="locale" value="en"/> + <set-property name="locale" value="en"/> + +  +  +  + <set-property name="loglevel" value="debug"/> + +  +  + <inherits name="com.google.gwt.user.Debug"/> +  + <set-configuration-property name="CssResource.style" + value="pretty"/> + +</module> Added: trunk/src/main/java/cc/kune/KuneProd.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/KuneProd.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/KuneProd.gwt.xml 2012-04-01 13:47:28 UTC (rev 1817) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.0.1//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.0.1/distro-source/core/…"> +<module rename-to="ws"> + + <inherits name="cc.kune.Kune"/> + +  +  +  +  + <set-property name="user.agent" value="safari,gecko1_8,ie6,ie8" /> + <set-property name="mobile.user.agent" value="not_mobile" /> + +  +  + <extend-property name="locale" values="en,es,fr,ca,it"/> + <set-property-fallback name="locale" value="en"/> + <set-property name="locale" value="en,es,fr,ca,it"/> + +  +  +  + <set-property name="loglevel" value="none"/> + +  +  +  + <inherits name="com.google.gwt.user.Debug"/> + + +</module> + Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.java 2012-04-01 13:47:28 UTC (rev 1817) @@ -5,6 +5,7 @@ /** * Autogenerated by trunk/bin/i18n-db2gwt.sh, please not edit directly */ + public interface KuneConstants extends ConstantsWithLookup { String aboutKune(); @@ -42,18 +43,26 @@ String administrators(); + String allowAnyPersonToEditThis(); + String allowAnyUsesOfYourWorkIncludingCommercial(); String allowModificationsOfYourWork(); + String allTheseMembersAreAlreadyPartipating(); + String almostImmediately(); String aLongTermTaskSample(); + String altTheAltKeyboardKey(); + String aMidTermTaskSample(); String andNExternalUser(); + String andNExternalUsers(); + String anOrganizationWorksTheSameWayAsAProjectExceptThatItMustBeALegalEntity(); String anyone(); @@ -84,6 +93,8 @@ String away(); + String backgroundChanged(); + String backgroupChanged(); String backUsedInButton(); @@ -156,6 +167,10 @@ String clickToGoHereOrDropContentsHereToMoveThem(); + String clickToOpen(); + + String clickToOpenDragAndDropToMoveThisToAnotherPlace(); + String clickToRename(); String clickToSelectAndConfigureThisTheme(); @@ -186,6 +201,8 @@ String copyTheTextToTranslate(); + String copyThisToANewMessage(); + String create(); String createANewBarterHere(); @@ -200,6 +217,8 @@ String createANewDocumentIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb(); + String createANewEvent(); + String createANewFolder(); String createANewFolderAFolderWillBeASectionInThePublicWeb(); @@ -208,6 +227,8 @@ String createANewList(); + String createANewMeeting(); + String createANewMeetingHere(); String createANewPost(); @@ -220,6 +241,8 @@ String createOne(); + String ctrlTheCtrlKeyboardKey(); + String currentBackgroundImage(); String currentPassword(); @@ -272,6 +295,8 @@ String emailNotifications(); + String english(); + String enterLanguage(); String enterToThisGroupPublicChatRoom(); @@ -284,16 +309,22 @@ String error(); + String errorAccessingThisDocumentPleaseContactTheAdministratorsProvidingThisReferenceParamAndAnyOtherReleva(); + String errorConfiguringTheTool(); String errorCreatingGroup(); + String errorDuringRegistrationAccountAlreadyExists(); + String errorRenaming(); String errorSettingTheLogo(); String errorsInfo(); + String esperanto(); + String esteBlogNoTieneNingnPostCreaUno(); String eurosurAThemeName(); @@ -302,6 +333,8 @@ String eventsInParam(); + String exportThisCalendar(); + String feedbackOfParam(); String finishUsedInButton(); @@ -362,8 +395,12 @@ String invalidAddressParam(); + String invalidConfirmationCode(); + String invalidEmail(); + String invalidOperation(); + String join(); String joinsIn(); @@ -408,6 +445,8 @@ String markAsNotDone(); + String maximizeTheWorkspace(); + String media(); String meetingMinutesOfParamOnParam(); @@ -432,6 +471,8 @@ String midTermTasks(); + String minimizeTheWorkspace(); + String moderateRequestToJoin(); String month(); @@ -448,6 +489,10 @@ String nConversationsUnread(); + String nDay(); + + String nDays(); + String newAdvancedPoll(); String newAlbum(); @@ -460,6 +505,8 @@ String newDocument(); + String newEvent(); + String newFolder(); String newGadget(); @@ -482,6 +529,8 @@ String newMembersPolicy(); + String newMessageWithEveryoneHere(); + String newMindmap(); String newPassword(); @@ -498,6 +547,8 @@ String newTaskFolder(); + String newToThisToolHereThereIsSomeHelp(); + String newTwitterSearch(); String newWikipage(); @@ -670,6 +721,8 @@ String rightNowThePublicWebSpaceOfThisGroupItSUnderConstruction(); + String russian(); + String saharaAThemeName(); String saving(); @@ -682,8 +735,12 @@ String security(); + String seemsThatTheListOfPartipantsWereAddedPartiallyPleaseRetry(); + String seeTheArchiveOfOldConversationsInDevelopment(); + String seeYourGroupsOrCreateANewOne(); + String select(); String selectACreativeCommonsLicenseRecommendedForCulturalWorks(); @@ -704,12 +761,28 @@ String selectTheLicenseYouPreferUsingForSharingYourGroupContentsWithOtherPeople(); + String sendedCheckYourEmailForTheVerificationLink(); + String serverErrorSavingTheTranslation(); String setYourChatStatus(); String setYourGroupPreferencesHere(); + String share(); + + String sharedWithGeneralPublicNowAnyoneCanParticipate(); + + String sharedWithMembers(); + + String shareThisWithGroupMembersEtc(); + + String shareWithAdmins(); + + String shareWithAllGroupMembers(); + + String shareWithCollaborators(); + String shortName(); String shortTermUrgentTasks(); @@ -732,12 +805,16 @@ String signInToCollaborate(); + String signInToVerifyYourEmail(); + String signOut(); String signOutOfChat(); String sorryThisGadgetHasProblemsWithItsnHeightWeHopeThisWillBeFixedSoonn(); + String spanish(); + String startACollaborativeDocumentForTheMeetingMinutes(); String startAPublicAssemblyWithMembers(); @@ -798,10 +875,14 @@ String thereIsnTAnyMeetingCreateOne(); + String thereIsnTAnyTask(); + String thereIsnTAnyTaskCreateOne(); String theSocialNetworkOfThisUserIsNotPublic(); + String theTrashIsEmpty(); + String theUsernamePasswordIsIncorrect(); String thisBlogHasnTAnyPost(); @@ -832,6 +913,8 @@ String thisIsNotAValidEmail(); + String thisIsNotEmpty(); + String thisIsOnlyABarterSampleYouCanInviteOtherParticipantsToThisBarterButAlsoPublishToTheGeneralPublicAllo(); String thisIsOnlyAMeetSampleYouCanInviteOtherParticipantsToThisMeetingButAlsoPublishToTheGeneralPublicAllow(); @@ -846,6 +929,8 @@ String thisIsOnlyAWikiPageSampleYouCanEditOrRenameItButAlsoAnyOtherUser(); + String thisIsTheDefaultContentOfTheGroupYouCannotDeleteItPleaseSelectOtherContentAsDefaultGroupContentBefor(); + String thisIsTheDefaultLicenseForAllTheContentsOfThisGroupAlthoughYouCanChooseADifferentLicenseForSpecificC(); String thisListIsNowRestrictedToThePublic(); @@ -896,6 +981,8 @@ String transparentAThemeName(); + String trash(); + String typeSomeKeywordThatDefineYourGroup(); String typeSomethingToSearchForUsersAndGroupsInParam(); @@ -990,6 +1077,8 @@ String youCanCollaborativelyEditThisDocumentWithTheMeetingMinutes(); + String youCanDropHereContentsToDeleteThen(); + String youCannotDisableThisToolBecauseItSWhereYourHomePageIsLocatedToDoThatYouHaveToSelectOtherContentAsThe(); String youCannotWriteToNonBuddies(); Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants.properties 2012-04-01 13:47:28 UTC (rev 1817) @@ -125,7 +125,7 @@ changeThisWorkspaceTheme = Change this workspace theme: selectAnImageFromYourComputerAsTheLogoForThisGroupForBestResultsUseANxnPixelImageBiggerImagesWillBeA = Select an image from your computer as the logo for this group. For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized. style = Style -currentBackgroundImage = Current background image: +currentBackgroundImage = Current background image: youCanAlsoUploadABackground = You can also upload a background: change = Change clear = Clear @@ -412,7 +412,9 @@ wikiPagesAreDocumentsThatCanBeEditedByAnyVisitorInParamInsteadOfOnlyByTheGroupThisAcceleratesUpdatin = Wiki-pages are Documents that can be edited by any visitor (in [%s]), instead of only by the group. This accelerates updating and construction errorSettingTheLogo = Error setting the logo signInOrCreateAnAccountToAccessToYourInbox = Sign in or create an account to access to your inbox -sorryThisGadgetHasProblemsWithItsnHeightWeHopeThisWillBeFixedSoonn = Sorry, this gadget has problems with its height. We hope this will be fixed soon +sorryThisGadgetHasProblemsWithItsnHeightWeHopeThisWillBeFixedSoonn = Sorry, this gadget has problems with its + height. We hope this will be fixed soon + addNewMember = Add new member typeTheNameOfTheUserAndSelectHimHer = Type the name of the user and select him/her: typeSomethingToSearchForUsersInParam = Type something to search for users in [%s] @@ -450,7 +452,7 @@ thereIsnTAnyList = There isn't any list thereIsnTAnyMeetingCreateOne = There isn't any meeting, create one thisFolderIsEmptyCreateSomeWikipageOrFolder = This folder is empty, create some wikipage or folder -thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Thanks for joining [%s]. Now you can actively participate in [%s]. You can also use your personal space to publish contents. +thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Thanks for joining [%s]. Now you can actively participate in [%s]. You can also use your personal space to publish contents. toHelpWithTheTranslationOfThisSoftwarePleaseContactBeforeWithThisSiteAdministrators = To help with the translation of this software please contact before with this site administrators. doYouWantToCollaborativelyEditYourMeetingMinutesInANewDocument = Do you want to collaboratively edit your meeting minutes in a new document? signInOrCreateAnAccountToGiveUsFeedback = Sign in or create an account to give us feedback @@ -465,10 +467,14 @@ inbox = Inbox today = Today goToToday = Go To Today +1Day = 1 Day +3Days = 3 Days previous = Previous +7Days = 7 Days month = Month next = Next userParamSaysParam = User [%s] says «[%s]» +0 = 0 signInOrCreateAnAccountToAccessToThisRoom = Sign in or create an account to access to this room editTheAppointment = Edit the appointment addAnAppointment = Add an appointment @@ -497,14 +503,19 @@ resetYourPassword = Reset your password pleaseEnterYourEmailAddressYouWillReceiveALinkToCreateANewPasswordViaEmail = Please enter your email address. You will receive a link to create a new password via email. newImage = New image -editThisToInsertResizeAndAnnotatenAnynImageFromTheWebTheImageCanBeAnnotatedDoubleClicknOnnItByAnyPar = Edit this to insert, resize and annotate any image from the web. The image can be annotated (double click on it) by any participant of this document +editThisToInsertResizeAndAnnotatenAnynImageFromTheWebTheImageCanBeAnnotatedDoubleClicknOnnItByAnyPar = Edit this to insert, resize and annotate + any + image from the web. The image can be annotated (double click + on + it) by any participant of this document + yourPasswordHasBeenResetSignIn = Your password has been reset. Sign in enterYourNewPasswordBelow = Enter your new password below. confirm = Confirm confirmPlease = Confirm please errorRenaming = Error renaming searching = Searching -thereIsnTAnyBarter = There isn't any barter. +thereIsnTAnyBarter = There isn't any barter. invalidAddressParam = Invalid address: [%s] errorCreatingGroup = Error creating group memberRejected = Member rejected @@ -516,4 +527,48 @@ eventsInParam = Events in [%s] participateInTheEditionOfThisPage = Participate in the edition of this page signInOrCreateAnAccountToSusbscribeToThisList = Sign in or create an account to susbscribe to this list -joinUsInParamPublicRoom = Join us in [%s] public room! \ No newline at end of file +joinUsInParamPublicRoom = Join us in [%s] public room! +thereIsnTAnyTask = There isn't any task +shareWithAdmins = Share with admins +shareWithAllGroupMembers = Share with all group members +shareWithCollaborators = Share with collaborators +newToThisToolHereThereIsSomeHelp = New to this tool? Here there is some help +nDay = [%d] Day +nDays = [%d] Days +invalidOperation = Invalid operation +backgroundChanged = Background changed +exportThisCalendar = Export this calendar +createANewMeeting = Create a New Meeting +english = English +shareThisWithGroupMembersEtc = Share this with group members, etc +allowAnyPersonToEditThis = Allow any person to edit this +share = Share +seemsThatTheListOfPartipantsWereAddedPartiallyPleaseRetry = Seems that the list of partipants were added partially. Please, retry +esperanto = Esperanto +sendedCheckYourEmailForTheVerificationLink = Sended. Check your email for the verification link. +newMessageWithEveryoneHere = New message with everyone here +copyThisToANewMessage = Copy this to a new message +spanish = Spanish +errorDuringRegistrationAccountAlreadyExists = Error during registration. Account already exists +clickToOpen = Click to open +clickToOpenDragAndDropToMoveThisToAnotherPlace = Click to open. Drag and drop to move this to another place +theTrashIsEmpty = The trash is empty +trash = trash +invalidConfirmationCode = Invalid confirmation code +errorAccessingThisDocumentPleaseContactTheAdministratorsProvidingThisReferenceParamAndAnyOtherReleva = Error accessing this document. Please contact the administrators providing this reference ([%s]) and any other relevant info. +allTheseMembersAreAlreadyPartipating = All these members are already partipating +sharedWithMembers = Shared with members +youCanDropHereContentsToDeleteThen = You can drop here contents to delete then +seeYourGroupsOrCreateANewOne = See your groups or create a new one +andNExternalUsers = and [%d] external users +russian = Russian +sharedWithGeneralPublicNowAnyoneCanParticipate = Shared with general public. Now anyone can participate +thisIsNotEmpty = This is not empty +thisIsTheDefaultContentOfTheGroupYouCannotDeleteItPleaseSelectOtherContentAsDefaultGroupContentBefor = This is the default content of the group, you cannot delete it. Please select other content as default group content before delete this +minimizeTheWorkspace = Minimize the workspace +maximizeTheWorkspace = Maximize the workspace +altTheAltKeyboardKey = Alt +signInToVerifyYourEmail = Sign in to verify your email +ctrlTheCtrlKeyboardKey = Ctrl +newEvent = New event +createANewEvent = Create a New Event Added: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_ca.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_ca.properties (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_ca.properties 2012-04-01 13:47:28 UTC (rev 1817) @@ -0,0 +1,479 @@ +# +# Autogenerated by trunk/bin/i18n-db2gwt.sh, please not edit directly +# + +chatWithThisGroupMember = Xatejar amb aquest membre del grup +chatWithYourBuddy = Xatejar amb el teu amic +addAsABuddy = Afegir com amic +chat = Xat ;) +oopsSomethingHasGoneWrongWithOurServersRetryLaterPlease = Uups! Alguna cosa ha anat malament amb els nostres servidors. Intenta-ho més tard, siusplau. +loading = Carregant +join = Unir-se +requestToJoinInThisGroup = Sol.licitud de Unió a aquest grup +leaveThisGroup = Deixa aquest grup +options = Opcions +newMembersPolicy = Nova política de membres +anyone = qualsevol +onlyMembers = només membres +moderateRequestToJoin = sol·licitud d'unió moderada +addANewBuddy = Afegir un nou amic +closedForNewMembers = tancat per membres nous +autoAcceptRequestToJoin = Auto acceptar sol·licitud d'unió +onlyAdministrators = només administradors +onlyYourBuddies = només els teus amics +onlyYou = només tú +groupMembers = Membres del grup +administrators = Administradors +collaborators = Col·laboradors +othersWhoCollaborateWithThisGroup = Altres que col.laboren amb aquest grup +thisIsAnOrphanedProjectIfYouAreInterestedInContributingPleaseRequestToJoin = Aquest és un projecte orfe, si estàs interessat en contribuïr si us plau sol.licita la unió +pending = Pendent +theMembersOfThisGroupAreNotPublic = Els membres d'aquest grup no són públics +changeToCollaborator = Canviar a col·laborador +changeToAdministrator = Canviar a administrador +removeThisMember = Treure aquest membre +visitThisGroupSHomepage = Visita la pàgina d'inici d'aquest grup +visitThisMemberSHomepage = Visita la pàgina d'inici d'aquest membre +acceptThisMember = Accepta aquest membre +rejectAsMember = Rebutja com a membre +visitYourHomepage = Visita la teva pàgina d'inici +visitHisHerHomepage = Visita la seva pàgina d'inici +hisHerNetwork = El seu/la seva red +buddies = Amics +joinsIn = S'uneix a +groupsWhichThisUserJoined = Grups als quals aquest usuari pertany +yourGroups = Els teus grups +yourHomepage = La teva pàgina d'inici +yourHomePageInParam = La teva pàgina d'inici en [%s] +groupAndPersonalSpaceWhereYouCanCreateAndPublishContentsForYourPersonalOrGroupWebSpaces = Grup i espai personal: On pots crear i publicar continguts per als teus espais personals o de grup +publicSpaceWhereYouCanSeeAPreviewOfHowYourPersonalOrGroupSpaceLooksLikeOnTheWeb = Espai públic: on pots veure una vista prèvia de com queda en la web el teu Espai Personal o de Grup +latestPublications = Últimes publicacions +stats = Estadístiques +registeredUsers = Usuaris registrats: +hostedGroups = Grups organitzats: +latestCreatedGroups = Últims grups creats +latestActivityInYourGroups = Última activitat als teus grups +tags = Etiquetes +keywordsOrTermsAssociatedWithThisGroup = Paraules clau o condicions associades a aquest grup +search = Recerca +close = Tanca +groupOptions = Opcions del grup +setYourGroupPreferencesHere = Estableix les teves preferencies de grup aquí +userOptions = Opcions d'usuari +helpWithTheTranslation = Ajudar amb la traducció +yourPreferences = Les teves preferences +giveUsFeedback = Dóna'ns resposta! +showHideTheChatWindow = Mostra/amaga la finestra del xat +setYourChatStatus = Estableix el teu estatus al Xat +available = Disponible +availableForChat = Disponible per xat +away = Fora +busy = Ocupat +signOutOfChat = Tanca la sessió del xat +groupSPublicChatRoom = Sala de Xat de Grup pública +enterToThisGroupPublicChatRoom = Entrar en aquesta cambra de xat pública +startAPublicAssemblyWithMembers = Comença una nova assamblea amb els membres +enterToThisGroupPublicChatRoomAndInviteMembers = Entrar en aquesta cambra de xat pública i invitar usuaris +reportKuneIssuesProblems = Reportar problemes de Kune +apacheWavePowered = Potenciat per Apache Wave +aboutKune = Sobre kune +errorsInfo = Informació d'errors +signInToCollaborate = Entra per col.laborar +pleaseSignInOrRegisterToGetFullAccessToParamToolsAndContents = Si us plau, entra o registra't per tenir accès complet a [%s] eines i continguts +signOut = Tanca la sessió +createNewGroup = Crea un Grup Nou +createANewGroupForYourInitiativeOrOrganizationNgoCollectiveAcademicGroup = Crea un nou grup per a la teva iniciativa o organització (ONG, col.lectiu, grup acadèmic...) +chatWithThisPerson = Xatejar amb aquesta persona +kuneDevelopmentSite = Lloc de desenvolupament de kune +andNExternalUser = i [%d] usuari extern +thisIsOnlyAPreviewOfHowThisPageWouldLookLikeToTheGeneralPublicOnTheInternet = Això és només una previsualització de com quedaria aquesta pàgina al públic general a internet. +preview = Vista prèvia +paramUnderLicenseParam = © [%s], sota llicència: [%s] +clickToRename = Click per renombrar +createANewDocumentIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb = Crear un Nou Document aquí. Si tries publicar-lo, aquest document apareixerà com una nova 'Pàgina' en la web pública +reloadCurrentPage = Recarrega la pàgina +newDocument = Nou document +goUpOpenTheContainerFolder = Anar a dalt: Obrir l'arxiu contenidor +edit = Editar +chatAbout = Xat sobre +chatAndCommentOnThis = Xatejar i comentar sobre això +nConversationsUnread = [%d] converses no llegides +memberAccepted = Membre acceptat +general = General +changeThisValues = Canvia aquests valors: +theNameMustBeBetween3And15LowercaseWesternCharactersAndOrNumbers = El nom pot ser entre 3 i 15 minúscules en caràcters occidentals i/o números +shortName = Nom curt +longName = Nom llarg +hereYouCanSelectTheToolsUsed = Aquí pots seleccionar les eines utilitzades: +choose = Escollir +changeThisWorkspaceTheme = Canvia aquest tema de l'espai de treball +selectAnImageFromYourComputerAsTheLogoForThisGroupForBestResultsUseANxnPixelImageBiggerImagesWillBeA = Selecciona una imatge del teu ordinador com a logo d'aquest grup. Per un millor resultat utilitza una imatge de [%d]x[%d] píxels. Imatges més grans serán redimensionades automàticament. +style = Estil +currentBackgroundImage = Actual imatge de fons: +change = Canviar +clear = Netejar +removeCurrentBackgroundImage = Treure la imatge actual de fons +selectAndConfigureThePublicSpaceThemeOfThisGroup = Selecciona i configura el tema de l'espai públic d'aquest grup: +clickToSelectAndConfigureThisTheme = Click per seleccionar i configurar aquest tema +redblackAThemeName = redblack +purpleAThemeName = lila +greenAThemeName = verd +highcontrastAThemeName = altcontrast +blackwhiteAThemeName = blackwhite +eurosurAThemeName = eurosur +campAThemeName = camp +defaultAThemeName = per defecte +blueAThemeName = blau +redAThemeName = vermell +greyAThemeName = gris +saharaAThemeName = sahara +pinkAThemeName = rosa +license = Llicència +enterLanguage = Introduir idioma +searching = Buscant... +yourLanguage = El teu idioma +name = Nom +security = Seguretat +changeYourPassword = Canvia la teva contrasenya: +currentPassword = Actual contrasenya +thePasswordMustBeBetween6And40Characters = La contrasenya ha de ser entre 6 i 40 caràcters +newPassword = Nova contrasenya +newPasswordRepeatIt = Nova contrasenya (repeteix-la) +changeIt = Canviar-ho +selectAnImageFromYourComputerAsYourAvatarForBestResultsUseANxnPixelImageBiggerImagesWillBeAutomatica = Selecciona una imatge del teu ordinador com a teu avatar. Per un millor resultat utilitza una imatge de [%d]x[%d] píxels. Imatges més grans serán redimensionades automàticament. +passwordChangedSuccessfully = Contrasenya canviada amb èxit +newGadget = Nou Gadget +voting = Votant +media = Mitjà +calendar = Calendari +others = Altres +thisDemoOfKune = aquesta demo de kune +paramBio = [%s] Bio +longTermTasks = Tasques a llarg termini +midTermTasks = Tasques a mitjà termini +shortTermUrgentTasks = Tasques (urgents) a curt termini +aLongTermTaskSample = Una mostra d'una tasca a llarg termini +thisIsOnlyATaskSampleYouCanEditItRenameIt = Això és només una tasca d'exemple. Pots editar-la, renomenar-la +aMidTermTaskSample = Una mostra d'una tasca a mitjà termini +aShortTermTaskSample = Una mostra de tasca a curt termini +wikiPageSample = Pàgina wiki d'exemple +thisIsOnlyAWikiPageSampleYouCanEditOrRenameItButAlsoAnyOtherUser = Això és només una pàgina wiki d'exemple. Pots editar-la o renomenar-la, però també qualsevol altre usuari. +blogSample = Exemple de Blog +aPostSample = Un post de mostra +thisIsOnlyAPostSampleYouCanEditItRenameThePostAndThisBlog = Això és només una publicació d'exemple. Pots editar-la, renomenar la publicació y aquest blog. +welcome = Benvingut +thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Gràcies per unir-te [%s]. Ara pots participar activament en [%s]. Pots també utilitzar el teu espai personal per a publicar continguts. Nota: el teu correu electrònic no està verficat, si us plau segueix les instruccions que rebràs per e-mail. +newTask = Nova tasca +createANewTask = Crea una tasca nova +doubleClickToOpen = Doble click per obrir +createANewFolder = Crear un nou arxiu +newTaskFolder = Nova carpeta de tasques +open = Obrir +delete = Suprimir +actions = Accions +connecting = Connectant +offline = Offline +newList = Nova llista +reloadThis = Recarrega això +createANewList = Crea una nova llista +yes = Si +confirmPlease = Confirmar, siusplau: +no = No +chatAboutParam = Xas sobre: [%s] +barterSample = Exemple d'intercanvis +thisIsOnlyABarterSampleYouCanInviteOtherParticipantsToThisBarterButAlsoPublishToTheGeneralPublicAllo = Això és només un trueque d'exemple. Pots convidar altres participants a aquest trueque, però també pots publicar-ho al públic en general, el que et permet compartir serveis, bèns, etc. +newBarter = Nou trueque +newFolder = Nou fitxer +createANewBarterHere = Crear un nou "trueque" aquí +newWikipage = Nova pàgina wiki +createANewFolderAFolderWillBeASectionInThePublicWeb = Crear un nou arxiu. L'arxiu serà una 'secció" en la web pública +createANewWikipageHereIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb = Crea una Nova Wikipàgina aquí. Si esculls publicar-la, aquest document apareixerá com una nova 'Pàgina' a la web pública +selectAsTheHomepage = Selecciona com a pàgina d'inici +registerANewGroup = Registra un grup nou +register = Registre +cancel = Cancel·lar +publicDescription = Descripció pública +groupTags = Etiquetes del grup +groupType = Tipus de grup +project = Projecte +organization = Organització +aProjectIsAKindOfGroupInWhichTheJoiningOfNewMembersIsModeratedByTheProjectAdministrators = Un projecte es una mena de grup en el qual la unió de nous membres es moderada per els administradors del projecte. +anOrganizationWorksTheSameWayAsAProjectExceptThatItMustBeALegalEntity = Una organització funciona de la mateixa manera que un projecte, excepte que ha de ser una entitat legal. +closed = Tancat +aClosedGroupIsAPrivateProjectWhichContentsAreOnlyAccessibleToItsMembersByDefault = El grup Tancat és un projecte privat, els continguts del qual son només accesibles als seus membres (per defecte). +community = Comunitat +aCommunityIsAGroupOfUsersWithSharedInterestsForInstanceTheEnvironmentalCommunityOrTheLgbtCommunityIt = Una comunitat és un grup d'usuaris amb interessos compartits (per exemple la comunitat mediambiental o la comunitat LGBT). Està oberta a qualsevol membre nou a que s'uneixi lliurement sense la moderació dels administradors. +paramCreatedNewContentCreatedForInstance = [%s] creat +notPublishedYet = Encara no Publicat +thisIsOnlyAPreviewOfHowThisWebpageWouldLookLikeToTheGeneralPublicOnTheInternet = Això és només una previsualització de com quedaria aquesta pàgina web al públic general a internet. +createANewDocumentHereIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb = Crear un Nou Document aquí. Si tries publicar-lo, aquest document apareixerà com una nova 'Pàgina' en la web pública +newPoll = Nova enquesta +newYesNoMaybeVoting = Nova Si/No/Potser/ + Votació +newAdvancedPoll = Nova Enquesta Avançada +newMeeting = Nova reunió +newYesNoMiniVoting = Nova Si/No/ Mini Votació +newMeetCoordination = Nova reunió de coordinació +newMap = Nou Mapa +newImageAndLetsAnnotate = Nova Imatge (i permet fer anotacions) +newYoutubeVideo = Nou vídeo de Youtube +newAlbum = Nou Album +newTwitterSearch = Nova recerca de twitter +newMindmap = Nou Mapa Mental +newBarter = Nou Trueque +newImagePainter = Pintor de la Nova Imatge +signIn = Entra +password = Contrasenya +donTHaveAnAccount = No tens un compte? +username = Nom d'usuari +email = Email +createOne = Crea un. +thisIsNotAValidEmail = No és un correu electrònic válid +newBlog = Nou blog +createANewBlog = Crear un blog nou +newPost = Nou post +createANewBlogPost = Crear un nou blog post +thisBlogHasnTAnyPostCreateOne = Aquest blog no té cap publicació, cre'an una +renaming = Renombrant +doYouWantToWriteUsWithSomePositiveOrNegativeFeedbackThisCanHelpUsToImproveTheseServices = Vols escriure'ns algun comentari positiu o negatiu? Això ens ajudarà a millorar aquests serveis +doYouWantToJoinThisGroup = Vols unir-te a aquest grup? +newRoom = Nova sala +createANewChatRoom = Crear una nova sala de xat +enterToThisRoom = Entrar en aquesta cambra +openTheConversationsArchiveOfThisRoom = Obrir el arxiu de converses d'aquesta sala +openArchive = Obrir archiu +aboutKuneTitleOfDialog = Sobre Kune +ok = Ok +processing = Processant +aboutParam = Sobre [%s] +meetingSample = Exemple de reunió +thisIsOnlyAMeetSampleYouCanInviteOtherParticipantsToThisMeetingButAlsoPublishToTheGeneralPublicAllow = Això és només una reunió d'exemple. Pots convidar altres participants a aquest trueque, però també pots publicar-ho al públic en general, per ajudar-te amb la organització, demanar i accelerar els events. +markAsDone = Marcar com Fet +createANewPost = Crea un nou post +makeThisListNotPublic = Fer que aquesta llista no sigui pública +subscribeToThisList = Subscriure's a aquesta llista +subscribe = Subscriure's +nSubscribedNPosts = [%d] subscrit, [%d] publicacions +confirmNewBuddy = Confirmar nou amic +paramCreatedSuccesfully = [%s] creat amb èxit +nRecentConversationsUnread = [%d] converses recents no llegides +oneRecentConversationUnread = Una conversa recent sense llegir +pleaseConfirm = Si us plau, confirma +startACollaborativeDocumentForTheMeetingMinutes = Començar un document col.laboratiu per als minuts de reunió? +meetingMinutesOfParamOnParam = Minuts de reunió de [%s] en [%s] +createANewMeetingHere = Crea una Nova Trobada aquí +thereIsnTAnyListCreateOne = No hi ha cap llista, crea'n una +create = Crear +areYouSure = Estàs segur? +welcomeToTheParamPublicChatRoom = Benvingut a la sala pública de xat [%s] +doYouWantToWriteUsWithSomePositiveOrNegativeFeedbackAboutParamThisCanHelpUsToImproveTheseServices = Vols escriure'ns algun comentari positiu o negatiu sobre [%s]? Això ens ajudarà a millorar aquests serveis +feedbackOfParam = Resposta de [%s] +editAndWriteHereYourFeedback = Editar i escriure aquí la teva resposta. +copyTheTextToTranslate = Copiar el text per traduir +notes = Notes: +clickAltpageupOrAltpagedownToMoveUpDownInTheListWhileTranslatingAndAltVToCopyTheOriginalTextTheTrans = Click Alt+PageUp o Alt+PageDown per moure adalt/abaix en la llista durant la traducció, i Alt-V per copiar el text original. Les traduccions es guarden automàticament +notTranslated = No traduït +recommendations = Recomanacions +helpToTranslateKune = Ajudar a traduir Kune +saving = Guardant +successUploading = Pujat exitosament +thereIsnTAnyTaskCreateOne = No hi ha cap tasca, crea'n una +searchTheUserYouWantToAddAndInHisHerHomepageClickAddAsABuddy = Cerca l'usuari que vols afegir i fes click a 'Afegir com amic' a la seva pàgina d'inici +doYouWantToWriteAMessageToTheMembersOfThisGroup = Vols escriure un missatge als membres d'aquest grup? +post = Publicació +thisIsEmpty = Això està buit. +documents = documents +thisFolderIsEmpty = Aquest fitxer està buit +barters = intercanvis +blogs = blogs +thereIsnTAnyBarter = No hi ha cap trueque +thereIsnTAnyBlogCreateOne = No hi ha cap blog, crea'n un +infoAboutErrors = Informació sobre els errors +chatrooms = Sales de Xat +events = events +pleaseCopyPasteThisInfoToReportProblems = Si us plau, copia/pega aquesta informació per avisar dels problemes +seeTheArchiveOfOldConversationsInDevelopment = Visualitza l'arxiu de converses antigues (en desenvolupament) +thereIsNothingPostedYetPostSomething = No hi ha res publicat encara. Publica alguna cosa +lists = llistes +thereIsnTAnyMeeting = No hi ha cap reunió +wiki = wiki +tasks = tasques +rightNowThePublicWebSpaceOfThisGroupItSUnderConstruction = Ara mateix, l'espai web públic d'aquest grup, és en construcció +paramTheDevelopment = [%s] el desenvolupament +pleaseSupport = Si us plau, ajuda +inDevelopment = (en desenvolupament) +chats = xats +theNameMustContainOnlyCharactersNumbersAndDashes = El nom pot incloure només caràcters, números i guions +chatroomCreated = Sala de Xat creada +doYouWantToWriteAMessageToYourBuddy = Vols escriure un missatge al teu amic? +error = Error +licenseWizard = Llicència de mag +backUsedInButton = « Enrere +nextUsedInButton = Següent » +select = Selecciona +finishUsedInButton = Finalitzar +selectTheLicenseYouPreferUsingForSharingYourGroupContentsWithOtherPeople = Selecciona la llicència que prefereixis utilitzar per compartir els continguts del teu grup amb l'altre gent. +copyleft = copyleft +whyDoWeNeedALicense = Perquè necessitem una llicència? +selectTheLicenseType = Selecciona el tipus de llicència: +commonLicensesForCulturalWorks = Llicències comuns per a treballs culturals +otherKindOfLicenses = Un altre tipus de llicències +selectACreativeCommonsLicenseRecommendedForCulturalWorks = Selecciona una llicència de Creative Commons (recomanat per als teus treballs culturals) +allowAnyUsesOfYourWorkIncludingCommercial = Permetre qualsevol ús del teu treball, inclòs l'ús comercial? +allowModificationsOfYourWork = Permetre modificacions del teu treball? +theLicensorPermitsOthersToCopyDistributeDisplayAndPerformOnlyUnalteredCopiesOfTheWork8212NotDerivati = La llicència permet als altres copiar, distriubir, display and perform només les còpies inalterades del treball +thisIsACopyleftLicense = Aquesta és una llicència copyleft. +thisIsNotACopyleftLicense = Això no és una llicència copyleft. +thisIsAppropriateForFreeCulturalWorks = Això és apropiat per a treballs culturals lliures. +thisIsNotAppropriateForFreeCulturalWorks = Això no és apropiat per a treballs culturals lliures. +reasonsNotToUseANonCommercialLicense = Raons per utilitzar una llicència no comercial +selectOtherKindOfLicenses = Selecciona un altra tipus de llicències: +selectLicense = Selecciona llicència +membershipRequestedWaitingForAdminsDecision = Afiliació sol·licitada. Esperant la decisió dels administradors +memberTypeChanged = Tipus de membre canviat +memberRemoved = Membre eliminat +contentNotFound = Contingut no trobat +onlyToAuthorizedTranslators = Només per traductors autoritzats +areYouSureYouWantThisItWillBeDeletedWithAllItsContents = Estàs segur que vols això? Serà esborrat amb tots els seus continguts. +doYouWantToWriteAMessageToTheAdministratorsOfThisGroup = Vols escriure un missatge als administradors d'aquest grup? +listCreated = Llista creada +makeThisListPublic = Fer que aquesta llista sigui pública +membersVisibilityChanged = Ha canviat la visibilitat dels membres +membersJoiningPolicyChanged = La política d'unió de membres ha canviat +moving = Movent +aContentWithTheSameNameAlreadyExistPleaseRenameIt = Ja existeix un contingut amb el mateix nom. Si us plau, renombra'l. +removedAsMember = Eliminat com a membre +addGadget = Afegir Gadget +theSocialNetworkOfThisUserIsNotPublic = La xarxa social d'aquest usuari no és pública +newDoc = Nou doc +clickToGoHereOrDropContentsHereToMoveThem = Click per anar aquí o arrossega els continguts aquí per moure'ls +markAsNotDone = Marcar com No Fet +more = Més +onlyForAuthorizedTranslators = Només per traductors autoritzats +hereYouCanCreateOrUploadYourPersonalGroupOrPublicDocumentsTheseDocumentsCanBeEditedAndCommentedColla = Aquí pots crear o carregar els teus documents personals, de grup o públics. Aquests documents poden ser editats i comentats colaborativament i a la vegada. Aquests documents poden ser pàgines estàtiques a la teva web si les publiques +blogsAreAChronologicalListOfPostsOrderedByDateAboutASpecificTopicEachPostCanBeCommentedByTheVisitors = Els Blogs son un llistat cronològic de posts (ordenats per dates) sobre una tema específic. Cada post pot ser comentat pels visitants +aDecentralizedWayToOfferOrAskForServicesAndGoodsToYourGroupsOrToAnyoneBarteringMeansTheExchangeOfGoo = Una manera descentralitzada d'oferir (o demanar) béns i serveis als teus grups o a qualsevol. "L'intercanvi" vol dir l'intercanvi de béns per l'acord de dues persones +listsBehaveLikeAMailingListOrAForumYouCanSubscribeAndDiscussAboutSpecificTopics = Les llistes es comporten com una llista d'email o un fòrum. Et pots subscriure i discutir sobre temes específics +aCollaborativeToDoListForTheGroupAnyGroupMemberCanParticipateInAnyProposedTaskAddOthersToATaskCommen = La llista col.laborativa TO-DO per al grup. Qualsevol membre del grup pot participar a qualsevol tasca proposada, afegir altres a una tasca, comentar-les, afegir informació, etc +aCalendarToScheduleActivitiesAndEvents = Un calendari per programar activitats o events +aRoomWhereYouCanHaveAGroupChatWithManyUsersAtOnceRoomsCanBePublicOrPrivateUsersCanBeFromParamOrOther = Una 'habitació' on pots tenir un grup de xat amb molts usuaris a la vegada. Els usuaris poden ser de [%s] o altres llocs (compatible amb el xat de gmail) +errorSettingTheLogo = Error ajustant el logo +signInOrCreateAnAccountToAccessToYourInbox = Entra o crea un compte per accedir a la teva safata d'entrada +sorryThisGadgetHasProblemsWithItsnHeightWeHopeThisWillBeFixedSoonn = Disculpa, aquest gadget té problemes amb la seva alçada. Esperem solucionar-ho aviat +addNewMember = Afegir nou membre +doubleClickToOpenDragAndDropToMoveThisToAnotherPlace = Doble click per obrir. Arrossega i deixa anar per moure això a un altre lloc +theUsernamePasswordIsIncorrect = El nom d'usuari/contrasenya és incorrecte +subscribed = Subscrit +doYouWantToAddParamToYourContacts = Vols afegir '[%s]' als teus contactes? +postCreatedEditIt = Publicació creada. Edita-la +pleaseSignInOrRegisterToCreateAGroup = Si us plau, entra o registra't per crear un grup +signInOrCreateAnAccountToParticipateInThisGroup = Entra o crea un compte per participar en aquest grup +nowadaysTheGadgetsMapsPollsEtcAreExperimentalInSomeBrowsersYouMightExperienceProblemsWithCertainGadg = Avui día els gadgets (mapes, enquestes, etc) son experimentals. En alguns navegadors pots experimentar problemes amb alguns gagdets +errorConfiguringTheTool = Error configurant l'eina +signInOrRegisterToHelpWithTheTranslation = Entra o registra't per ajudar amb la traducció +doYouWantToAddParamAsAMemberOfParam = Vols afegir '[%s]' com a membre de '[%s]'? +memberAddedAsCollaborator = Membre afegit com col·laborar +thisEmailAddressIsBeingUsedByAnotherUserPleaseTryWithAnotherOne = Aquesta direcció de correu electrònic està sent utilitzada per un altre usuari. Si us plau, prova amb una altra. +nameOfTheNewChatroom = Nom de la nova sala de xat? +nameOfTheNewList = Nom de la nova llista? +serverErrorSavingTheTranslation = Error de servidor guardant la traducció +thisBlogHasnTAnyPost = Aquest blog no té cap publicació +thereIsnTAnyBlog = No hi ha cap blog +thisFolderIsEmptyYouCanCreateSomeDocumentOrFolderHere = Aquest fitxer està buit. Pots crear algún document o fitxer aquí. +thereIsnTAnyBarterYouCanCreateSomeHere = No hi ha cap trueque. Pots crear algún aquí +thereIsNothingPostedYet = No hi ha res publicat encara +homePageOfParam = Inici de [%s] +thereIsnTAnyList = No hi ha cap llista +thereIsnTAnyMeetingCreateOne = No hi ha cap reunió, crea'n una +thisFolderIsEmptyCreateSomeWikipageOrFolder = Aquest fitxer està buit, crea algún wikipage o fitxer +thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Gràcies per unir-te [%s]. Ara pots participar activament en [%s]. Pots també utilitzar el teu espai personal per a publicar continguts. +doYouWantToCollaborativelyEditYourMeetingMinutesInANewDocument = Vols editar els teus minuts de trobada en un nou document? +signInOrCreateAnAccountToGiveUsFeedback = Entra o crea un compte per enviar-nos una resposta +paramCreatedSuccesfully = '[%s]' creat amb èxit +doYouWantToReloadThisPageToUseParamLanguage = Vols recarregar aquesta pàgina per utilitzar '[%s]' idioma? +participate = Participa +noResults = No hi ha resultats +newMeetPlaner = Nova reunió de planificació +home = Inici +inbox = Safata d'entrada +goToToday = Anar a Avui +1Day = 1 Día +3Days = 3 Dies +previous = Anterior +7Days = 7 Dies +month = Mes +next = Següent +0 = 0 +signInOrCreateAnAccountToAccessToThisRoom = Entra o crea un compte per accedir a aquesta sala +editTheAppointment = Editar el nomenament +addAnAppointment = Afegir un nomenament +removeThisAppointment = Treure aquest nomenament +emailNotifications = Notificacions d'email +esteBlogNoTieneNingnPostCreaUno = Aquest bloc no té cap post, crea un +noHayListasCrearUna = No hi ha llistes, crea una +noSeHaPublicadoNadaTodavaPublicaAlgo = No s'ha publicat res encara. Publica alguna cosa +descriptionOfTheAppointment = Descripció del nomenament +add = Afegir +pleaseSignInAgain = Si us plau, entra una altra vegada +lostYourPassword = Has perdut la contrasenya? +howOftenDoYouWantToReceiveEmailNotifications = Amb quina freqüència vols rebre notificacions per e-mail? +almostImmediately = quasi immediatament +atMostHourly = com a màxim cada hora +atMostDaily = com a màxim diariament +iDonTNeedEmailNotifications = No necessito notificacions per e-mail +resendVerificationEmail = Reenviar e-mail de verificaci +otherErrorTryingToVerifyYourPassword = Un altre error intentant verificar la teva contrasenya +emailConfirmationCodeExpired = El codi de confirmació de l'e-mail ha caducat +resetYourPassword = Redefinir la teva contrasenya +pleaseEnterYourEmailAddressYouWillReceiveALinkToCreateANewPasswordViaEmail = Si us plau, introduexi el teu correu electrònic. Rebrás un enllaç per a crear una nova contrasenya vía e-mail. +newImage = Nova imatge +editThisToInsertResizeAndAnnotatenAnynImageFromTheWebTheImageCanBeAnnotatedDoubleClicknOnnItByAnyPar = Editar per insertar, redimensionar i anotar qualsevol image desde la web. La imatge pot ser anotada (doble click a sobre) per qualsevol participant d'aquest document +yourPasswordHasBeenResetSignIn = La teva contrasenya s'ha restablert. Entra +enterYourNewPasswordBelow = Introduir la nova contrasenya a continuació: +confirm = Confirmar +confirmPlease = Confirmar siusplau +errorRenaming = Error renombrant +searching = Buscant +thereIsnTAnyBarter = No hi ha cap trueque. +invalidAddressParam = Direcció incorrecta: [%s] +errorCreatingGroup = Error creant el grup +memberRejected = Membre rebutjat +invalidEmail = E-mail incorrecte +onlyMembersCanUpdateEvents = Només els membres poden actualitzar els events +backgroupChanged = Backgroup canviat +checkYourEmailForTheConfirmationLink = Revisa el teu email per l'enllaç de confirmació +openTheAppointment = Obrir la cita +eventsInParam = Events en [%s] +participateInTheEditionOfThisPage = Participa en l'edició d'aquesta pàgina +signInOrCreateAnAccountToSusbscribeToThisList = Entra o crea un compte per subscriure't a aquesta llista +joinUsInParamPublicRoom = Unir-se a [%s] sala pública! +thereIsnTAnyTask = No hi ha cap tasca +shareWithAdmins = Comparteix amb els administradors +shareWithAllGroupMembers = Comparteix amb tots els membres del grup +shareWithCollaborators = Comparteix amb els col.laboradors +newToThisToolHereThereIsSomeHelp = Nou amb aquesta eina? Aquí hi tens ajuda +nDay = [%d] Dia +nDays = [%d] Dies +invalidOperation = Operació invàlida +backgroundChanged = Fons canviat +exportThisCalendar = Exporta aquest calendari +createANewMeeting = Crea una Nova Reunió +english = Anglès +shareThisWithGroupMembersEtc = Comparteix això amb els membres del grup, etc +allowAnyPersonToEditThis = P +share = Comparteix +seemsThatTheListOfPartipantsWereAddedPartiallyPleaseRetry = Sembla que el llistat de participants va ser afegit parcialment. Si us plau, reintenta +esperanto = Esperanto +sendedCheckYourEmailForTheVerificationLink = Enviat. Revisa el teu correu electrònic per a l'email de verificació +newMessageWithEveryoneHere = Nou missatge amb tots aquí +copyThisToANewMessage = Copia això a un nou missatge +spanish = Espanyol +errorDuringRegistrationAccountAlreadyExists = Error durant el registre. Aquest compte ja existeix +clickToOpen = Click per obrir +clickToOpenDragAndDropToMoveThisToAnotherPlace = Click para abrir +theTrashIsEmpty = La paperera és plena +invalidConfirmationCode = Codi de confirmació invàlid +errorAccessingThisDocumentPleaseContactTheAdministratorsProvidingThisReferenceParamAndAnyOtherReleva = Error d'accès a aquest document. Si us plau, contacta amb els administradors facilitant aquesta referència ([%s]) i qualsevol altra informació rellevant. +allTheseMembersAreAlreadyPartipating = Todos estos miembros ya están participando +sharedWithMembers = Compartit amb els membres +altTheAltKeyboardKey = Alt +ctrlTheCtrlKeyboardKey = Ctrl Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_es.properties 2012-04-01 13:47:28 UTC (rev 1817) @@ -75,7 +75,7 @@ userOptions = Opciones de usuario/a helpWithTheTranslation = Ayuda con la traducción yourPreferences = Tus preferencias -giveUsFeedback = ¡Danos feedback! +giveUsFeedback = ¡Danos tu opinión! writeUsWithSomeFeedbackForHelpUsToImproveTheseServices = Escríbenos con tu feedback para ayudarnos a mejorar estos servicios showHideTheChatWindow = Mostrar/Ocultar la ventana de chat setYourChatStatus = Establecer tu estado de chat @@ -130,7 +130,7 @@ change = Cambiar clear = Quitar removeCurrentBackgroundImage = Quita la imagen actual de fondo -selectAndConfigureThePublicSpaceThemeOfThisGroup = Selecciona y configura el tema del espacio público de este grupo: +selectAndConfigureThePublicSpaceThemeOfThisGroup = Selecciona y configura el tema del espacio público de este grupo: clickToSelectAndConfigureThisTheme = Pulsa para configurar y seleccionar este tema redblackAThemeName = rojinegro purpleAThemeName = violeta @@ -403,13 +403,13 @@ youDidNotSignInSoYouCanJustSeeSomePublicContentsInParamButNotEditOrCollaborateWithOthersPleaseParamO = No te has registrado o autenticado, así que solo podrás ver ciertos contenidos públicos de [%s], pero no podrás editar ni colaborar con otras personas. Por favor [%s] o [%s] para tener acceso total a las herramientas y contenidos de [%s] onlyForAuthorizedTranslators = Solo para traductores autorizados hereYouCanCreateOrUploadYourPersonalGroupOrPublicDocumentsTheseDocumentsCanBeEditedAndCommentedColla = Aquí puedes crear o subir tus documentos personales, grupales o públicos. Esos documentos pueden ser editados y comentados simultáneamente por otras personas. Esos documentos pueden ser páginas estáticas en vuestra web si los publicáis -blogsAreAChronologicalListOfPostsOrderedByDateAboutASpecificTopicEachPostCanBeCommentedByTheVisitors = Los Blogs son una lista cronológica de mensajes publicados (ordenados por la fecha) sobre un tema específico. Cada mensaje publicado puede ser comentado por los lectores +blogsAreAChronologicalListOfPostsOrderedByDateAboutASpecificTopicEachPostCanBeCommentedByTheVisitors = Los Blogs son una lista cronológica de mensajes publicados (ordenados por la fecha) sobre un tema específico. Cada mensaje publicado puede ser comentado por los lectores aDecentralizedWayToOfferOrAskForServicesAndGoodsToYourGroupsOrToAnyoneBarteringMeansTheExchangeOfGoo = Una forma descentralizada de ofrecer (y solicitar) servicios y bienes a tus grupos o a cualquiera. El trueque es el intercambio de bienes a través del acuerdo de dos personas listsBehaveLikeAMailingListOrAForumYouCanSubscribeAndDiscussAboutSpecificTopics = Las listas se comportan como una lista de distribución o un foro. Puedes suscribirte y debatir sobre un tema específico aCollaborativeToDoListForTheGroupAnyGroupMemberCanParticipateInAnyProposedTaskAddOthersToATaskCommen = Una lista colaborativa de tareas por hacer por el grupo. Cualquier miembro del grupo puede participar en las tareas propuestas, comentarlas, añadir información, etc aCalendarToScheduleActivitiesAndEvents = Un calendario para programar actividades y eventos aRoomWhereYouCanHaveAGroupChatWithManyUsersAtOnceRoomsCanBePublicOrPrivateUsersCanBeFromParamOrOther = Una 'sala' donde puedes tener una conversación en grupo con muchos/as usuarios/as al mismo tiempo. Las salas pueden ser privadas o públicas. Los/as usuarios/as pueden ser de [%s] o de otros sitios (es compatible con el chat de gmail). -wikiPagesAreDocumentsThatCanBeEditedByAnyVisitorInParamInsteadOfOnlyByTheGroupThisAcceleratesUpdatin = Las páginas Wiki son documentos que pueden ser editados por cualquier usuario/a (de [%s]) en vez de solo por el grupo. Este acelera su actualización y construcción +wikiPagesAreDocumentsThatCanBeEditedByAnyVisitorInParamInsteadOfOnlyByTheGroupThisAcceleratesUpdatin = Las páginas Wiki son documentos que pueden ser editados por cualquier usuario/a (de [%s]) en vez de solo por el grupo. Esto acelera su actualización y construcción errorSettingTheLogo = Error configurando el logo signInOrCreateAnAccountToAccessToYourInbox = Entra o créate una cuenta para acceder a tu carpeta de entrada sorryThisGadgetHasProblemsWithItsnHeightWeHopeThisWillBeFixedSoonn = Lo sentimos, este gadget tiene problemas con su altura. Esperamos solucionar este problema pronto @@ -450,7 +450,7 @@ thereIsnTAnyList = No hay ninguna lista thereIsnTAnyMeetingCreateOne = No hay ningún encuentro, crea uno thisFolderIsEmptyCreateSomeWikipageOrFolder = Esta carpeta está vacía, crea alguna página wiki o carpeta -thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Gracias por apuntarte [%s]. Ahora ya puedes participar activamente en [%s]. Puedes usar también tu espacio personal para publicar contenidos. +thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Gracias por unirte a [%s]. Ahora puedes participar activamente en [%s]. Puedes usar también tu espacio personal para publicar contenidos. toHelpWithTheTranslationOfThisSoftwarePleaseContactBeforeWithThisSiteAdministrators = Para ayudar con la traducción de este software contacta por favor antes con las adminitradoras de este sitio. doYouWantToCollaborativelyEditYourMeetingMinutesInANewDocument = ¿Quieres editar las actas de tu encuentro de forma colaborativa en un nuevo documento? signInOrCreateAnAccountToGiveUsFeedback = Entra o crea una cuenta para darnos feedback @@ -480,6 +480,7 @@ emailNotifications = Notificaciones por correo esteBlogNoTieneNingnPostCreaUno = Este blog no tiene ningún post, crea uno noHayListasCrearUna = No hay listas, crea una +noSeHaPublicadoNadaTodavaPublicaAlgo = No se ha publicado nada todavía. Publica algo descriptionOfTheAppointment = Descripción de la cita add = Añadir pleaseSignInAgain = Entra de nuevo, por favor @@ -516,7 +517,51 @@ backgroupChanged = Fondo cambiado checkYourEmailForTheConfirmationLink = Comprueba tu correo para el enlace de confirmación openTheAppointment = Abre el evento -eventsInParam = Eventos en [%s] +eventsInParam = Eventos el [%s] participateInTheEditionOfThisPage = Participa en la edición de esta página signInOrCreateAnAccountToSusbscribeToThisList = Entra o regístrate para suscribirte a esta lista -joinUsInParamPublicRoom = ¡Unete a nosotros en la sala pública de [%s]! \ No newline at end of file +joinUsInParamPublicRoom = ¡Unete a nosotros en la sala pública de [%s]! +thereIsnTAnyTask = No hay ninguna tarea +shareWithAdmins = Comarte con los/as administradoræs +shareWithAllGroupMembers = Comparte con todos los miembros del grupo +shareWithCollaborators = Comparte con los/as colaboradoræs +newToThisToolHereThereIsSomeHelp = ¿Nuevo con esta herramienta? Aquí hay un poco de ayuda +nDay = [%d] Día +nDays = [%d] Días +invalidOperation = Operación invalida +backgroundChanged = Fondo de pantalla cambiado +exportThisCalendar = Exporta este calendario +createANewMeeting = Crea un Nuevo Evento +english = Inglés +shareThisWithGroupMembersEtc = Compartir con los miembros del grupo, etc +allowAnyPersonToEditThis = Permite a cualquier persona editar esto +share = Compartir +seemsThatTheListOfPartipantsWereAddedPartiallyPleaseRetry = Parece que la lista de participantes se ha añadido parcialmente. Por favor, reinténtalo +esperanto = Inglés +sendedCheckYourEmailForTheVerificationLink = Enviado. Comprueba el enlace de verificación en tu correo electrónico. +newMessageWithEveryoneHere = Nuevo mensaje con todos/as los de aquí +copyThisToANewMessage = Copia esto en un nuevo mensaje +spanish = Español +errorDuringRegistrationAccountAlreadyExists = Error en el registro. La cuenta ya existe +clickToOpen = Pulsa para abrir +clickToOpenDragAndDropToMoveThisToAnotherPlace = Pulsa para abrir. Arrastra y suelta para mover esto a otro sitio +theTrashIsEmpty = La papelera está vacía +trash = papelera +invalidConfirmationCode = Código de confirmación inválido +errorAccessingThisDocumentPleaseContactTheAdministratorsProvidingThisReferenceParamAndAnyOtherReleva = Error de acceso a este documento. Por favor contacta con los administradores proporcionando este referencia ([%s]) y cualquier otra información relevante. +allTheseMembersAreAlreadyPartipating = Todos estos miembros ya están participando +sharedWithMembers = Compartido con los miembros +youCanDropHereContentsToDeleteThen = Puedes arrastrar contenidos aquí para borrarlos +seeYourGroupsOrCreateANewOne = Ver tus grupos o crear uno nuevo +andNExternalUsers = y [%d] usuarias/os externas/os +russian = Ruso +sharedWithGeneralPublicNowAnyoneCanParticipate = Compartido con público general. Ahora cualquiera puede participar +thisIsNotEmpty = No esta vacío +thisIsTheDefaultContentOfTheGroupYouCannotDeleteItPleaseSelectOtherContentAsDefaultGroupContentBefor = Este es el contenido por defecto de tu grupo, no puedes borrarlo. Por favor selecciona otro contenido por defecto antes de borrar este +minimizeTheWorkspace = Minimiza el escritorio +maximizeTheWorkspace = Maximiza el escritorio +altTheAltKeyboardKey = Alt +signInToVerifyYourEmail = Entra para verificar tu correo +ctrlTheCtrlKeyboardKey = Ctrl +newEvent = Nuevo evento +createANewEvent = Crea un nuevo evento Modified: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_fr.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_fr.properties 2012-04-01 11:25:44 UTC (rev 1816) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_fr.properties 2012-04-01 13:47:28 UTC (rev 1817) @@ -36,7 +36,7 @@ thisIsAnOrphanedProjectIfYouAreInterestedInContributingPleaseRequestToJoin = Ceci est un projet orphelin, si vous désirez contribuer merci de demander à le rejoindre pending = En attente theMembersOfThisGroupAreNotPublic = Les membres de ce groupe ne sont pas publics -usersPendingToBeAcceptedInThisGroupByTheAdministrators = Utilisateurs en attente d'être acceptés dans ce groupe par les administrateurs +usersPendingToBeAcceptedInThisGroupByTheAdministrators = Utilisateurs en attente d'être acceptés dans ce groupe par les administrateurs changeToCollaborator = Changer vers collaborateur changeToAdministrator = Changer vers administrateur removeThisMember = Retirer ce membre @@ -93,7 +93,7 @@ aboutKune = À propos de kune errorsInfo = Informations sur l'erreur signInToCollaborate = Connectez-vous pour collaborer -pleaseSignInOrRegisterToGetFullAccessToParamToolsAndContents = Merci de vous connecter ou de vous inscrire pour avoir un accès complet aux outils et contenus de [%s] +pleaseSignInOrRegisterToGetFullAccessToParamToolsAndContents = Merci de vous connecter ou de vous inscrire pour avoir un accès complet aux outils et contenus de [%s] signOut = Se déconnecter createNewGroup = Créer un Nouveau Groupe createANewGroupForYourInitiativeOrOrganizationNgoCollectiveAcademicGroup = Créer un nouveau groupe pour votre initiative ou organisation (ONG, collectif, groupe académique, ...) @@ -115,7 +115,7 @@ memberAccepted = Membre accepté general = Général changeThisValues = Changer ces valeurs : -theNameMustBeBetween3And15LowercaseWesternCharactersAndOrNumbers = Le nom doit comprendre entre 3 et 15 caractères européens en bas de casse et/ou des chiffres +theNameMustBeBetween3And15LowercaseWesternCharactersAndOrNumbers = Le nom doit comprendre entre 3 et 15 caractères européens en bas de casse et/ou des chiffres shortName = Nom court longName = Nom long tools = Outils @@ -184,7 +184,7 @@ aPostSample = Un exemple de post thisIsOnlyAPostSampleYouCanEditItRenameThePostAndThisBlog = Ceci est seulement un exemple d'article. Vous pouvez le modifier, renommer l'article et ce blog welcome = Bienvenue -thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Merci de rejoindre [%s]. Vous pouvez désormais participer activement à [%s]. Vous pouvez aussi utiliser votre espace personnel pour publier des contenus. Note : +thanksForJoiningParamNowYouCanActivelyParticipateInParamYouCanAlsoUseYourPersonalSpaceToPublishConte = Merci de rejoindre [%s]. Vous pouvez désormais participer activement à [%s]. Vous pouvez aussi utiliser votre espace personnel pour publier des contenus. Note : thisUserHasNoBuddiesYet = Cet utilisateur n'a pas encore de contact newTask = Nouvelle tâche createANewTask = Créer une nouvelle tâche @@ -201,7 +201,7 @@ createANewList = Créer une nouvelle liste yes = Oui confirmPlease = Confirmez, s'il vous plaît : -thisWillOpenASpecificChatroomToChatAboutThisPageOrDocumentItSUsefulToChatWithOthersAboutSomethingWhi = Ceci ouvrira une salle de discussion spécifique au sujet de cette page ou document (c'est utile de discuter avec les autres au sujet de ce qu'on est en train de lire ou d'écrire). Etes-vous sûr ? +thisWillOpenASpecificChatroomToChatAboutThisPageOrDocumentItSUsefulToChatWithOthersAboutSomethingWhi = Ceci ouvrira une salle de discussion spécifique au sujet de cette page ou document (c'est utile de discuter avec les autres au sujet de ce qu'on est en train de lire ou d'écrire). Etes-vous sûr ? no = Non chatAboutParam = Discuter à propos de : [%s] barterSample = example de troc @@ -283,12 +283,12 @@ paramHadAddedYouAsABuddyDoYouWantToAddHimHerAlso = [%s] vous a ajouté comme contact. Voulez-vous aussi l'ajouter ? paramCreatedSuccesfully = [%s] créé avec succès nRecentConversationsUnread = [%d] conversations récentes non lues -writeUsWithSomeFeedbackForHelpUsToImproveTheServicesOnParam = Envoyez-nous des retours pour nous aider à améliorer les services de [%s] +writeUsWithSomeFeedbackForHelpUsToImproveTheServicesOnParam = Envoyez-nous des retours pour nous aider à améliorer les services de [%s] oneRecentConversationUnread = Une conversation récente non lue pleaseConfirm = Merci de confirmer startACollaborativeDocumentForTheMeetingMinutes = Démarrer un document collaboratif pour les minutes de la réunion ? meetingMinutesOfParamOnParam = Minutes de la réunion de [%s] sur [%s] -youCanCollaborativelyEditThisDocumentWithTheMeetingMinutes = Vous pouvez modifier collaborativement ce document contenant les minutes de la réunion +youCanCollaborativelyEditThisDocumentWithTheMeetingMinutes = Vous pouvez modifier collaborativement ce document contenant les minutes de la réunion createANewMeetingHere = Créer une nouvelle réunion ici thereIsnTAnyListCreateOne = Il n'y a aucune liste, en créer une create = Créer @@ -404,9 +404,9 @@ onlyForAuthorizedTranslators = Seulement pour les traducteurs autorisés hereYouCanCreateOrUploadYourPersonalGroupOrPublicDocumentsTheseDocumentsCanBeEditedAndCommentedColla = Ici vous pouvez créer ou mettre en ligne vos documents personnels, de groupe ou publics. Ces documents peuvent être édités et commentés de manière collaborative et simultanément. Ces docs peuvent être des pages statiques blogsAreAChronologicalListOfPostsOrderedByDateAboutASpecificTopicEachPostCanBeCommentedByTheVisitors = Les blogs sont des listes chronologiques d'articles (rangé par date) sur un thème spécifique. Chaque article peut être commenté par les visiteurs -aDecentralizedWayToOfferOrAskForServicesAndGoodsToYourGroupsOrToAnyoneBarteringMeansTheExchangeOfGoo = Une manière décentralisée d'offrir (ou de demander) des biens et des services à vos groupes ou à n'importe qui. "Troc" signifie l'échange de biens ou de services par l'accord de deux personnes. +aDecentralizedWayToOfferOrAskForServicesAndGoodsToYourGroupsOrToAnyoneBarteringMeansTheExchangeOfGoo = Une manière décentralisée d'offrir (ou de demander) des biens et des services à vos groupes ou à n'importe qui. "Troc" signifie l'échange de biens ou de services par l'accord de deux personnes. listsBehaveLikeAMailingListOrAForumYouCanSubscribeAndDiscussAboutSpecificTopics = Les listes fonctionnent comme une liste de discussion ou un forum. Vous pouvez vous inscrire et discuter à propos de sujets particuliers -aCollaborativeToDoListForTheGroupAnyGroupMemberCanParticipateInAnyProposedTaskAddOthersToATaskCommen = Une liste de TODOs collaborative pour le groupe. Tout membre du groupe peut participer à toute tâche proposée, ajouter d'autres membres pour une tâche, les commenter, ajouter des infos, etc. +aCollaborativeToDoListForTheGroupAnyGroupMemberCanParticipateInAnyProposedTaskAddOthersToATaskCommen = Une liste de TODOs collaborative pour le groupe. Tout membre du groupe peut participer à toute tâche proposée, ajouter d'autres membres pour une tâche, les commenter, ajouter des infos, etc. aCalendarToScheduleActivitiesAndEvents = Un calendrier pour planifier les activités et les événements aRoomWhereYouCanHaveAGroupChatWithManyUsersAtOnceRoomsCanBePublicOrPrivateUsersCanBeFromParamOrOther = Une 'salle' où vous pouvez tenir une discussion collective avec plusieurs utilisateurs à la fois. Les salles peuvent être publiques ou privées. Les utilisateurs peuvent être de [%s] ou d'autres sites (compatible avec le chat gmail) wikiPagesAreDocumentsThatCanBeEditedByAnyVisitorInParamInsteadOfOnlyByTheGroupThisAcceleratesUpdatin = Les pages wiki sont des Documents qui peuvent être édité par tout visiteur (de [%s]), au lieu seulement du groupe. Cela accélère la mise à jour et la construction @@ -425,7 +425,7 @@ doYouWantToAddParamToYourContacts = Voulez-vous ajouter '[%s]' à vos contacts ? youAreTryingToMoveThisToTheSameLocation = Vous essayez de déplacer ceci au même endroit postCreatedEditIt = Article créé. Modifiez-le -pleaseSignInOrRegisterToCreateAGroup = S'il vous plaît, connectez-vous ou enregistrez-vous pour créer un groupe +pleaseSignInOrRegisterToCreateAGroup = S'il vous plaît, connectez-vous ou enregistrez-vous pour créer un groupe signInOrCreateAnAccountToParticipateInThisGroup = Connectez-vous ou créez un compte pour participer à ce groupe thisNameInAlreadyInUsePleaseTryWithADifferentName = Ce nom est déjà utilisé. Merci d'essayer avec un nom différent nowadaysTheGadgetsMapsPollsEtcAreExperimentalInSomeBrowsersYouMightExperienceProblemsWithCertainGadg = Les gadgets (cartes, sondages, etc) sont encore expérimentaux. Dans certains navigateurs, vous pourrez avoir des problèmes avec certains gadgets @@ -472,6 +472,7 @@ month = Mois next = Suivant userParamSaysParam = L'utilisateur [%s] dit « [%s] » +0 = 0 signInOrCreateAnAccountToAccessToThisRoom = Connectez-vous ou créez un compte pour accéder à cet espace editTheAppointment = Editer le rendez-vous addAnAppointment = Ajouter un rendez-vous @@ -512,4 +513,4 @@ errorCreatingGroup = Erreur lors de la création du groupe memberRejected = Membre rejeté invalidEmail = Adresse de courriel non erronée -onlyMembersCanUpdateEvents = Seuls les membres peuvent mettre à jour les événements \ No newline at end of file +onlyMembersCanUpdateEvents = Seuls les membres peuvent mettre à jour les événements Added: trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_it.properties =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_it.properties (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/KuneConstants_it.properties 2012-04-01 13:47:28 UTC (rev 1817) @@ -0,0 +1,169 @@ +# +# Autogenerated by trunk/bin/i18n-db2gwt.sh, please not edit directly +# + +chatWithThisGroupMember = Chatta con questo membro del gruppo +chatWithYourBuddy = Chatta con il tuo collega +addAsABuddy = Aggiungere come collega +chat = Chat ;) +anyone = qualsiasi +addANewBuddy = Aggiungere un collega +closedForNewMembers = Chiuso per nuovi membri +autoAcceptRequestToJoin = autoaccettare le richieste di patecipazione +groupMembers = Membri del gruppo +administrators = Amministratori/trici +collaborators = Collaboratori/trici +changeToCollaborator = Cambiare a collaboratore/trice +changeToAdministrator = Cambiare amministratore/trice +acceptThisMember = Accettare come membro +buddies = colleghi +groupsWhichThisUserJoined = Gruppi nei quali questo membro partecipa +groupAndPersonalSpaceWhereYouCanCreateAndPublishContentsForYourPersonalOrGroupWebSpaces = Spazio personale e gruppale: Dove puoi creare e pubblicare contenuti per il tuo spazio web personale o gruppale +close = Chiudere +groupOptions = Opzioni del gruppo +helpWithTheTranslation = Aiuto alla traduzione +giveUsFeedback = Darci feedback! +available = Disponibile +availableForChat = Disponibile per la chat +away = Sono fuori +busy = occupato/a +groupSPublicChatRoom = Sale di chat pubbliche del gruppo +enterToThisGroupPublicChatRoom = Entra a questo gruppo pubblico di sala di chat +enterToThisGroupPublicChatRoomAndInviteMembers = Entra alla sala pubblica di chat di questo gruppo e fai l'invito ad altre membri +apacheWavePowered = Funziona con Apache Wave +aboutKune = Intorno a Kune +errorsInfo = informazione su errori +createNewGroup = Creare un Nuovo Gruppo +createANewGroupForYourInitiativeOrOrganizationNgoCollectiveAcademicGroup = Crei un nuovo gruppo per la tua iniziativa u organizzazione (ONG, collettivo, accademico, gruppo) +chatWithThisPerson = Chatta con questa persona +andNExternalUser = e [%d] utenti esterni +clickToRename = Fai clic per rinominare +createANewDocumentIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb = Crei un Nuovo Documento. Se dopo lo pubblichi, questo documento apparirà come una nuova 'Pagina' nel vostro web pubblico +goUpOpenTheContainerFolder = Vai su: Apri la carpetta contenitora +edit = Editare +chatAbout = Chatta su questo +chatAndCommentOnThis = Chatta e fai un commento su questo +general = Generale +changeThisValues = Cambia questi valori: +choose = Scegliere +changeThisWorkspaceTheme = Cambia il tema di questo spazio di lavoro +currentBackgroundImage = Immagine di fondo attuale: +change = cambiare +clear = Togliere +clickToSelectAndConfigureThisTheme = Fai clic per configurare e selezionare questo tema +greenAThemeName = verde +blackwhiteAThemeName = Bianco e nero +eurosurAThemeName = eurosud +campAThemeName = accamparsi +defaultAThemeName = difetto +blueAThemeName = blu +greyAThemeName = grigio +enterLanguage = Introduci l' idioma +changeYourPassword = Cambia il tuo contrasegno: +currentPassword = Password attuale +changeIt = Cambia quella +calendar = Calendario +aLongTermTaskSample = Esempio di lavoro a lungo termine +aMidTermTaskSample = Esempio di lavoro a medio termine +aShortTermTaskSample = Un lavoro a breve termine +blogSample = Esempio di blog +aPostSample = Esempio di post +createANewTask = Crei un nuovo lavoro +doubleClickToOpen = Premi due volte per editare +createANewFolder = Creare una nuova carpetta +delete = Cancellare +actions = Azioni +connecting = Collegando +createANewList = Crei un nuovo elenco +confirmPlease = Conferma per piacere: +chatAboutParam = Chatta su: [%s] +barterSample = Esempio di scambio +createANewBarterHere = Creare qui un nuovo scabio +createANewFolderAFolderWillBeASectionInThePublicWeb = Creare una nuova carpetta. Una carpetta sarà una 'sezione' sul web pubblico +createANewWikipageHereIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb = Creare una nuova pagina Wiki qui. Se scegli pubblicarla, questo documento se vedrà come una nuova 'Pagina' sulla web pubblica +cancel = Cancellare +groupTags = Tags del gruppo +groupType = Tipo di gruppo +aProjectIsAKindOfGroupInWhichTheJoiningOfNewMembersIsModeratedByTheProjectAdministrators = Un progetto è un tipo di gruppo nel quale l' incorporazione dei nuovi membri deve essere moderata per gli amministratori. +anOrganizationWorksTheSameWayAsAProjectExceptThatItMustBeALegalEntity = Una organizzazione funziona lo stesso che un progetto, a eccezione che deve essere una entità legale. +closed = Chiuso +aClosedGroupIsAPrivateProjectWhichContentsAreOnlyAccessibleToItsMembersByDefault = Un gruppo chiuso è un progetto privato, nel quale i suoi contenuti, per opzione predefinita, sono solo accessibili per i suoi membri. +community = Comunità +aCommunityIsAGroupOfUsersWithSharedInterestsForInstanceTheEnvironmentalCommunityOrTheLgbtCommunityIt = Una comunità è un gruppo di utenti con interessi condivise (per ess. una comunità ecologista o la comunità LGBT). È aperta alla partecipazione libera di qualsiasi persona senza la moderazione degli amministratori/trici. +createANewDocumentHereIfYouChooseToPublishItThisDocumentWillAppearAsANewPageInThePublicWeb = Creare qui Un Nuovo Documento. Se scegli pubblicarlo, questo documento si vedrà come una nuova 'Pagina' sul web pubblico +password = Password +donTHaveAnAccount = Non hai un conto? +email = posta elettronica +createOne = Crea una +createANewBlog = Creare un nuovo blog +createANewBlogPost = Creare un nuovo post in questo blog +doYouWantToWriteUsWithSomePositiveOrNegativeFeedbackThisCanHelpUsToImproveTheseServices = Vuoi scriverci con qualsiasi feedback positivo o negativo? Questo ci puo' aiutare a migliorare questi servizi +doYouWantToJoinThisGroup = Vuoi unirti a questo gruppo? +createANewChatRoom = Creare una nuova sala di chat +enterToThisRoom = Entrare a questa sala di chat +aboutKuneTitleOfDialog = Intorno a Kune +aboutParam = Intorno [%s] +createANewPost = Creare un nuovo post in questo blog +confirmNewBuddy = Conferma nuovo/a collega +createANewMeetingHere = Creare una nuova cita qui +create = Creare +areYouSure = Sei sicuro/ra +doYouWantToWriteUsWithSomePositiveOrNegativeFeedbackAboutParamThisCanHelpUsToImproveTheseServices = Vuoi scriverci con qualsiasi feedback positivo o negativo su [%s]? Questo puo' aiutarci a migliorare questi servizi +feedbackOfParam = Feedback di [%s] +editAndWriteHereYourFeedback = Editi e scrive qui il tuo feedback +copyTheTextToTranslate = Copia del testo a tradurre +clickAltpageupOrAltpagedownToMoveUpDownInTheListWhileTranslatingAndAltVToCopyTheOriginalTextTheTrans = Fai clic Alt+RePag o Alt+AvPag per muoverti su/giù nello elenco mentre fai le traduzioni e Alt-V per copiare il testo originale. Le traduzioni si salvano automaticamente +helpToTranslateKune = Aiuto a tradurre kune +doYouWantToWriteAMessageToTheMembersOfThisGroup = Vuoi scrivere un messaggio al tuo collega? +documents = documenti +barters = scambi +blogs = i blog +chatrooms = sale di chat +events = eventi +inDevelopment = (in sviluppo) +chats = chat +chatroomCreated = Sala di chat creata +doYouWantToWriteAMessageToYourBuddy = Voui scrivere un messaggio al tuo amico? +error = Errore +finishUsedInButton = Finire +copyleft = copyleft +commonLicensesForCulturalWorks = Licenze abituali per lavori culturali +allowAnyUsesOfYourWorkIncludingCommercial = Permetere qualsiasi uso del tuo lavoro compreso il commerciale? +allowModificationsOfYourWork = Permetere modificazioni del tuo lavoro? +contentNotFound = Contenuto non trovato +areYouSureYouWantThisItWillBeDeletedWithAllItsContents = Sei sicuro di voler continuare? Tutti i suoi contenuti verranno cancellati +doYouWantToWriteAMessageToTheAdministratorsOfThisGroup = Do you want to write a message to the members of this group? +aContentWithTheSameNameAlreadyExistPleaseRenameIt = Esiste già un contenuto con lo stesso nome. Per favore rinomina il contenuto. +addGadget = Aggiungere un gadget +clickToGoHereOrDropContentsHereToMoveThem = Clicca per andare al sito o lasciare commenti +blogsAreAChronologicalListOfPostsOrderedByDateAboutASpecificTopicEachPostCanBeCommentedByTheVisitors = I blogs sono l'elenco di posts (ordinati per data) su un argumento specifico. Ogni post puo essere commentato per gli utenti +aDecentralizedWayToOfferOrAskForServicesAndGoodsToYourGroupsOrToAnyoneBarteringMeansTheExchangeOfGoo = Un modo decentralizzato da offrire (oppure chiedere) beni e servizi ai tuoi gruppi o a chiunque altro utente.Barattare significa lo scambio dei beni per l'intesa tra due persone +aCollaborativeToDoListForTheGroupAnyGroupMemberCanParticipateInAnyProposedTaskAddOthersToATaskCommen = Un'elenco di cose da fare per il gruppo. Qualsiasi membro del gruppo può partecipare in ogni compito proposto, aggiungere altri al compito, fare dei commenti, agiungere informazione, ecc +aCalendarToScheduleActivitiesAndEvents = Un calendario per fissare le attività ed eventi +aRoomWhereYouCanHaveAGroupChatWithManyUsersAtOnceRoomsCanBePublicOrPrivateUsersCanBeFromParamOrOther = Una 'stanza' dove puoi avere una chat in gruppo con altri utenti allo stesso momento. Le stanze possono essere pubbliche oppure private. Gli utenti possono essere da [%s] o di altri siti (compatibile con la chat di gmail) +addNewMember = Aggiungere un nuovo membro +doYouWantToAddParamToYourContacts = Vuoi aggiungere '[%s]' ai tuoi contatti? +doYouWantToAddParamAsAMemberOfParam = Vuoi aggiungere '[%s]'come membro di'[%s]'? +doYouWantToCollaborativelyEditYourMeetingMinutesInANewDocument = Vuoi editare i tuoi verbali delle riunioni in un nuovo documento +paramCreatedSuccesfully = '[%s]' creato con esito +doYouWantToReloadThisPageToUseParamLanguage = Vuoi ricaricare questo sito per usare la lingua'[%s]' ? +1Day = 1 giorno +3Days = 3 giorni +7Days = 7 Giorni +0 = 0 +addAnAppointment = Aggiungere un appuntamento +descriptionOfTheAppointment = Descrizione dell'appuntamento +add = Agiungere +almostImmediately = subito +atMostHourly = al massimo ogni ora +atMostDaily = al massimo ogni giorno +confirm = Confermare +confirmPlease = Per favore confermare +backgroupChanged = Backgroup modificato +checkYourEmailForTheConfirmationLink = Controlla la tua posta per il link di confirma +backgroundChanged = Background modificato +createANewMeeting = Creare un Nuovo Meeting +allowAnyPersonToEditThis = Autorizzare qualsiasi persona a modificare questo +copyThisToANewMessage = Copiare questo su un altro messaggio +clickToOpen = Clicca per aprire +clickToOpenDragAndDropToMoveThisToAnotherPlace = Clicca per aprire. Trascina e lascia per muovere ad un'altra parte

1 0

r1816 - in trunk: . kune-data kune-data/lucene kune-data/lucene/kune_dev kune-data/lucene/kune_dev/indexes kune-data/lucene/kune_prod kune-data/lucene/kune_prod/indexes kune-data/lucene/kune_test kune-data/lucene/kune_test/indexes kune-data/uploads src/main/java/cc/kune/common/client/actions/gwtui src/main/resources src/main/resources/META-INF
by Vicente J. Ruiz Jurado 01 Apr '12

01 Apr '12

Author: vjrj_ Date: 2012-04-01 13:25:44 +0200 (Sun, 01 Apr 2012) New Revision: 1816 Added: trunk/kune-data/ trunk/kune-data/lucene/ trunk/kune-data/lucene/kune_dev/ trunk/kune-data/lucene/kune_dev/indexes/ trunk/kune-data/lucene/kune_prod/ trunk/kune-data/lucene/kune_prod/indexes/ trunk/kune-data/lucene/kune_test/ trunk/kune-data/lucene/kune_test/indexes/ trunk/kune-data/uploads/ Modified: trunk/INSTALL trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/resources/META-INF/persistence.xml trunk/src/main/resources/wave-server-testing.properties trunk/src/main/resources/wave-server.properties Log: Few steps in the install for dev environments Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-04-01 10:43:49 UTC (rev 1815) +++ trunk/INSTALL 2012-04-01 11:25:44 UTC (rev 1816) @@ -85,6 +85,8 @@ ===Configure directories=== +Note: This is not needed in development enviroments or when you use debian package + sudo mkdir -p /usr/share/kune/ sudo chown yourUser:yourUser /usr/share/kune/ @@ -97,8 +99,10 @@ # yourUser is the user you are using to develop/run the application sudo mkdir -p /var/lib/kune/lucene/kune_dev/indexes sudo mkdir -p /var/lib/kune/lucene/kune_test/indexes + sudo mkdir -p /var/lib/kune/lucene/kune_prod/indexes sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_dev/indexes sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_test/indexes + sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_prod/indexes But in general you can do it recursively with: Property changes on: trunk/kune-data ___________________________________________________________________ Name: svn:ignore + * _accounts _attachments _certificates _deltas _sessions _sessions-mal Property changes on: trunk/kune-data/lucene/kune_dev/indexes ___________________________________________________________________ Name: svn:ignore + * Property changes on: trunk/kune-data/lucene/kune_prod/indexes ___________________________________________________________________ Name: svn:ignore + * Property changes on: trunk/kune-data/lucene/kune_test/indexes ___________________________________________________________________ Name: svn:ignore + * Property changes on: trunk/kune-data/uploads ___________________________________________________________________ Name: svn:ignore + * Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2012-04-01 10:43:49 UTC (rev 1815) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2012-04-01 11:25:44 UTC (rev 1816) @@ -24,7 +24,6 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.event.dom.client.ClickEvent; @@ -41,7 +40,6 @@ protected boolean enableTongle; private IconLabel iconLabel; private boolean isChild; - private Tooltip tooltip; public AbstractGwtButtonGui() { this(null, false); Modified: trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/src/main/resources/META-INF/persistence.xml 2012-04-01 10:43:49 UTC (rev 1815) +++ trunk/src/main/resources/META-INF/persistence.xml 2012-04-01 11:25:44 UTC (rev 1816) @@ -165,7 +165,7 @@ <property name="hibernate.search.default.directory_provider" value="org.hibernate.search.store.FSDirectoryProvider"/> <property name="hibernate.search.default.indexBase" - value="/var/lib/kune/lucene/kune_dev/indexes"/> + value="kune-data/lucene/kune_dev/indexes"/> </properties> </persistence-unit> @@ -223,7 +223,7 @@ <property name="hibernate.search.default.directory_provider" value="org.hibernate.search.store.FSDirectoryProvider"/> <property name="hibernate.search.default.indexBase" - value="/var/lib/kune/lucene/kune_test/indexes"/> + value="kune-data/lucene/kune_test/indexes"/> </properties> </persistence-unit> @@ -267,7 +267,7 @@ <property name="hibernate.search.default.directory_provider" value="org.hibernate.search.store.FSDirectoryProvider"/> <property name="hibernate.search.default.indexBase" - value="/var/lib/kune/lucene/kune_test/indexes"/> + value="kune-data/lucene/kune_test/indexes"/> </properties> </persistence-unit> Modified: trunk/src/main/resources/wave-server-testing.properties =================================================================== --- trunk/src/main/resources/wave-server-testing.properties 2012-04-01 10:43:49 UTC (rev 1815) +++ trunk/src/main/resources/wave-server-testing.properties 2012-04-01 11:25:44 UTC (rev 1816) @@ -15,7 +15,7 @@ # A comma separated list of webApp source directories # Default value: ./war -resource_bases = /var/www/kune/,target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ +resource_bases = target/kune-0.1.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-01 10:43:49 UTC (rev 1815) +++ trunk/src/main/resources/wave-server.properties 2012-04-01 11:25:44 UTC (rev 1816) @@ -27,7 +27,7 @@ # Note: This is only used when using the file signer info store. It is ignored # for other data store types. # Default value: _certificates -signer_info_store_directory = /var/lib/kune/_certificates +signer_info_store_directory = kune-data/_certificates # Currently supported attachment types: mongodb, disk # Default value: disk @@ -36,7 +36,7 @@ # The location where attachments are stored on disk. This should be changed. # Note: This is only used when using the disk attachment store. It is ignored # for other data store types. -attachment_store_directory = /var/lib/kune/_attachments +attachment_store_directory = kune-data/_attachments # Currently supported account store types: fake, memory, file, mongodb account_store_type = file @@ -44,7 +44,7 @@ # The location where accounts are stored on disk. This should be changed. # Note: This is only used when using the file account store. It is ignored # for other data store types. -account_store_directory = /var/lib/kune/_accounts +account_store_directory = kune-data/_accounts # Currently supported delta store types: memory, file delta_store_type = file @@ -53,12 +53,12 @@ # Note: This is only used when using the file delta store. It is ignored # for other data store types. # Default value: _deltas -delta_store_directory = /var/lib/kune/_deltas +delta_store_directory = kune-data/_deltas # The location where user sessions are persisted on disk. This allow to restore user sessions # between restarts. # Default value: _sessions -sessions_store_directory = /var/lib/kune/_sessions +sessions_store_directory = kune-data/_sessions # Set false to use raw WebSockets instead of Socket.IO (still a bit experimental) in the webclient # Default value: true

1 0

r1815 - in trunk/src: main/java/cc/kune/common/client/actions/gwtui test/java/cc/kune/core/server test/java/cc/kune/core/server/integration
by Vicente J. Ruiz Jurado 01 Apr '12

01 Apr '12

Author: vjrj_ Date: 2012-04-01 12:43:49 +0200 (Sun, 01 Apr 2012) New Revision: 1815 Removed: trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/test/java/cc/kune/core/server/TestHelper.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java Log: Fix some compilation error Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2012-04-01 02:50:08 UTC (rev 1814) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2012-04-01 10:43:49 UTC (rev 1815) @@ -19,13 +19,11 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; -import cc.kune.common.client.log.Log; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; @@ -113,8 +111,9 @@ @Override public void setEnabled(final boolean enabled) { - Log.info("Set button" + descriptor.getValue(Action.NAME) + " enabled " + enabled - + " ----------------------------------"); + // Log.info("Set button" + descriptor.getValue(Action.NAME) + " enabled " + + // enabled + // + " ----------------------------------"); button.setEnabled(enabled); button.getElement().getStyle().setOpacity(enabled ? 1d : 0.6d); } Modified: trunk/src/test/java/cc/kune/core/server/TestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/TestHelper.java 2012-04-01 02:50:08 UTC (rev 1814) +++ trunk/src/test/java/cc/kune/core/server/TestHelper.java 2012-04-01 10:43:49 UTC (rev 1815) @@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.configuration.ConfigurationException; +import org.mockito.Mockito; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.authentication.AccountStoreHolder; @@ -35,7 +36,6 @@ import cc.kune.barters.server.BarterServerModule; import cc.kune.chat.server.ChatServerModule; -import cc.kune.core.server.integration.HttpServletRequestMocked; import cc.kune.core.server.persist.DataSourceKunePersistModule; import cc.kune.core.server.persist.DataSourceOpenfirePersistModule; import cc.kune.docs.server.DocumentServerModule; @@ -68,9 +68,9 @@ "kune.properties", TestConstants.PERSISTENCE_UNIT); final Injector childInjector = injector.createChildInjector(wavePersistModule, new ServerModule( false, 1, 2, 2), new RobotApiModule(), federationModule, new ListsServerModule(), - new DocumentServerModule(), new ChatServerModule(), federationModule, - new WikiServerModule(), new TaskServerModule(), new BarterServerModule(), - new EventsServerModule(), new TrashServerModule(), kuneDataSource, + new DocumentServerModule(), new ChatServerModule(), federationModule, new WikiServerModule(), + new TaskServerModule(), new BarterServerModule(), new EventsServerModule(), + new TrashServerModule(), kuneDataSource, new DataSourceOpenfirePersistModule(kuneDataSource.getKuneProperties()), module, new Module() { @Override public void configure(final Binder binder) { @@ -78,7 +78,8 @@ binder.bindScope(RequestScoped.class, Scopes.SINGLETON); // binder.bind(KuneProperties.class).toInstance(new // KunePropertiesDefault(propetiesFileName)); - binder.bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); + // Used by I18nRPC to detect user lang + binder.bind(HttpServletRequest.class).toInstance(Mockito.mock(HttpServletRequest.class)); } }); try { Deleted: trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java 2012-04-01 02:50:08 UTC (rev 1814) +++ trunk/src/test/java/cc/kune/core/server/integration/HttpServletRequestMocked.java 2012-04-01 10:43:49 UTC (rev 1815) @@ -1,444 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.server.integration; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.Part; - -public class HttpServletRequestMocked implements HttpServletRequest { - - @Override - public boolean authenticate(final HttpServletResponse arg0) throws IOException, ServletException { - // TODO Auto-generated method stub - return false; - } - - @Override - public AsyncContext getAsyncContext() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getAttribute(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration<String> getAttributeNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getAuthType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getCharacterEncoding() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getContentLength() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getContentType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getContextPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Cookie[] getCookies() { - // TODO Auto-generated method stub - return null; - } - - @Override - public long getDateHeader(final String arg0) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public DispatcherType getDispatcherType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getHeader(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration<String> getHeaderNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration<String> getHeaders(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ServletInputStream getInputStream() throws IOException { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getIntHeader(final String arg0) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getLocalAddr() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Locale getLocale() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration<Locale> getLocales() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getLocalName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getLocalPort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getMethod() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getParameter(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map<String, String[]> getParameterMap() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Enumeration<String> getParameterNames() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String[] getParameterValues(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Part getPart(final String arg0) throws IOException, ServletException { - // TODO Auto-generated method stub - return null; - } - - @Override - public Collection<Part> getParts() throws IOException, ServletException { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPathInfo() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPathTranslated() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getProtocol() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getQueryString() { - // TODO Auto-generated method stub - return null; - } - - @Override - public BufferedReader getReader() throws IOException { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRealPath(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteAddr() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRemoteHost() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getRemotePort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public String getRemoteUser() { - // TODO Auto-generated method stub - return null; - } - - @Override - public RequestDispatcher getRequestDispatcher(final String arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRequestedSessionId() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getRequestURI() { - // TODO Auto-generated method stub - return null; - } - - @Override - public StringBuffer getRequestURL() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getScheme() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServerName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public int getServerPort() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public ServletContext getServletContext() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getServletPath() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HttpSession getSession() { - // TODO Auto-generated method stub - return null; - } - - @Override - public HttpSession getSession(final boolean arg0) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Principal getUserPrincipal() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean isAsyncStarted() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isAsyncSupported() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromCookie() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromUrl() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdFromURL() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isRequestedSessionIdValid() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isSecure() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isUserInRole(final String arg0) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void login(final String arg0, final String arg1) throws ServletException { - // TODO Auto-generated method stub - - } - - @Override - public void logout() throws ServletException { - // TODO Auto-generated method stub - - } - - @Override - public void removeAttribute(final String arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void setAttribute(final String arg0, final Object arg1) { - // TODO Auto-generated method stub - - } - - @Override - public void setCharacterEncoding(final String arg0) throws UnsupportedEncodingException { - // TODO Auto-generated method stub - - } - - @Override - public AsyncContext startAsync() throws IllegalStateException { - // TODO Auto-generated method stub - return null; - } - - @Override - public AsyncContext startAsync(final ServletRequest arg0, final ServletResponse arg1) - throws IllegalStateException { - // TODO Auto-generated method stub - return null; - } - -} Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-04-01 02:50:08 UTC (rev 1814) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-04-01 10:43:49 UTC (rev 1815) @@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.configuration.ConfigurationException; +import org.mockito.Mockito; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.ServerModule; import org.waveprotocol.box.server.persistence.PersistenceModule; @@ -76,8 +77,8 @@ protected void configure() { bindScope(SessionScoped.class, Scopes.SINGLETON); bindScope(RequestScoped.class, Scopes.SINGLETON); - - bind(HttpServletRequest.class).to(HttpServletRequestMocked.class); + // Used by I18nRPC to detect user lang + bind(HttpServletRequest.class).toInstance(Mockito.mock(HttpServletRequest.class)); bindInterceptor(annotatedWith(KuneTransactional.class), any(), kuneDataSource.getTransactionInterceptor()); bindInterceptor(any(), annotatedWith(KuneTransactional.class),

1 0