This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

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

(-)a/core.browser.webview/build.xml (-25 lines)
Lines 2-30 Link Here
2
<project basedir="." default="netbeans" name="core.browser.webview">
2
<project basedir="." default="netbeans" name="core.browser.webview">
3
    <description>Builds, tests, and runs the project org.netbeans.core.browser.webview</description>
3
    <description>Builds, tests, and runs the project org.netbeans.core.browser.webview</description>
4
    <import file="../nbbuild/templates/projectized.xml"/>
4
    <import file="../nbbuild/templates/projectized.xml"/>
5
6
    <target name="ext-compile">
7
        <mkdir dir="build/extclasses"/>
8
        <javac srcdir="extsrc" destdir="build/extclasses" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.6">
9
            <classpath>
10
                <path path="${module.classpath}"/>
11
                <path location="${cluster}/${module.jar}"/>
12
                <path path="${extsrc.cp.extra}"/>
13
            </classpath>
14
        </javac>
15
        <copy todir="build/extclasses">
16
          <fileset dir="extsrc" excludes="${jar-excludes}"/>
17
        </copy>
18
    </target>
19
20
    <target name="ext-jar" depends="ext-compile">
21
        <mkdir dir="${cluster}/modules/ext"/>
22
        <jar jarfile="${cluster}/modules/ext/core.browser.webview-ext.jar" compress="false">
23
            <fileset dir="build/extclasses"/>
24
        </jar>
25
    </target>
26
27
    <target name="netbeans-extra" depends="release,ext-jar"/>
28
29
30
</project>
5
</project>
(-)a/core.browser.webview/external/binaries-list (-1 lines)
Line 1 Link Here
1
5E40984A55F6FFF704F05D511A119CA5B456DDB1 jfxrt.jar
(-)a/core.browser.webview/nbproject/project.properties (-16 lines)
Lines 1-19 Link Here
1
javac.source=1.6
1
javac.source=1.6
2
javac.compilerargs=-Xlint -Xlint:-serial
2
javac.compilerargs=-Xlint -Xlint:-serial
3
4
5
extsrc.cp.extra=external/jfxrt.jar
6
7
jnlp.indirect.jars=modules/ext/core.browser.webview-ext.jar\
8
,modules/ext/locale/core.browser.webview-ext_ja.jar\
9
,modules/ext/locale/core.browser.webview-ext_ru.jar\
10
,modules/ext/locale/core.browser.webview-ext_pt_BR.jar\
11
,modules/ext/locale/core.browser.webview-ext_zh_CN.jar
12
13
extra.module.files=modules/ext/core.browser.webview-ext.jar\
14
,modules/ext/locale/core.browser.webview-ext_ja.jar\
15
,modules/ext/locale/core.browser.webview-ext_ru.jar\
16
,modules/ext/locale/core.browser.webview-ext_pt_BR.jar\
17
,modules/ext/locale/core.browser.webview-ext_zh_CN.jar
18
19
spec.version.base=1.9.0
3
spec.version.base=1.9.0
(-)a/core.browser.webview/nbproject/project.xml (-6 / +8 lines)
Lines 33-38 Link Here
33
                    </run-dependency>
33
                    </run-dependency>
34
                </dependency>
34
                </dependency>
35
                <dependency>
35
                <dependency>
36
                    <code-name-base>org.netbeans.libs.javafx</code-name-base>
37
                    <build-prerequisite/>
38
                    <compile-dependency/>
39
                    <run-dependency>
40
                        <specification-version>2.2</specification-version>
41
                    </run-dependency>
42
                </dependency>
43
                <dependency>
36
                    <code-name-base>org.netbeans.libs.json_simple</code-name-base>
44
                    <code-name-base>org.netbeans.libs.json_simple</code-name-base>
37
                    <build-prerequisite/>
45
                    <build-prerequisite/>
38
                    <compile-dependency/>
46
                    <compile-dependency/>
Lines 147-158 Link Here
147
                </dependency>
155
                </dependency>
148
            </module-dependencies>
156
            </module-dependencies>
149
            <public-packages/>
157
            <public-packages/>
