Index: j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java,v
retrieving revision 1.60
diff -u -r1.60 J2SEProject.java
--- j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java	4 Jan 2006 17:48:38 -0000	1.60
+++ j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEProject.java	3 May 2006 14:34:54 -0000
@@ -28,6 +28,7 @@
 import org.netbeans.api.project.ant.AntArtifact;
 import org.netbeans.modules.java.j2seproject.classpath.ClassPathProviderImpl;
 import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathExtender;
+import org.netbeans.modules.java.j2seproject.classpath.J2SEProjectClassPathModifier;
 import org.netbeans.modules.java.j2seproject.queries.CompiledSourceForBinaryQuery;
 import org.netbeans.modules.java.j2seproject.queries.JavadocForBinaryQueryImpl;
 import org.netbeans.modules.java.j2seproject.queries.SourceLevelQueryImpl;
@@ -144,6 +145,7 @@
 
     private Lookup createLookup(AuxiliaryConfiguration aux) {
         SubprojectProvider spp = refHelper.createSubprojectProvider();
+        final J2SEProjectClassPathModifier cpMod = new J2SEProjectClassPathModifier(this, this.updateHelper, eval, refHelper);
         return Lookups.fixed(new Object[] {
             new Info(),
             aux,
@@ -165,7 +167,8 @@
             new J2SESharabilityQuery (this.helper, evaluator(), getSourceRoots(), getTestSourceRoots()), //Does not use APH to get/put properties/cfgdata
             new J2SEFileBuiltQuery (this.helper, evaluator(),getSourceRoots(),getTestSourceRoots()), //Does not use APH to get/put properties/cfgdata
             new RecommendedTemplatesImpl (this.updateHelper),
-            new J2SEProjectClassPathExtender(this, this.updateHelper, eval,refHelper),
+            new J2SEProjectClassPathExtender(cpMod),
+            cpMod,
             this, // never cast an externally obtained Project to J2SEProject - use lookup instead
             new J2SEProjectOperations(this),
             new J2SEProjectWebServicesSupportProvider()
Index: j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/ClassPathProviderImpl.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/ClassPathProviderImpl.java,v
retrieving revision 1.17
diff -u -r1.17 ClassPathProviderImpl.java
--- j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/ClassPathProviderImpl.java	23 Nov 2005 11:00:04 -0000	1.17
+++ j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/ClassPathProviderImpl.java	3 May 2006 14:34:55 -0000
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 
 import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.project.SourceGroup;
 import org.netbeans.spi.java.classpath.ClassPathFactory;
 import org.netbeans.spi.java.classpath.ClassPathProvider;
 import org.netbeans.spi.java.project.classpath.support.ProjectClassPathSupport;
@@ -38,6 +39,12 @@
     private static final String DIST_JAR = "dist.jar"; // NOI18N
     private static final String BUILD_TEST_CLASSES_DIR = "build.test.classes.dir"; // NOI18N
     
+    private static final String JAVAC_CLASSPATH = "javac.classpath";    //NOI18N
+    private static final String JAVAC_TEST_CLASSPATH = "javac.test.classpath";  //NOI18N
+    private static final String RUN_CLASSPATH = "run.classpath";    //NOI18N
+    private static final String RUN_TEST_CLASSPATH = "run.test.classpath";  //NOI18N
+    
+    
     private final AntProjectHelper helper;
     private final File projectDirectory;
     private final PropertyEvaluator evaluator;
@@ -149,12 +156,12 @@
             if (type == 0) {
                 cp = ClassPathFactory.createClassPath(
                     ProjectClassPathSupport.createPropertyBasedClassPathImplementation(
-                    projectDirectory, evaluator, new String[] {"javac.classpath"})); // NOI18N
+                    projectDirectory, evaluator, new String[] {JAVAC_CLASSPATH})); // NOI18N
             }
             else {
                 cp = ClassPathFactory.createClassPath(
                     ProjectClassPathSupport.createPropertyBasedClassPathImplementation(
-                    projectDirectory, evaluator, new String[] {"javac.test.classpath"})); // NOI18N
+                    projectDirectory, evaluator, new String[] {JAVAC_TEST_CLASSPATH})); // NOI18N
             }
             cache[2+type] = cp;
         }
