[330405] jst.jsp - TLD files not detected in jar file within defined user library that is on project classpath
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePluginResources.properties b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePluginResources.properties
index f322e91..acc05bf 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePluginResources.properties
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/JSPCorePluginResources.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
+# Copyright (c) 2004, 2011 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -26,7 +26,7 @@
JSPDirectiveValidator_6=Undefined attribute name "{0}"
JSPDirectiveValidator_7=A {0} or {1} value is required in this directive
JSPDirectiveValidator_8=The superclass "{0}" was not found on the Java Build Path
-JSPDirectiveValidator_9=Can not find the tag library descriptor for "{0}". Try increasing the version of the Dynamic Web Module project facet.
+JSPDirectiveValidator_9=Can not find the tag library descriptor for "{0}". Try increasing the version of the Dynamic Web Module project facet, as this method of reference may not be supported by the current JSP version ({1}).
JSPDirectiveValidator_10=Can not find the tag library descriptor for "{0}". Try using a newer grammar or declared version in the Web Deployment Descriptor.
JSPDirectiveValidator_11=Can not find the tag directory "{0}"
JSPActionValidator_0=Tag ({0}) must be empty
diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/validation/JSPDirectiveValidator.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/validation/JSPDirectiveValidator.java
index 9519c62..d4c7faa 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/validation/JSPDirectiveValidator.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/validation/JSPDirectiveValidator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2001, 2010 IBM Corporation and others.
+ * Copyright (c) 2001, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -459,9 +459,10 @@
// URI specified but does not resolve
String msgText = null;
// provide better messages for typical "http:*" URIs
- if (uri.startsWith("http:") && DeploymentDescriptorPropertyCache.getInstance().getJSPVersion(file.getFullPath()) < 1.2) { //$NON-NLS-1$
+ final float version = DeploymentDescriptorPropertyCache.getInstance().getJSPVersion(file.getFullPath());
+ if (uri.startsWith("http:") && version < 1.2) { //$NON-NLS-1$
if (FacetModuleCoreSupport.isDynamicWebProject(file.getProject())) {
- msgText = NLS.bind(JSPCoreMessages.JSPDirectiveValidator_9, uri);
+ msgText = NLS.bind(JSPCoreMessages.JSPDirectiveValidator_9, new Object[] { uri, new Float(version)} );
}
else {
msgText = NLS.bind(JSPCoreMessages.JSPDirectiveValidator_10, uri);
