You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/15 11:38:05 UTC
svn commit: r475188 - in /lenya/trunk/src:
impl/test/org/apache/lenya/cms/site/SimpleSiteManagerTest.java
webapp/lenya/i18n.xmap
Author: andreas
Date: Wed Nov 15 02:38:04 2006
New Revision: 475188
URL: http://svn.apache.org/viewvc?view=rev&rev=475188
Log:
Don't fail if site structure is empty
Modified:
lenya/trunk/src/impl/test/org/apache/lenya/cms/site/SimpleSiteManagerTest.java
lenya/trunk/src/webapp/lenya/i18n.xmap
Modified: lenya/trunk/src/impl/test/org/apache/lenya/cms/site/SimpleSiteManagerTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/test/org/apache/lenya/cms/site/SimpleSiteManagerTest.java?view=diff&rev=475188&r1=475187&r2=475188
==============================================================================
--- lenya/trunk/src/impl/test/org/apache/lenya/cms/site/SimpleSiteManagerTest.java (original)
+++ lenya/trunk/src/impl/test/org/apache/lenya/cms/site/SimpleSiteManagerTest.java Wed Nov 15 02:38:04 2006
@@ -71,29 +71,12 @@
SiteStructure structure = siteManager.getSiteStructure(factory, pub,
Publication.AUTHORING_AREA);
- SiteNode[] nodes = structure.getNodes();
- assertTrue(nodes.length > 0);
-
- for (int i = 0; i < nodes.length; i++) {
-
- assertTrue(structure.contains(nodes[i].getPath()));
-
- SiteNode node = structure.getNode(nodes[i].getPath());
- assertNotNull(node);
- if (node.getLanguages().length > 0) {
- assertNotNull(node.getUuid());
- }
- assertEquals(nodes[i], node);
-
- checkLinks(siteManager, node);
- }
-
docManager = (DocumentManager) getManager().lookup(DocumentManager.ROLE);
resourceTypeSelector = (ServiceSelector) getManager().lookup(
ResourceType.ROLE + "Selector");
ResourceType type = (ResourceType) resourceTypeSelector.select("entry");
- String contentSourceUri = structure.getRepositoryNode().getSourceURI();
+ String contentSourceUri = "context://sitemap.xmap";
Document doc = docManager.add(getFactory(), type, contentSourceUri, pub,
Publication.AUTHORING_AREA, "en", "xml");
@@ -108,11 +91,28 @@
checkSetLabel(link);
}
+ SiteNode[] nodes = structure.getNodes();
+ assertTrue(nodes.length > 0);
+
+ for (int i = 0; i < nodes.length; i++) {
+
+ assertTrue(structure.contains(nodes[i].getPath()));
+
+ SiteNode node = structure.getNode(nodes[i].getPath());
+ assertNotNull(node);
+ if (node.getLanguages().length > 0) {
+ assertNotNull(node.getUuid());
+ }
+ assertEquals(nodes[i], node);
+
+ checkLinks(siteManager, node);
+ }
+
doc.getLink().delete();
assertFalse(structure.containsByUuid(doc.getUUID(), doc.getLanguage()));
assertFalse(structure.contains(PATH));
assertFalse(structure.contains(PARENT_PATH));
-
+
} finally {
if (selector != null) {
if (siteManager != null) {
Modified: lenya/trunk/src/webapp/lenya/i18n.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/i18n.xmap?view=diff&rev=475188&r1=475187&r2=475188
==============================================================================
--- lenya/trunk/src/webapp/lenya/i18n.xmap (original)
+++ lenya/trunk/src/webapp/lenya/i18n.xmap Wed Nov 15 02:38:04 2006
@@ -48,8 +48,8 @@
<!-- i18n-catalogue/module/{module-id}/{catalogue}-->
<map:match pattern="i18n-catalogue/module/*/*">
<map:select type="resource-exists">
- <map:when test="fallback://lenya/modules/{1}/resources/i18n/{2}">
- <map:generate src="fallback://lenya/modules/{1}/resources/i18n/{2}"/>
+ <map:when test="aggregate-fallback://lenya/modules/{1}/resources/i18n/{2}">
+ <map:generate src="aggregate-fallback://lenya/modules/{1}/resources/i18n/{2}"/>
</map:when>
<map:otherwise>
<map:generate src="resources/i18n/emptyCatalogue.xml"/>
@@ -60,9 +60,9 @@
<map:match pattern="i18n-catalogue/**">
<map:select type="resource-exists">
- <map:when test="fallback://lenya/resources/i18n/{1}">
+ <map:when test="aggregate-fallback://lenya/resources/i18n/{1}">
<map:generate type="serverpages" src="fallback://lenya/resources/i18n/catalogue.xsp">
- <map:parameter name="pub-catalogue-location" value="fallback://lenya/resources/i18n/"/>
+ <map:parameter name="pub-catalogue-location" value="aggregate-fallback://lenya/resources/i18n/"/>
<map:parameter name="catalogue-file" value="{1}"/>
</map:generate>
<map:call resource="serializeCatalogue">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org