1.1 --- a/gsf/src/org/netbeans/modules/gsfret/source/usages/Index.java	Wed Jul 27 17:57:17 2011 -0400
     1.2 +++ b/gsf/src/org/netbeans/modules/gsfret/source/usages/Index.java	Wed Jul 27 18:04:54 2011 -0400
     1.3 @@ -102,6 +102,7 @@
     1.4      private static final String NB_USER_DIR = "netbeans.user";   //NOI18N
     1.5      private static final String SEGMENTS_FILE = "segments";      //NOI18N
     1.6      private static final String SLICE_PREFIX = "s";              //NOI18N    
     1.7 +    // XXX should be replaced; see #57798:
     1.8      private static final String INDEX_DIR = "var"+File.separatorChar+"cache"+File.separatorChar+"gsf-index"+File.separatorChar+VERSION+'.'+SUBVERSION;    //NOI18N
     1.9      // BEGIN TOR MODIFICATIONS
    1.10      protected static final String PREINDEXED = "netbeans-index-" + VERSION + "." + SUBVERSION + "-"; // NOI18N

     2.1 --- a/mdr/src/org/netbeans/modules/mdr/MDRDataObject.java	Wed Jul 27 17:57:17 2011 -0400
     2.2 +++ b/mdr/src/org/netbeans/modules/mdr/MDRDataObject.java	Wed Jul 27 18:04:54 2011 -0400
     2.3 @@ -161,6 +161,7 @@
     2.4          if (tagName.startsWith(TAG_BODY_FOLDER)) {
     2.5              String folder = tagName.substring(TAG_BODY_FOLDER.length()).replace('\\', '/');
     2.6              ErrorManager.getDefault().log(ErrorManager.INFORMATIONAL, "found folder: " + folder);
     2.7 +            // XXX should be replaced; see #57798
     2.8              String resultFolder = System.getProperty("netbeans.user") + "/var/cache/" + folder;
     2.9              try {
    2.10                  File result = new File(resultFolder);

     3.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/Cache.java	Wed Jul 27 17:57:17 2011 -0400
     3.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/Cache.java	Wed Jul 27 18:04:54 2011 -0400
     3.3 @@ -171,6 +171,7 @@
     3.4  
     3.5      private static File getCacheFile(boolean create) throws IOException {
     3.6          String loc = System.getProperty("netbeans.user") + // NOI18N
     3.7 +            // XXX should be replaced; see bug #57798
     3.8              File.separatorChar + "var" + File.separatorChar + "cache" + File.separatorChar + "all-todos.ser";
     3.9          File file = new File(loc);
    3.10          if (create) {

     4.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystem.java	Wed Jul 27 17:57:17 2011 -0400
     4.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystem.java	Wed Jul 27 18:04:54 2011 -0400
     4.3 @@ -236,6 +236,7 @@
     4.4          setCommands(new CommandsTree(new UserCommandSupport(new UserCommand("NONE"), this)));//EMPTY_COMMANDS);
     4.5          addPropertyChangeListener(this);
     4.6          String userDir = System.getProperty("netbeans.user");
     4.7 +        // XXX should be replaced; see #57798
     4.8          cacheRoot = userDir+File.separator+"var"+File.separator+"cache"+File.separator+"vcs"; // NOI18N
     4.9          cachePath = createNewCacheDir();
    4.10          //System.out.println("  cachePath = "+cachePath);