? ant/external/ant-api-1.6.3.zip
? ant/external/ant-docs-1.6.3.zip
? ant/external/ant-libs-1.6.3.zip
? ant/external/ant-misc-1.6.3.zip
? ant/project/test/unit/src/META-INF
Index: ant/project/apichanges.xml
===================================================================
RCS file: /cvs/ant/project/apichanges.xml,v
retrieving revision 1.8
diff -u -r1.8 apichanges.xml
--- ant/project/apichanges.xml	22 Aug 2005 20:47:51 -0000	1.8
+++ ant/project/apichanges.xml	29 Aug 2005 16:16:29 -0000
@@ -75,6 +75,20 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        
+        <change id="ReferenceHelper.addReference">
+            <api name="general"/>
+            <summary>Semantic changes in the ReferenceHelper behavior</summary>
+            <version major="1" minor="10"/>
+            <date day="28" month="8" year="2005"/>
+            <author login="tzezula"/>
+            <compatibility semantic="yes"/>
+            <description>
+                The ReferenceHelper was changed to support better sharability of
+                projects. The collocalted references are stored both into the project
+                properties (as relative) and private properties (as absolute)
+            </description>
+        </change>
 
         <change id="delete-support">
             <api name="general"/>
Index: ant/project/manifest.mf
===================================================================
RCS file: /cvs/ant/project/manifest.mf,v
retrieving revision 1.12
diff -u -r1.12 manifest.mf
--- ant/project/manifest.mf	22 Aug 2005 20:47:51 -0000	1.12
+++ ant/project/manifest.mf	29 Aug 2005 16:16:29 -0000
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.project.ant/1
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties
 
