language bundles are now in a directory bundles/ in WEB-INF classes in order to keep...

diff --git a/build.xml b/build.xml
index f72143b..7daa9ec 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 
 
 <!-- What this file is all about
-     
+
      You can use this version of build.xml to use directly with ant
      i.e. without the build.sh script. Simply call ant and let it all
      happen.
@@ -49,7 +49,7 @@
 
        java.home          The location of your Java SDK.
 
-       java.localhome     Where your local java classes and jar files 
+       java.localhome     Where your local java classes and jar files
                        are located.
 
        tomcat.home        The location of the tomcat root directory.
@@ -124,7 +124,7 @@
         <exclude name="xerces.jar"/>
       </fileset>
     </copy>
-    <copy todir="${deploy.home}/WEB-INF/classes">
+    <copy todir="${deploy.home}/WEB-INF/classes/bundles">
       <fileset dir="bundles"/>
     </copy>
     <mkdir  dir="${javadoc.home}"/>
@@ -185,12 +185,16 @@
     <copy   todir="${deploy.home}">
       <fileset dir="source" includes="**/content-types.properties"/>
     </copy>
+    <copy   todir="${deploy.classes}/bundles">
+      <fileset dir="bundles" includes="**/*.properties"/>
+    </copy>
+<!--
        <exec executable="./perms.sh"/>
-
+-->
 <!--   <echo>
                Now you should call perms.sh(-dist) in order to set
                the permissions of your installed files to a meaningful
-               value. 
+               value.
                Have fun with Mir!
        </echo>
 -->

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index af419ea..cf5e0ae 100755 (executable)
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -255,7 +255,7 @@ public final class HTMLTemplateProcessor {
                outPutHash.put("data",tmr);
                outPutHash.put("config", configHash);
                        
-               MessageResources messages = MessageResources.getMessageResources("admin");
+               MessageResources messages = MessageResources.getMessageResources("bundles.admin");
                outPutHash.put("lang", new MessageMethodModel(locale, messages) );
                        
                tmpl.process(outPutHash,out);