diff --git a/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImpl.java b/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImpl.java --- a/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImpl.java +++ b/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImpl.java @@ -98,7 +98,6 @@ */ private static enum ClassPathCache { WEB_SOURCE, - PACKAGED, // #131785 WEB_COMPILATION, WEB_RUNTIME, } @@ -194,21 +193,6 @@ return null; } - // packaged classpath = compilation time classpath - J2EE platform classpath - private synchronized ClassPath getPackagedClasspath(FileType type) { - if (type == FileType.SOURCE || type == FileType.CLASS || type == FileType.WEB_SOURCE) { - // treat all these types as source: - ClassPath cp = cache.get(ClassPathCache.PACKAGED); - if (cp == null) { - cp = ClassPathFactory.createClassPath(ProjectClassPathSupport.createPropertyBasedClassPathImplementation( - projectDirectory, evaluator, new String[] {"javac.classpath"})); // NOI18N - cache.put(ClassPathCache.PACKAGED, cp); - } - return cp; - } - return null; - } - private synchronized ClassPath getRunTimeClasspath(FileType type) { if (type == FileType.WEB_SOURCE) { if (sourceRoots.getRoots().length > 0) { @@ -255,8 +239,6 @@ cp = getRunTimeClasspath(fileType); } else if (type.equals(ClassPath.SOURCE)) { cp = getSourcepath(fileType); - } else if (type.equals("classpath/packaged")) { // NOI18N - cp = getPackagedClasspath(fileType); } else if (type.equals("js/library")) { // NOI18N cp = getSourcepath(FileType.WEB_SOURCE); } diff --git a/web.project/test/unit/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImplTest.java b/web.project/test/unit/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImplTest.java --- a/web.project/test/unit/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImplTest.java +++ b/web.project/test/unit/src/org/netbeans/modules/web/project/classpath/ClassPathProviderImplTest.java @@ -226,11 +226,6 @@ cp = cpp.findClassPath(jspPage, ClassPath.SOURCE); checkJSPSourceClassPath(cp); - // test packaged classpath - just basic test it does something - // TODO: test that J2EE jars are excluded - cp = cpp.findClassPath(sourceClass, "classpath/packaged"); - checkCompileClassPath(cp); - //=========================================================== //test special source structure described in issue #59055 //===========================================================