[xwiki-notifications] Build Curriki::Trunk #1063 failing
Build Curriki::Trunk #1063 failing Agent: Default agent Build results: http://teamcity.xwiki.org/viewLog.html?buildId=6687&buildTypeId=bt12 Changes included (1 change) Change 6464 by ludovic (11 files): CURRIKI-1179 Added class creation on plugin init, Fix storage definitions, More debugging see more information about changed files: http://teamcity.xwiki.org/viewLog.html?tab=buildChangesDiv&buildId=6687&buildTypeId=bt12 Configure email notifications: http://teamcity.xwiki.org/profile.html?init=1#notifications ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] r6464 - in xwiki-products/curriki/trunk/plugins/invitationmanager/src: main/java/org/xwiki/plugin/invitationmanager/api main/java/org/xwiki/plugin/invitationmanager/impl main/jav
Author: ludovic Date: 2007-12-27 00:35:22 +0100 (Thu, 27 Dec 2007) New Revision: 6464 Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/JoinRequest.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/JoinRequestStatus.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationImpl.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/JoinRequestImpl.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/MembershipRequestImpl.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPlugin.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPluginApi.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/JoinRequestTest.java Log: CURRIKI-1179 Added class creation on plugin init, Fix storage definitions, More debugging Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java === --- xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java 2007-12-26 15:53:05 UTC (rev 6463) +++ xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java 2007-12-26 23:35:22 UTC (rev 6464) @@ -25,10 +25,6 @@ */ public interface Invitation extends JoinRequest { -/** - * Returns true is this invitation is new - */ -boolean isNew(); /** * @return The one who is invited to join the space Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java === --- xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java 2007-12-26 15:53:05 UTC (rev 6463) +++ xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java 2007-12-26 23:35:22 UTC (rev 6464) @@ -23,6 +23,7 @@ import java.util.Map; import com.xpn.xwiki.XWikiContext; +import com.xpn.xwiki.XWikiException; /** * Manages invitations and membership requests @@ -196,7 +197,7 @@ * context user is not an administrator of the space, does nothing and log a warning in the * context */ -void acceptMembership(String space, String userName, XWikiContext context) throws InvitationManagerException; +boolean acceptMembership(String space, String userName, XWikiContext context) throws InvitationManagerException; /** * Accept a pending membership using a custom email template which can differ from the @@ -205,7 +206,7 @@ * * @see #acceptMembership(String, String, XWikiContext) */ -void acceptMembership(String space, String userName, String templateMail, XWikiContext context) throws InvitationManagerException; +boolean acceptMembership(String space, String userName, String templateMail, XWikiContext context) throws InvitationManagerException; /** * Reject a pending membership request. Update the membership request object, and notify the @@ -468,4 +469,9 @@ * @see #getInvitations(String, int, XWikiContext) */ List getInvitations(int status, int start, int count, XWikiContext context); + +/** + * Creates the classes used by the invitation manager when necessary + */ +void initClasses(XWikiContext context) throws XWikiException; } Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/JoinRequest.java === --- xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/JoinRequest.java 2007-12-26 15:53:05 UTC (rev 6463) +++ xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/JoinRequest.java
[xwiki-notifications] Build Curriki::Trunk #1062 failing
Build Curriki::Trunk #1062 failing Agent: Default agent Build results: http://teamcity.xwiki.org/viewLog.html?buildId=6686&buildTypeId=bt12 Changes included (1 change) Change 6463 by ludovic (1 file): CURRIKI-1179 Fix InvitationImpl constructor to not throw exception if invitation exists see more information about changed files: http://teamcity.xwiki.org/viewLog.html?tab=buildChangesDiv&buildId=6686&buildTypeId=bt12 Configure email notifications: http://teamcity.xwiki.org/profile.html?init=1#notifications ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] r6463 - xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl
Author: ludovic Date: 2007-12-26 16:53:05 +0100 (Wed, 26 Dec 2007) New Revision: 6463 Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationImpl.java Log: CURRIKI-1179 Fix InvitationImpl constructor to not throw exception if invitation exists Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationImpl.java === --- xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationImpl.java 2007-12-26 15:52:30 UTC (rev 6462) +++ xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationImpl.java 2007-12-26 15:53:05 UTC (rev 6463) @@ -62,12 +62,9 @@ initRequestDoc(space, invitee); // if we are asked to create the request if (create) { -// we created it if it does not yet exist, otherwise throw exception -if (isNew()) { -createRequestDoc(invitee, inviter, space, open, roles, map); -} else { -throw new XWikiException(-1, -1, "Invitation already exists"); -} +// we created it if it does not yet exist, otherwise pass +if (isNew()) +createRequestDoc(invitee, inviter, space, open, roles, map); } } ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] Build Curriki::Trunk #1061 failing
Build Curriki::Trunk #1061 failing Agent: Default agent Build results: http://teamcity.xwiki.org/viewLog.html?buildId=6685&buildTypeId=bt12 Changes included (1 change) Change 6462 by ludovic (3 files): CURRIKI-1179 Fix addMember see more information about changed files: http://teamcity.xwiki.org/viewLog.html?tab=buildChangesDiv&buildId=6685&buildTypeId=bt12 Configure email notifications: http://teamcity.xwiki.org/profile.html?init=1#notifications ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] r6462 - in xwiki-products/curriki/trunk/plugins/spacemanager/src: main/java/org/xwiki/plugin/spacemanager/impl test/java/org/xwiki/plugin/spacemanager/impl
Author: ludovic Date: 2007-12-26 16:52:30 +0100 (Wed, 26 Dec 2007) New Revision: 6462 Modified: xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java Log: CURRIKI-1179 Fix addMember Modified: xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java === --- xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java 2007-12-26 14:32:37 UTC (rev 6461) +++ xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java 2007-12-26 15:52:30 UTC (rev 6462) @@ -707,14 +707,18 @@ memberObject.setName(groupDoc.getFullName()); memberObject.setStringValue("member", username); groupDoc.addObject(groupClass.getName(), memberObject); +xwiki.saveDocument(groupDoc, context.getMessageTool().get("core.comment.addedUserToGroup"), + context); +/* if (groupDoc.isNew()) { -xwiki.saveDocument(groupDoc, context.getMessageTool().get("core.comment.addedUserToGroup"), -context); } else { xwiki.getHibernateStore().saveXWikiObject(memberObject, context, true); } // we need to make sure we add the user to the group cache -xwiki.getGroupService(context).addUserToGroup(username, context.getDatabase(), groupName, context); +try { +xwiki.getGroupService(context).addUserToGroup(username, context.getDatabase(), groupName, context); +} catch (Exception e) {} +*/ } Modified: xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java === --- xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java 2007-12-26 14:32:37 UTC (rev 6461) +++ xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceImplTest.java 2007-12-26 15:52:30 UTC (rev 6462) @@ -19,7 +19,7 @@ import com.xpn.xwiki.store.XWikiStoreInterface; import com.xpn.xwiki.store.XWikiVersioningStoreInterface; -public class SpaceImplTest extends org.jmock.cglib.MockObjectTestCase{ +public class SpaceImplTest extends org.jmock.cglib.MockObjectTestCase { private XWikiContext context; private SpaceManagerImpl spaceManager; Modified: xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java === --- xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java 2007-12-26 14:32:37 UTC (rev 6461) +++ xwiki-products/curriki/trunk/plugins/spacemanager/src/test/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImplTest.java 2007-12-26 15:52:30 UTC (rev 6462) @@ -244,9 +244,10 @@ List testlist = new ArrayList(); testlist.add("XWiki.cristi"); - testlist.addAll(newusers); +testlist.add("XWiki.testuser1"); +testlist.add("XWiki.testuser2"); l = (List) this.spaceManager.getMembers(s1.getSpaceName(), context); - assertEquals(l, testlist); + assertEquals(testlist, l); } public void testAddAdmin() throws SpaceManagerException { @@ -262,10 +263,11 @@ this.spaceManager.addAdmins(s1.getSpaceName(), newusers, context); List testlist = new ArrayList(); - testlist.add("XWiki.cristi"); - testlist.addAll(newusers); +testlist.add("XWiki.cristi"); +testlist.add("XWiki.testuser1"); +testlist.add("XWiki.testuser2"); l = (List) this.spaceManager.getAdmins(s1.getSpaceName(), context); - assertEquals(l, testlist); + assertEquals(testlist, l); } /** ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] Build Curriki::Trunk #1060 failing
Build Curriki::Trunk #1060 failing Agent: Default agent Build results: http://teamcity.xwiki.org/viewLog.html?buildId=6684&buildTypeId=bt12 Changes included (1 change) Change 6461 by ludovic (1 file): CURRIKI-1179 Added call to add user to group cache when adding to group see more information about changed files: http://teamcity.xwiki.org/viewLog.html?tab=buildChangesDiv&buildId=6684&buildTypeId=bt12 Configure email notifications: http://teamcity.xwiki.org/profile.html?init=1#notifications ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] Build Curriki::Trunk #1059 failing
Build Curriki::Trunk #1059 failing Agent: Default agent Build results: http://teamcity.xwiki.org/viewLog.html?buildId=6683&buildTypeId=bt12 Changes included (1 change) Change 6460 by ludovic (5 files): CURRIKI-1179 Added verifyInvitation and boolean return to invitations api see more information about changed files: http://teamcity.xwiki.org/viewLog.html?tab=buildChangesDiv&buildId=6683&buildTypeId=bt12 Configure email notifications: http://teamcity.xwiki.org/profile.html?init=1#notifications ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] r6461 - xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl
Author: ludovic Date: 2007-12-26 15:32:37 +0100 (Wed, 26 Dec 2007) New Revision: 6461 Modified: xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java Log: CURRIKI-1179 Added call to add user to group cache when adding to group Modified: xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java === --- xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java 2007-12-26 14:32:07 UTC (rev 6460) +++ xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java 2007-12-26 14:32:37 UTC (rev 6461) @@ -713,6 +713,8 @@ } else { xwiki.getHibernateStore().saveXWikiObject(memberObject, context, true); } +// we need to make sure we add the user to the group cache +xwiki.getGroupService(context).addUserToGroup(username, context.getDatabase(), groupName, context); } ___ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
[xwiki-notifications] r6460 - in xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager: api impl plugin
Author: ludovic Date: 2007-12-26 15:32:07 +0100 (Wed, 26 Dec 2007) New Revision: 6460 Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/JoinRequest.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPluginApi.java Log: CURRIKI-1179 Added verifyInvitation and boolean return to invitations api Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java === --- xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java 2007-12-24 22:26:46 UTC (rev 6459) +++ xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/Invitation.java 2007-12-26 14:32:07 UTC (rev 6460) @@ -26,6 +26,11 @@ public interface Invitation extends JoinRequest { /** + * Returns true is this invitation is new + */ +boolean isNew(); + +/** * @return The one who is invited to join the space */ String getInvitee(); Modified: xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java === --- xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java 2007-12-24 22:26:46 UTC (rev 6459) +++ xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/api/InvitationManager.java 2007-12-26 14:32:07 UTC (rev 6460) @@ -251,42 +251,62 @@ *should be a mailing list address * @param context A XWikiContext instance */ -void inviteUser(String user, String space, boolean open, XWikiContext context) throws InvitationManagerException; +boolean inviteUser(String user, String space, boolean open, XWikiContext context) throws InvitationManagerException; /** * @param role The role the user will have in the space, provided he accepts the invitation * @see #inviteUser(String, String, XWikiContext) */ -void inviteUser(String user, String space, boolean open, String role, XWikiContext context) throws InvitationManagerException; +boolean inviteUser(String user, String space, boolean open, String role, XWikiContext context) throws InvitationManagerException; /** * @param roles The list of roles the user will have in the space, provided he accepts the *invitation * @see #inviteUser(String, String, XWikiContext) */ -void inviteUser(String user, String space, boolean open, List roles, XWikiContext context) throws InvitationManagerException; +boolean inviteUser(String user, String space, boolean open, List roles, XWikiContext context) throws InvitationManagerException; /** * @param templateMail Custom e-mail template * @see #inviteUser(String, String, List, XWikiContext) */ -void inviteUser(String user, String space, boolean open, List roles, String templateMail, +boolean inviteUser(String user, String space, boolean open, List roles, String templateMail, XWikiContext context) throws InvitationManagerException; /** * @param map A map of additional parameters for the invitation * @see #inviteUser(String, String, List, String, XWikiContext) */ -void inviteUser(String user, String space, boolean open, List roles, String templateMail, +boolean inviteUser(String user, String space, boolean open, List roles, String templateMail, Map map, XWikiContext context) throws InvitationManagerException; /** + * The current logged-in user verify the invitation to join the specified space. + * + * @param space The space the user accepts to join + * @param context A XWikiContext instance + */ +boolean verifyInvitation(String space, XWikiContext context) throws InvitationManagerException; + +/** + * The current logged-in user verifies the invitation to join the specified space, using an email + * address and a code. + * + * @param space The space the user accepts to join + * @param email The e-mail where the invitation was sent + * @param code The code of the invitation, when it was sent to a single person (e.g. the e-