taylor 02/03/28 17:10:16
Modified: src/java/org/apache/jetspeed/services/registry
CastorRegistryService.java
TestRegistryCategories.java
Log:
- updated tests for refs
- moved init up to resolve deadlock
Revision Changes Path
1.15 +6 -7
jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java
Index: CastorRegistryService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/CastorRegistryService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CastorRegistryService.java 28 Mar 2002 23:13:15 -0000 1.14
+++ CastorRegistryService.java 29 Mar 2002 01:10:16 -0000 1.15
@@ -102,7 +102,7 @@
* </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
- * @version $Id: CastorRegistryService.java,v 1.14 2002/03/28 23:13:15 taylor Exp $
+ * @version $Id: CastorRegistryService.java,v 1.15 2002/03/29 01:10:16 taylor Exp $
*/
public class CastorRegistryService
extends TurbineBaseService
@@ -369,9 +369,11 @@
// changing the base will trigger a synchronous loading of the fragments
this.watcher.changeBase(base);
}
-
+
+ //Mark that we are done
+ setInit(true);
+
// load the registries
-
Enumeration en = names.elements();
while(en.hasMoreElements()) {
@@ -389,12 +391,9 @@
refresh( name );
}
-
+
// Start the directory watcher thread
if (this.watcher!=null) this.watcher.start();
-
- //Mark that we are done
- setInit(true);
Log.debug( "Registry early init()....end!");
}
1.2 +12 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryCategories.java
Index: TestRegistryCategories.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestRegistryCategories.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRegistryCategories.java 28 Mar 2002 23:13:15 -0000 1.1
+++ TestRegistryCategories.java 29 Mar 2002 01:10:16 -0000 1.2
@@ -31,7 +31,7 @@
* TestRegistryCategories
*
* @author <a href="[EMAIL PROTECTED]">David Sean Taylor</a>
- * @version $Id: TestRegistryCategories.java,v 1.1 2002/03/28 23:13:15 taylor Exp $
+ * @version $Id: TestRegistryCategories.java,v 1.2 2002/03/29 01:10:16 taylor Exp $
*/
public class TestRegistryCategories extends TestCase {
@@ -81,7 +81,7 @@
PortletEntry pe = (PortletEntry)registry.getEntry("RSS");
assertNotNull(pe);
- Iterator iterator = registry.findPortletsByCategory("news");
+ Iterator iterator = registry.findPortletsByCategory("rss");
int count = 0;
init();
PortletEntry rss;
@@ -91,23 +91,27 @@
print(iterator, rss);
count++;
}
- System.out.println("[news] count = " + count);
+ System.out.println("[RSS] count = " + count);
System.out.println("------------------");
- assertTrue(count == 1);
+ assertTrue(count == 6);
registry.removeEntry(pe);
- iterator = registry.findPortletsByCategory("news");
- assertTrue(iterator.hasNext() == false);
+ iterator = registry.findPortletsByCategory("rss");
+ assertTrue(iterator.hasNext());
+ assertTrue(iterator.hasNext());
+ assertTrue(iterator.hasNext());
+ assertTrue(iterator.hasNext());
+ assertTrue(iterator.hasNext());
registry.addEntry(pe);
- iterator = registry.findPortletsByCategory("news");
+ iterator = registry.findPortletsByCategory("rss");
assertTrue(iterator.hasNext());
rss = (PortletEntry)iterator.next();
Iterator cats = rss.listCategories();
assertNotNull(cats);
assertTrue(cats.hasNext());
Category cat = (Category)cats.next();
- assertTrue(cat.getName().startsWith("news"));
+ assertTrue(cat.getName().startsWith("rss") ||
cat.getName().startsWith("news"));
iterator = registry.listByCategory();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
