[Yanel-commits] rev 27596 - public/yanel/trunk/src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-09-24 15:49:58 +0200 (Mon, 24 Sep 2007)
New Revision: 27596

Modified:
   public/yanel/trunk/src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java
Log:
use resolved

Modified: public/yanel/trunk/src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java	2007-09-24 13:48:54 UTC (rev 27595)
+++ public/yanel/trunk/src/contributions/resources/pdf/src/java/org/wyona/yanel/impl/resources/PDFResource.java	2007-09-24 13:49:58 UTC (rev 27596)
@@ -21,7 +21,7 @@
 import org.wyona.yanel.core.api.attributes.ViewableV2;
 import org.wyona.yanel.core.attributes.viewable.View;
 import org.wyona.yanel.core.attributes.viewable.ViewDescriptor;
-import org.wyona.yanel.core.source.YanelRepositoryResolver;
+import org.wyona.yanel.core.source.SourceResolver;
 
 import org.wyona.yarep.core.RepositoryException;
 import org.wyona.yarep.core.Repository;
@@ -75,9 +75,15 @@
         try {
             String yanelPath = getResourceConfigProperty("yanel-path");
             Repository repo = getRealm().getRepository();
-            InputStream docSource;
+            InputStream docSource = null;
             if (yanelPath != null) {
-                docSource = repo.getNode(yanelPath).getInputStream();
+                if (yanelPath.startsWith("yanelrepo:") || yanelPath.startsWith("yanelresource:")) {
+                    SourceResolver resolver = new SourceResolver(this);
+                    Source source = resolver.resolve(yanelPath, null);
+                    docSource = ((StreamSource) source).getInputStream();
+                } else {
+                    docSource = repo.getNode(yanelPath).getInputStream();
+                }
             } else {
                 docSource = repo.getNode(getPath()).getInputStream();
             }
@@ -89,8 +95,8 @@
             // Step 2: Construct fop with desired output format
             Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, getResponse().getOutputStream());
 
-            YanelRepositoryResolver yanelRepoResolver = new YanelRepositoryResolver(this);
-            fopFactory.setURIResolver(yanelRepoResolver);
+            SourceResolver srcResolver = new SourceResolver(this);
+            fopFactory.setURIResolver(srcResolver);
             
             /* Only for debugging ...
             java.io.FileOutputStream fout = new java.io.FileOutputStream("/home/michi/Desktop/yanel.pdf");