Changeset 6582 for trunk/gli

Timestamp:

2004-01-22T13:54:55+13:00 (20 years ago)

Author:

jmt12

Message:

A whole bunch of files right in the middle of being edited because Michael is being awkward and expecting me to commit stuff regular like.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (6 diffs)
• WGet.java (modified) (2 diffs)
• collection/CollectionManager.java (modified) (4 diffs)
• collection/Job.java (modified) (6 diffs)
• file/WorkspaceTreeModel.java (modified) (3 diffs)
• gui/CreatePane.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (1 diff)
• gui/MirrorPane.java (modified) (7 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• util/StaticStrings.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -82 +82 @@
     /** The name of the general Gatherer configuration template. */
     static final private String TEMPLATE_CONFIG_XML = "xml/config.xml";
-    /** The first of two patterns used during tokenization, this pattern handles a comma separated list. */
+    /** The first of three patterns used during tokenization, this pattern handles a comma separated list. */
     static final private String TOKENIZER_PATTERN1 = " ,\n\t";
-    /** The second of two patterns used during tokenization, this pattern handles an underscore separated list. */
+    /** The second of three patterns used during tokenization, this pattern handles an underscore separated list. */
     static final private String TOKENIZER_PATTERN2 = "_\n\t";
+    /** The last of three patterns used during tokenization, this pattern handles an comma separated list containing spaces. */
+    static final private String TOKENIZER_PATTERN3 = ",\n\t";
 
     public File exec_file;
@@ -183 +185 @@
     // Unix based systems. This one I know. Look for .gli/config.xml in the users home folder
     else {
-        user_config_xml = new File(System.getProperty("user.home") + File.separator + ".gli" + File.separator + CONFIG_XML);        
+        user_config_xml = new File(Utility.getGLIUserFolder(), CONFIG_XML);     
     }
     if(user_config_xml != null && user_config_xml.exists()) {
@@ -422 +424 @@
         String raw = getString(property, general);
         // Font is a face, style, size triplet.
-        StringTokenizer tokenizer = new StringTokenizer(raw, TOKENIZER_PATTERN1);
-        String face = tokenizer.nextToken();
+        StringTokenizer tokenizer = new StringTokenizer(raw, TOKENIZER_PATTERN3);
+        String face = tokenizer.nextToken().trim();
+        System.err.println("Face: " + face);
         int style = Font.PLAIN;
         String temp = tokenizer.nextToken().toUpperCase();
@@ -432 +435 @@
         style = Font.ITALIC;
         }
-        int size = Integer.parseInt(tokenizer.nextToken());
+        int size = Integer.parseInt(tokenizer.nextToken().trim());
         result = new FontUIResource(face, style, size);
     }
@@ -575 +578 @@
     }
 
+
+    public String getWGetPath() {
+    return "/usr/bin/wget";
+    }
+
     /** Remove a previously defined special directory mapping.
      * @param name The name of the mapping to remove as a <strong>String</strong>.
@@ -613 +621 @@
         // Unix systems save user preferences in . folders in the home directory.
         else {
-        user_config_xml = new File(System.getProperty("user.home") + File.separator + ".gli" + File.separator + CONFIG_XML);
+        user_config_xml = new File(Utility.getGLIUserFolder(), CONFIG_XML);
         ///ystem.err.println("Trying to save to: " + user_config_xml.getAbsolutePath());
         ///ystem.err.println("Writing.");

trunk/gli/src/org/greenstone/gatherer/WGet.java

@@ -254 +254 @@
      * @see org.greenstone.gatherer.util.GURL
      */
-    public void newJob(/* TreeModel model, */ boolean overwrite, boolean no_parents, boolean other_hosts, boolean page_requisites, URL url, int depth, String destination) {
+    public void newJob(boolean no_parents, boolean other_hosts, boolean page_requisites, URL url, int depth, String destination) {
     // Create the job and fill in the details from gatherer.config.
     Gatherer.println("About to create a new job");
@@ -261 +261 @@
         destination = destination + url.getHost();
     }
-    Job new_job = new Job(/* model, */ overwrite, Gatherer.config.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Gatherer.config.get("mirroring.quiet", false), url, depth, destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);
+    Job new_job = new Job(Gatherer.config.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Gatherer.config.get("mirroring.quiet", false), url, depth, destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);
     // Add to job_queue job list.
     job_queue.add(new_job);

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -257 +257 @@
 
         String a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path) + name + File.separator;
