C:\nb_all\web\project\src\org\netbeans\modules\web\project>cvs di -r 1.14 -r 1.13 -u WebContainerImpl.java Index: WebContainerImpl.java =================================================================== RCS file: /cvs/web/project/src/org/netbeans/modules/web/project/WebContainerImpl.java,v retrieving revision 1.14 retrieving revision 1.13 diff -u -r1.14 -r1.13 --- WebContainerImpl.java 15 Apr 2005 01:09:39 -0000 1.14 +++ WebContainerImpl.java 2 Apr 2005 14:49:03 -0000 1.13 @@ -27,15 +27,11 @@ import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.api.ejbjar.EnterpriseReferenceContainer; import org.netbeans.modules.schema2beans.BaseBean; -import org.netbeans.modules.web.project.classpath.WebProjectClassPathExtender; -import org.netbeans.modules.web.project.ui.customizer.AntArtifactChooser; -import org.netbeans.modules.web.project.ui.customizer.AntArtifactChooser.ArtifactItem; import org.netbeans.modules.web.project.ui.customizer.WebProjectProperties; import org.netbeans.modules.web.spi.webmodule.WebModuleImplementation; import org.netbeans.spi.project.support.ant.AntProjectHelper; import org.netbeans.spi.project.support.ant.EditableProperties; import org.netbeans.spi.project.support.ant.ReferenceHelper; -import org.openide.ErrorManager; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; @@ -110,18 +106,14 @@ } catch (ClassNotFoundException ex){} } - WebProjectClassPathExtender cpExtender = (WebProjectClassPathExtender) webProject.getLookup().lookup(WebProjectClassPathExtender.class); - if (cpExtender != null) { - try { - AntArtifactChooser.ArtifactItem artifactItems[] = new AntArtifactChooser.ArtifactItem [1]; - artifactItems[0] = new AntArtifactChooser.ArtifactItem (target, target.getArtifactLocation()); - cpExtender.addAntArtifacts(WebProjectProperties.JAVAC_CLASSPATH, artifactItems, WebProjectProperties.TAG_WEB_MODULE_LIBRARIES); - } catch (IOException ioe) { - ErrorManager.getDefault().notify(ioe); - } - } - else { - ErrorManager.getDefault().log ("WebProjectClassPathExtender not found in the project lookup of project: "+webProject.getProjectDirectory().getPath()); //NOI18N + if(helper.addReference(target)) { + EditableProperties ep = + antHelper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH); + String s = ep.getProperty(WebProjectProperties.JAVAC_CLASSPATH); + s += File.pathSeparatorChar + helper.createForeignFileReference(target); + ep.setProperty(WebProjectProperties.JAVAC_CLASSPATH, s); + antHelper.putProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH, ep); + ProjectManager.getDefault().saveProject(webProject); } writeDD();