dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Morten Olav Hansen (mortenoh)
------------------------------------------------------------
revno: 5322 [merge]
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-12-07 14:45:11 +0100
message:
  minor fix
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java	2011-12-02 16:05:28 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java	2011-12-07 13:44:45 +0000
@@ -54,9 +54,9 @@
 
     static final String MODEL2FOP = "model2fop.xsl"; 
 
-    static final String HTMLXSLT_RESOURCE = "/templates/xslt/";
+    static final String HTMLXSLT_RESOURCE = "/templates/html/";
 
-    static final String FOPXSLT_RESOURCE = "/templates/xslfo/";
+    static final String FOPXSLT_RESOURCE = "/templates/pdf/";
     
     static private TransformCache instance;
     

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2011-12-05 12:21:38 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2011-12-07 13:44:45 +0000
@@ -41,13 +41,13 @@
     <property name="viewResolvers">
       <list>
         <bean name="xsltHtmlViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-          <property name="prefix" value="/templates/xslt/" />
+          <property name="prefix" value="/templates/html/" />
           <property name="suffix" value=".xsl" />
           <property name="viewClass" value="org.hisp.dhis.api.view.XsltHtmlView" />
         </bean>
 
         <bean name="xslFoPdfViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-          <property name="prefix" value="/templates/xslfo/" />
+          <property name="prefix" value="/templates/pdf/" />
           <property name="suffix" value=".xsl" />
           <property name="viewClass" value="org.hisp.dhis.api.view.XslFoPdfView" />
         </bean>