Index: ant/project/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java
===================================================================
RCS file: /cvs/ant/project/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java,v
retrieving revision 1.27
diff -u -r1.27 ReferenceHelper.java
--- ant/project/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java	22 Aug 2005 20:47:52 -0000	1.27
+++ ant/project/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java	29 Aug 2005 16:16:30 -0000
@@ -293,42 +293,63 @@
      * @return was there any change or not
      */
     private boolean setPathProperty(File base, File path, String propertyName) {
-        String value;
-        String propertiesFile;
+        String[] values;
+        String[] propertiesFiles;
         if (CollocationQuery.areCollocated(base, path)) {
             // Fine, using a relative path to subproject.
-            value = PropertyUtils.relativizeFile(base, path);
-            assert value != null : "These dirs are not really collocated: " + base + " & " + path;
-            propertiesFile = AntProjectHelper.PROJECT_PROPERTIES_PATH;
+            String relativePath = PropertyUtils.relativizeFile(base, path);
+            assert relativePath != null : "These dirs are not really collocated: " + base + " & " + path;
+            values = new String[] {
+                relativePath,
+                path.getAbsolutePath()
+            };            
+            propertiesFiles = new String[] {
+                AntProjectHelper.PROJECT_PROPERTIES_PATH,
+                AntProjectHelper.PRIVATE_PROPERTIES_PATH,
+            };
         } else {
             // try relativize against external base dirs
-            value = relativizeFileToExtraBaseFolders(path);
-            if (value != null) {
-                propertiesFile = AntProjectHelper.PROJECT_PROPERTIES_PATH;
+            String relativePath = relativizeFileToExtraBaseFolders(path);
+            if (relativePath != null) {
+                propertiesFiles = new String[] {
+                    AntProjectHelper.PROJECT_PROPERTIES_PATH
+                };
+                values = new String[] {
+                    relativePath
+                };
             } else {
                 // use an absolute path.
-                propertiesFile = AntProjectHelper.PRIVATE_PROPERTIES_PATH;
-                value = path.getAbsolutePath();
+                propertiesFiles = new String[] {
+                    AntProjectHelper.PRIVATE_PROPERTIES_PATH
+                };
+                values = new String[] {
+                    path.getAbsolutePath()
+                };
             }
             
         }
-        EditableProperties props = h.getProperties(propertiesFile);
-        if (!value.equals(props.getProperty(propertyName))) {
-            props.put(propertyName, value);
-            h.putProperties(propertiesFile, props);
+        
+        boolean metadataChanged = false;
+        for (int i=0; i<propertiesFiles.length; i++) {
+            EditableProperties props = h.getProperties(propertiesFiles[i]);
+            if (!values[i].equals(props.getProperty(propertyName))) {
+                props.put(propertyName, values[i]);
+                h.putProperties(propertiesFiles[i], props);
+                metadataChanged = true;
+            }
+        }
+        
+        if (propertiesFiles.length == 1) {                    
             // check presence of this property in opposite property file and
             // remove it if necessary
-            propertiesFile = (propertiesFile == AntProjectHelper.PROJECT_PROPERTIES_PATH ? 
+            String propertiesFile = (propertiesFiles[0] == AntProjectHelper.PROJECT_PROPERTIES_PATH ? 
                 AntProjectHelper.PRIVATE_PROPERTIES_PATH : AntProjectHelper.PROJECT_PROPERTIES_PATH);
-            props = h.getProperties(propertiesFile);
+            EditableProperties props = h.getProperties(propertiesFile);
             if (props.remove(propertyName) != null) {
                 h.putProperties(propertiesFile, props);
             }
-            return true;
-        } else {
-            return false;
         }
-        
+        return metadataChanged;
     }
     
     /**
@@ -1298,7 +1319,7 @@
             
             //TODO: extra base dir relativization:
             if (CollocationQuery.areCollocated(absolutePath, projectDir)) {
-                privRemove.add(key);
+// Don't remove it from private properties and add the relative path to project properties   privRemove.add(key);
                 pubAdd.put(key, PropertyUtils.relativizeFile(projectDir, absolutePath));
             }
         }
Index: ant/project/test/unit/src/org/netbeans/spi/project/support/ant/ReferenceHelperTest.java
===================================================================
RCS file: /cvs/ant/project/test/unit/src/org/netbeans/spi/project/support/ant/ReferenceHelperTest.java,v
retrieving revision 1.19
diff -u -r1.19 ReferenceHelperTest.java
--- ant/project/test/unit/src/org/netbeans/spi/project/support/ant/ReferenceHelperTest.java	5 Apr 2005 00:19:24 -0000	1.19
+++ ant/project/test/unit/src/org/netbeans/spi/project/support/ant/ReferenceHelperTest.java	29 Aug 2005 16:16:32 -0000
@@ -618,14 +618,20 @@
      * Check that methods to add foreign file references really work.
      * @throws Exception in case of unexpected failure
      */
-    public void testForeignFileReferences() throws Exception {
+    public void testForeignFileReferences() throws Exception {        
         // test collocated foreign project reference
         File f = new File(new File(FileUtil.toFile(sisterprojdir), "dist"), "proj2.jar");
         assertEquals("can add a ref to an artifact", "${reference.proj2.dojar}", r.createForeignFileReference(f, "jar"));
         assertEquals("creating reference second time must return already existing ID", "${reference.proj2.dojar}", r.createForeignFileReference(f, "jar"));
-        assertNotNull("ref added", r.getRawReference("proj2", "dojar"));
-        String refval = pev.getProperty("reference.proj2.dojar");
-        assertEquals("reference correctly evaluated", "../proj2/dist/proj2.jar", refval);
+        assertNotNull("ref added", r.getRawReference("proj2", "dojar"));                
+        EditableProperties privateProps = h.getProperties (AntProjectHelper.PRIVATE_PROPERTIES_PATH);
+        String refval = privateProps.getProperty("project.proj2");        
+        assertEquals("reference correctly stored into private.properties", FileUtil.toFile(sisterprojdir).getAbsolutePath(), refval);        
+        EditableProperties projectProps = h.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
+        refval = projectProps.getProperty("project.proj2");        
+        assertEquals("reference correctly stored into project.properties", "../proj2", refval);        
+        refval = pev.getProperty("reference.proj2.dojar");
+        assertEquals("reference correctly evaluated", f.getAbsolutePath(), refval);                
         assertEquals("reference correctly evaluated", f, h.resolveFile(refval));
         AntArtifact art = r.getForeignFileReferenceAsArtifact("${reference.proj2.dojar}");
         assertNotNull("got the reference back", art);
@@ -678,7 +684,10 @@
         assertEquals("Duplicate reference created", ref, ref2);
         assertEquals("Foreign file reference was not correctly created", "${file.reference.m_y_l_i_b.jar}", ref);
         refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
-        assertEquals("Reference was not correctly evaluated", "../j a r s/m y l i b.jar", refval);
+        assertEquals("Reference was not correctly evaluated from project.properties", "../j a r s/m y l i b.jar", refval);
+        refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
+        assertEquals("Reference was not correctly evaluated from private.properties", f.getAbsolutePath(), refval);
+        
         assertEquals("Reference was not correctly evaluated", f, h.resolveFile(refval));
         collocatedLib = scratch.createFolder("jars2").createData("m y l i b.jar");
         f = FileUtil.toFile(collocatedLib);
@@ -686,8 +695,10 @@
         ref2 = r.createForeignFileReference(f, "jar");
         assertEquals("Duplicate reference created", ref, ref2);
         assertEquals("Foreign file reference was not correctly created", "${file.reference.m_y_l_i_b.jar-1}", ref);
-        refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
-        assertEquals("Reference was not correctly evaluated", "../jars2/m y l i b.jar", refval);
+        refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));        
+        assertEquals("Reference was not correctly evaluated form project.properties", "../jars2/m y l i b.jar", refval);        
+        refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));        
+        assertEquals("Reference was not correctly evaluated from private.properties", f.getAbsolutePath(), refval);                        
         collocatedLib = scratch.createFolder("jars3").createData("m y l i b.jar");
         f = FileUtil.toFile(collocatedLib);
         ref = r.createForeignFileReference(f, "jar");
@@ -695,7 +706,10 @@
         assertEquals("Duplicate reference created", ref, ref2);
         assertEquals("Foreign file reference was not correctly created", "${file.reference.m_y_l_i_b.jar-2}", ref);
         refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
-        assertEquals("Reference was not correctly evaluated", "../jars3/m y l i b.jar", refval);
+        assertEquals("Reference was not correctly evaluated from project.properties", "../jars3/m y l i b.jar", refval);
+        refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
+        assertEquals("Reference was not correctly evaluated from private.properties", f.getAbsolutePath(), refval);
+        
         assertTrue("Reference was not removed", r.destroyReference(ref));
         assertFalse("There should not be any reference", r.destroyReference(ref));
         refval = pev.evaluate(ref);
@@ -708,7 +722,9 @@
         ref2 = r.createForeignFileReference(f, "jar");
         assertEquals("Duplicate reference created", ref, ref2);
         assertEquals("Foreign file reference was not correctly created", "${file.reference.mylib2.jar}", ref);
-        refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
+        refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
+        assertNull ("Foreign file reference is stored into project.properties",refval);
+        refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));        
         assertEquals("Reference was not correctly evaluated", f.getAbsolutePath(), refval);
         assertEquals("Reference was not correctly evaluated", f, h.resolveFile(refval));
         nonCollocatedLib = scratch.getFileObject("separate").createFolder("jars2").createData("mylib2.jar");
