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 197066
Collapse All | Expand All

(-)a/apisupport.harness/release/build.xml (+3 lines)
Lines 230-235 Link Here
230
                <include name="*/modules/ext/junit-*.jar"/>
230
                <include name="*/modules/ext/junit-*.jar"/>
231
            </fileset>
231
            </fileset>
232
        </path>
232
        </path>
233
        <!-- to make branding.token available -->
234
        <loadproperties srcfile="${suite.dir}/nbproject/project.properties" prefix="test-unit-sys-prop."/>
235
        <property name="test-qa-functional-sys-prop.branding.token" value="${test-unit-sys-prop.branding.token}"/>
233
    </target>
236
    </target>
234
237
235
    <target name="javahelp" depends="init" if="has.javahelp">
238
    <target name="javahelp" depends="init" if="has.javahelp">
(-)a/nbbuild/templates/projectized.xml (+1 lines)
Lines 255-260 Link Here
255
            <sequential>
255
            <sequential>
256
                <property name="test.@{test.type}.folder" location="${build.dir}/test/@{test.type}/dist"/>
256
                <property name="test.@{test.type}.folder" location="${build.dir}/test/@{test.type}/dist"/>
257
                <property name="test.@{test.type}.out.folder" location="${test.@{test.type}.folder}"/>
257
                <property name="test.@{test.type}.out.folder" location="${test.@{test.type}.folder}"/>
258
                <property name="test-@{test.type}-sys-prop.branding.token" value="nb"/>
258
            </sequential>
259
            </sequential>
259
        </macrodef>
260
        </macrodef>
260
        <test-init-nborg test.type="unit"/>
261
        <test-init-nborg test.type="unit"/>
(-)a/nbjunit/src/org/netbeans/junit/NbModuleSuite.java (+7 lines)
Lines 800-805 Link Here
800
                }
800
                }
801
            }
801
            }
802
            
802
            
803
            
803
            // loader that does not see our current classloader
804
            // loader that does not see our current classloader
804
            JUnitLoader junit = new JUnitLoader(config.parentClassLoader, NbModuleSuite.class.getClassLoader());
805
            JUnitLoader junit = new JUnitLoader(config.parentClassLoader, NbModuleSuite.class.getClassLoader());
805
            URLClassLoader loader = new URLClassLoader(bootCP.toArray(new URL[0]), junit);
806
            URLClassLoader loader = new URLClassLoader(bootCP.toArray(new URL[0]), junit);
Lines 815-820 Link Here
815
            System.setProperty("netbeans.home", platform.getPath());
816
            System.setProperty("netbeans.home", platform.getPath());
816
            System.setProperty("netbeans.full.hack", "true");
817
            System.setProperty("netbeans.full.hack", "true");
817
818
819
            String branding = System.getProperty("branding.token"); // NOI18N
820
            if (branding != null) {
821
                Method setBranding = loader.loadClass("org.openide.util.NbBundle").getMethod("setBranding", String.class); // NOI18N
822
                setBranding.invoke(null, branding);
823
            }
824
            
818
            File ud = new File(new File(Manager.getWorkDirPath()), "userdir" + invocations++);
825
            File ud = new File(new File(Manager.getWorkDirPath()), "userdir" + invocations++);
819
            if (config.reuseUserDir) {
826
            if (config.reuseUserDir) {
820
                ud = lastUserDir != null ? lastUserDir : ud;
827
                ud = lastUserDir != null ? lastUserDir : ud;
(-)f5508ddfc576 (+72 lines)
Added Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 1997-2010 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
 * Contributor(s):
28
 *
29
 * The Original Software is NetBeans. The Initial Developer of the Original
30
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31
 * Microsystems, Inc. All Rights Reserved.
32
 *
33
 * If you wish your version of this file to be governed by only the CDDL
34
 * or only the GPL Version 2, indicate your decision by adding
35
 * "[Contributor] elects to include this software in this distribution
36
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
37
 * single choice of license, a recipient has the option to distribute
38
 * your version of this file under either the CDDL, the GPL Version 2 or
39
 * to extend the choice of license to its licensees as provided above.
40
 * However, if you add GPL Version 2 code and therefore, elected the GPL
41
 * Version 2 license, then the option applies only if the new code is
42
 * made subject to such option by the copyright holder.
43
 */
44
45
package test.pkg.not.in.junit;
46
47
import java.util.logging.Level;
48
import junit.framework.Test;
49
import org.netbeans.junit.NbModuleSuite;
50
import org.netbeans.junit.NbTestCase;
51
import org.openide.util.NbBundle;
52
53
/**
54
 *
55
 * @author Jaroslav Tulach <jtulach@netbeans.org>
56
 */
57
public class BrandingAssignedTest extends NbTestCase {
58
    
59
    public BrandingAssignedTest(String testName) {
60
        super(testName);
61
    }
62
    
63
    public static Test suite() {
64
        return NbModuleSuite.createConfiguration(BrandingAssignedTest.class)
65
            .clusters(".*").failOnException(Level.WARNING).suite();
66
    }
67
68
    public void testBrandingIsAssigned() throws Exception {
69
        Object branding = NbBundle.getBranding();
70
        assertEquals("Default branding in NetBeans is nb", "nb", branding);
71
    }
72
}
(-)a/o.eclipse.equinox.common/nbproject/project.properties (+2 lines)
Lines 1-3 Link Here
1
release.external/org.eclipse.equinox.common-3.6.0.jar=modules/org-eclipse-equinox-common.jar
1
release.external/org.eclipse.equinox.common-3.6.0.jar=modules/org-eclipse-equinox-common.jar
2
is.autoload=true
2
is.autoload=true
3
nbm.module.author=Tomas Stupka
3
nbm.module.author=Tomas Stupka
4
module.startlevel=2
5

Return to bug 197066