Changeset 3710 in main for trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml

Timestamp:

04/12/12 01:58:53 (10 years ago)

Author:

Garth Braithwaite

Message:

java and view - email verification code working. updated systemid modelmaps to use verified file, then the new resource then classpath system id lookup. many of the modelmap objects were changed from "XML" to the more generic "file". Renamed the saxon*.jars to include the exact version number.

File:

• trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml (modified) (4 diffs)

trunk/src/main/webapps/ibisph-view/WEB-INF/config/spring/query.xml

@@ -34 +34 @@
         </bean>
         <bean id="Query.ModuleXInclude.XSLT.SystemID" class="org.ibisph.systemid.FileSystemID">
-                <constructor-arg ref="Common.Context.Servlet.RootPath"/>
+                <constructor-arg ref="Common.Webapp.RootPath"/>
                 <constructor-arg value="xslt/xml/query/module/ConfigurationIncludeCriteriaExclude.xslt"/>
         </bean>
@@ -65 +65 @@
         <!-- X M L   M O D E L S -->
         <bean id="Query.HTMLContent.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestEndOfPathInfo" parent="Common.XMLModelMap.CommonProperties">
-                <property name="XMLPath" ref="Query.HTMLContent.XML.Path"/>
+                <property name="FilePath" ref="Query.HTMLContent.XML.Path"/>
         </bean>
         <bean id="Query.DefaultHTMLContent.ModelMap" class="org.ibisph.modelmap.DefaultModelIfNullModel" parent="Common.XMLModelMap.CommonProperties">
@@ -72 +72 @@
 
         <bean id="Query.ModuleSelectionSystemID.ModelMap" class="org.ibisph.systemid.modelmap.SystemIDFromHTTPRequestPathInfo" parent="Common.XMLModelMap.CommonProperties">
-                <property name="XMLPath" ref="Query.ModuleBase.XML.Path"/>
+                <property name="FilePath" ref="Query.ModuleBase.XML.Path"/>
         </bean>
 
@@ -245 +245 @@
         <!--  V I E W   R E S O U R C E S  -->
         <bean id="Query.HTMLContent.XSLT.SystemID" class="org.ibisph.systemid.FileSystemID">
-                <constructor-arg ref="Common.Context.Servlet.RootPath"/>
+                <constructor-arg ref="Common.Webapp.RootPath"/>
                 <constructor-arg value="xslt/html/query/HTMLContentPage.xslt"/>
         </bean>
         <bean id="Query.Selection.XSLT.SystemID" class="org.ibisph.systemid.FileSystemID">
-                <constructor-arg ref="Common.Context.Servlet.RootPath"/>
+                <constructor-arg ref="Common.Webapp.RootPath"/>
                 <constructor-arg value="xslt/html/query/selection/SelectionPage.xslt"/>
         </bean>
         <bean id="Query.Builder.XSLT.SystemID" class="org.ibisph.systemid.FileSystemID">
-                <constructor-arg ref="Common.Context.Servlet.RootPath"/>
+                <constructor-arg ref="Common.Webapp.RootPath"/>
                 <constructor-arg value="xslt/html/query/module/builder/BuilderPage.xslt"/>
         </bean>
         <bean id="Query.Result.XSLT.SystemID" class="org.ibisph.systemid.FileSystemID">
-                <constructor-arg ref="Common.Context.Servlet.RootPath"/>
+                <constructor-arg ref="Common.Webapp.RootPath"/>
                 <constructor-arg value="xslt/html/query/module/result/ResultPage.xslt"/>
         </bean>
         <bean id="Query.Map.XSLT.SystemID" class="org.ibisph.systemid.FileSystemID">
-                <constructor-arg ref="Common.Context.Servlet.RootPath"/>
+                <constructor-arg ref="Common.Webapp.RootPath"/>
                 <constructor-arg value="xslt/svg/query/Map.xslt"/>
         </bean>