-
-        // ACTIVE_DIR/gcache/
-        File gcache_dir_temp = new File(Utility.getCacheDir(a_dir)+"temp.dat");
-        File gcache_dir = gcache_dir_temp.getParentFile();
-        gcache_dir.mkdirs();
-        if(progress != null) {
-        progress.setNote(Dictionary.get("CollectionManager.Gcache_Created"));
-        }
 
         // ACTIVE_DIR/log/
@@ -541 +533 @@
     return Utility.getBuildDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
     }
-    /** Constructs the absolute filename of the collection cache directory, which should resemble "$GSDLHOME/collect/<col_name>/gcache/"
-     * @return A <strong>String</strong> containing the filename.
-     * @see org.greenstone.gatherer.Configuration
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.Collection
-     * @see org.greenstone.gatherer.util.Utility
-     */
-    public String getCollectionCache() {
-    return Utility.getCacheDir(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
-    }
+
     /** Constructs the absolute filename of the collection config file, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/etc/collect.cfg"
      * @return A <strong>String</strong> containing the filename.
@@ -1111 +1094 @@
             Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
         }
+
+        // Fire a collection changed first to update the preview etc buttons
+        Gatherer.g_man.collectionChanged(ready());
+
+        // Now display a message dialog saying its all built
         WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", false);
         collection_built_warning_dialog.setMessageOnly(true); // Not a warning
@@ -1116 +1104 @@
         collection_built_warning_dialog.dispose();
         collection_built_warning_dialog = null;
-        Gatherer.g_man.collectionChanged(ready());
         }
         else {

trunk/gli/src/org/greenstone/gatherer/collection/Job.java

@@ -55 +55 @@
     implements ActionListener {
      
-    private boolean clobber;
     private boolean debug;
     private boolean higher_directories;
@@ -91 +90 @@
     /**
      */
-    public Job(/* TreeModel model, */ boolean clobber, boolean debug, boolean no_parents, boolean other_hosts, boolean page_requisites, boolean quiet, URL initial, int depth, String destination, String proxy_pass, String proxy_user, WGet mummy, boolean simple) {
+    public Job(boolean debug, boolean no_parents, boolean other_hosts, boolean page_requisites, boolean quiet, URL initial, int depth, String destination, String proxy_pass, String proxy_user, WGet mummy, boolean simple) {
     // this.model = model;
 
     this.debug = debug;
-    this.clobber = clobber;
     this.no_parents = no_parents;
     this.other_hosts = other_hosts;
@@ -181 +179 @@
 
     public void callWGet() {
-    // Build parameter string
-    String command = "wget ";
-
-    // Parse arguments into array.
-    // Always:
-    // rewrite links to be local if possible - NOOOOOO,
-    // output a debug file and debug messages,
-    // run quietly.
-    //command = command + "-k ";
-
+    // Build parameter string. Note that we never clobber, and we continue if possible
+    String command = Gatherer.config.getWGetPath() + " -nc -c ";
+
+    // Add the destination parameter
     if(destination != null) {
         command = command + "-P " + destination + " ";
@@ -205 +197 @@
         // Recursion to the specified depth.
         command = command + "-r -l" + depth + " ";
-    }
-
-    if(!clobber || previous_state == Job.PAUSED) {
-        command = command + "-nc -c ";
     }
 
@@ -236 +224 @@
         }
     }
-          
+        
+    // The user can either choose to mirror all of the page requisites...
     if(page_requisites) {
         command = command + "-p ";
+    }
+    // or not. In which case we ensure links are rewritten.
+    else {
     }
 
@@ -407 +399 @@
     }
 
-    if(!clobber || previous_state == PAUSED) {
+    if(previous_state == PAUSED) {
         args.add("-nc");
         args.add("-c");

trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeModel.java

@@ -13 +13 @@
     static private WorkspaceTreeModel workspace_tree_model = null;
     static private FileNode greenstone_collections_mapping = null;
-    static private FileNode public_web_cache_mapping = null;
-    static private FileNode private_web_cache_mapping = null;
+    static private FileNode web_cache_mapping = null;
     static private FileNode[] collection_specific_mappings = null;
 
@@ -53 +52 @@
     {
     // If mirroring is enabled show the public and private caches
-    public_web_cache_mapping = MirrorPane.getPublicWebCacheMapping();
-    if (public_web_cache_mapping != null) {
-        workspace_tree_root.insert(public_web_cache_mapping);
-    }
-    private_web_cache_mapping = MirrorPane.getPrivateWebCacheMapping();
-    if (private_web_cache_mapping != null) {
-        workspace_tree_root.insert(private_web_cache_mapping);
+    web_cache_mapping = MirrorPane.getWebCacheMapping();
+    if (web_cache_mapping != null) {
+        workspace_tree_root.insert(web_cache_mapping);
     }
     }
@@ -91 +86 @@
     static public void refreshWebCacheMappings()
     {
-    if (public_web_cache_mapping != null) {
-        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
-                                public_web_cache_mapping);
-    }
-    if (private_web_cache_mapping != null) {
-        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
-                                private_web_cache_mapping);
+    if (web_cache_mapping != null) {
+        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model, web_cache_mapping);
     }
 

trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -568 +568 @@
         build_button.setEnabled(true);
         cancel_button.setEnabled(false);
-        preview_button.setEnabled(true);
+        //preview_button.setEnabled(true);
         simple_build_button.setEnabled(true);
         simple_cancel_button.setEnabled(false);
-        simple_preview_button.setEnabled(true);
+        //simple_preview_button.setEnabled(true);
         int status = event.getStatus();
         document.setSpecialCharacter(OptionsPane.SUCCESSFUL);
@@ -589 +589 @@
         build_button.setEnabled(true);
         // The build may have failed, but a previous index may still be in place
-        preview_button.setEnabled(Gatherer.c_man.built());
+        //preview_button.setEnabled(Gatherer.c_man.built());
 
         simple_build_button.setEnabled(true);
         simple_cancel_button.setEnabled(false);
-        simple_preview_button.setEnabled(Gatherer.c_man.built());
+        //simple_preview_button.setEnabled(Gatherer.c_man.built());
         if(event.getStatus() == GShell.CANCELLED) {
         document.setSpecialCharacter(OptionsPane.CANCELLED);

trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -347 +347 @@
      */
     public void afterDisplay() {
-    if(Gatherer.config.get("workflow.mirror", true)) {
+    if(Gatherer.config.get("workflow.browse", true)) {
         browser_pane.afterDisplay();
     }

trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java

@@ -41 +41 @@
 import java.io.File;
 import java.net.*;
+import java.util.*;
 import javax.swing.*;
 import javax.swing.border.*;
@@ -58 +59 @@
 public class MirrorPane
     extends JPanel {
-    private JButton download_button = null;
-    private JCheckBox automatic_checkbox = null;
-    private JCheckBox higher_checkbox = null;
-    private JCheckBox overwrite_checkbox = null;
-    private JCheckBox remove_failed_checkbox = null;
-    private JCheckBox same_host_checkbox = null;
-    private JRadioButton public_radiobutton = null;
-    private JRadioButton private_radiobutton = null;
-    private JScrollPane list_scroll = null;
-    private JSpinner depth_spinner = null;
-    private JTextField url_textfield = null;
-    private WGet getter = null;
+
+    private JButton download_button;
+    private JCheckBox higher_checkbox;
+    private JCheckBox requisite_checkbox;
+    private JCheckBox same_host_checkbox;
+    private JScrollPane list_scroll;
+    private JComboBox depth_combobox;
+    private JTextField url_textfield;
+    private Vector depth_model;
+    private WGet getter;
 
     public MirrorPane() {
@@ -90 +89 @@
     Dictionary.registerTooltip(url_textfield, "Mirroring.Source_URL_Tooltip");
 
+    depth_model = new Vector();
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(0, "0 (this page only)"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(1, "1"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(2, "2"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(3, "3"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(4, "4"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(5, "5"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(-1, "Unlimited"));
     JPanel depth_pane = new JPanel();
     JLabel depth_label = new JLabel();
     Dictionary.registerText(depth_label, "Mirroring.Download_Depth");
-    depth_spinner = new JSpinner();
-    Dictionary.registerTooltip(depth_spinner, "Mirroring.Download_Depth_Tooltip");
-
-    JPanel destination_pane = new JPanel();
-    JLabel destination_label = new JLabel();
-    Dictionary.registerText(destination_label, "Mirroring.Destination_Folder");
-    ButtonGroup group = new ButtonGroup();
-    public_radiobutton = new JRadioButton();
-    public_radiobutton.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    public_radiobutton.setOpaque(false);
-    Dictionary.registerText(public_radiobutton, "Tree.Public");
-    private_radiobutton = new JRadioButton();
-    private_radiobutton.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    private_radiobutton.setOpaque(false);
-    Dictionary.registerText(private_radiobutton, "Tree.Private");
-    group.add(public_radiobutton);
-    group.add(private_radiobutton);
-    public_radiobutton.setSelected(true);
-
-    JPanel first_pane = new JPanel();
-    automatic_checkbox = new JCheckBox();
-    Dictionary.registerText(automatic_checkbox, "Mirroring.Download_Hidden");
-    overwrite_checkbox = new JCheckBox();
-    Dictionary.registerText(overwrite_checkbox, "Mirroring.Overwrite_Existing");
-
-    JPanel second_pane = new JPanel();
+    depth_combobox = new JComboBox(depth_model);
+    Dictionary.registerTooltip(depth_combobox, "Mirroring.Download_Depth_Tooltip");
+
+    requisite_checkbox = new JCheckBox();
+    Dictionary.registerText(requisite_checkbox, "Mirroring.Download_Hidden");
+
     higher_checkbox = new JCheckBox();
     Dictionary.registerText(higher_checkbox, "Mirroring.Higher_Directories");
+
     same_host_checkbox = new JCheckBox();
+    same_host_checkbox.setSelected(true);
     Dictionary.registerText(same_host_checkbox, "Mirroring.Same_Host");
-
-    remove_failed_checkbox = new JCheckBox();
-    Dictionary.registerText(remove_failed_checkbox, "Mirroring.Remove_Failed");
-
-    JLabel further_label = new JLabel();
-    Dictionary.registerText(further_label, "Mirroring.Further_Options");
+    
+    /* @todo - add to dictionary */
+    JLabel further_label = new JLabel("For further options see File->Preferences->Connection");
 
     JPanel button_pane = new JPanel();
@@ -143 +136 @@
     url_pane.add(url_textfield, BorderLayout.CENTER);
 
-    depth_pane.setLayout(new GridLayout(1,3));
-    depth_pane.add(depth_label);
-    depth_pane.add(new JPanel());
-    depth_pane.add(depth_spinner);
-
-    destination_pane.setLayout(new GridLayout(1,3));
-    destination_pane.add(destination_label);
-    destination_pane.add(public_radiobutton);
-    destination_pane.add(private_radiobutton);
-
-    first_pane.setLayout(new GridLayout(1,2));
-    first_pane.add(automatic_checkbox);
-    first_pane.add(overwrite_checkbox);
-
-    second_pane.setLayout(new GridLayout(1,2));
-    second_pane.add(higher_checkbox);
-    second_pane.add(same_host_checkbox);
-
-    details_pane.setLayout(new GridLayout(7,1,0,5));
+    depth_pane.setLayout(new BorderLayout());
+    depth_pane.add(depth_label, BorderLayout.CENTER);
+    depth_pane.add(depth_combobox, BorderLayout.EAST);
+
+    details_pane.setLayout(new GridLayout(6,1,0,5));
     details_pane.add(url_pane);
     details_pane.add(depth_pane);
-    details_pane.add(destination_pane);
-    details_pane.add(first_pane);
-    details_pane.add(second_pane);
-    details_pane.add(remove_failed_checkbox);
+    details_pane.add(requisite_checkbox);
+    details_pane.add(higher_checkbox);
+    details_pane.add(same_host_checkbox);
     details_pane.add(further_label);
 
@@ -187 +165 @@
 
     public void collectionChanged(boolean ready) {
-    if(private_radiobutton.isSelected() && !ready) {
-        public_radiobutton.setSelected(true);
-    }
-    private_radiobutton.setEnabled(ready);
     }
 
@@ -198 +172 @@
 
 
-    static public FileNode getPublicWebCacheMapping()
-    {
-    if (Gatherer.config.get("workflow.mirror", false)) {
-        return new FileNode(new File(Utility.CACHE_DIR), Dictionary.get("Tree.Public"));
-    }
-
-    return null;
-    }
-
-
-    static public FileNode getPrivateWebCacheMapping()
+    static public FileNode getWebCacheMapping()
     {
     if (Gatherer.config.get("workflow.mirror", false) && Gatherer.c_man.ready()) {
-        return new FileNode(new File(Gatherer.c_man.getCollectionCache()), Dictionary.get("Tree.Private"));
-    }
-
+        /* @todo - add to dictionary */
+        return new FileNode(Utility.getCacheDir(), "Mirror Cache");
+    }
     return null;
     }
 
+    /** A DepthEntry contains a depth value, as an int, and a representitive text string. This allows for a more meaningful appearance than '0' for instance. */
+    private class DepthEntry 
+    implements Comparable {
+    private int value;
+    private String text;
+    /** Default constructor. 
+     * @param value the depth value as an int
+     * @param text how this entry show represent itself as a String
+     */
+    public DepthEntry(int value, String text) {
+        this.text = text;
+        this.value = value;
+    }
+    /** Determines the natural ordering of this DepthEntry and some other object
+     * @param object the Object to test for ordering
+     * @return >0 if the object is before this one, 0 if they are equal, or <0 if the object is after this one
+     */
+    public int compareTo(Object object) {
+        // If the object is a DepthEntry then this is easy pesy.
+        if(object instanceof DepthEntry) {
+        int target_value = ((DepthEntry) object).getValue();
+        return value - target_value;
+        }
+        // If the object is a String, then we should try parsing an int from it
+        if(object instanceof String) {
+        try {
+            int target_value = Integer.parseInt((String)object);
+            return value - target_value;
+        }
+        catch(Exception exception) {
+        }
+        }
+        // Otherwise we'll try a string comparison between our text and the toString of the object
+        return text.compareTo(object.toString());
+    }
+
+    /** Determine if this DepthEntry is equal to some other object. Given that there is significant processing involved we push the resposiblility for this onto compareTo, so we only have the complex code once.
+     * @param object the Object to test for equality
+     * @return true if the object is equal to this depth entry, false otherwise
+     */
+    public boolean equals(Object object) {
+        return (compareTo(object) == 0);
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public String toString() {
+        return text;
+    }
+    }
 
     private class DownloadButtonListener
@@ -229 +245 @@
         }
         catch(MalformedURLException error) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Mirroring.Invalid_URL"), Dictionary.get("Mirroring.Invalid_URL__Title"), JOptionPane.ERROR_MESSAGE);
-        }
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Mirroring.Invalid_URL"), Dictionary.get("Mirroring.Invalid_URL_Title"), JOptionPane.ERROR_MESSAGE);
+        }
+
+        // Otherwise construct a new download job
+        Object depth_object = depth_combobox.getSelectedItem();
+        int depth_value = 0;
+        if(depth_object instanceof DepthEntry) {
+        depth_value = ((DepthEntry)depth_object).getValue();
+        }
+        else if(depth_object instanceof String) {
+        String depth_string = (String) depth_object;
+        try {
+            depth_value = Integer.parseInt(depth_string);
+            // Create a new entry for the purposes of comparison, and if needs be, addition
+            DepthEntry new_entry = new DepthEntry(depth_value, depth_string);
+            // Try to select the correct item from the combobox
+            depth_combobox.setSelectedItem(null);
+            depth_combobox.setSelectedItem(new_entry);
+            // We can see if that worked, and if it didn't add the entry
+            if(depth_combobox.getSelectedItem() == null) {
+            depth_combobox.addItem(new_entry);
+            depth_combobox.setSelectedItem(new_entry);
+            }
+            new_entry = null;
+        }
+        catch(Exception exception) {
+            /* @todo - add to dictionary */
+            JOptionPane.showMessageDialog(Gatherer.g_man, "The depth value you have entered is not valid.\nPlease choose an item from the list, or type in\na number.", "Invalid Depth", JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        depth_string = null;
+        }
+        depth_object = null;
+    
+        File destination_file = Utility.getCacheDir();
+        destination_file.mkdirs(); // If they aren't already
+        String destination_filename = destination_file.getAbsolutePath();
+        if(!destination_filename.endsWith(File.separator)) {
+        destination_filename = destination_filename + File.separator;
+        }
+
         if(url != null) {
-        // Otherwise construct a new download job
-        getter.newJob(/* Gatherer.c_man.getWorkspace(), */ overwrite_checkbox.isSelected(), !higher_checkbox.isSelected(), !same_host_checkbox.isSelected(), automatic_checkbox.isSelected(), url, ((Integer)depth_spinner.getValue()).intValue(), (public_radiobutton.isSelected() ? Utility.CACHE_DIR : Gatherer.c_man.getCollectionCache()));
+        getter.newJob(!higher_checkbox.isSelected(), !same_host_checkbox.isSelected(), requisite_checkbox.isSelected(), url, depth_value, destination_filename);
         }
     }

trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -47 +47 @@
 
     static public boolean titleClashes(String title, File current_config_file) {
+    // An empty collection title never clashes with anything. I may look ugly in the final collection but there is nothing wrong with having no title for a particular language.
+    if(title == null || title.length() == 0) {
+        return false;
+    }
     File collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
     File children[] = collection_directory.listFiles();

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -49 +49 @@
     static final public String ATTRIBUTE_ELEMENT                          = "Attribute";
     static final public String BUILDTYPE_STR                              = "buildtype";
+    static final public String CACHE_FOLDER                               = "cache";
     static final public String CCS_STR                                    = "ccs";
     static final public String CLASSES_FOLDER                             = "classes";