modified repo for eXist app structure

webapp/build.xml

@@ -22,12 +22,9 @@
         <zip destfile="${build.dir}/${project.app}-${project.version}.xar">
             <fileset dir=".">
                 <include name="*.*"/>
-                <include name="css/**"/>
-                <include name="fonts/**"/>
-                <include name="jscript/**"/>
-                <include name="pix/**"/>
-                <include name="xml/**"/>
-                <include name="xql/**"/>
+                <include name="modules/**"/>
+                <include name="resources/**"/>
+                <include name="catalogues/**"/>
                 <include name="xsl/**"/>
                 <exclude name="${build}/*"/>
                 <exclude name=".git*"/>

webapp/xml/wegaOptions.xml → webapp/catalogues/options.xml

@@ -1,5 +1,5 @@
 <dictionary xml:id="wegaOptions">
-   <div xml:id="collections">
+   <!--<div xml:id="collections">
       <entry xml:id="persons" type="xs:string">/db/persons</entry>
       <entry xml:id="letters" type="xs:string">/db/letters</entry>
       <entry xml:id="diaries" type="xs:string">/db/diaries</entry>
@@ -9,8 +9,8 @@
       <entry xml:id="works" type="xs:string">/db/works</entry>
       <entry xml:id="var" type="xs:string">/db/var</entry>
       <entry xml:id="biblio" type="xs:string">/db/biblio</entry>
