View | Details | Raw Unified | Return to bug 196456
Collapse All | Expand All

(-)web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/DefaultFaceletLibraries.java (-1 / +1 lines)
 Lines 80-86    Link Here 
80
80
81
    private void init() {
81
    private void init() {
82
        File jsfImplJar = InstalledFileLocator.getDefault().locate(
82
        File jsfImplJar = InstalledFileLocator.getDefault().locate(
83
                "modules/ext/jsf-2_0/jsf-impl.jar", //NOI18N
83
                "modules/ext/jsf-2_1/jsf-impl.jar", //NOI18N
84
                "org.netbeans.modules.web.jsf20", false); //NOI18N
84
                "org.netbeans.modules.web.jsf20", false); //NOI18N
85
        assert jsfImplJar != null;
85
        assert jsfImplJar != null;
86
86
(-)web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/FaceletsLibrarySupport.java (-10 / +18 lines)
 Lines 46-51    Link Here 
46
import org.netbeans.modules.web.jsf.editor.facelets.mojarra.FaceletsTaglibConfigProcessor;
46
import org.netbeans.modules.web.jsf.editor.facelets.mojarra.FaceletsTaglibConfigProcessor;
47
import com.sun.faces.config.DocumentInfo;
47
import com.sun.faces.config.DocumentInfo;
48
import com.sun.faces.spi.ConfigurationResourceProvider;
48
import com.sun.faces.spi.ConfigurationResourceProvider;
49
import java.net.URI;
50
import java.net.URISyntaxException;
49
import java.net.URL;
51
import java.net.URL;
50
import java.net.URLClassLoader;
52
import java.net.URLClassLoader;
51
import java.util.ArrayList;
53
import java.util.ArrayList;
 Lines 300-316    Link Here 
300
        //WEB-INF/web.xml <param-name>javax.faces.FACELETS_LIBRARIES</param-name> context param provider
302
        //WEB-INF/web.xml <param-name>javax.faces.FACELETS_LIBRARIES</param-name> context param provider
301
        faceletTaglibProviders.add(new WebFaceletTaglibResourceProvider(getJsfSupport().getWebModule()));
303
        faceletTaglibProviders.add(new WebFaceletTaglibResourceProvider(getJsfSupport().getWebModule()));
302
304
303
        //2. second add a provider returning URLs of library descriptors found during indexing
305
        //2. second add a provider returning URIs of library descriptors found during indexing
304
        //   the URLs points to both source roots and binary roots of dependent libraries.
306
        //   the URIs points to both source roots and binary roots of dependent libraries.
305
        final Collection<URL> urls = new ArrayList<URL>();
307
        final Collection<URI> uris = new ArrayList<URI>();
306
        for (IndexedFile file : getJsfSupport().getIndex().getAllFaceletsLibraryDescriptors()) {
308
        for (IndexedFile file : getJsfSupport().getIndex().getAllFaceletsLibraryDescriptors()) {
307
            urls.add(URLMapper.findURL(file.getFile(), URLMapper.EXTERNAL));
309
            try {
310
                uris.add(URLMapper.findURL(file.getFile(), URLMapper.EXTERNAL).toURI());
311
            } catch (URISyntaxException ex) {
312
                LOGGER.log(Level.INFO, null, ex);
313
            }
308
        }
314
        }
309
        faceletTaglibProviders.add(new ConfigurationResourceProvider() {
315
        faceletTaglibProviders.add(new ConfigurationResourceProvider() {
310
316
311
            @Override
317
            @Override
312
            public Collection<URL> getResources(ServletContext sc) {
318
            public Collection<URI> getResources(ServletContext sc) {
313
                return urls;
319
                return uris;
314
            }
320
            }
315
        });
321
        });
316
322
 Lines 328-345    Link Here 
328
        //be overridden if the descriptors are found in any of the jars
334
        //be overridden if the descriptors are found in any of the jars
329
        //on compile classpath.
335
        //on compile classpath.
330
        Collection<FileObject> libraryDescriptorFiles = DefaultFaceletLibraries.getInstance().getLibrariesDescriptorsFiles();
336
        Collection<FileObject> libraryDescriptorFiles = DefaultFaceletLibraries.getInstance().getLibrariesDescriptorsFiles();
331
        final Collection<URL> libraryURLs = new ArrayList<URL>();
337
        final Collection<URI> libraryURIs = new ArrayList<URI>();
332
        for(FileObject fo : libraryDescriptorFiles) {
338
        for(FileObject fo : libraryDescriptorFiles) {
333
            try {
339
            try {
334
                libraryURLs.add(fo.getURL());
340
                libraryURIs.add(fo.getURL().toURI());
335
            } catch (FileStateInvalidException ex) {
341
            } catch (FileStateInvalidException ex) {
336
                LOGGER.log(Level.INFO, null, ex);
342
                LOGGER.log(Level.INFO, null, ex);
343
            } catch (URISyntaxException ex) {
344
                LOGGER.log(Level.INFO, null, ex);
337
            }
345
            }
338
        }
346
        }
339
        faceletTaglibProviders.add(new ConfigurationResourceProvider() {
347
        faceletTaglibProviders.add(new ConfigurationResourceProvider() {
340
            @Override
348
            @Override
341
            public Collection<URL> getResources(ServletContext sc) {
349
            public Collection<URI> getResources(ServletContext sc) {
342
                return libraryURLs;
350
                return libraryURIs;
343
            }
351
            }
344
        });
352
        });
345
353
(-)web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/WebFaceletTaglibResourceProvider.java (-4 / +12 lines)
 Lines 43-52    Link Here 
43
43
44
import com.sun.faces.spi.ConfigurationResourceProvider;
44
import com.sun.faces.spi.ConfigurationResourceProvider;
45
import java.io.IOException;
45
import java.io.IOException;
46
import java.net.URI;
47
import java.net.URISyntaxException;
46
import java.net.URL;
48
import java.net.URL;
47
import java.util.ArrayList;
49
import java.util.ArrayList;
48
import java.util.Collection;
50
import java.util.Collection;
49
import java.util.StringTokenizer;
51
import java.util.StringTokenizer;
52
import java.util.logging.Level;
53
import java.util.logging.Logger;
50
import javax.servlet.ServletContext;
54
import javax.servlet.ServletContext;
51
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
55
import org.netbeans.modules.j2ee.dd.api.common.InitParam;
52
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
56
import org.netbeans.modules.j2ee.dd.api.web.WebApp;
 Lines 75-81    Link Here 
75
        this.wm = wm;
79
        this.wm = wm;
76
    }
80
    }
