You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2011/03/28 21:58:44 UTC
svn commit: r1086372 -
/incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java
Author: reto
Date: Mon Mar 28 19:58:44 2011
New Revision: 1086372
URL: http://svn.apache.org/viewvc?rev=1086372&view=rev
Log:
CLEREZZA-460: hack for available static index.html to be used instead of generated index site, real solution would comprise a more pervasive support for all-host-uri and resource with multiple representation that can be provided by mutliple files with different extensions
Modified:
incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java
Modified: incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java?rev=1086372&r1=1086371&r2=1086372&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java (original)
+++ incubator/clerezza/trunk/parent/tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java Mon Mar 28 19:58:44 2011
@@ -156,7 +156,7 @@ public class Generator {
formatExtensions);
PathNode allHostsNode = createFileHierarchy(Constants.ALL_HOSTS_URI_PREFIX+"/",
baseUri,targetUri, rootLinkPrefix, formatExtensions);
- PathNode rootNode = new MultiPathNode(baseNode, allHostsNode);
+ PathNode rootNode = new MultiPathNode(allHostsNode, baseNode);
try {
return ZipCreationUtil.createZip(rootNode);
} catch (IOException ex) {
@@ -180,6 +180,9 @@ public class Generator {
if (matchingUri.contains(new UriRef(uriRef.getUnicodeString()+"index"))) {
continue;
}
+ if (matchingUri.contains(new UriRef(uriRef.getUnicodeString()+"index.html"))) {
+ continue;
+ }
generateFilesForResource(baseUri, retrievalBaseUri, targetUri,
rootLinkPrefix, uriRef, contentGraph, formatExtensions,
result);