-      <!--<entry xml:id="weberStudies" type="xs:string">/db/biblio</entry>-->
-   </div>
+      <entry xml:id="weberStudies" type="xs:string">/db/biblio</entry>
+   </div>-->
    <div xml:id="collectionPredicates">
       <entry xml:id="lettersPred">[(.//tei:sender/tei:persName/@key = '%1', .//tei:addressee/tei:persName/@key = '%1')][not(*/tei:ref)]</entry>
       <entry xml:id="writingsPred">[.//tei:fileDesc//tei:author/@key = '%1'][not(*/tei:ref)]</entry>
@@ -35,33 +35,33 @@
       <entry xml:id="digilibDir" type="xs:string">/digilib/servlet/Scaler?fn=</entry>
       <entry xml:id="relativeTmpDir" type="xs:string">../tmp/</entry>
       <entry xml:id="html_sitemapDir" type="xs:string">sitemap</entry>
-      <entry xml:id="html_cssDir" type="xs:string">css</entry>
-      <entry xml:id="html_jsDir" type="xs:string">jscript</entry>
+      <entry xml:id="html_cssDir" type="xs:string">resources/css</entry>
+      <entry xml:id="html_jsDir" type="xs:string">resources/js</entry>
       <entry xml:id="figureHeight" type="xs:int">75</entry>
    </div>
    <div xml:id="dbPaths">
-      <entry xml:id="tmpDir" type="xs:string">/db/webapp/tmp/</entry>
-      <entry xml:id="pixDir" type="xs:string">/db/webapp/pix/</entry>
-      <entry xml:id="sitemapDir" type="xs:string">/db/webapp/tmp/sitemap</entry>
-      <entry xml:id="dic_de" type="xs:string">/db/webapp/xml/dictionary_de.xml</entry>
-      <entry xml:id="dic_en" type="xs:string">/db/webapp/xml/dictionary_en.xml</entry>
-      <entry xml:id="imagesDir" type="xs:string">/db/images/</entry>
-      <entry xml:id="unknownMan" type="xs:string">/db/images/persons/unknown/nobody_m.png</entry>
-      <entry xml:id="unknownWoman" type="xs:string">/db/images/persons/unknown/nobody_f.png</entry>
-      <entry xml:id="unknownSex" type="xs:string">/db/images/persons/unknown/nobody_n.png</entry>
-      <entry xml:id="persNamesFile" type="xs:string">/db/webapp/tmp/persNames.xml</entry>
-      <entry xml:id="lettersNormDatesFile" type="xs:string">/db/webapp/tmp/lettersNormDates.xml</entry>
-      <entry xml:id="writingsNormDatesFile" type="xs:string">/db/webapp/tmp/writingsNormDates.xml</entry>
-      <entry xml:id="newsNormDatesFile" type="xs:string">/db/webapp/tmp/newsNormDates.xml</entry>
-      <entry xml:id="biblioNormDatesFile" type="xs:string">/db/webapp/tmp/biblioNormDates.xml</entry>
-      <entry xml:id="weberStudiesNormDatesFile" type="xs:string">/db/webapp/tmp/weberStudiesNormDates.xml</entry>
-      <entry xml:id="diariesNormDatesFile" type="xs:string">/db/webapp/tmp/diariesNormDates.xml</entry>
-      <entry xml:id="worksNormSeriesFile" type="xs:string">/db/webapp/tmp/worksNormSeries.xml</entry>
-      <entry xml:id="facetsFile" type="xs:string">/db/webapp/xml/facets.xml</entry>
-      <entry xml:id="svnChangeHistoryFile" type="xs:string">/db/webapp/xml/svnChangeHistory.xml</entry>
-      <entry xml:id="svnUsers" type="xs:string">/db/webapp/xml/subversionUsers.xml</entry>
-      <entry xml:id="typo3ContentMappings" type="xs:string">/db/webapp/xml/typo3ContentMappings.xml</entry>
-      <entry xml:id="menusFile" type="xs:string">/db/webapp/xml/menus.xml</entry>
+      <entry xml:id="tmpDir" type="xs:string">/db/apps/WeGA-WebApp/tmp/</entry>
+      <entry xml:id="pixDir" type="xs:string">/db/apps/WeGA-WebApp/resources/pix/</entry>
+      <entry xml:id="sitemapDir" type="xs:string">/db/apps/WeGA-WebApp/tmp/sitemap</entry>
+      <entry xml:id="dic_de" type="xs:string">/db/apps/WeGA-WebApp/catalogues/dictionary_de.xml</entry>
+      <entry xml:id="dic_en" type="xs:string">/db/apps/WeGA-WebApp/catalogues/dictionary_en.xml</entry>
+<!--      <entry xml:id="imagesDir" type="xs:string">/db/images/</entry>-->
+<!--      <entry xml:id="unknownMan" type="xs:string">/db/images/persons/unknown/nobody_m.png</entry>-->
+<!--      <entry xml:id="unknownWoman" type="xs:string">/db/images/persons/unknown/nobody_f.png</entry>-->
+<!--      <entry xml:id="unknownSex" type="xs:string">/db/images/persons/unknown/nobody_n.png</entry>-->
+      <entry xml:id="persNamesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/persNames.xml</entry>
+      <entry xml:id="lettersNormDatesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/lettersNormDates.xml</entry>
+      <entry xml:id="writingsNormDatesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/writingsNormDates.xml</entry>
+      <entry xml:id="newsNormDatesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/newsNormDates.xml</entry>
+      <entry xml:id="biblioNormDatesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/biblioNormDates.xml</entry>
+      <entry xml:id="weberStudiesNormDatesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/weberStudiesNormDates.xml</entry>
+      <entry xml:id="diariesNormDatesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/diariesNormDates.xml</entry>
+      <entry xml:id="worksNormSeriesFile" type="xs:string">/db/apps/WeGA-WebApp/tmp/worksNormSeries.xml</entry>
+      <entry xml:id="facetsFile" type="xs:string">/db/apps/WeGA-WebApp/catalogues/facets.xml</entry>
+      <entry xml:id="svnChangeHistoryFile" type="xs:string">/db/apps/WeGA-WebApp/catalogues/svnChangeHistory.xml</entry>
+      <entry xml:id="svnUsers" type="xs:string">/db/apps/WeGA-WebApp/catalogues/subversionUsers.xml</entry>
+      <entry xml:id="typo3ContentMappings" type="xs:string">/db/apps/WeGA-WebApp/catalogues/typo3ContentMappings.xml</entry>
+      <entry xml:id="menusFile" type="xs:string">/db/apps/WeGA-WebApp/catalogues/menus.xml</entry>
    </div>
    <div xml:id="javaScriptOptions">
       <entry xml:id="baseHref" type="xs:string">http://localhost:8080</entry>