@@ -177,12 +184,12 @@
             if (type == 0) {
                 cp = ClassPathFactory.createClassPath(
                     ProjectClassPathSupport.createPropertyBasedClassPathImplementation(
-                    projectDirectory, evaluator, new String[] {"run.classpath"})); // NOI18N
+                    projectDirectory, evaluator, new String[] {RUN_CLASSPATH})); // NOI18N
             }
             else if (type == 1) {
                 cp = ClassPathFactory.createClassPath(
                     ProjectClassPathSupport.createPropertyBasedClassPathImplementation(
-                    projectDirectory, evaluator, new String[] {"run.test.classpath"})); // NOI18N
+                    projectDirectory, evaluator, new String[] {RUN_TEST_CLASSPATH})); // NOI18N
             }
             else if (type == 2) {
                 //Only to make the CompiledDataNode hapy
@@ -269,6 +276,39 @@
 
     public synchronized void propertyChange(PropertyChangeEvent evt) {
         dirCache.remove(evt.getPropertyName());
+    }
+    
+    public String getPropertyName (SourceGroup sg, String classPathId) {
+        FileObject root = sg.getRootFolder();
+        FileObject[] path = getPrimarySrcPath();
+        for (int i=0; i<path.length; i++) {
+            if (root.equals(path[i])) {
+                if (ClassPath.COMPILE.equals(classPathId)) {
+                    return JAVAC_CLASSPATH;
+                }
+                else if (ClassPath.EXECUTE.equals(classPathId)) {
+                    return RUN_CLASSPATH;
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+        path = getTestSrcDir();
+        for (int i=0; i<path.length; i++) {
+            if (root.equals(path[i])) {
+                if (ClassPath.COMPILE.equals(classPathId)) {
+                    return JAVAC_TEST_CLASSPATH;
+                }
+                else if (ClassPath.EXECUTE.equals(classPathId)) {
+                    return RUN_TEST_CLASSPATH;
+                }
+                else {
+                    return null;
+                }
+            }
+        }
+        return null;
     }
     
 }
Index: j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathExtender.java
===================================================================
RCS file: /cvs/java/j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathExtender.java,v
retrieving revision 1.12
diff -u -r1.12 J2SEProjectClassPathExtender.java
--- j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathExtender.java	6 Jan 2006 14:14:03 -0000	1.12
+++ j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathExtender.java	3 May 2006 14:34:55 -0000
@@ -39,25 +39,11 @@
     
     private static final String CP_CLASS_PATH = "javac.classpath"; //NOI18N
 
-    private Project project;
-    private UpdateHelper helper;
-    private ReferenceHelper refHelper;
-    private PropertyEvaluator eval;
-    
-    
-    private ClassPathSupport cs;
-
-    public J2SEProjectClassPathExtender (Project project, UpdateHelper helper, PropertyEvaluator eval, ReferenceHelper refHelper) {
-        this.project = project;
-        this.helper = helper;
-        this.eval = eval;
-        this.refHelper = refHelper;
-        
-        this.cs = new ClassPathSupport( eval, refHelper, helper.getAntProjectHelper(), 
-                                        J2SEProjectProperties.WELL_KNOWN_PATHS, 
-                                        J2SEProjectProperties.LIBRARY_PREFIX, 
-                                        J2SEProjectProperties.LIBRARY_SUFFIX, 
-                                        J2SEProjectProperties.ANT_ARTIFACT_PREFIX );        
+    private final J2SEProjectClassPathModifier delegate;
+
+    public J2SEProjectClassPathExtender (final J2SEProjectClassPathModifier delegate) {
+        assert delegate != null;
+        this.delegate = delegate;
     }
 
     public boolean addLibrary(final Library library) throws IOException {
@@ -65,77 +51,18 @@
     }
 
     public boolean addLibrary(final String classPathId, final Library library) throws IOException {
-        assert library != null : "Parameter cannot be null";       //NOI18N
-        try {
-            return ((Boolean)ProjectManager.mutex().writeAccess(
-                    new Mutex.ExceptionAction () {
-                        public Object run() throws IOException {
-                            EditableProperties props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
-                            String raw = props.getProperty(classPathId);
-                            List resources = cs.itemsList( raw );
-                            ClassPathSupport.Item item = ClassPathSupport.Item.create( library, null );
-                            if (!resources.contains(item)) {
-                                resources.add (item);                                
-                                String itemRefs[] = cs.encodeToStrings( resources.iterator() );                                
-                                props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);    //PathParser may change the EditableProperties                                
-                                props.setProperty(classPathId, itemRefs);                                
-                                String prop = cs.getLibraryReference( item );
-                                prop = prop.substring(2, prop.length()-1); // XXX make a PropertyUtils method for this!
-                                ClassPathSupport.relativizeLibraryClassPath(props, helper.getAntProjectHelper(), prop);                                
-                                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
-                                ProjectManager.getDefault().saveProject(project);
-                                return Boolean.TRUE;
-                            }
-                            return Boolean.FALSE;
-                        }
-                    }
-            )).booleanValue();
-        } catch (MutexException e) {
-            throw (IOException) e.getException();
-        }
+        return this.delegate.handleLibrary (library,classPathId, J2SEProjectClassPathModifier.ADD);
     }
 
     public boolean addArchiveFile(final FileObject archiveFile) throws IOException {
         return addArchiveFile(CP_CLASS_PATH,archiveFile);
     }
 
-    public boolean addArchiveFile(final String classPathId, final FileObject archiveFile) throws IOException {
-        assert archiveFile != null : "Parameter cannot be null";       //NOI18N
-        try {
-            return ((Boolean)ProjectManager.mutex().writeAccess(
-                    new Mutex.ExceptionAction () {
-                        public Object run() throws Exception {
-                            EditableProperties props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
-                            String raw = props.getProperty(classPathId);                            
-                            List resources = cs.itemsList( raw );                                                        
-                            File f = FileUtil.toFile (archiveFile);
-                            if (f == null ) {
-                                throw new IllegalArgumentException ("The file must exist on disk");     //NOI18N
-                            }
-                            ClassPathSupport.Item item = ClassPathSupport.Item.create( f, null );
-
-                            if (!resources.contains(item)) {
-                                resources.add (item);
-                                String itemRefs[] = cs.encodeToStrings( resources.iterator() );
-                                props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);  //PathParser may change the EditableProperties
-                                props.setProperty(classPathId, itemRefs);
-                                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
-                                ProjectManager.getDefault().saveProject(project);
-                                return Boolean.TRUE;
-                            }
-                            return Boolean.FALSE;
-                        }
-                    }
-            )).booleanValue();
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            else {
-                Exception t = new IOException ();
-                throw (IOException) ErrorManager.getDefault().annotate(t,e);
-            }
+    public boolean addArchiveFile(final String classPathId, FileObject archiveFile) throws IOException {
+        if (FileUtil.isArchiveFile(archiveFile)) {
+            archiveFile = FileUtil.getArchiveRoot (archiveFile);
         }
+        return this.delegate.handleRoot(archiveFile.getURL(),classPathId,J2SEProjectClassPathModifier.ADD);
     }
 
     public boolean addAntArtifact(final AntArtifact artifact, final URI artifactElement) throws IOException {
@@ -143,37 +70,7 @@
     }
 
     public boolean addAntArtifact(final String classPathId, final AntArtifact artifact, final URI artifactElement) throws IOException {
-        assert artifact != null : "Parameter cannot be null";       //NOI18N
-        try {
-            return ((Boolean)ProjectManager.mutex().writeAccess(
-                    new Mutex.ExceptionAction () {
-                        public Object run() throws Exception {
-                            EditableProperties props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
-                            String raw = props.getProperty (classPathId);
-                            List resources = cs.itemsList( raw );
-                            ClassPathSupport.Item item = ClassPathSupport.Item.create( artifact, artifactElement, null );                            
-                            if (!resources.contains(item)) {
-                                resources.add (item);
-                                String itemRefs[] = cs.encodeToStrings( resources.iterator() );                                
-                                props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);    //Reread the properties, PathParser changes them
-                                props.setProperty (classPathId, itemRefs);
-                                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
-                                ProjectManager.getDefault().saveProject(project);
-                                return Boolean.TRUE;
-                            }
-                            return Boolean.FALSE;
-                        }
-                    }
-            )).booleanValue();
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            else {
-                Exception t = new IOException ();
-                throw (IOException) ErrorManager.getDefault().annotate(t,e);
-            }
-        }
+        return this.delegate.handleAntArtifact(artifact, artifactElement,classPathId,J2SEProjectClassPathModifier.ADD);
     }
 
 }
Index: j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifier.java
===================================================================
RCS file: j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifier.java
diff -N j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifier.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ j2seproject/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifier.java	3 May 2006 14:34:55 -0000
@@ -0,0 +1,241 @@
+/*
+ *                 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-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ */
+
+package org.netbeans.modules.java.j2seproject.classpath;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectManager;
+import org.netbeans.api.project.SourceGroup;
+import org.netbeans.api.project.ant.AntArtifact;
+import org.netbeans.api.project.libraries.Library;
+import org.netbeans.modules.java.j2seproject.UpdateHelper;
+import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
+import org.netbeans.spi.java.project.classpath.ProjectClassPathModifier;
+import org.netbeans.spi.project.support.ant.AntProjectHelper;
+import org.netbeans.spi.project.support.ant.EditableProperties;
+import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+import org.netbeans.spi.project.support.ant.ReferenceHelper;
+import org.openide.ErrorManager;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.util.Mutex;
+import org.openide.util.MutexException;
+
+/**
+ *
+ * @author Tomas Zezula
+ */
+public class J2SEProjectClassPathModifier implements ProjectClassPathModifier {
+    
+    static final int ADD = 1;
+    static final int REMOVE = 2;
+    
+    private final Project project;
+    private final UpdateHelper helper;
+    private final ReferenceHelper refHelper;
+    private final PropertyEvaluator eval;    
+    private final ClassPathSupport cs;    
+    
+    /** Creates a new instance of J2SEProjectClassPathModifier */
+    public J2SEProjectClassPathModifier(final Project project, final UpdateHelper helper, final PropertyEvaluator eval, final ReferenceHelper refHelper) {
+        assert project != null;
+        assert helper != null;
+        assert eval != null;
+        assert refHelper != null;
+        this.project = project;
+        this.helper = helper;
+        this.eval = eval;
+        this.refHelper = refHelper;        
+        this.cs = new ClassPathSupport( eval, refHelper, helper.getAntProjectHelper(), 
+                                        J2SEProjectProperties.WELL_KNOWN_PATHS, 
+                                        J2SEProjectProperties.LIBRARY_PREFIX, 
+                                        J2SEProjectProperties.LIBRARY_SUFFIX, 
+                                        J2SEProjectProperties.ANT_ARTIFACT_PREFIX );
+    }
+
+    public boolean removeRoot(final URL classPathRoot, final SourceGroup sourceGroup, final String classPathId) throws IOException, UnsupportedOperationException {
+        return handleRoot (classPathRoot, getClassPathProperty(sourceGroup, classPathId), REMOVE);
+    }
+
+    public boolean addRoot(final URL classPathRoot, final SourceGroup sourceGroup, final String classPathId) throws IOException, UnsupportedOperationException {        
+        return handleRoot (classPathRoot, getClassPathProperty(sourceGroup, classPathId), ADD);
+    }
+    
+    boolean handleRoot (final URL classPathRoot, final String classPathProperty, final int operation) throws IOException, UnsupportedOperationException {
+        assert classPathRoot != null : "The classPathRoot cannot be null";      //NOI18N
+        assert classPathRoot.toExternalForm().endsWith("/") : "The classPathRoot must be a folder"; //NOI18N
+        assert classPathProperty != null;
+        try {
+            return ((Boolean)ProjectManager.mutex().writeAccess(
+                    new Mutex.ExceptionAction () {
+                        public Object run() throws Exception {
+                            EditableProperties props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
+                            String raw = props.getProperty(classPathProperty);                            
+                            List resources = cs.itemsList( raw );
+                            URL toAdd = FileUtil.getArchiveFile(classPathRoot);
+                            if (toAdd == null) {
+                                toAdd = classPathRoot;
+                            }
+                            File f = FileUtil.normalizeFile( new File (URI.create(toAdd.toExternalForm())));
+                            if (f == null ) {
+                                throw new IllegalArgumentException ("The file must exist on disk");     //NOI18N
+                            }
+                            ClassPathSupport.Item item = ClassPathSupport.Item.create( f, null );
+                            boolean changed = false;
+                            if (operation == ADD && !resources.contains(item)) {
+                                resources.add (item);
+                                changed = true;
+                            }                            
+                            else if (operation == REMOVE && resources.contains(item)) {
+                                resources.remove(item);
+                                changed = true;
+                            }
+                            if (changed) {
+                                String itemRefs[] = cs.encodeToStrings( resources.iterator() );
+                                props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);  //PathParser may change the EditableProperties
+                                props.setProperty(classPathProperty, itemRefs);
+                                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
+                                ProjectManager.getDefault().saveProject(project);
+                                return Boolean.TRUE;
+                            }
+                            return Boolean.FALSE;
+                        }
+                    }
+            )).booleanValue();
+        } catch (Exception e) {
+            if (e instanceof IOException) {
+                throw (IOException) e;
+            }
+            else {
+                Exception t = new IOException ();
+                throw (IOException) ErrorManager.getDefault().annotate(t,e);
+            }
+        }
+    }
+
+    public boolean removeAntArtifact(final AntArtifact artifact, final URI artifactElement, final SourceGroup sourceGroup, final String classPathId) throws IOException, UnsupportedOperationException {
+        return handleAntArtifact (artifact, artifactElement, getClassPathProperty(sourceGroup, classPathId), REMOVE);
+    }
+
+    public boolean addAntArtifact(final AntArtifact artifact, final URI artifactElement, final SourceGroup sourceGroup, final String classPathId) throws IOException, UnsupportedOperationException {
+        return handleAntArtifact (artifact, artifactElement, getClassPathProperty(sourceGroup, classPathId), ADD);
+    }
+    
+    boolean handleAntArtifact (final AntArtifact artifact, final URI artifactElement, final String classPathProperty, final int operation) throws IOException, UnsupportedOperationException {
+        assert artifact != null : "Artifact cannot be null";    //NOI18N
+        assert artifactElement != null : "ArtifactElement cannot be null";  //NOI18N
+        assert classPathProperty != null;
+        try {
+            return ((Boolean)ProjectManager.mutex().writeAccess(
+                    new Mutex.ExceptionAction () {
+                        public Object run() throws Exception {
+                            EditableProperties props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
+                            String raw = props.getProperty (classPathProperty);
+                            List resources = cs.itemsList( raw );
+                            ClassPathSupport.Item item = ClassPathSupport.Item.create( artifact, artifactElement, null );
+                            boolean changed = false;                            
+                            if (operation == ADD && !resources.contains(item)) {
+                                resources.add (item);
+                                changed = true;
+                            }
+                            else if (operation == REMOVE && resources.contains(item)) {
+                                resources.remove(item);
+                                changed = true;
+                            }
+                            if (changed) {
+                                String itemRefs[] = cs.encodeToStrings( resources.iterator() );                                
+                                props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);    //Reread the properties, PathParser changes them
+                                props.setProperty (classPathProperty, itemRefs);
+                                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
+                                ProjectManager.getDefault().saveProject(project);
+                                return Boolean.TRUE;
+                            }
+                            return Boolean.FALSE;
+                        }
+                    }
+            )).booleanValue();
+        } catch (Exception e) {
+            if (e instanceof IOException) {
+                throw (IOException) e;
+            }
+            else {
+                Exception t = new IOException ();
+                throw (IOException) ErrorManager.getDefault().annotate(t,e);
+            }
+        }
+    }
+    
+    
+    public boolean removeLibrary(final Library library, final SourceGroup sourceGroup, final String classPathId) throws IOException, UnsupportedOperationException {
+        return handleLibrary (library, getClassPathProperty(sourceGroup, classPathId), REMOVE);
+    }
+
+    public boolean addLibrary(final Library library, final SourceGroup sourceGroup, final String classPathId) throws IOException, UnsupportedOperationException {
+        return handleLibrary (library, getClassPathProperty(sourceGroup, classPathId), ADD);
+    }
+    
+    boolean handleLibrary (final Library library, final String classPathProperty, final int operation) throws IOException, UnsupportedOperationException {
+        assert library != null : "Library cannot be null";  //NOI18N
+        assert classPathProperty != null;
+        try {
+            return ((Boolean)ProjectManager.mutex().writeAccess(
+                    new Mutex.ExceptionAction () {
+                        public Object run() throws IOException {
+                            EditableProperties props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);
+                            String raw = props.getProperty(classPathProperty);
+                            List resources = cs.itemsList( raw );
+                            ClassPathSupport.Item item = ClassPathSupport.Item.create( library, null );
+                            boolean changed = false;
+                            if (operation == ADD && !resources.contains(item)) {
+                                resources.add (item);                                
+                                changed = true;
+                            }
+                            else if (operation == REMOVE && resources.contains(item)) {
+                                resources.remove(item);
+                                changed = true;
+                            }                            
+                            if (changed) {
+                                String itemRefs[] = cs.encodeToStrings( resources.iterator() );                                
+                                props = helper.getProperties (AntProjectHelper.PROJECT_PROPERTIES_PATH);    //PathParser may change the EditableProperties                                
+                                props.setProperty(classPathProperty, itemRefs);                                
+                                String prop = cs.getLibraryReference( item );
+                                prop = prop.substring(2, prop.length()-1); // XXX make a PropertyUtils method for this!
+                                ClassPathSupport.relativizeLibraryClassPath(props, helper.getAntProjectHelper(), prop);                                
+                                helper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, props);
+                                ProjectManager.getDefault().saveProject(project);
+                                return Boolean.TRUE;
+                            }
+                            return Boolean.FALSE;
+                        }
+                    }
+            )).booleanValue();
+        } catch (MutexException e) {
+            throw (IOException) e.getException();
+        }
+    }
+    
+    private String getClassPathProperty (final SourceGroup sg, final String classPathId) throws UnsupportedOperationException {
+        assert sg != null : "SourceGroup cannot be null";  //NOI18N
+        assert classPathId != null : "ClassPathId cannot be null";  //NOI18N
+        final String classPathProperty = ((ClassPathProviderImpl)project.getLookup().lookup(ClassPathProviderImpl.class)).getPropertyName (sg, classPathId);
+        if (classPathProperty == null) {
+            throw new UnsupportedOperationException ("Modification of [" + sg.getRootFolder().getPath() +", " + classPathId + "] is not supported"); //NOI8N
+        }
+        return classPathProperty;
+    }
+}
Index: j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifierTest.java
===================================================================
RCS file: j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifierTest.java
diff -N j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifierTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/classpath/J2SEProjectClassPathModifierTest.java	3 May 2006 14:34:55 -0000
@@ -0,0 +1,360 @@
+/*
+ * J2SEProjectClassPathModifierTest.java
+ * JUnit based test
+ *
+ * Created on May 2, 2006, 9:45 PM
+ */
+
+package org.netbeans.modules.java.j2seproject.classpath;
+
+import java.beans.Customizer;
+import java.beans.PropertyChangeListener;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import junit.framework.*;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.java.project.JavaProjectConstants;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectManager;
+import org.netbeans.api.project.SourceGroup;
+import org.netbeans.api.project.Sources;
+import org.netbeans.api.project.TestUtil;
+import org.netbeans.api.project.ant.AntArtifact;
+import org.netbeans.api.project.libraries.Library;
+import org.netbeans.api.project.libraries.LibraryManager;
+import org.netbeans.junit.NbTestCase;
+import org.netbeans.modules.java.j2seproject.J2SEProjectGenerator;
+import org.netbeans.modules.java.j2seproject.UpdateHelper;
+import org.netbeans.modules.java.j2seproject.ui.customizer.J2SEProjectProperties;
+import org.netbeans.spi.java.project.classpath.ProjectClassPathExtender;
+import org.netbeans.spi.java.project.classpath.ProjectClassPathModifier;
+import org.netbeans.spi.project.ant.AntArtifactProvider;
+import org.netbeans.spi.project.libraries.LibraryImplementation;
+import org.netbeans.spi.project.libraries.LibraryProvider;
+import org.netbeans.spi.project.libraries.LibraryTypeProvider;
+import org.netbeans.spi.project.support.ant.AntProjectHelper;
+import org.netbeans.spi.project.support.ant.EditableProperties;
+import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+import org.netbeans.spi.project.support.ant.PropertyUtils;
+import org.netbeans.spi.project.support.ant.ReferenceHelper;
+import org.openide.ErrorManager;
+import org.openide.filesystems.FileLock;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.modules.SpecificationVersion;
+import org.openide.util.Lookup;
+import org.openide.util.Mutex;
+import org.openide.util.MutexException;
+
+/**
+ *
+ * @author tom
+ */
+public class J2SEProjectClassPathModifierTest extends NbTestCase {
+    
+    private FileObject scratch;
+    private AntProjectHelper helper;
+    private PropertyEvaluator eval;
+    private Project prj;
+    
+    public J2SEProjectClassPathModifierTest(String testName) {
+        super(testName);
+    }       
+    
+    protected void setUp() throws Exception {
+        super.setUp();
+        TestUtil.setLookup(new Object[] {
+            new org.netbeans.modules.java.j2seproject.J2SEProjectType(),
+            new org.netbeans.modules.projectapi.SimpleFileOwnerQueryImplementation(),
+            new TestLibraryProvider (),
+        });
+        this.scratch = TestUtil.makeScratchDir(this);
+        FileObject projdir = scratch.createFolder("proj");  //NOI18N
+        J2SEProjectGenerator.setDefaultSourceLevel(new SpecificationVersion ("1.4"));   //NOI18N    
+        this.helper = J2SEProjectGenerator.createProject(FileUtil.toFile(projdir),"proj",null,null); //NOI18N
+        this.eval = this.helper.getStandardPropertyEvaluator();
+        J2SEProjectGenerator.setDefaultSourceLevel(null);
+        this.prj = FileOwnerQuery.getOwner(projdir);
+        assertNotNull (this.prj);
+    }
+
+    protected void tearDown() throws Exception {
+    }
+    
+    public void testAddRemoveRoot () throws Exception {        
+        final FileObject rootFolder = this.scratch.createFolder("Root");
+        final FileObject jarFile = this.scratch.createData("archive","jar");
+        FileLock lck = jarFile.lock();
+        try {
+            ZipOutputStream jf = new ZipOutputStream (jarFile.getOutputStream(lck));            
+            try {
+                jf.putNextEntry(new ZipEntry("Test.properties"));
+            }finally {
+                jf.close();
+            }
+        } finally {
+            lck.releaseLock();
+        }
+        final FileObject jarRoot = FileUtil.getArchiveRoot(jarFile);
+        ProjectClassPathModifier modifier = (ProjectClassPathModifier) this.prj.getLookup().lookup(ProjectClassPathModifier.class);
+        assertNotNull (modifier);
+        Sources sources = (Sources) this.prj.getLookup().lookup(Sources.class);
+        assertNotNull (sources);
+        SourceGroup[] sgs = sources.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
+        assertNotNull (sgs);
+        assertEquals(2,sgs.length);
+        SourceGroup srcSg=null, testSg = null;
+        for (int i=0; i<sgs.length; i++) {
+            if ("src".equals(sgs[i].getRootFolder().getName())) {
+                srcSg = sgs[i];
+            }
+            if ("test".equals(sgs[i].getRootFolder().getName())) {
+                testSg = sgs[i];
+            }
+        }
+        assertNotNull (srcSg);
+        assertNotNull (testSg);
+        modifier.addRoot (rootFolder.getURL(),srcSg,ClassPath.COMPILE);
+        String cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        String[] cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(1,cpRoots.length);
+        assertEquals(rootFolder,this.helper.resolveFileObject(cpRoots[0]));
+        modifier.removeRoot (rootFolder.getURL(),srcSg,ClassPath.COMPILE);
+        cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(0,cpRoots.length);
+        modifier.addRoot(jarRoot.getURL(),testSg,ClassPath.EXECUTE);
+        cp = this.eval.getProperty("run.test.classpath");
+        assertNotNull (cp);
+        cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(4,cpRoots.length);
+        assertEquals(this.helper.resolveFileObject(cpRoots[3]),jarFile);
+    }
+    
+    public void testAddRemoveArtifact () throws Exception {
+        FileObject projdir = scratch.createFolder("libPrj");  //NOI18N
+        J2SEProjectGenerator.setDefaultSourceLevel(new SpecificationVersion ("1.4"));   //NOI18N    
+        AntProjectHelper helper = J2SEProjectGenerator.createProject(FileUtil.toFile(projdir),"libProj",null,null); //NOI18N        
+        J2SEProjectGenerator.setDefaultSourceLevel(null);
+        Project libPrj = FileOwnerQuery.getOwner(projdir);
+        assertNotNull (this.prj);
+        AntArtifactProvider ap = (AntArtifactProvider) libPrj.getLookup().lookup(AntArtifactProvider.class);
+        AntArtifact[] aas = ap.getBuildArtifacts();
+        AntArtifact output = null;
+        for (int i=0; i<aas.length; i++) {
+            if (JavaProjectConstants.ARTIFACT_TYPE_JAR.equals(aas[i].getType())) {
+                output = aas[i];
+                break;
+            }
+        }
+        assertNotNull (output);        
+        ProjectClassPathModifier modifier = (ProjectClassPathModifier) this.prj.getLookup().lookup(ProjectClassPathModifier.class);
+        assertNotNull (modifier);
+        Sources sources = (Sources) this.prj.getLookup().lookup(Sources.class);
+        assertNotNull (sources);
+        SourceGroup[] sgs = sources.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
+        assertNotNull (sgs);
+        assertEquals(2,sgs.length);
+        SourceGroup srcSg=null;
+        for (int i=0; i<sgs.length; i++) {
+            if ("src".equals(sgs[i].getRootFolder().getName())) {
+                srcSg = sgs[i];
+                break;
+            }
+        }
+        assertNotNull (srcSg);
+        modifier.addAntArtifact(output,output.getArtifactLocations()[0],srcSg,ClassPath.COMPILE);
+        String cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        String[] cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(1,cpRoots.length);
+        URI projectURI = URI.create(output.getProject().getProjectDirectory().getURL().toExternalForm());
+        URI expected = projectURI.resolve(output.getArtifactLocations()[0]);
+        assertEquals(expected,this.helper.resolveFile(cpRoots[0]).toURI());
+        modifier.removeAntArtifact(output,output.getArtifactLocations()[0],srcSg,ClassPath.COMPILE);
+        cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(0,cpRoots.length);
+    }
+    
+    public void testAddRemoveLibrary () throws Exception {
+        LibraryProvider lp = (LibraryProvider) Lookup.getDefault().lookup(LibraryProvider.class);
+        assertNotNull (lp);
+        LibraryImplementation[] impls = lp.getLibraries();
+        assertNotNull (impls);
+        assertEquals(1,impls.length);
+        FileObject libRoot = this.scratch.createFolder("libRoot");
+        impls[0].setContent("classpath",Collections.singletonList(libRoot.getURL()));
+        Library[] libs =LibraryManager.getDefault().getLibraries();
+        assertNotNull (libs);
+        assertEquals(1,libs.length);        
+        ProjectClassPathModifier modifier = (ProjectClassPathModifier) this.prj.getLookup().lookup(ProjectClassPathModifier.class);
+        assertNotNull (modifier);
+        Sources sources = (Sources) this.prj.getLookup().lookup(Sources.class);
+        assertNotNull (sources);
+        SourceGroup[] sgs = sources.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
+        assertNotNull (sgs);
+        assertEquals(2,sgs.length);
+        SourceGroup srcSg=null;
+        for (int i=0; i<sgs.length; i++) {
+            if ("src".equals(sgs[i].getRootFolder().getName())) {
+                srcSg = sgs[i];
+                break;
+            }
+        }
+        assertNotNull (srcSg);
+        modifier.addLibrary(libs[0],srcSg,ClassPath.COMPILE);
+        String cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        String[] cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(1,cpRoots.length);
+        assertEquals("${libs.Test.classpath}",cpRoots[0]);    //There is no build.properties filled, the libraries are not resolved
+        modifier.removeLibrary(libs[0],srcSg,ClassPath.COMPILE);
+        cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(0,cpRoots.length);
+    }
+    
+    public void testClassPathExtenderCompatibility () throws Exception {
+        final FileObject rootFolder = this.scratch.createFolder("Root");
+        final FileObject jarFile = this.scratch.createData("archive","jar");
+        FileLock lck = jarFile.lock();
+        try {
+            ZipOutputStream jf = new ZipOutputStream (jarFile.getOutputStream(lck));            
+            try {
+                jf.putNextEntry(new ZipEntry("Test.properties"));
+            }finally {
+                jf.close();
+            }
+        } finally {
+            lck.releaseLock();
+        }
+        final FileObject jarRoot = FileUtil.getArchiveRoot(jarFile);
+        ProjectClassPathExtender extender = (ProjectClassPathExtender) this.prj.getLookup().lookup(ProjectClassPathExtender.class);
+        assertNotNull (extender);
+        extender.addArchiveFile(rootFolder);
+        extender.addArchiveFile(jarFile);
+        String cp = this.eval.getProperty("javac.classpath");
+        assertNotNull (cp);
+        String[] cpRoots = PropertyUtils.tokenizePath (cp);
+        assertNotNull (cpRoots);
+        assertEquals(2,cpRoots.length);
+        assertEquals(rootFolder,this.helper.resolveFileObject(cpRoots[0]));
+        assertEquals(jarFile,this.helper.resolveFileObject(cpRoots[1]));
+    }
+    
+    
+    private static class TestLibraryProvider implements LibraryProvider {
+        
+        private LibraryImplementation[] libs;
+        
+        public void removePropertyChangeListener(PropertyChangeListener listener) {
+        }
+
+        public void addPropertyChangeListener(PropertyChangeListener listener) {
+        }
+
+        public LibraryImplementation[] getLibraries() {
+            if (libs == null) {
+                this.libs = new LibraryImplementation[] { new TestLibrary ("Test")};
+            }
+            return this.libs;
+        }
+        
+    }    
+    
+    private static class TestLibrary implements LibraryImplementation {
+        
+        private String name;
+        private List cp = Collections.EMPTY_LIST;
+        private List src = Collections.EMPTY_LIST;
+        private List jdoc = Collections.EMPTY_LIST;
+        
+        public TestLibrary (String name) {
+            this.name = name;
+        }
+        
+        public void setName(String name) {
+        }
+
+        public void setLocalizingBundle(String resourceName) {
+        }
+
+        public void setDescription(String text) {
+        }
+
+        public List getContent(String volumeType) throws IllegalArgumentException {
+            if ("classpath".equals(volumeType)) {
+                return this.cp; 
+            }
+            else if ("src".equals(volumeType)) {
+                return this.src;
+            }
+            else if ("jdoc".equals(volumeType)) {
+                return this.jdoc;
+            }
+            throw new IllegalArgumentException ();
+        }
+
+        public void removePropertyChangeListener(PropertyChangeListener l) {
+        }
+
+        public void addPropertyChangeListener(PropertyChangeListener l) {
+        }
+
+        public void setContent(String volumeType, List path) throws IllegalArgumentException {
+            if ("classpath".equals(volumeType)) {
+                this.cp = path;
+            }
+            else if ("src".equals(volumeType)) {
+                this.src = path;
+            }
+            else if ("jdoc".equals(volumeType)) {
+                this.jdoc = path;
+            }
+            else {
+                throw new IllegalArgumentException ();
+            }
+        }
+
+        public String getType() {
+            return "j2se";
+        }
+
+        public String getName() {
+            return this.name;
+        }
+
+        public String getLocalizingBundle() {
+            return null;
+        }
+
+        public String getDescription() {
+            return null;
+        }
+        
+    }
+    
+}
Index: project/apichanges.xml
===================================================================
RCS file: /cvs/java/project/apichanges.xml,v
retrieving revision 1.13
diff -u -r1.13 apichanges.xml
--- project/apichanges.xml	1 Sep 2005 08:26:27 -0000	1.13
+++ project/apichanges.xml	3 May 2006 14:34:56 -0000
@@ -77,6 +77,24 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+    <change id="ProjectClassPathModifier">
+        <api name="classpath"/>
+        <summary>New ProjectClassPathModifier SPI for modification of project's classpath</summary>
+        <version major="1" minor="10"/>
+        <date day="3" month="5" year="2006"/>
+        <author login="tzezula"/>
+        <compatibility addition="yes"/>
+        <description>
+        The new SPI interface ProjectClassPathModifier was created to allow extension modules to
+        add or remove classpath elements (archive files, folders, libraries, subprojects) from the
+        project's classpath.
+        </description>
+        <class package="org.netbeans.spi.java.project.classpath" name="ProjectClassPathModifier"/>
+         <issue number="74356"/>
+         <issue number="75469"/>
+         <issue number="60852"/>
+    </change>
+                                                                                                                                
     <change id="BrokenReferencesModel.updateReference">
         <api name="general"/>
         <summary>Semantic changes in the BrokenReferencesModel.updateReference behavior</summary>