@@ -717,6 +733,8 @@
         ref2 = r.createForeignFileReference(f, "jar");
         assertEquals("Duplicate reference created", ref, ref2);
         assertEquals("Foreign file reference was not correctly created", "${file.reference.mylib2.jar-1}", ref);
+        refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
+        assertNull ("Foreign file reference is stored into project.properties",refval);
         refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
         assertEquals("Reference was not correctly evaluated", f.getAbsolutePath(), refval);
         nonCollocatedLib = scratch.getFileObject("separate").createFolder("jars3").createData("mylib2.jar");
@@ -725,13 +743,15 @@
         ref2 = r.createForeignFileReference(f, "jar");
         assertEquals("Duplicate reference created", ref, ref2);
         assertEquals("Foreign file reference was not correctly created", "${file.reference.mylib2.jar-2}", ref);
+        refval = h.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
+        assertNull ("Foreign file reference is stored into project.properties",refval);
         refval = h.getProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH).getProperty(ref.substring(2, ref.length()-1));
         assertEquals("Reference was not correctly evaluated", f.getAbsolutePath(), refval);
         r.destroyForeignFileReference(ref);
         refval = pev.evaluate(ref);
         assertEquals("Reference was not removed", ref, refval);
         
-    }
+    } 
     
     public void testToAntArtifact() throws Exception {
         ReferenceHelper.RawReference ref = new ReferenceHelper.RawReference(
Index: projects/queries/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation
===================================================================
RCS file: /cvs/projects/queries/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation,v
retrieving revision 1.4
diff -u -r1.4 org.netbeans.spi.queries.CollocationQueryImplementation
--- projects/queries/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation	6 Sep 2004 11:56:08 -0000	1.4
+++ projects/queries/src/META-INF/services/org.netbeans.spi.queries.CollocationQueryImplementation	29 Aug 2005 16:16:34 -0000
@@ -1 +1,2 @@
 org.netbeans.modules.queries.ParentChildCollocationQuery
+org.netbeans.modules.queries.AlwaysRelativeCollocationQuery
Index: projects/queries/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQuery.java
===================================================================
RCS file: projects/queries/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQuery.java
diff -N projects/queries/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQuery.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ projects/queries/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQuery.java	29 Aug 2005 16:16:34 -0000
@@ -0,0 +1,94 @@
+/*
+ *                 Sun Public License Notice
+ *
+ * The contents of this file are subject to the Sun Public License
+ * Version 1.0 (the "License"). You may not use this file except in
+ * compliance with the License. A copy of the License is available at
+ * http://www.sun.com/
+ *
+ * The Original Code is NetBeans. The Initial Developer of the Original
+ * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ */
+
+package org.netbeans.modules.queries;
+
+import java.io.File;
+import org.netbeans.spi.queries.CollocationQueryImplementation;
+
+/**
+ * The CollocationQueryImplementation which makes all the paths in the single tree
+ * relative. On the UNIX all the files lies within a single tree, all the files
+ * are collocated. On the Windows (the VMS) all the files from single disk (volume) are collocated,
+ * files lying on the different disks (volumes) are not collocated.
+ * @author Tomas Zezula
+ */
+public class AlwaysRelativeCollocationQuery implements CollocationQueryImplementation {
+    
+    private File[] roots;
+    
+    /** Creates a new instance of AlwaysRelativeCollocationQuery */
+    public AlwaysRelativeCollocationQuery() {
+    }
+
+    public File findRoot(File file) {
+        File[] roots = getFileSystemRoots ();
+        if (roots.length == 0) {
+            assert false : "Cannot find filesystem roots";
+            return null;
+        }
+        else if (roots.length == 1) {
+            //On UNIX always relative
+            return roots[0];
+        }
+        else {            
+            while (!isRoot(file)) {
+                file = file.getParentFile();
+            }
+            for (int i = 0; i < roots.length; i++) {
+                if (file.equals(roots[i])) {
+                    return roots[i];
+                }
+            }
+            return null;
+        }
+    }
+
+    public boolean areCollocated(File file1, File file2) {        
+        File root1 = findRoot (file1);
+        File root2 = findRoot (file2);
+        return root1 != null && root1.equals(root2);
+    }
+    
+    // ---------------- Unit test helper methods -----------------------        
+    
+    private File[] getFileSystemRoots () {
+        if (this.roots != null) {
+            return this.roots;
+        }
+        else {       
+            return File.listRoots();
+        }
+    }
+    
+    private boolean isRoot (File f) {
+        if (this.roots == null) {
+            return f.getParentFile() == null;
+        }
+        else {
+            //In unit test the roots are not necessary the real fs roots
+            //we have to compare them
+            for (int i=0; i<roots.length; i++) {
+                if (roots[i].equals(f)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+    
+    final void setFileSystemRoots (File[] roots) {
+        this.roots = roots;
+    }
+    
+}
Index: projects/queries/test/unit/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQueryTest.java
===================================================================
RCS file: projects/queries/test/unit/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQueryTest.java
diff -N projects/queries/test/unit/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQueryTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ projects/queries/test/unit/src/org/netbeans/modules/queries/AlwaysRelativeCollocationQueryTest.java	29 Aug 2005 16:16:34 -0000
@@ -0,0 +1,94 @@
+/*
+ *                 Sun Public License Notice
+ *
+ * The contents of this file are subject to the Sun Public License
+ * Version 1.0 (the "License"). You may not use this file except in
+ * compliance with the License. A copy of the License is available at
+ * http://www.sun.com/
+ *
+ * The Original Code is NetBeans. The Initial Developer of the Original
+ * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ */
+
+package org.netbeans.modules.queries;
+
+import java.io.IOException;
+import junit.framework.*;
+import java.io.File;
+import org.netbeans.junit.NbTestCase;
+import org.netbeans.spi.queries.CollocationQueryImplementation;
+
+/**
+ *
+ * @author Tomas Zezula
+ */
+public class AlwaysRelativeCollocationQueryTest extends NbTestCase {
+    
+    public AlwaysRelativeCollocationQueryTest(String testName) {
+        super(testName);
+    } 
+
+
+    public void testFindRoot() throws IOException {
+        AlwaysRelativeCollocationQuery cq = new AlwaysRelativeCollocationQuery ();
+        File testRoot = this.getWorkDir();
+        File root1 = new File (testRoot,"root1");
+        root1.mkdirs();
+        File root2 = new File (testRoot, "root2");
+        root2.mkdirs();
+        File folder1 = new File (new File (root1,"folder1_1"), "folder1_2");
+        folder1.mkdirs();
+        File folder2 = new File (new File (root1,"folder2_1"), "folder2_2");
+        folder2.mkdirs();
+        File folderExt = new File (new File (root2,"folderExt_1"), "folderExt_2");
+        folderExt.mkdirs();        
+        
+        File[] roots = new File[] {
+            root1
+        };        
+        cq.setFileSystemRoots (roots);
+        assertEquals("Wrong root of the folder1", root1, cq.findRoot(folder1));
+        assertEquals("Wrong root of the folder2", root1, cq.findRoot(folder2));
+        
+        roots = new File[] {
+            root1,
+            root2
+        };
+        cq.setFileSystemRoots (roots);
+        assertEquals("Wrong root of the folder1", root1, cq.findRoot(folder1));
+        assertEquals("Wrong root of the folder2", root1, cq.findRoot(folder2));
+        assertEquals("Wrong root of the folderExt", root2, cq.findRoot(folderExt));
+    }
+
+    public void testAreCollocated() throws IOException {
+        AlwaysRelativeCollocationQuery cq = new AlwaysRelativeCollocationQuery ();
+        File testRoot = this.getWorkDir();
+        File root1 = new File (testRoot,"root1");
+        root1.mkdirs();
+        File root2 = new File (testRoot, "root2");
+        root2.mkdirs();
+        File folder1 = new File (new File (root1,"folder1_1"), "folder1_2");
+        folder1.mkdirs();
+        File folder2 = new File (new File (root1,"folder2_1"), "folder2_2");
+        folder2.mkdirs();
+        File folderExt = new File (new File (root2,"folderExt_1"), "folderExt_2");
+        folderExt.mkdirs();        
+        
+        File[] roots = new File[] {
+            root1
+        };       
+        cq.setFileSystemRoots (roots);
+        assertTrue ("The folder1 should be collocated with the folder2", cq.areCollocated(folder1,folder2));
+                
+        roots = new File[] {
+            root1,
+            root2
+        };
+        cq.setFileSystemRoots (roots);
+        assertTrue ("The folder1 should be collocated with the folder2", cq.areCollocated(folder1,folder2));
+        assertFalse ("The folder1 should not be collocated with the folderExt", cq.areCollocated(folder1,folderExt));
+        assertFalse ("The folder2 should not be collocated with the folderExt", cq.areCollocated(folder2,folderExt));
+    }
+    
+}
Index: java/project/apichanges.xml
===================================================================
RCS file: /cvs/java/project/apichanges.xml,v
retrieving revision 1.11
diff -u -r1.11 apichanges.xml
--- java/project/apichanges.xml	27 Jun 2005 22:22:36 -0000	1.11
+++ java/project/apichanges.xml	29 Aug 2005 16:16:38 -0000
@@ -77,6 +77,19 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+    <change id="BrokenReferencesModel.updateReference">
+        <api name="general"/>
+        <summary>Semantic changes in the BrokenReferencesModel.updateReference behavior</summary>
+        <version major="1" minor="6"/>
+        <date day="28" month="8" year="2005"/>
+        <author login="tzezula"/>
+        <compatibility semantic="yes"/>
+        <description>
+                The BrokenReferencesModel was changed to support better sharability of
+                projects. The BrokenReferencesModel always stores the resolved broken reference
+                into the private properties as absolute files and does not affect the project properties.
+        </description>
+    </change>
     <change id="JavaProjectConstants">
             <api name="general"/>
             <summary>Added artifact type representing folder</summary>
Index: java/project/manifest.mf
===================================================================
RCS file: /cvs/java/project/manifest.mf,v
retrieving revision 1.14
diff -u -r1.14 manifest.mf
--- java/project/manifest.mf	11 May 2005 14:50:09 -0000	1.14
+++ java/project/manifest.mf	29 Aug 2005 16:16:38 -0000
@@ -2,6 +2,6 @@
 OpenIDE-Module: org.netbeans.modules.java.project/1
 OpenIDE-Module-Layer: org/netbeans/modules/java/project/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
 OpenIDE-Module-Requires: org.netbeans.modules.project.uiapi.ActionsFactory
 
Index: java/project/src/org/netbeans/modules/java/project/BrokenReferencesModel.java
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/modules/java/project/BrokenReferencesModel.java,v
retrieving revision 1.18
diff -u -r1.18 BrokenReferencesModel.java
--- java/project/src/org/netbeans/modules/java/project/BrokenReferencesModel.java	25 Mar 2005 14:08:34 -0000	1.18
+++ java/project/src/org/netbeans/modules/java/project/BrokenReferencesModel.java	29 Aug 2005 16:16:38 -0000
@@ -362,16 +362,8 @@
         final String reference = getOneReference(index).ID;
         FileObject myProjDirFO = helper.getProjectDirectory();
         File myProjDir = FileUtil.toFile(myProjDirFO);
-        final String propertiesFile;
-        final String path;
-        if (CollocationQuery.areCollocated(myProjDir, file)) {
-            propertiesFile = AntProjectHelper.PROJECT_PROPERTIES_PATH;
-            path = PropertyUtils.relativizeFile(myProjDir, file);
-            assert path != null : "expected relative path from " + myProjDir + " to " + file; // NOI18N
-        } else {
-            propertiesFile = AntProjectHelper.PRIVATE_PROPERTIES_PATH;
-            path = file.getAbsolutePath();
-        }
+        final String propertiesFile = AntProjectHelper.PRIVATE_PROPERTIES_PATH;
+        final String path = file.getAbsolutePath();
         Project p;
         try {
             p = ProjectManager.getDefault().findProject(myProjDirFO);
@@ -388,15 +380,16 @@
                         helper.putProperties(propertiesFile, props);
                     }
                     
+//Don't remove the property from the project properties, the private props have precedence                    
                     // #47541 - check that property is not defined in opposite
                     // property file and delete it if it is
-                    String oppositePropertiesFile = (propertiesFile.equals(AntProjectHelper.PROJECT_PROPERTIES_PATH) ? 
-                        AntProjectHelper.PRIVATE_PROPERTIES_PATH : AntProjectHelper.PROJECT_PROPERTIES_PATH);
-                    props = helper.getProperties(oppositePropertiesFile);
-                    if (props.containsKey(reference)) {
-                        props.remove(reference);
-                        helper.putProperties(oppositePropertiesFile, props);
-                    }
+//                    String oppositePropertiesFile = (propertiesFile.equals(AntProjectHelper.PROJECT_PROPERTIES_PATH) ? 
+//                        AntProjectHelper.PRIVATE_PROPERTIES_PATH : AntProjectHelper.PROJECT_PROPERTIES_PATH);
+//                    props = helper.getProperties(oppositePropertiesFile);
+//                    if (props.containsKey(reference)) {
+//                        props.remove(reference);
+//                        helper.putProperties(oppositePropertiesFile, props);
+//                    }
                     
                     if (proj != null) {
                         try {