Author: jvelociter
Date: 2008-02-07 13:14:01 +0100 (Thu, 07 Feb 2008)
New Revision: 7342
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManager.java
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/plugin/CurrikiSpaceManagerPluginApi.java
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerTest.java
Log:
Changed imports to match new spacemanager package name
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
2008-02-07 12:12:59 UTC (rev 7341)
+++
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
2008-02-07 12:14:01 UTC (rev 7342)
@@ -1,19 +1,17 @@
package org.curriki.plugin.spacemanager.impl;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.xwiki.plugin.spacemanager.api.SpaceManagerException;
-import org.xwiki.plugin.spacemanager.impl.SpaceImpl;
-import org.xwiki.plugin.spacemanager.impl.SpaceManagerImpl;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManagerException;
+import com.xpn.xwiki.plugin.spacemanager.impl.SpaceImpl;
+import com.xpn.xwiki.plugin.spacemanager.impl.SpaceManagerImpl;
public class CurrikiSpace extends SpaceImpl {
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManager.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManager.java
2008-02-07 12:12:59 UTC (rev 7341)
+++
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManager.java
2008-02-07 12:14:01 UTC (rev 7342)
@@ -1,18 +1,18 @@
package org.curriki.plugin.spacemanager.impl;
+import java.util.List;
+
+import org.curriki.plugin.spacemanager.plugin.CurrikiSpaceManagerPluginApi;
+
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.api.Api;
import com.xpn.xwiki.plugin.XWikiPluginInterface;
-import com.xpn.xwiki.api.Api;
-import org.xwiki.plugin.spacemanager.api.Space;
-import org.xwiki.plugin.spacemanager.api.SpaceManagerException;
-import org.xwiki.plugin.spacemanager.api.SpaceManagerExtension;
-import org.xwiki.plugin.spacemanager.impl.SpaceManagerImpl;
-import org.curriki.plugin.spacemanager.plugin.CurrikiSpaceManagerPluginApi;
+import com.xpn.xwiki.plugin.spacemanager.api.Space;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManagerException;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManagerExtension;
+import com.xpn.xwiki.plugin.spacemanager.impl.SpaceManagerImpl;
-import java.lang.reflect.Constructor;
-import java.util.List;
-
/**
* Created by IntelliJ IDEA.
* User: ludovic
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
2008-02-07 12:12:59 UTC (rev 7341)
+++
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
2008-02-07 12:14:01 UTC (rev 7342)
@@ -1,15 +1,14 @@
package org.curriki.plugin.spacemanager.impl;
-import org.xwiki.plugin.spacemanager.api.Space;
-import org.xwiki.plugin.spacemanager.api.SpaceManager;
-import org.xwiki.plugin.spacemanager.api.SpaceManagerException;
-import org.xwiki.plugin.spacemanager.impl.SpaceManagerExtensionImpl;
-
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.classes.BaseClass;
+import com.xpn.xwiki.plugin.spacemanager.api.Space;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManager;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManagerException;
+import com.xpn.xwiki.plugin.spacemanager.impl.SpaceManagerExtensionImpl;
public class CurrikiSpaceManagerExtension extends SpaceManagerExtensionImpl {
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/plugin/CurrikiSpaceManagerPluginApi.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/plugin/CurrikiSpaceManagerPluginApi.java
2008-02-07 12:12:59 UTC (rev 7341)
+++
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/plugin/CurrikiSpaceManagerPluginApi.java
2008-02-07 12:14:01 UTC (rev 7342)
@@ -1,16 +1,17 @@
package org.curriki.plugin.spacemanager.plugin;
-import org.xwiki.plugin.spacemanager.api.SpaceManagerException;
-import org.xwiki.plugin.spacemanager.plugin.SpaceManagerPluginApi;
+import java.util.List;
+
import org.curriki.plugin.spacemanager.impl.CurrikiSpaceManager;
+
import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManagerException;
+import com.xpn.xwiki.plugin.spacemanager.plugin.SpaceManagerPluginApi;
-import java.util.List;
-
/**
* Created by IntelliJ IDEA.
* User: ludovic
- * Date: 17 d�c. 2007
+ * Date: 17 d�c. 2007
* Time: 08:59:52
* To change this template use File | Settings | File Templates.
*/
Modified:
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/InvitationManagerImpl.java
2008-02-07 12:12:59 UTC (rev 7341)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-02-07 12:14:01 UTC (rev 7342)
@@ -19,26 +19,36 @@
*/
package org.xwiki.plugin.invitationmanager.impl;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
-import org.xwiki.plugin.invitationmanager.api.*;
-import org.xwiki.plugin.spacemanager.api.SpaceManager;
-import org.xwiki.plugin.spacemanager.api.SpaceManagers;
-import org.xwiki.plugin.spacemanager.api.Space;
-import org.xwiki.plugin.spacemanager.api.SpaceUserProfile;
-import org.xwiki.plugin.spacemanager.impl.SpaceUserProfileImpl;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.velocity.VelocityContext;
+import org.xwiki.plugin.invitationmanager.api.Invitation;
+import org.xwiki.plugin.invitationmanager.api.InvitationManager;
+import org.xwiki.plugin.invitationmanager.api.InvitationManagerException;
+import org.xwiki.plugin.invitationmanager.api.JoinRequest;
+import org.xwiki.plugin.invitationmanager.api.JoinRequestStatus;
+import org.xwiki.plugin.invitationmanager.api.MembershipRequest;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.render.XWikiVelocityRenderer;
-import com.xpn.xwiki.plugin.mailsender.Mail;
-import com.xpn.xwiki.plugin.mailsender.MailSenderPlugin;
import com.xpn.xwiki.api.Document;
import com.xpn.xwiki.api.XWiki;
+import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.classes.BaseClass;
-import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.plugin.mailsender.Mail;
+import com.xpn.xwiki.plugin.mailsender.MailSenderPlugin;
+import com.xpn.xwiki.plugin.spacemanager.api.Space;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManager;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManagers;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceUserProfile;
+import com.xpn.xwiki.plugin.spacemanager.impl.SpaceUserProfileImpl;
+import com.xpn.xwiki.render.XWikiVelocityRenderer;
/**
* The default implementation for [EMAIL PROTECTED] InvitationManager}
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerTest.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerTest.java
2008-02-07 12:12:59 UTC (rev 7341)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerTest.java
2008-02-07 12:14:01 UTC (rev 7342)
@@ -30,14 +30,18 @@
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Invocation;
import org.jmock.core.stub.CustomStub;
-import org.xwiki.plugin.invitationmanager.api.*;
-import org.xwiki.plugin.spacemanager.api.SpaceManager;
+import org.xwiki.plugin.invitationmanager.api.Invitation;
+import org.xwiki.plugin.invitationmanager.api.InvitationManager;
+import org.xwiki.plugin.invitationmanager.api.InvitationManagerException;
+import org.xwiki.plugin.invitationmanager.api.JoinRequestStatus;
+import org.xwiki.plugin.invitationmanager.api.MembershipRequest;
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiConfig;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.plugin.spacemanager.api.SpaceManager;
import com.xpn.xwiki.store.XWikiHibernateStore;
import com.xpn.xwiki.store.XWikiStoreInterface;
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
