[kune-commits] r1800 - in trunk: debian src/main/java/cc/kune/core/client/auth src/main/java/cc/kune/core/server/persist src/main/java/cc/kune/core/server/properties src/main/java/cc/kune/core/server/rpc src/main/java/cc/kune/core/server/state src/main/java/com/google/wave/splash/web/template src/main/webapp src/main/webapp/tutorials
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Wed Mar 28 02:20:38 CEST 2012
Author: vjrj_
Date: 2012-03-28 02:20:38 +0200 (Wed, 28 Mar 2012)
New Revision: 1800
Modified:
trunk/debian/changelog
trunk/debian/files
trunk/debian/kune.init
trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java
trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java
trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java
trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java
trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java
trunk/src/main/java/com/google/wave/splash/web/template/Templates.java
trunk/src/main/webapp/tutorials/chats.svg
trunk/src/main/webapp/ws.html
Log:
Login remember in chrome, first works
CLOSED - # 70: Implement some kind of "/etc/init.d/kune reload" to reload configuration
http://kune.ourproject.org/issues/ticket/70
CLOSED - # 119: Generate debian packages for production installs
http://kune.ourproject.org/issues/ticket/119
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/debian/changelog 2012-03-28 00:20:38 UTC (rev 1800)
@@ -1,3 +1,9 @@
+kune (0.1.0+b2) unstable; urgency=low
+
+ * Perms in daemon. SIGHUP to reload. Other minor changes
+
+ -- Vicente J. Ruiz Jurado <vjrj at ourproject.org> Wed, 28 Mar 2012 01:35:15 +0200
+
kune (0.1.0+b1) unstable; urgency=low
* For a full changelog see trunk/ChangeLog in svn repo
Modified: trunk/debian/files
===================================================================
--- trunk/debian/files 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/debian/files 2012-03-28 00:20:38 UTC (rev 1800)
@@ -1 +1 @@
-kune_0.1.0+b1_all.deb java optional
+kune_0.1.0+b2_all.deb java optional
Modified: trunk/debian/kune.init
===================================================================
--- trunk/debian/kune.init 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/debian/kune.init 2012-03-28 00:20:38 UTC (rev 1800)
@@ -51,9 +51,9 @@
# 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/ --exec $DAEMON --test > /dev/null \
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $NAME:$NAME -b --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ --exec $DAEMON -- \
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -d /usr/share/kune/ -c $NAME:$NAME -b --exec $DAEMON -- \
$DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
@@ -101,7 +101,9 @@
# then implement that here.
#
log_daemon_msg "Reloading kune"
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+ # 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-application-initialized-using-a-bash-script
+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --user $NAME --group $NAME --name $NAME
return 0
}
@@ -125,15 +127,14 @@
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
- #reload|force-reload)
+ reload|force-reload)
#
# If do_reload() is not implemented then leave this commented out
# and leave 'force-reload' as an alias for 'restart'.
#
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
+ do_reload
+ log_end_msg $?
+ ;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
Modified: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-03-28 00:20:38 UTC (rev 1800)
@@ -39,9 +39,15 @@
return $doc.getElementById(domId).value;
}-*/;
+ /**
+ * login.submit() only works in FF // $doc.getElementById("login").submit();
+ * http
+ * ://stackoverflow.com/questions/4254284/browser-stored-username-passwords
+ * -in-chrome
+ */
@Override
public native void clickFormLogin() /*-{
- $doc.getElementById("login").submit();
+ $doc.getElementById("loginsubmit").click();
}-*/;
@Override
Modified: trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java 2012-03-28 00:20:38 UTC (rev 1800)
@@ -86,7 +86,7 @@
dbProperties.setProperty("hibernate.connection.password", dbPass);
jpm.properties(dbProperties);
LOG.info(String.format("Using user '%s' and connection '%s'", dbUser, dbUrl));
- LOG.debug(String.format("dbpass '%s'", dbPass));
+ // LOG.debug(String.format("dbpass '%s'", dbPass));
}
// http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Injector.html
Modified: trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/java/cc/kune/core/server/properties/KunePropertiesDefault.java 2012-03-28 00:20:38 UTC (rev 1800)
@@ -26,7 +26,10 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import sun.misc.SignalHandler;
import cc.kune.core.server.error.ServerException;
import com.google.inject.Inject;
@@ -34,20 +37,23 @@
@Singleton
public class KunePropertiesDefault implements KuneProperties {
+ public static final Log LOG = LogFactory.getLog(KunePropertiesDefault.class);
private CompositeConfiguration config;
private final String fileName;
@Inject
public KunePropertiesDefault(final String fileName) {
this.fileName = fileName;
- try {
- config = new CompositeConfiguration();
- config.addConfiguration(new SystemConfiguration());
- config.addConfiguration(new PropertiesConfiguration(fileName));
- } catch (final ConfigurationException e) {
- final String msg = MessageFormat.format("Couldn't open property file {0}", fileName);
- throw new ServerException(msg, e);
- }
+ // http://stackoverflow.com/questions/40376/handle-signals-in-the-java-virtual-machine
+ // Runtime.getRuntime().addShutdownHook() ??
+ sun.misc.Signal.handle(new sun.misc.Signal("HUP"), new SignalHandler() {
+ @Override
+ public void handle(final sun.misc.Signal sig) {
+ LOG.warn("Received SIGHUP signal. Will reload kune.properties");
+ loadConfiguration();
+ }
+ });
+ loadConfiguration();
}
private void checkNull(final String key, final Object value) {
@@ -100,4 +106,15 @@
return value;
}
+ private void loadConfiguration() {
+ try {
+ config = new CompositeConfiguration();
+ config.addConfiguration(new SystemConfiguration());
+ config.addConfiguration(new PropertiesConfiguration(fileName));
+ } catch (final ConfigurationException e) {
+ final String msg = MessageFormat.format("Couldn't open property file {0}", fileName);
+ throw new ServerException(msg, e);
+ }
+ }
+
}
Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2012-03-28 00:20:38 UTC (rev 1800)
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.TimeZone;
+import sun.misc.SignalHandler;
import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.client.rpcservices.SiteService;
import cc.kune.core.server.InitData;
@@ -56,9 +57,9 @@
private final I18nLanguageManager languageManager;
private final LicenseManager licenseManager;
private final Mapper mapper;
- private final ReservedWordsRegistryDTO reservedWords;
+ private ReservedWordsRegistryDTO reservedWords;
private final ServerToolRegistry serverToolRegistry;
- private final HashMap<String, GSpaceTheme> siteThemes;
+ private HashMap<String, GSpaceTheme> siteThemes;
private final UserInfoService userInfoService;
private final UserSessionManager userSessionManager;
@@ -78,9 +79,13 @@
this.countryManager = countryManager;
this.serverToolRegistry = serverToolRegistry;
this.extMediaDescManager = extMediaDescManager;
- data = loadInitData();
- siteThemes = getSiteThemes(this.kuneProperties.getList(KuneProperties.WS_THEMES));
- reservedWords = new ReservedWordsRegistryDTO(ReservedWordsRegistry.fromList(kuneProperties));
+ sun.misc.Signal.handle(new sun.misc.Signal("HUP"), new SignalHandler() {
+ @Override
+ public void handle(final sun.misc.Signal sig) {
+ loadProperties(kuneProperties);
+ }
+ });
+ loadProperties(kuneProperties);
}
private String[] getColors(final String key) {
@@ -157,4 +162,10 @@
return data;
}
+ private void loadProperties(final KuneProperties kuneProperties) {
+ data = loadInitData();
+ siteThemes = getSiteThemes(this.kuneProperties.getList(KuneProperties.WS_THEMES));
+ reservedWords = new ReservedWordsRegistryDTO(ReservedWordsRegistry.fromList(kuneProperties));
+ }
+
}
Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2012-03-28 00:20:38 UTC (rev 1800)
@@ -19,6 +19,8 @@
*/
package cc.kune.core.server.state;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder;
import cc.kune.common.shared.i18n.I18nTranslationService;
@@ -43,7 +45,7 @@
@Singleton
public class StateServiceDefault implements StateService {
-
+ public static final Log LOG = LogFactory.getLog(StateServiceDefault.class);
private final ContentManager contentManager;
private final GroupManager groupManager;
private final I18nTranslationService i18n;
@@ -125,6 +127,7 @@
state.setIsParticipant(userLogged != User.UNKNOWN_USER ? kuneWaveManager.isParticipant(wavelet,
userLogged.getShortName()) : false);
} catch (final Exception e) {
+ LOG.error("Error accessing wave " + waveId, e);
state.setContent(i18n.t("Error accessing this document. "
+ "Please contact the administrators providing this reference ([%s]) "
+ "and any other relevant info.", waveId));
Modified: trunk/src/main/java/com/google/wave/splash/web/template/Templates.java
===================================================================
--- trunk/src/main/java/com/google/wave/splash/web/template/Templates.java 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/java/com/google/wave/splash/web/template/Templates.java 2012-03-28 00:20:38 UTC (rev 1800)
@@ -109,9 +109,9 @@
FileInputStream stream = null;
try {
- stream = new FileInputStream(new File("src/main/webapp/others/splash/" + file));
+ stream = new FileInputStream(new File((productionMode ? "/usr/share/kune/webapp"
+ : "src/main/webapp") + "/others/splash/" + file));
} catch (final FileNotFoundException e) {
- // TODO Auto-generated catch block
LOG.info("Could not find resource named: " + file);
}
return stream;
Modified: trunk/src/main/webapp/tutorials/chats.svg
===================================================================
--- trunk/src/main/webapp/tutorials/chats.svg 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/webapp/tutorials/chats.svg 2012-03-28 00:20:38 UTC (rev 1800)
@@ -27,15 +27,15 @@
inkscape:pageshadow="2"
inkscape:zoom="1.5916065"
inkscape:cx="243.10117"
- inkscape:cy="328.42964"
+ inkscape:cy="1308.5714"
inkscape:document-units="px"
- inkscape:current-layer="g19891"
+ inkscape:current-layer="layer1"
showgrid="false"
showborder="true"
inkscape:showpageshadow="false"
- inkscape:window-width="1306"
- inkscape:window-height="744"
- inkscape:window-x="60"
+ inkscape:window-width="1080"
+ inkscape:window-height="1868"
+ inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<!-- Start kune i18n part -->
@@ -301,11 +301,11 @@
y="723.52075" />
<rect
y="622.80676"
- x="52.822086"
+ x="52.822083"
height="91.091072"
- width="212.24748"
+ width="222.91"
id="rect6444"
- style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
+ style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.6663546;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
<rect
style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.83669257;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
id="rect21625"
@@ -324,7 +324,7 @@
y="466.51004"
x="29.671577"
height="123.13216"
- width="398.70364"
+ width="427.13708"
id="rect21642-5"
style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.7304064;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
</g>
@@ -332,8 +332,7 @@
inkscape:groupmode="layer"
id="layer6"
inkscape:label="graphics"
- style="display:inline"
- sodipodi:insensitive="true">
+ style="display:inline">
<g
transform="matrix(1.5625,0,0,1.5636219,144.82865,137.05532)"
id="chat_x5F_32x32">
@@ -403,11 +402,11 @@
sodipodi:cy="3.6610169"
sodipodi:rx="5.1525426"
sodipodi:ry="5.1525426"
- d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
+ d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
transform="matrix(1.7017328,0,0,1.7017328,109.33073,517.00513)" />
<path
transform="matrix(1.7017328,0,0,1.7017328,109.33073,548.30382)"
- d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
+ d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
sodipodi:ry="5.1525426"
sodipodi:rx="5.1525426"
sodipodi:cy="3.6610169"
@@ -423,7 +422,7 @@
sodipodi:cy="3.6610169"
sodipodi:rx="5.1525426"
sodipodi:ry="5.1525426"
- d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
+ d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
transform="matrix(1.7017328,0,0,1.7017328,140.62945,532.72866)" />
<path
style="fill:none;stroke:#231f20;stroke-width:6.95526648;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@@ -622,39 +621,39 @@
<text
sodipodi:linespacing="125%"
id="text15572"
- y="939.13818"
+ y="929.13818"
x="127.9239"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
xml:space="preserve"><tspan
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="939.13818"
+ y="929.13818"
x="127.9239"
sodipodi:role="line"
id="tspan13522">Más ventajas: éste es un sistema <tspan
id="tspan24241"
style="font-weight:bold">descentralizado </tspan>que</tspan><tspan
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="954.13818"
+ y="944.13818"
x="127.9239"
sodipodi:role="line"
id="tspan13695">mantiene tu privacidad. Es decir, que al usarlo y tener </tspan><tspan
id="tspan21344"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="969.13818"
+ y="959.13818"
x="127.9239"
sodipodi:role="line">aquí tu lista de contactos, ésta estará en un sistema </tspan><tspan
id="tspan15585"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="984.13818"
+ y="974.13818"
x="127.9239"
sodipodi:role="line">que te dé confianza (como quizás éste), mientras que </tspan><tspan
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="999.13818"
+ y="989.13818"
x="127.9239"
sodipodi:role="line"
id="tspan13553">a su vez te puedes comunicar con usuarios/as que </tspan><tspan
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="1014.1382"
+ y="1004.1382"
x="127.9239"
sodipodi:role="line"
id="tspan13557">hayan elegido otros sistemas fuera de este sitio</tspan></text>
@@ -686,110 +685,13 @@
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">las notas sobre el encuentro</tspan></text>
</g>
<g
- style="display:inline"
- inkscape:label="en-working"
- id="g19891"
- inkscape:groupmode="layer">
- <g
- transform="translate(106.00677,59.44173)"
- id="g19893"
- style="display:inline">
- <text
- transform="scale(0.99912117,1.0008796)"
- sodipodi:linespacing="125%"
- id="text19895"
- y="122.68937"
- x="101.1684"
- style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- xml:space="preserve"><tspan
- id="tspan19897"
- style="font-size:32px;font-weight:bold;fill:#aa4400"
- y="122.68937"
- x="101.1684"
- sodipodi:role="line">Chats</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- x="101.42439"
- y="95.114334"
- id="text19899"
- sodipodi:linespacing="125%"
- transform="scale(0.99912117,1.0008796)"><tspan
- sodipodi:role="line"
- x="101.42439"
- y="95.114334"
- style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400"
- id="tspan19901">explaining the</tspan></text>
- </g>
+ inkscape:groupmode="layer"
+ id="layer8"
+ inkscape:label="en"
+ style="display:none">
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- x="149.85907"
- y="-168.92439"
- id="text19903"
- sodipodi:linespacing="125%"
- transform="translate(0,435.82679)"><tspan
- y="-168.92439"
- x="149.85907"
- id="tspan19905"
- sodipodi:role="line"
- style="font-style:italic">Mouse click to continue</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text19907"
- y="1176.7134"
- x="149.82024"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- xml:space="preserve"><tspan
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="1176.7134"
- x="149.82024"
- sodipodi:role="line"
- id="tspan19909" /><tspan
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="1191.7134"
- x="149.82024"
- sodipodi:role="line"
- id="tspan19911">...and give us your</tspan><tspan
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="1206.7134"
- x="149.82024"
- sodipodi:role="line"
- id="tspan13788"><tspan
- id="tspan19913"
- style="font-weight:bold">feedback</tspan>, and even</tspan><tspan
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="1221.7134"
- x="149.82024"
- sodipodi:role="line"
- id="tspan13793">join to improve </tspan><tspan
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="1236.7134"
- x="149.82024"
- sodipodi:role="line"
- id="tspan19919">this tool</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- x="122.1581"
- y="1092.6705"
- id="text19921"
- sodipodi:linespacing="125%"><tspan
- id="tspan19923"
- sodipodi:role="line"
- x="122.1581"
- y="1092.6705"
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">From here you can </tspan><tspan
- id="tspan19925"
- sodipodi:role="line"
- x="122.1581"
- y="1107.6705"
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">create new <tspan
- style="font-weight:bold"
- id="tspan13786">chat-rooms</tspan></tspan></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
x="155.08841"
y="419.41821"
id="text19929"
@@ -867,39 +769,39 @@
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
x="127.9239"
- y="939.13818"
+ y="929.13818"
id="text19963"
sodipodi:linespacing="125%"><tspan
id="tspan19965"
sodipodi:role="line"
x="127.9239"
- y="939.13818"
+ y="929.13818"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Other benefits: this is a <tspan
style="font-weight:bold"
id="tspan13686">decentralized </tspan>system that</tspan><tspan
sodipodi:role="line"
x="127.9239"
- y="954.13818"
+ y="944.13818"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
id="tspan13749">protects your privacy. That is, while you use it and</tspan><tspan
sodipodi:role="line"
x="127.9239"
- y="969.13818"
+ y="959.13818"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
id="tspan13751">thus keep here your contact list, such info can be in a</tspan><tspan
sodipodi:role="line"
x="127.9239"
- y="984.13818"
+ y="974.13818"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
id="tspan13753">system you trust (as maybe this one), while you can</tspan><tspan
sodipodi:role="line"
x="127.9239"
- y="999.13818"
+ y="989.13818"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
id="tspan13755">still communicate with other users that chose other</tspan><tspan
sodipodi:role="line"
x="127.9239"
- y="1014.1382"
+ y="1004.1382"
style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
id="tspan13747">systems outside of this one.</tspan></text>
<text
@@ -928,128 +830,103 @@
x="116.10284"
sodipodi:role="line"
id="tspan19987">or event notes</tspan></text>
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer8"
- inkscape:label="en"
- style="display:none">
<text
xml:space="preserve"
- style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- x="207.26842"
- y="166.0929"
- id="text11705"
- sodipodi:linespacing="125%"
- transform="scale(0.99912117,1.0008796)"><tspan
- sodipodi:role="line"
- x="207.26842"
- y="166.0929"
- style="font-size:32px;font-weight:bold;fill:#aa4400"
- id="tspan11707">chats</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text11729"
- y="1189.5017"
- x="155.79486"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- xml:space="preserve"><tspan
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="1189.5017"
- x="155.79486"
- sodipodi:role="line"
- id="tspan11731" /><tspan
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="1204.5017"
- x="155.79486"
- sodipodi:role="line"
- id="tspan11733">...give us your <tspan
- id="tspan11735"
- style="font-weight:bold">feedback </tspan></tspan><tspan
- id="tspan11739"
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="1219.5017"
- x="155.79486"
- sodipodi:role="line">and participate</tspan><tspan
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- y="1234.5017"
- x="155.79486"
- sodipodi:role="line"
- id="tspan11741">to improve this tool...</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- x="126.6009"
- y="1099.3315"
- id="text11743"
+ x="122.1581"
+ y="1092.6705"
+ id="text19921"
sodipodi:linespacing="125%"><tspan
- id="tspan11745"
+ id="tspan19923"
sodipodi:role="line"
- x="126.6009"
- y="1099.3315"
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...here you can create</tspan><tspan
+ x="122.1581"
+ y="1092.6705"
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">From here you can </tspan><tspan
+ id="tspan19925"
sodipodi:role="line"
- x="126.6009"
- y="1114.3315"
- style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
- id="tspan11814">your new <tspan
- id="tspan13685"
- style="font-weight:bold">chat rooms</tspan>...</tspan></text>
+ x="122.1581"
+ y="1107.6705"
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">create new <tspan
+ style="font-weight:bold"
+ id="tspan13786">chat-rooms</tspan></tspan></text>
<text
- xml:space="preserve"
- style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
- x="207.5244"
- y="184.92917"
- id="text11787"
sodipodi:linespacing="125%"
- transform="scale(0.99912117,1.0008796)"><tspan
- sodipodi:role="line"
- x="207.5244"
- y="184.92917"
- style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400"
- id="tspan11789">explained</tspan></text>
- <text
- sodipodi:linespacing="125%"
- id="text11717-5"
- y="222.1895"
- x="207.88985"
+ id="text19907"
+ y="1176.7134"
+ x="149.82024"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
xml:space="preserve"><tspan
- id="tspan11719-7"
style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="222.1895"
- x="207.88985"
- sodipodi:role="line">Sorry, we are</tspan><tspan
+ y="1176.7134"
+ x="149.82024"
+ sodipodi:role="line"
+ id="tspan19909" /><tspan
style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="237.1895"
- x="207.88985"
+ y="1191.7134"
+ x="149.82024"
sodipodi:role="line"
- id="tspan11791-7">still designing </tspan><tspan
- id="tspan11725-4"
+ id="tspan19911">...and give us your</tspan><tspan
style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="252.1895"
- x="207.88985"
- sodipodi:role="line">this tutorial.</tspan><tspan
- id="tspan11727-0"
+ y="1206.7134"
+ x="149.82024"
+ sodipodi:role="line"
+ id="tspan13788"><tspan
+ id="tspan19913"
+ style="font-weight:bold">feedback</tspan>, and even</tspan><tspan
style="font-size:12px;font-weight:normal;fill:#aa4400"
- y="267.18951"
- x="207.88985"
- sodipodi:role="line" /></text>
+ y="1221.7134"
+ x="149.82024"
+ sodipodi:role="line"
+ id="tspan13793">join to improve </tspan><tspan
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"
+ y="1236.7134"
+ x="149.82024"
+ sodipodi:role="line"
+ id="tspan19919">this tool</tspan></text>
<g
- id="g16880"
- transform="matrix(0.75024247,0,0,0.75024247,176.23508,211.84322)"
+ transform="translate(106.00677,59.44173)"
+ id="g19893"
style="display:inline">
- <g
- id="Layer_1-8" />
- <g
- id="cog_x5F_alt_x5F_32x32">
- <path
- id="path16872"
- d="m 32,17.969 v -4 L 27.219,11.977 C 27.086,11.602 26.946,11.24 26.774,10.883 L 28.704,6.078 25.875,3.25 21.112,5.211 C 20.75,5.036 20.378,4.888 19.995,4.75 L 17.969,0 h -4 L 11.992,4.734 C 11.594,4.875 11.211,5.023 10.831,5.203 L 6.078,3.294 3.25,6.122 5.188,10.833 C 5,11.219 4.847,11.614 4.703,12.021 L 0,14.031 v 4 l 4.706,1.961 c 0.146,0.406 0.302,0.802 0.489,1.188 l -1.903,4.742 2.828,2.828 4.724,-1.945 c 0.378,0.18 0.766,0.325 1.164,0.461 L 14.031,32 h 4 l 1.979,-4.758 c 0.38,-0.141 0.755,-0.289 1.114,-0.461 l 4.797,1.922 2.828,-2.828 -1.969,-4.773 c 0.167,-0.359 0.305,-0.722 0.438,-1.094 L 32,17.969 z M 15.969,22 c -3.312,0 -6,-2.688 -6,-6 0,-3.312 2.688,-6 6,-6 3.312,0 6,2.688 6,6 0,3.312 -2.688,6 -6,6 z"
- inkscape:connector-curvature="0"
- style="fill:#231f20" />
- </g>
+ <text
+ transform="scale(0.99912117,1.0008796)"
+ sodipodi:linespacing="125%"
+ id="text19895"
+ y="122.68937"
+ x="101.1684"
+ style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ xml:space="preserve"><tspan
+ id="tspan19897"
+ style="font-size:32px;font-weight:bold;fill:#aa4400"
+ y="122.68937"
+ x="101.1684"
+ sodipodi:role="line">Chats</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ x="101.42439"
+ y="95.114334"
+ id="text19899"
+ sodipodi:linespacing="125%"
+ transform="scale(0.99912117,1.0008796)"><tspan
+ sodipodi:role="line"
+ x="101.42439"
+ y="95.114334"
+ style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400"
+ id="tspan19901">explaining the</tspan></text>
</g>
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+ x="149.85907"
+ y="-168.92439"
+ id="text19903"
+ sodipodi:linespacing="125%"
+ transform="translate(0,435.82679)"><tspan
+ y="-168.92439"
+ x="149.85907"
+ id="tspan19905"
+ sodipodi:role="line"
+ style="font-style:italic">Mouse click to continue</tspan></text>
</g>
<g
inkscape:groupmode="layer"
Modified: trunk/src/main/webapp/ws.html
===================================================================
--- trunk/src/main/webapp/ws.html 2012-03-27 00:41:57 UTC (rev 1799)
+++ trunk/src/main/webapp/ws.html 2012-03-28 00:20:38 UTC (rev 1800)
@@ -298,15 +298,17 @@
<!-- Banner for wave errors -->
<div class="banner" id="banner"></div>
<!-- Remember user/pass (this is removed from here and rendered in gxt form) -->
- <form id="loginrender" action="javascript:;" style="display: none;">
+ <!-- action empty suggested in http://stackoverflow.com/questions/4254284/browser-stored-username-passwords-in-chrome -->
+ <form id="loginrender" action="" style="display: none;">
<input type="text" id="usernamerender" name="usernamerender"
value="" /> <input type="password" id="passwordrender"
name="passwordrender" value="" />
</form>
<!-- Remember user/pass (this part is used to send the values to the browser) -->
- <form id="login" action="javascript:;" style="display: none;">
+ <form id="login" action="" style="display: none;">
<input type="text" id="username" name="username" value="" /> <input
- type="password" id="password" name="password" value="" />
+ type="password" id="password" name="password" value="" /> <input
+ id="loginsubmit" type="submit" value="login">
</form>
<!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
<noscript>
More information about the kune-commits
mailing list