Index: project/manifest.mf
===================================================================
RCS file: /cvs/java/project/manifest.mf,v
retrieving revision 1.18
diff -u -r1.18 manifest.mf
--- project/manifest.mf	12 Dec 2005 15:40:01 -0000	1.18
+++ project/manifest.mf	3 May 2006 14:34:56 -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.9
+OpenIDE-Module-Specification-Version: 1.10
 OpenIDE-Module-Requires: org.netbeans.modules.project.uiapi.ActionsFactory
 
Index: project/nbproject/project.properties
===================================================================
RCS file: /cvs/java/project/nbproject/project.properties,v
retrieving revision 1.20
diff -u -r1.20 project.properties
--- project/nbproject/project.properties	17 Apr 2006 15:48:42 -0000	1.20
+++ project/nbproject/project.properties	3 May 2006 14:34:56 -0000
@@ -11,6 +11,7 @@
 
 is.autoload=true
 
+javac.source=1.5
 javadoc.title=Java Project API
 javadoc.overview=${basedir}/overview.html
 javadoc.arch=${basedir}/arch.xml
Index: project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathExtender.java
===================================================================
RCS file: /cvs/java/project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathExtender.java,v
retrieving revision 1.3
diff -u -r1.3 ProjectClassPathExtender.java
--- project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathExtender.java	12 Jul 2005 04:06:10 -0000	1.3
+++ project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathExtender.java	3 May 2006 14:34:56 -0000
@@ -24,9 +24,10 @@
  * A project can provide this interface in its {@link org.netbeans.api.project.Project#getLookup lookup} to
  * allow clients to extend its compilation classpath
  * by a new classpath element (JAR, folder, dependent project, or library).
- * @since org.netbeans.modules.java.project/1 1.3 
+ * @since org.netbeans.modules.java.project/1 1.3
+ * @deprecated Please use the {@link ProjectClassPathModifier} instead.
  */
-public interface ProjectClassPathExtender {
+public @Deprecated interface ProjectClassPathExtender {
 
     /**
      * Adds a library into the project's compile classpath if the
@@ -34,6 +35,7 @@
      * @param library to be added
      * @return true in case the classpath was changed
      * @exception IOException in case the project metadata cannot be changed
+     * @deprecated Please use {@link ProjectClassPathModifier#addLibrary} instead.
      */
     boolean addLibrary(Library library) throws IOException;
 
@@ -43,6 +45,7 @@
      * @param archiveFile ZIP/JAR file to be added
      * @return true in case the classpath was changed
      * @exception IOException in case the project metadata cannot be changed
+     * @deprecated Please use {@link ProjectClassPathModifier#addArchive} instead.
      */
     boolean addArchiveFile(FileObject archiveFile) throws IOException;
 
@@ -54,6 +57,7 @@
      *                        (must be owned by the artifact and be relative to it)
      * @return true in case the classpath was changed
      * @exception IOException in case the project metadata cannot be changed
+     * @deprecated Please use {@link ProjectClassPathModifier#addAntArtifact} instead.
      */
     boolean addAntArtifact(AntArtifact artifact, URI artifactElement) throws IOException;
 
Index: project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathModifier.java
===================================================================
RCS file: project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathModifier.java
diff -N project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathModifier.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ project/src/org/netbeans/spi/java/project/classpath/ProjectClassPathModifier.java	3 May 2006 14:34:56 -0000
@@ -0,0 +1,128 @@
+/*
+ *                 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-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ */
+
+package org.netbeans.spi.java.project.classpath;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import org.netbeans.api.project.SourceGroup;
+import org.netbeans.api.project.ant.AntArtifact;
+import org.netbeans.api.project.libraries.Library;
+import org.openide.filesystems.FileObject;
+
+/**
+ * Interface for project's classpaths modification.
+ * A project can provide this interface in its {@link org.netbeans.api.project.Project#getLookup lookup} to
+ * allow clients to add or remove new classpath elements (JAR, folder, dependent project, or library) to its 
+ * classpaths.
+ * @since org.netbeans.modules.java.project/1 1.10
+ */
+public interface ProjectClassPathModifier {
+    
+    /**
+     * Adds a library into the project's classpath if the
+     * library is not already included.
+     * @param library to be added
+     * @param sourceGroup of type {@link org.netbeans.api.java.project.JavaProjectConstants#SOURCES_TYPE_JAVA}
+     * identifying the compilation unit to change
+     * @param classPathId the id of the classpath the library should be added to,
+     * eg {@link org.netbeans.api.java.classpath.ClassPath.COMPILE}
+     * @return true in case the classpath was changed
+     * @exception IOException in case the project metadata cannot be changed
+     * @exception UnsupportedOperationException is thrown when the project does not support
+     * adding of a library to the classpath of the given id.
+     */
+    boolean addLibrary (Library library, SourceGroup sourceGroup, String classPathId) throws IOException, UnsupportedOperationException;
+    
+    
+    /**
+     * Removes a library from the project's classpath if the
+     * library is included on it.
+     * @param library to be removed
+     * @param sourceGroup of type {@link org.netbeans.api.java.project.JavaProjectConstants#SOURCES_TYPE_JAVA}
+     * identifying the compilation unit to change
+     * @param classPathId the id of the classpath the library should be removed from,
+     * eg {@link org.netbeans.api.java.classpath.ClassPath.COMPILE}
+     * @return true in case the classpath was changed
+     * @exception IOException in case the project metadata cannot be changed
+     * @exception UnsupportedOperationException is thrown when the project does not support
+     * removing of a library from the classpath of the given id.
+     */
+    boolean removeLibrary (Library library, SourceGroup sourceGroup, String classPathId) throws IOException, UnsupportedOperationException;
+    
+    /**
+     * Adds an archive file or folder into the project's classpath if the
+     * entry is not already there.
+     * @param classPathRoot root to be added, either root of an archive or folder
+     * @param sourceGroup of type {@link org.netbeans.api.java.project.JavaProjectConstants#SOURCES_TYPE_JAVA}
+     * identifying the compilation unit to change
+     * @param classPathId the id of the classpath the root should be added to,
+     * eg {@link org.netbeans.api.java.classpath.ClassPath.COMPILE}
+     * @return true in case the classpath was changed
+     * @exception IOException in case the project metadata cannot be changed
+     * @exception UnsupportedOperationException is thrown when the project does not support
+     * adding of a root to the classpath of the given id.
+     */
+    boolean addRoot (URL classPathRoot, SourceGroup sourceGroup, String classPathId) throws IOException, UnsupportedOperationException;
+    
+    /**
+     * Removes an archive file or folder from the project's classpath if the
+     * entry is included on it.
+     * @param classPathRoot root to be removed, either root of an archive or folder
+     * @param sourceGroup of type {@link org.netbeans.api.java.project.JavaProjectConstants#SOURCES_TYPE_JAVA}
+     * identifying the compilation unit to change
+     * @param classPathId the id of the classpath the root should be removed from,
+     * eg {@link org.netbeans.api.java.classpath.ClassPath.COMPILE}
+     * @return true in case the classpath was changed
+     * @exception IOException in case the project metadata cannot be changed
+     * @exception UnsupportedOperationException is thrown when the project does not support
+     * removing of a root from the classpath of the given id.
+     */
+    boolean removeRoot (URL classPathRoot, SourceGroup sourceGroup, String classPathId) throws IOException, UnsupportedOperationException;
+    
+    /**
+     * Adds an artifact (e.g. subproject) into project's classpath if the
+     * artifact is not already on it.
+     * @param artifact to be added
+     * @param artifactElement the URI of the build output
+     * (must be owned by the artifact and be relative to it)
+     * @param sourceGroup of type {@link org.netbeans.api.java.project.JavaProjectConstants#SOURCES_TYPE_JAVA}
+     * identifying the compilation unit to change
+     * @param classPathId the id of the classpath the artifact should be added to,
+     * eg {@link org.netbeans.api.java.classpath.ClassPath.COMPILE}
+     * @return true in case the classpath was changed
+     * @exception IOException in case the project metadata cannot be changed
+     * @exception UnsupportedOperationException is thrown when the project does not support
+     * adding of an artifact to the classpath of the given id.
+     */
+    boolean addAntArtifact (AntArtifact artifact, URI artifactElement, SourceGroup sourceGroup, String classPathId) throws IOException, UnsupportedOperationException;
+    
+    /**
+     * Removes an artifact (e.g. subproject) from project's classpath if the
+     * artifact is not already on it.
+     * @param artifact to be added
+     * @param artifactElement the URI of the build output
+     * (must be owned by the artifact and be relative to it)
+     * @param sourceGroup of type {@link org.netbeans.api.java.project.JavaProjectConstants#SOURCES_TYPE_JAVA}
+     * identifying the compilation unit to change
+     * @param classPathId the id of the classpath the artifact should be removed from,
+     * eg {@link org.netbeans.api.java.classpath.ClassPath.COMPILE}
+     * @return true in case the classpath was changed
+     * @exception IOException in case the project metadata cannot be changed
+     * @exception UnsupportedOperationException is thrown when the project does not support
+     * removing of an artifact from the classpath of the given id.
+     */
+    boolean removeAntArtifact (AntArtifact artifact, URI artifactElement, SourceGroup sourceGroup, String classPathId) throws IOException, UnsupportedOperationException;
+
+}