>> annotatedClasses =
- provider.getAnnotatedClasses(urls);
+ provider.getAnnotatedClasses(uris);
if (t != null) {
t.stopTiming();
@@ -847,7 +849,7 @@
timer.logResult("Parse " + documentURL.toExternalForm());
}
- return new DocumentInfo(d, documentURL);
+ return new DocumentInfo(d, new URI(documentURL.toExternalForm()));
} catch (Exception e) {
throw new ConfigurationException(MessageFormat.format(
"Unable to parse document ''{0}'': {1}",
@@ -1027,11 +1029,11 @@
/**
*
* This Callable
will be used by {@link ConfigManager#getConfigDocuments(javax.servlet.ServletContext, java.util.List, java.util.concurrent.ExecutorService, boolean)}.
- * It represents one or more URLs to configuration resources that require
+ * It represents one or more URIs to configuration resources that require
* processing.
*
*/
- private static class URLTask implements Callable> {
+ private static class URITask implements Callable> {
private ConfigurationResourceProvider provider;
private ServletContext sc;
@@ -1041,12 +1043,12 @@
/**
- * Constructs a new URLTask
instance.
+ * Constructs a new URITask
instance.
* @param provider the ConfigurationResourceProvider
from
- * which zero or more URL
s will be returned
+ * which zero or more URI
s will be returned
* @param sc the ServletContext
of the current application
*/
- public URLTask(ConfigurationResourceProvider provider,
+ public URITask(ConfigurationResourceProvider provider,
ServletContext sc) {
this.provider = provider;
this.sc = sc;
@@ -1057,11 +1059,11 @@
/**
- * @return zero or more URL
instances
+ * @return zero or more URI
instances
* @throws Exception if an Exception is thrown by the underlying
* ConfigurationResourceProvider
*/
- public Collection call() throws Exception {
+ public Collection call() throws Exception {
return provider.getResources(sc);
}
diff -r 1a3e3fb27c10 web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/mojarra/FaceletsTaglibConfigProcessor.java
--- a/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/mojarra/FaceletsTaglibConfigProcessor.java Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/mojarra/FaceletsTaglibConfigProcessor.java Thu Apr 21 09:22:16 2011 +0200
@@ -273,11 +273,19 @@
}
}
+ URL sourceUrl;
+ try {
+ sourceUrl = info.getSourceURI().toURL();
+ } catch (MalformedURLException ex) {
+ LOGGER.log(Level.INFO, null, ex);
+ return;
+ }
+
if (compositeLibraryName != null) {
//nothing to process inside the library definition AFAIR...
- compiler.addTagLibrary(new CompositeComponentLibrary(support, compositeLibraryName, taglibNamespace, info.getSourceURL()));
+ compiler.addTagLibrary(new CompositeComponentLibrary(support, compositeLibraryName, taglibNamespace, sourceUrl));
} else {
- ClassBasedFaceletsLibrary taglibrary = new ClassBasedFaceletsLibrary(info.getSourceURL(), support, taglibNamespace);
+ ClassBasedFaceletsLibrary taglibrary = new ClassBasedFaceletsLibrary(sourceUrl, support, taglibNamespace);
//process the library content
NodeList tags =
documentElement.getElementsByTagNameNS(namespace, TAG);
diff -r 1a3e3fb27c10 web.jsf20/external/binaries-list
--- a/web.jsf20/external/binaries-list Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf20/external/binaries-list Thu Apr 21 09:22:16 2011 +0200
@@ -1,1 +1,1 @@
-6B90A110E1B1503C4623B13D3BB536212F1BF3DB jsf-2.0.zip
+1D74DA79DC71C52D1B7916853BDD51F346A85359 jsf-2.1.zip
diff -r 1a3e3fb27c10 web.jsf20/nbproject/project.properties
--- a/web.jsf20/nbproject/project.properties Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf20/nbproject/project.properties Thu Apr 21 09:22:16 2011 +0200
@@ -40,9 +40,9 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-release.external/jsf-2.0.zip!/jsf-2.0/jsf-api.jar=modules/ext/jsf-2_0/jsf-api.jar
-release.external/jsf-2.0.zip!/jsf-2.0/jsf-impl.jar=modules/ext/jsf-2_0/jsf-impl.jar
-release.external/jsf-2.0.zip!/jsf-2.0/LICENSE-APACHE.txt=modules/ext/jsf-2_0/LICENSE-APACHE.txt
-release.external/jsf-2.0.zip!/jsf-2.0/LICENSE.TXT=modules/ext/jsf-2_0/LICENSE.TXT
-release.external/jsf-2.0.zip!/jsf-2.0/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-2_0/THIRDPARTYLICENSEREADME.txt
+release.external/jsf-2.1.zip!/jsf-2.1/jsf-api.jar=modules/ext/jsf-2_1/jsf-api.jar
+release.external/jsf-2.1.zip!/jsf-2.1/jsf-impl.jar=modules/ext/jsf-2_1/jsf-impl.jar
+release.external/jsf-2.1.zip!/jsf-2.1/LICENSE-APACHE.txt=modules/ext/jsf-2_1/LICENSE-APACHE.txt
+release.external/jsf-2.1.zip!/jsf-2.1/LICENSE.TXT=modules/ext/jsf-2_1/LICENSE.TXT
+release.external/jsf-2.1.zip!/jsf-2.1/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-2_1/THIRDPARTYLICENSEREADME.txt
spec.version.base=1.7.0
diff -r 1a3e3fb27c10 web.jsf20/nbproject/project.xml
--- a/web.jsf20/nbproject/project.xml Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf20/nbproject/project.xml Thu Apr 21 09:22:16 2011 +0200
@@ -64,10 +64,10 @@
com.sun.faces
- ext/jsf-2_0/jsf-api.jar
+ ext/jsf-2_1/jsf-api.jar
- ext/jsf-2_0/jsf-impl.jar
+ ext/jsf-2_1/jsf-impl.jar
diff -r 1a3e3fb27c10 web.jsf20/src/org/netbeans/modules/web/jsf20/Bundle.properties
--- a/web.jsf20/src/org/netbeans/modules/web/jsf20/Bundle.properties Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf20/src/org/netbeans/modules/web/jsf20/Bundle.properties Thu Apr 21 09:22:16 2011 +0200
@@ -41,11 +41,11 @@
# made subject to such option by the copyright holder.
# module descritpion
-OpenIDE-Module-Name=JavaServer Faces 2.0 Library
+OpenIDE-Module-Name=JavaServer Faces 2.1 Library
OpenIDE-Module-Display-Category=Web
-OpenIDE-Module-Short-Description=Installs the JavaServer Faces 2.0 Library
-OpenIDE-Module-Long-Description=Installs the JavaServer Faces 2.0 Library
+OpenIDE-Module-Short-Description=Installs the JavaServer Faces 2.1 Library
+OpenIDE-Module-Long-Description=Installs the JavaServer Faces 2.1 Library
# library display name
-jsf20=JSF 2.0
-jsf20ri=JSF 2.0 RI
+jsf20=JSF 2.1
+jsf20ri=JSF 2.1 RI
diff -r 1a3e3fb27c10 web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20.xml
--- a/web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20.xml Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20.xml Thu Apr 21 09:22:16 2011 +0200
@@ -51,8 +51,8 @@
org/netbeans/modules/web/jsf20/Bundle
classpath
- jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_0/jsf-api.jar!/
- jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_0/jsf-impl.jar!/
+ jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_1/jsf-api.jar!/
+ jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_1/jsf-impl.jar!/
javadoc
@@ -61,7 +61,7 @@
maven-pom
- http://download.java.net/maven/2/com/sun/faces/jsf-api/2.0.4-b09/jsf-api-2.0.4-b09.pom
- http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.0.4-b09/jsf-impl-2.0.4-b09.pom
+ http://download.java.net/maven/2/com/sun/faces/jsf-api/2.1.1-b04/jsf-api-2.1.1-b04.pom
+ http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.1.1-b04/jsf-impl-2.1.1-b04.pom
diff -r 1a3e3fb27c10 web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20ri.xml
--- a/web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20ri.xml Wed Apr 20 19:34:18 2011 -0400
+++ b/web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20ri.xml Thu Apr 21 09:22:16 2011 +0200
@@ -51,7 +51,7 @@
org/netbeans/modules/web/jsf20/Bundle
classpath
- jar:nbinst://org.netbeans.modules.web.jsf20ri/modules/ext/jsf-2_0/jsf-impl.jar!/
+ jar:nbinst://org.netbeans.modules.web.jsf20ri/modules/ext/jsf-2_1/jsf-impl.jar!/
javadoc
@@ -60,6 +60,6 @@
maven-pom
- http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.0.4-b09/jsf-impl-2.0.4-b09.pom
+ http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.1.1-b04/jsf-impl-2.1.1-b04.pom
\ No newline at end of file