77
81
78
    public Collection<URL> getResources(ServletContext ignored) {
82
    public Collection<URI> getResources(ServletContext ignored) {
79
        try {
83
        try {
80
            MetadataModel<WebAppMetadata> model = wm.getMetadataModel();
84
            MetadataModel<WebAppMetadata> model = wm.getMetadataModel();
81
            String faceletsLibrariesList = null;
85
            String faceletsLibrariesList = null;
 Lines 100-106    Link Here 
100
104
101
            FileObject webModuleRoot = wm.getDocumentBase();
105
            FileObject webModuleRoot = wm.getDocumentBase();
102
            FileObject webInfBase = wm.getWebInf() == null ? null : wm.getWebInf().getParent();
106
            FileObject webInfBase = wm.getWebInf() == null ? null : wm.getWebInf().getParent();
103
            Collection<URL> librariesURLs = new ArrayList<URL>();
107
            Collection<URI> librariesURIs = new ArrayList<URI>();
104
            if(faceletsLibrariesList != null) {
108
            if(faceletsLibrariesList != null) {
105
                StringTokenizer st = new StringTokenizer(faceletsLibrariesList, ";");
109
                StringTokenizer st = new StringTokenizer(faceletsLibrariesList, ";");
106
                while(st.hasMoreTokens()) {
110
                while(st.hasMoreTokens()) {
 Lines 119-130    Link Here 
119
                    if(libraryFO != null) {
123
                    if(libraryFO != null) {
120
                        URL url = URLMapper.findURL(libraryFO, URLMapper.INTERNAL);
124
                        URL url = URLMapper.findURL(libraryFO, URLMapper.INTERNAL);
121
                        if(url != null) {
125
                        if(url != null) {
122
                            librariesURLs.add(url);
126
                            try {
127
                                librariesURIs.add(new URI(url.toExternalForm()));
128
                            } catch (URISyntaxException ex) {
129
                                Logger.getLogger(WebFaceletTaglibResourceProvider.class.getName()).log(Level.INFO, null, ex);
130
                            }
123
                        }
131
                        }
124
                    }
132
                    }
125
                }
133
                }
126
            }
134
            }
127
            return librariesURLs;
135
            return librariesURIs;
128
136
129
        } catch (MetadataModelException ex) {
137
        } catch (MetadataModelException ex) {
130
            Exceptions.printStackTrace(ex);
138
            Exceptions.printStackTrace(ex);
(-)web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/mojarra/ConfigManager.java (-30 / +32 lines)
 Lines 119-124    Link Here 
119
import java.util.logging.Level;
119
import java.util.logging.Level;
120
import java.util.logging.Logger;
120
import java.util.logging.Logger;
121
import java.lang.annotation.Annotation;
121
import java.lang.annotation.Annotation;
122
import java.net.MalformedURLException;
123
import java.net.URI;
122
124
123
import org.w3c.dom.*;
125
import org.w3c.dom.*;
124
126
 Lines 327-340    Link Here 
327
                      isFaceletsDisabled(webConfig, webInfFacesConfigInfo);
329
                      isFaceletsDisabled(webConfig, webInfFacesConfigInfo);
328
                if (!webInfFacesConfigInfo.isWebInfFacesConfig() || !webInfFacesConfigInfo.isMetadataComplete()) {
330
                if (!webInfFacesConfigInfo.isWebInfFacesConfig() || !webInfFacesConfigInfo.isMetadataComplete()) {
329
                    // execute the Task responsible for finding annotation classes
331
                    // execute the Task responsible for finding annotation classes
330
                    Set<URL> scanUrls = getAnnotationScanURLs(facesDocuments);
332
                    Set<URI> scanUris = getAnnotationScanURIs(facesDocuments);
331
                    Future<Map<Class<? extends Annotation>,Set<Class<?>>>> annotationScan;
333
                    Future<Map<Class<? extends Annotation>,Set<Class<?>>>> annotationScan;
332
                    if (executor != null) {
334
                    if (executor != null) {
333
                        annotationScan = executor.submit(new AnnotationScanTask(sc, scanUrls));
335
                        annotationScan = executor.submit(new AnnotationScanTask(sc, scanUris));
334
                        pushTaskToContext(sc, annotationScan);
336
                        pushTaskToContext(sc, annotationScan);
335
                    } else {
337
                    } else {
336
                        annotationScan =
338
                        annotationScan =
337
                              new FutureTask<Map<Class<? extends Annotation>,Set<Class<?>>>>(new AnnotationScanTask(sc, scanUrls));
339
                              new FutureTask<Map<Class<? extends Annotation>,Set<Class<?>>>>(new AnnotationScanTask(sc, scanUris));
338
                        ((FutureTask) annotationScan).run();
340
                        ((FutureTask) annotationScan).run();
339
                    }
341
                    }
340
                    pushTaskToContext(sc, annotationScan);
342
                    pushTaskToContext(sc, annotationScan);
 Lines 426-450    Link Here 
426
    // --------------------------------------------------------- Private Methods
428
    // --------------------------------------------------------- Private Methods
427
429
428
430
429
    private static Set<URL> getAnnotationScanURLs(DocumentInfo[] documentInfos) {
431
    private static Set<URI> getAnnotationScanURIs(DocumentInfo[] documentInfos) {
430
432
431
        Set<URL> urls = new HashSet<URL>(documentInfos.length);
433
        Set<URI> uris = new HashSet<URI>(documentInfos.length);
432
        Set<String> jarNames = new HashSet<String>(documentInfos.length);
434
        Set<String> jarNames = new HashSet<String>(documentInfos.length);
433
        for (DocumentInfo docInfo : documentInfos) {
435
        for (DocumentInfo docInfo : documentInfos) {
434
            Matcher m = JAR_PATTERN.matcher(docInfo.getSourceURL().toString());
436
            Matcher m = JAR_PATTERN.matcher(docInfo.getSourceURI().toString());
435
            if (m.matches()) {
437
            if (m.matches()) {
436
                String jarName = m.group(2);
438
                String jarName = m.group(2);
437
                if (!jarNames.contains(jarName)) {
439
                if (!jarNames.contains(jarName)) {
438
                    FacesConfigInfo configInfo = new FacesConfigInfo(docInfo);
440
                    FacesConfigInfo configInfo = new FacesConfigInfo(docInfo);
439
                    if (!configInfo.isMetadataComplete()) {
441
                    if (!configInfo.isMetadataComplete()) {
440
                        urls.add(docInfo.getSourceURL());
442
                        uris.add(docInfo.getSourceURI());
441
                        jarNames.add(jarName);
443
                        jarNames.add(jarName);
442
                    }
444
                    }
443
                }
445
                }
444
            }
446
            }
445
        }
447
        }
446
448
447
        return urls;
449
        return uris;
448
450
449
    }
451
    }
450
452
 Lines 624-630    Link Here 
624
     * @param sc the <code>ServletContext</code> for the application to be
626
     * @param sc the <code>ServletContext</code> for the application to be
625
     *  processed
627
     *  processed
626
     * @param providers <code>List</code> of <code>ConfigurationResourceProvider</code>
628
     * @param providers <code>List</code> of <code>ConfigurationResourceProvider</code>
627
     *  instances that provide the URL of the documents to parse.
629
     *  instances that provide the URI of the documents to parse.
628
     * @param executor the <code>ExecutorService</code> used to dispatch parse
630
     * @param executor the <code>ExecutorService</code> used to dispatch parse
629
     *  request to
631
     *  request to
630
     * @param validating flag indicating whether or not the documents
632
     * @param validating flag indicating whether or not the documents
 Lines 636-647    Link Here 
636
                                                 ExecutorService executor,
638
                                                 ExecutorService executor,
637
                                                 boolean validating) {
639
                                                 boolean validating) {
638
640
639
        List<FutureTask<Collection<URL>>> urlTasks =
641
        List<FutureTask<Collection<URI>>> uriTasks =
640
             new ArrayList<FutureTask<Collection<URL>>>(providers.size());
642
             new ArrayList<FutureTask<Collection<URI>>>(providers.size());
641
        for (ConfigurationResourceProvider p : providers) {
643
        for (ConfigurationResourceProvider p : providers) {
642
            FutureTask<Collection<URL>> t =
644
            FutureTask<Collection<URI>> t =
643
                 new FutureTask<Collection<URL>>(new URLTask(p, sc));
645
                 new FutureTask<Collection<URI>>(new URITask(p, sc));
644
            urlTasks.add(t);
646
            uriTasks.add(t);
645
            if (executor != null) {
647
            if (executor != null) {
646
                executor.execute(t);
648
                executor.execute(t);
647
            } else {
649
            } else {
 Lines 652-663    Link Here 
652
        List<FutureTask<DocumentInfo>> docTasks =
654
        List<FutureTask<DocumentInfo>> docTasks =
653
             new ArrayList<FutureTask<DocumentInfo>>(providers.size() << 1);
655
             new ArrayList<FutureTask<DocumentInfo>>(providers.size() << 1);
654
656
655
        for (FutureTask<Collection<URL>> t : urlTasks) {
657
        for (FutureTask<Collection<URI>> t : uriTasks) {
656
            try {
658
            try {
657
                Collection<URL> l = t.get();
659
                Collection<URI> l = t.get();
658
                for (URL u : l) {
660
                for (URI u : l) {
659
                    FutureTask<DocumentInfo> d =
661
                    FutureTask<DocumentInfo> d =
660
                         new FutureTask<DocumentInfo>(new ParseTask(validating, u));
662
                         new FutureTask<DocumentInfo>(new ParseTask(validating, u.toURL()));
661
                    docTasks.add(d);
663
                    docTasks.add(d);
662
                    if (executor != null) {
664
                    if (executor != null) {
663
                        executor.execute(d);
665
                        executor.execute(d);
 Lines 748-763    Link Here 
748
    private static class AnnotationScanTask implements Callable<Map<Class<? extends Annotation>,Set<Class<?>>>> {
750
    private static class AnnotationScanTask implements Callable<Map<Class<? extends Annotation>,Set<Class<?>>>> {
749
751
750
        private ServletContext sc;
752
        private ServletContext sc;
751
        private Set<URL> urls;
753
        private Set<URI> uris;
752
754
753
755
754
        // -------------------------------------------------------- Constructors
756
        // -------------------------------------------------------- Constructors
755
757
756
758
757
        public AnnotationScanTask(ServletContext sc, Set<URL> urls) {
759
        public AnnotationScanTask(ServletContext sc, Set<URI> uris) {
758
760
759
            this.sc = sc;
761
            this.sc = sc;
760
            this.urls = urls;
762
            this.uris = uris;
761
763
762
        }
764
        }
763
765
 Lines 775-781    Link Here 
775
            //AnnotationScanner scanner = new AnnotationScanner(sc);
777
            //AnnotationScanner scanner = new AnnotationScanner(sc);
776
            AnnotationProvider provider = AnnotationProviderFactory.createAnnotationProvider(sc);
778
            AnnotationProvider provider = AnnotationProviderFactory.createAnnotationProvider(sc);
777
            Map<Class<? extends Annotation>,Set<Class<?>>> annotatedClasses =
779
            Map<Class<? extends Annotation>,Set<Class<?>>> annotatedClasses =
778
                  provider.getAnnotatedClasses(urls);
780
                  provider.getAnnotatedClasses(uris);
779
781
780
            if (t != null) {
782
            if (t != null) {
781
                t.stopTiming();
783
                t.stopTiming();
 Lines 847-853    Link Here 
847
                    timer.logResult("Parse " + documentURL.toExternalForm());
849
                    timer.logResult("Parse " + documentURL.toExternalForm());
848
                }
850
                }
849
851
850
                return new DocumentInfo(d, documentURL);
852
                return new DocumentInfo(d, new URI(documentURL.toExternalForm()));
851
            } catch (Exception e) {
853
            } catch (Exception e) {
852
                throw new ConfigurationException(MessageFormat.format(
854
                throw new ConfigurationException(MessageFormat.format(
853
                     "Unable to parse document ''{0}'': {1}",
855
                     "Unable to parse document ''{0}'': {1}",
 Lines 1027-1037    Link Here 
1027
    /**
1029
    /**
1028
     * <p>
1030
     * <p>
1029
     *  This <code>Callable</code> will be used by {@link ConfigManager#getConfigDocuments(javax.servlet.ServletContext, java.util.List, java.util.concurrent.ExecutorService, boolean)}.
1031
     *  This <code>Callable</code> will be used by {@link ConfigManager#getConfigDocuments(javax.servlet.ServletContext, java.util.List, java.util.concurrent.ExecutorService, boolean)}.
1030
     *  It represents one or more URLs to configuration resources that require
1032
     *  It represents one or more URIs to configuration resources that require
1031
     *  processing.
1033
     *  processing.
1032
     * </p>
1034
     * </p>
1033
     */
1035
     */
1034
    private static class URLTask implements Callable<Collection<URL>> {
1036
    private static class URITask implements Callable<Collection<URI>> {
1035
1037
1036
        private ConfigurationResourceProvider provider;
1038
        private ConfigurationResourceProvider provider;
1037
        private ServletContext sc;
1039
        private ServletContext sc;
 Lines 1041-1052    Link Here 
1041
1043
1042
1044
1043
        /**
1045
        /**
1044
         * Constructs a new <code>URLTask</code> instance.
1046
         * Constructs a new <code>URITask</code> instance.
1045
         * @param provider the <code>ConfigurationResourceProvider</code> from
1047
         * @param provider the <code>ConfigurationResourceProvider</code> from
1046
         *  which zero or more <code>URL</code>s will be returned
1048
         *  which zero or more <code>URI</code>s will be returned
1047
         * @param sc the <code>ServletContext</code> of the current application
1049
         * @param sc the <code>ServletContext</code> of the current application
1048
         */
1050
         */
1049
        public URLTask(ConfigurationResourceProvider provider,
1051
        public URITask(ConfigurationResourceProvider provider,
1050
                       ServletContext sc) {
1052
                       ServletContext sc) {
1051
            this.provider = provider;
1053
            this.provider = provider;
1052
            this.sc = sc;
1054
            this.sc = sc;
 Lines 1057-1067    Link Here 
1057
1059
1058
1060
1059
        /**
1061
        /**
1060
         * @return zero or more <code>URL</code> instances
1062
         * @return zero or more <code>URI</code> instances
1061
         * @throws Exception if an Exception is thrown by the underlying
1063
         * @throws Exception if an Exception is thrown by the underlying
1062
         *  <code>ConfigurationResourceProvider</code> 
1064
         *  <code>ConfigurationResourceProvider</code> 
1063
         */
1065
         */
1064
        public Collection<URL> call() throws Exception {
1066
        public Collection<URI> call() throws Exception {
1065
            return provider.getResources(sc);
1067
            return provider.getResources(sc);
1066
        }
1068
        }
1067
1069
(-)web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/mojarra/FaceletsTaglibConfigProcessor.java (-2 / +10 lines)
 Lines 273-283    Link Here 
273
                }
273
                }
274
            }
274
            }
275
275
276
            URL sourceUrl;
277
            try {
278
                sourceUrl = info.getSourceURI().toURL();
279
            } catch (MalformedURLException ex) {
280
                LOGGER.log(Level.INFO, null, ex);
281
                return;
282
            }
283
276
            if (compositeLibraryName != null) {
284
            if (compositeLibraryName != null) {
277
                //nothing to process inside the library definition AFAIR...
285
                //nothing to process inside the library definition AFAIR...
278
                compiler.addTagLibrary(new CompositeComponentLibrary(support, compositeLibraryName, taglibNamespace, info.getSourceURL()));
286
                compiler.addTagLibrary(new CompositeComponentLibrary(support, compositeLibraryName, taglibNamespace, sourceUrl));
279
            } else {
287
            } else {
280
                ClassBasedFaceletsLibrary taglibrary = new ClassBasedFaceletsLibrary(info.getSourceURL(), support, taglibNamespace);
288
                ClassBasedFaceletsLibrary taglibrary = new ClassBasedFaceletsLibrary(sourceUrl, support, taglibNamespace);
281
                //process the library content
289
                //process the library content
282
                NodeList tags =
290
                NodeList tags =
283
                        documentElement.getElementsByTagNameNS(namespace, TAG);
291
                        documentElement.getElementsByTagNameNS(namespace, TAG);
(-)web.jsf20/external/binaries-list (-1 / +1 lines)
Line 1    Link Here 
1
6B90A110E1B1503C4623B13D3BB536212F1BF3DB jsf-2.0.zip
1
1D74DA79DC71C52D1B7916853BDD51F346A85359 jsf-2.1.zip
(-)web.jsf20/nbproject/project.properties (-5 / +5 lines)
 Lines 40-48    Link Here 
40
# Version 2 license, then the option applies only if the new code is
40
# Version 2 license, then the option applies only if the new code is
41
# made subject to such option by the copyright holder.
41
# made subject to such option by the copyright holder.
42
42
43
release.external/jsf-2.0.zip!/jsf-2.0/jsf-api.jar=modules/ext/jsf-2_0/jsf-api.jar
43
release.external/jsf-2.1.zip!/jsf-2.1/jsf-api.jar=modules/ext/jsf-2_1/jsf-api.jar
44
release.external/jsf-2.0.zip!/jsf-2.0/jsf-impl.jar=modules/ext/jsf-2_0/jsf-impl.jar
44
release.external/jsf-2.1.zip!/jsf-2.1/jsf-impl.jar=modules/ext/jsf-2_1/jsf-impl.jar
45
release.external/jsf-2.0.zip!/jsf-2.0/LICENSE-APACHE.txt=modules/ext/jsf-2_0/LICENSE-APACHE.txt
45
release.external/jsf-2.1.zip!/jsf-2.1/LICENSE-APACHE.txt=modules/ext/jsf-2_1/LICENSE-APACHE.txt
46
release.external/jsf-2.0.zip!/jsf-2.0/LICENSE.TXT=modules/ext/jsf-2_0/LICENSE.TXT
46
release.external/jsf-2.1.zip!/jsf-2.1/LICENSE.TXT=modules/ext/jsf-2_1/LICENSE.TXT
47
release.external/jsf-2.0.zip!/jsf-2.0/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-2_0/THIRDPARTYLICENSEREADME.txt
47
release.external/jsf-2.1.zip!/jsf-2.1/THIRDPARTYLICENSEREADME.txt=modules/ext/jsf-2_1/THIRDPARTYLICENSEREADME.txt
48
spec.version.base=1.7.0
48
spec.version.base=1.7.0
(-)web.jsf20/nbproject/project.xml (-2 / +2 lines)
 Lines 64-73    Link Here 
64
                <subpackages>com.sun.faces</subpackages>
64
                <subpackages>com.sun.faces</subpackages>
65
            </public-packages>
65
            </public-packages>
66
            <class-path-extension>
66
            <class-path-extension>
67
                <runtime-relative-path>ext/jsf-2_0/jsf-api.jar</runtime-relative-path>
67
                <runtime-relative-path>ext/jsf-2_1/jsf-api.jar</runtime-relative-path>
68
            </class-path-extension>
68
            </class-path-extension>
69
            <class-path-extension>
69
            <class-path-extension>
70
                <runtime-relative-path>ext/jsf-2_0/jsf-impl.jar</runtime-relative-path>
70
                <runtime-relative-path>ext/jsf-2_1/jsf-impl.jar</runtime-relative-path>
71
            </class-path-extension>
71
            </class-path-extension>
72
        </data>
72
        </data>
73
    </configuration>
73
    </configuration>
(-)web.jsf20/src/org/netbeans/modules/web/jsf20/Bundle.properties (-5 / +5 lines)
 Lines 41-51    Link Here 
41
# made subject to such option by the copyright holder.
41
# made subject to such option by the copyright holder.
42
42
43
# module descritpion
43
# module descritpion
44
OpenIDE-Module-Name=JavaServer Faces 2.0 Library
44
OpenIDE-Module-Name=JavaServer Faces 2.1 Library
45
OpenIDE-Module-Display-Category=Web
45
OpenIDE-Module-Display-Category=Web
46
OpenIDE-Module-Short-Description=Installs the JavaServer Faces 2.0 Library
46
OpenIDE-Module-Short-Description=Installs the JavaServer Faces 2.1 Library
47
OpenIDE-Module-Long-Description=Installs the JavaServer Faces 2.0 Library
47
OpenIDE-Module-Long-Description=Installs the JavaServer Faces 2.1 Library
48
48
49
# library display name
49
# library display name
50
jsf20=JSF 2.0
50
jsf20=JSF 2.1
51
jsf20ri=JSF 2.0 RI
51
jsf20ri=JSF 2.1 RI
(-)web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20.xml (-4 / +4 lines)
 Lines 51-58    Link Here 
51
    <localizing-bundle>org/netbeans/modules/web/jsf20/Bundle</localizing-bundle>
51
    <localizing-bundle>org/netbeans/modules/web/jsf20/Bundle</localizing-bundle>
52
    <volume>
52
    <volume>
53
        <type>classpath</type>
53
        <type>classpath</type>
54
	<resource>jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_0/jsf-api.jar!/</resource>
54
	<resource>jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_1/jsf-api.jar!/</resource>
55
	<resource>jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_0/jsf-impl.jar!/</resource>
55
	<resource>jar:nbinst://org.netbeans.modules.web.jsf20/modules/ext/jsf-2_1/jsf-impl.jar!/</resource>
56
    </volume>
56
    </volume>
57
    <volume>
57
    <volume>
58
        <type>javadoc</type>
58
        <type>javadoc</type>
 Lines 61-67    Link Here 
61
    <volume>
61
    <volume>
62
        <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
62
        <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
63
        <type>maven-pom</type>
63
        <type>maven-pom</type>
64
        <resource>http://download.java.net/maven/2/com/sun/faces/jsf-api/2.0.4-b09/jsf-api-2.0.4-b09.pom</resource>
64
        <resource>http://download.java.net/maven/2/com/sun/faces/jsf-api/2.1.1-b04/jsf-api-2.1.1-b04.pom</resource>
65
        <resource>http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.0.4-b09/jsf-impl-2.0.4-b09.pom</resource>
65
        <resource>http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.1.1-b04/jsf-impl-2.1.1-b04.pom</resource>
66
    </volume>
66
    </volume>
67
</library>
67
</library>
(-)web.jsf20/src/org/netbeans/modules/web/jsf20/jsf20ri.xml (-2 / +2 lines)
 Lines 51-57    Link Here 
51
    <localizing-bundle>org/netbeans/modules/web/jsf20/Bundle</localizing-bundle>
51
    <localizing-bundle>org/netbeans/modules/web/jsf20/Bundle</localizing-bundle>
52
    <volume>
52
    <volume>
53
        <type>classpath</type>
53
        <type>classpath</type>
54
	<resource>jar:nbinst://org.netbeans.modules.web.jsf20ri/modules/ext/jsf-2_0/jsf-impl.jar!/</resource>
54
	<resource>jar:nbinst://org.netbeans.modules.web.jsf20ri/modules/ext/jsf-2_1/jsf-impl.jar!/</resource>
55
    </volume>
55
    </volume>
56
    <volume>
56
    <volume>
57
        <type>javadoc</type>
57
        <type>javadoc</type>
 Lines 60-65    Link Here 
60
    <volume>
60
    <volume>
61
        <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
61
        <!-- please check with mkleint@netbeans.org before/after updating this or "classpath" section -->
62
        <type>maven-pom</type>
62
        <type>maven-pom</type>
63
        <resource>http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.0.4-b09/jsf-impl-2.0.4-b09.pom</resource>
63
        <resource>http://download.java.net/maven/2/com/sun/faces/jsf-impl/2.1.1-b04/jsf-impl-2.1.1-b04.pom</resource>
64
    </volume>
64
    </volume>
65
</library>
65
</library>

Return to bug 196456
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo