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