150
            <extra-compilation-unit>
151
                <package-root>extsrc</package-root>
152
                <classpath>${module.classpath}:${cluster}/${module.jar}:${extsrc.cp.extra}</classpath>
153
                <built-to>build/extclasses</built-to>
154
                <built-to>build/external/core.browser.webview-ext.jar</built-to>
155
            </extra-compilation-unit>
156
        </data>
158
        </data>
157
    </configuration>
159
    </configuration>
158
</project>
160
</project>
(-)a/libs.javafx/build.xml (+5 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project basedir="." default="netbeans" name="libs.javafx">
3
    <description>Builds, tests, and runs the project org.netbeans.libs.javafx</description>
4
    <import file="../nbbuild/templates/projectized.xml"/>
5
</project>
(-)a/libs.javafx/manifest.mf (+6 lines)
Line 0 Link Here
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.libs.javafx
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/Bundle.properties
4
OpenIDE-Module-Specification-Version: 2.2
5
Class-Path: ${java.home}/lib/ext/jfxrt.jar
6
(-)a/libs.javafx/nbproject/project.properties (+46 lines)
Line 0 Link Here
1
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2
#
3
# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
4
#
5
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6
# Other names may be trademarks of their respective owners.
7
#
8
# The contents of this file are subject to the terms of either the GNU
9
# General Public License Version 2 only ("GPL") or the Common
10
# Development and Distribution License("CDDL") (collectively, the
11
# "License"). You may not use this file except in compliance with the
12
# License. You can obtain a copy of the License at
13
# http://www.netbeans.org/cddl-gplv2.html
14
# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
15
# specific language governing permissions and limitations under the
16
# License.  When distributing the software, include this License Header
17
# Notice in each file and include the License file at
18
# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
19
# particular file as subject to the "Classpath" exception as provided
20
# by Oracle in the GPL Version 2 section of the License file that
21
# accompanied this code. If applicable, add the following below the
22
# License Header, with the fields enclosed by brackets [] replaced by
23
# your own identifying information:
24
# "Portions Copyrighted [year] [name of copyright owner]"
25
#
26
# Contributor(s):
27
#
28
# The Original Software is NetBeans. The Initial Developer of the Original
29
# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
30
# Microsystems, Inc. All Rights Reserved.
31
#
32
# If you wish your version of this file to be governed by only the CDDL
33
# or only the GPL Version 2, indicate your decision by adding
34
# "[Contributor] elects to include this software in this distribution
35
# under the [CDDL or GPL Version 2] license." If you do not indicate a
36
# single choice of license, a recipient has the option to distribute
37
# your version of this file under either the CDDL, the GPL Version 2 or
38
# to extend the choice of license to its licensees as provided above.
39
# However, if you add GPL Version 2 code and therefore, elected the GPL
40
# Version 2 license, then the option applies only if the new code is
41
# made subject to such option by the copyright holder.
42
43
javac.source=1.7
44
javac.target=1.7
45
javac.compilerargs=-Xlint -Xlint:-serial
46
is.autoload=true
(-)a/libs.javafx/nbproject/project.xml (+79 lines)
Line 0 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project xmlns="http://www.netbeans.org/ns/project/1">
3
    <type>org.netbeans.modules.apisupport.project</type>
4
    <configuration>
5
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
6
            <code-name-base>org.netbeans.libs.javafx</code-name-base>
7
            <module-dependencies>
8
                <dependency>
9
                    <code-name-base>org.openide.modules</code-name-base>
10
                    <build-prerequisite/>
11
                    <compile-dependency/>
12
                    <run-dependency>
13
                        <specification-version>7.40</specification-version>
14
                    </run-dependency>
15
                </dependency>
16
                <dependency>
17
                    <code-name-base>org.openide.util.lookup</code-name-base>
18
                    <build-prerequisite/>
19
                    <compile-dependency/>
20
                    <run-dependency>
21
                        <specification-version>8.23</specification-version>
22
                    </run-dependency>
23
                </dependency>
24
            </module-dependencies>
25
            <test-dependencies>
26
                <test-type>
27
                    <name>unit</name>
28
                    <test-dependency>
29
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
30
                        <compile-dependency/>
31
                    </test-dependency>
32
                    <test-dependency>
33
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
34
                        <recursive/>
35
                        <compile-dependency/>
36
                    </test-dependency>
37
                </test-type>
38
            </test-dependencies>
39
            <public-packages>
40
                <package>javafx.animation</package>
41
                <package>javafx.application</package>
42
                <package>javafx.beans</package>
43
                <package>javafx.beans.binding</package>
44
                <package>javafx.beans.property</package>
45
                <package>javafx.beans.property.adapter</package>
46
                <package>javafx.beans.value</package>
47
                <package>javafx.collections</package>
48
                <package>javafx.concurrent</package>
49
                <package>javafx.embed.swing</package>
50
                <package>javafx.event</package>
51
                <package>javafx.fxml</package>
52
                <package>javafx.geometry</package>
53
                <package>javafx.scene</package>
54
                <package>javafx.scene.canvas</package>
55
                <package>javafx.scene.chart</package>
56
                <package>javafx.scene.control</package>
57
                <package>javafx.scene.control.cell</package>
58
                <package>javafx.scene.effect</package>
59
                <package>javafx.scene.image</package>
60
                <package>javafx.scene.input</package>
61
                <package>javafx.scene.layout</package>
62
                <package>javafx.scene.media</package>
63
                <package>javafx.scene.paint</package>
64
                <package>javafx.scene.shape</package>
65
                <package>javafx.scene.text</package>
66
                <package>javafx.scene.transform</package>
67
                <package>javafx.scene.web</package>
68
                <package>javafx.stage</package>
69
                <package>javafx.util</package>
70
                <package>javafx.util.converter</package>
71
                <package>netscape.javascript</package>
72
                <package>com.sun.javafx.scene.web</package>
73
            </public-packages>
74
            <class-path-extension>
75
                <runtime-relative-path>${java.home}/lib/ext/jfxrt.jar</runtime-relative-path>
76
            </class-path-extension>
77
        </data>
78
    </configuration>
79
</project>
(-)a/libs.javafx/src/org/netbeans/libs/javafx/Bundle.properties (+1 lines)
Line 0 Link Here
1
OpenIDE-Module-Name=JavaFX wrapper
(-)a/libs.javafx/test/unit/src/org/netbeans/libs/javafx/IsFXEnabledTest.java (+78 lines)
Line 0 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
41
 */
42
43
package org.netbeans.libs.javafx;
44
45
import junit.framework.Test;
46
import org.netbeans.junit.NbModuleSuite;
47
import org.netbeans.junit.NbTestCase;
48
import org.openide.modules.ModuleInfo;
49
import org.openide.util.Lookup;
50
51
/**
52
 *
53
 * @author Jaroslav Tulach <jtulach@netbeans.org>
54
 */
55
public class IsFXEnabledTest extends NbTestCase {
56
57
    public IsFXEnabledTest(String name) {
58
        super(name);
59
    }
60
    
61
    public static Test suite() {
62
        return NbModuleSuite.emptyConfiguration().addTest(IsFXEnabledTest.class).
63
            gui(false).
64
            suite();
65
    }
66
    
67
    public void testIsFxModuleEnabled() throws Exception {
68
        for (ModuleInfo mi : Lookup.getDefault().lookupAll(ModuleInfo.class)) {
69
            if (mi.getCodeNameBase().equals("org.netbeans.libs.javafx")) {
70
                assertTrue("Enabled", mi.isEnabled());
71
                Class app = mi.getClassLoader().loadClass("javafx.application.Application");
72
                assertNotNull("FX class loaded OK", app);
73
                return;
74
            }
75
        }
76
        fail("libs.javafx not found!");
77
    }
78
}
(-)a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java (+10 lines)
Lines 461-466 Link Here
461
                String reltext = XMLUtil.findText(runtimeRelativePath);
461
                String reltext = XMLUtil.findText(runtimeRelativePath);
462
                // No need to evaluate property refs in it - it is *not* substitutable-text in the schema.
462
                // No need to evaluate property refs in it - it is *not* substitutable-text in the schema.
463
                resultBin = new File(jar.getParentFile(), reltext.replace('/', File.separatorChar));
463
                resultBin = new File(jar.getParentFile(), reltext.replace('/', File.separatorChar));
464
                if (!resultBin.exists() && reltext.contains("${java.home}/lib/ext/jfxrt.jar")) {
465
                    String jhm = System.getProperty("java.home");
466
                    resultBin = new File(new File(new File(new File(jhm), "lib"), "ext"), "jfxrt.jar");
467
                    if (!resultBin.exists()) {
468
                        File jdk7 = new File(new File(new File(jhm), "lib"), "jfxrt.jar");
469
                        if (jdk7.exists()) {
470
                            resultBin = jdk7;
471
                        }
472
                    }
473
                }
464
            }
474
            }
465
475
466
            if (origBin != null) {
476
            if (origBin != null) {
(-)a/nbbuild/cluster.properties (+1 lines)
Lines 182-187 Link Here
182
        keyring.impl,\
182
        keyring.impl,\
183
        lib.uihandler,\
183
        lib.uihandler,\
184
        libs.felix,\
184
        libs.felix,\
185
        libs.javafx,\
185
        libs.jna,\
186
        libs.jna,\
186
        libs.jna.platform,\
187
        libs.jna.platform,\
187
        libs.jsr223,\
188
        libs.jsr223,\
(-)a/o.n.bootstrap/src/org/netbeans/StandardModuleData.java (-9 / +21 lines)
Lines 102-117 Link Here
102
            StringTokenizer tok = new StringTokenizer(classPath);
102
            StringTokenizer tok = new StringTokenizer(classPath);
103
            while (tok.hasMoreTokens()) {
103
            while (tok.hasMoreTokens()) {
104
                String ext = tok.nextToken().replace("%20", " "); // NOI18N
104
                String ext = tok.nextToken().replace("%20", " "); // NOI18N
105
                if (new File(ext).isAbsolute()) { // NOI18N
105
                File extfile;
106
                    Util.err.log(Level.WARNING, "Class-Path value {0} from {1} is illegal according to the Java Extension Mechanism: must be relative", new Object[]{ext, jar});
106
                if (ext.equals("${java.home}/lib/ext/jfxrt.jar")) { // NOI18N
107
                    // special handling on JDK7
108
                    File jre = new File(System.getProperty("java.home")); // NOI18N
109
                    File jdk8 = new File(new File(new File(jre, "lib"), "ext"), "jfxrt.jar"); // NOI18N
110
                    if (jdk8.exists()) {
111
                        // jdk8 has the classes on bootclasspath
112
                        continue;
113
                    }
114
                    extfile = new File(new File(jre, "lib"), "jfxrt.jar"); // NOI18N
115
                } else {
116
                    if (new File(ext).isAbsolute()) { // NOI18N
117
                        Util.err.log(Level.WARNING, "Class-Path value {0} from {1} is illegal according to the Java Extension Mechanism: must be relative", new Object[]{ext, jar});
118
                    }
119
                    File base = jar.getParentFile();
120
                    while (ext.startsWith("../")) {
121
                        // cannot access FileUtil.normalizeFile from here, and URI.normalize might be unsafe for UNC paths
122
                        ext = ext.substring(3);
123
                        base = base.getParentFile();
124
                    }
125
                    extfile = new File(base, ext.replace('/', File.separatorChar));
107
                }
126
                }
108
                File base = jar.getParentFile();
109
                while (ext.startsWith("../")) {
110
                    // cannot access FileUtil.normalizeFile from here, and URI.normalize might be unsafe for UNC paths
111
                    ext = ext.substring(3);
112
                    base = base.getParentFile();
113
                }
114
                File extfile = new File(base, ext.replace('/', File.separatorChar));
115
                //No need to sync on extensionOwners - we are in write mutex
127
                //No need to sync on extensionOwners - we are in write mutex
116
                Set<File> owners = extensionOwners.get(extfile);
128
                Set<File> owners = extensionOwners.get(extfile);
117
                if (owners == null) {
129
                if (owners == null) {

Return to bug 237973