1.1 --- a/apisupport.beanbrowser/src/org/netbeans/modules/apisupport/beanbrowser/WrapperKids.java Wed Jul 27 16:19:09 2011 +0200
1.2 +++ b/apisupport.beanbrowser/src/org/netbeans/modules/apisupport/beanbrowser/WrapperKids.java Wed Jul 27 18:05:33 2011 -0400
1.3 @@ -431,8 +431,8 @@
1.4 }
1.5 }
1.6 if (provenance == null) {
1.7 - File system1 = new File(new File(System.getProperty("netbeans.home")), "system");
1.8 - File system2 = new File(new File(System.getProperty("netbeans.user")), "system");
1.9 + File system1 = new File(new File(System.getProperty("netbeans.home")), "config");
1.10 + File system2 = new File(new File(System.getProperty("netbeans.user")), "config");
1.11 if (dir.equals(system1)) {
1.12 provenance = "NetBeans installation";
1.13 } else if (dir.equals(system2)) {
1.14 @@ -442,6 +442,7 @@
1.15 } else if (fs instanceof XMLFileSystem) {
1.16 // Well, a good guess at least. Note merged XMLFS's and
1.17 // module cache mean we cannot easily do better.
1.18 + // XXX look for "layers" file attribute
1.19 provenance = "module";
1.20 }
1.21 if (provenance != null) {
2.1 --- a/autoproject.core/manifest.mf Wed Jul 27 16:19:09 2011 +0200
2.2 +++ b/autoproject.core/manifest.mf Wed Jul 27 18:05:33 2011 -0400
2.3 @@ -3,5 +3,5 @@
2.4 OpenIDE-Module: org.netbeans.modules.autoproject.core/1
2.5 OpenIDE-Module-Layer: org/netbeans/modules/autoproject/core/layer.xml
2.6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoproject/core/Bundle.properties
2.7 -OpenIDE-Module-Specification-Version: 1.17
2.8 +OpenIDE-Module-Specification-Version: 1.18
2.9
3.1 --- a/autoproject.core/src/org/netbeans/modules/autoproject/spi/Cache.java Wed Jul 27 16:19:09 2011 +0200
3.2 +++ b/autoproject.core/src/org/netbeans/modules/autoproject/spi/Cache.java Wed Jul 27 18:05:33 2011 -0400
3.3 @@ -75,7 +75,12 @@
3.4 static {
3.5 String userdir = System.getProperty("netbeans.user");
3.6 if (userdir != null) {
3.7 - CACHE = new File(userdir, "var/cache/autoprojects.properties");
3.8 + File compatibilityLocation = new File(userdir, "var/cache/autoprojects.properties");
3.9 + if (compatibilityLocation.isFile()) {
3.10 + CACHE = compatibilityLocation;
3.11 + } else {
3.12 + CACHE = new File(userdir, "var/autoprojects.properties");
3.13 + }
3.14 } else {
3.15 CACHE = null;
3.16 }
4.1 --- a/gsf/src/org/netbeans/modules/gsfret/source/usages/Index.java Wed Jul 27 16:19:09 2011 +0200
4.2 +++ b/gsf/src/org/netbeans/modules/gsfret/source/usages/Index.java Wed Jul 27 18:05:33 2011 -0400
4.3 @@ -102,6 +102,7 @@
4.4 private static final String NB_USER_DIR = "netbeans.user"; //NOI18N
4.5 private static final String SEGMENTS_FILE = "segments"; //NOI18N
4.6 private static final String SLICE_PREFIX = "s"; //NOI18N
4.7 + // XXX should be replaced; see #57798:
4.8 private static final String INDEX_DIR = "var"+File.separatorChar+"cache"+File.separatorChar+"gsf-index"+File.separatorChar+VERSION+'.'+SUBVERSION; //NOI18N
4.9 // BEGIN TOR MODIFICATIONS
4.10 protected static final String PREINDEXED = "netbeans-index-" + VERSION + "." + SUBVERSION + "-"; // NOI18N
5.1 --- a/mdr/src/org/netbeans/modules/mdr/MDRDataObject.java Wed Jul 27 16:19:09 2011 +0200
5.2 +++ b/mdr/src/org/netbeans/modules/mdr/MDRDataObject.java Wed Jul 27 18:05:33 2011 -0400
5.3 @@ -161,6 +161,7 @@
5.4 if (tagName.startsWith(TAG_BODY_FOLDER)) {
5.5 String folder = tagName.substring(TAG_BODY_FOLDER.length()).replace('\\', '/');
5.6 ErrorManager.getDefault().log(ErrorManager.INFORMATIONAL, "found folder: " + folder);
5.7 + // XXX should be replaced; see #57798
5.8 String resultFolder = System.getProperty("netbeans.user") + "/var/cache/" + folder;
5.9 try {
5.10 File result = new File(resultFolder);
6.1 --- a/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/Cache.java Wed Jul 27 16:19:09 2011 +0200
6.2 +++ b/tasklist.docscan/src/org/netbeans/modules/tasklist/docscan/Cache.java Wed Jul 27 18:05:33 2011 -0400
6.3 @@ -171,6 +171,7 @@
6.4
6.5 private static File getCacheFile(boolean create) throws IOException {
6.6 String loc = System.getProperty("netbeans.user") + // NOI18N
6.7 + // XXX should be replaced; see bug #57798
6.8 File.separatorChar + "var" + File.separatorChar + "cache" + File.separatorChar + "all-todos.ser";
6.9 File file = new File(loc);
6.10 if (create) {
7.1 --- a/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystem.java Wed Jul 27 16:19:09 2011 +0200
7.2 +++ b/vcs.advanced/src/org/netbeans/modules/vcs/advanced/CommandLineVcsFileSystem.java Wed Jul 27 18:05:33 2011 -0400
7.3 @@ -236,6 +236,7 @@
7.4 setCommands(new CommandsTree(new UserCommandSupport(new UserCommand("NONE"), this)));//EMPTY_COMMANDS);
7.5 addPropertyChangeListener(this);
7.6 String userDir = System.getProperty("netbeans.user");
7.7 + // XXX should be replaced; see #57798
7.8 cacheRoot = userDir+File.separator+"var"+File.separator+"cache"+File.separator+"vcs"; // NOI18N
7.9 cachePath = createNewCacheDir();
7.10 //System.out.println(" cachePath = "+cachePath);