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

(-)apisupport/ant/nbproject/project.properties (-1 / +2 lines)
Lines 12-18 Link Here
12
cli.jar=core/org-netbeans-modules-apisupport-ant-cli.jar
12
cli.jar=core/org-netbeans-modules-apisupport-ant-cli.jar
13
cli.jar.absolute=${netbeans.dest.dir}/${cluster.dir}/${cli.jar}
13
cli.jar.absolute=${netbeans.dest.dir}/${cluster.dir}/${cli.jar}
14
14
15
cp.extra=${cli.jar.absolute}
15
cp.extra=${cli.jar.absolute}:${core.dir}/core/core.jar
16
16
17
17
cli.cp=\
18
cli.cp=\
18
    ${openide.dir}/core/openide.jar:\
19
    ${openide.dir}/core/openide.jar:\
(-)autoupdate/nbproject/project.properties (-1 / +1 lines)
Lines 9-15 Link Here
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
10
# Microsystems, Inc. All Rights Reserved.
10
# Microsystems, Inc. All Rights Reserved.
11
11
12
cp.extra=${netbeans.dest.dir}/${cluster.dir}/core/updater.jar
12
cp.extra=${netbeans.dest.dir}/${cluster.dir}/core/updater.jar:${netbeans.dest.dir}/${cluster.dir}/core/core.jar
13
extra.module.files=core/updater.jar
13
extra.module.files=core/updater.jar
14
14
15
# javadoc.apichanges=${basedir}/api/doc/changes/apichanges.xml
15
# javadoc.apichanges=${basedir}/api/doc/changes/apichanges.xml
(-)nbbuild/build.xml (-1 / +1 lines)
Lines 3600-3606 Link Here
3600
  
3600
  
3601
  <target 
3601
  <target 
3602
    name="commit-validation" 
3602
    name="commit-validation" 
3603
    depends="commit-verification,commitValidation,no-commit-validation" 
3603
    depends="commitValidation,no-commit-validation" 
3604
    description="Runs tests to validate IDE before commit."
3604
    description="Runs tests to validate IDE before commit."
3605
  />
3605
  />
3606
3606
(-)xml/tax/build.xml (-1 / +1 lines)
Lines 29-35 Link Here
29
      </patternset>
29
      </patternset>
30
      <path id="cp">
30
      <path id="cp">
31
         <pathelement location="${openide.dir}/core/openide.jar"/>
31
         <pathelement location="${openide.dir}/core/openide.jar"/>
32
         <pathelement location="${openide/loaders.dir}/core/openide-loaders.jar"/>
32
         <pathelement location="${openide/loaders.dir}/modules/org-openide-loaders.jar"/>
33
         <pathelement location="${lib_root}/src"/>
33
         <pathelement location="${lib_root}/src"/>
34
         <pathelement location="${xml/api.dir}/modules/org-netbeans-api-xml.jar"/>
34
         <pathelement location="${xml/api.dir}/modules/org-netbeans-api-xml.jar"/>
35
         <pathelement location="${xml/core.dir}/modules/org-netbeans-modules-xml-core.jar"/>
35
         <pathelement location="${xml/core.dir}/modules/org-netbeans-modules-xml-core.jar"/>
(-)xtest/plugins_src/ide/build.xml (-18 / +58 lines)
Lines 19-29 Link Here
19
    <property name="plugins.install.dir" location="../../plugins"/>
19
    <property name="plugins.install.dir" location="../../plugins"/>
20
20
21
    <target name="compile">
21
    <target name="compile">
22
        <path id="basecp">
22
        <path id="bootcp" >
23
            <pathelement location="${openide.dir}/core/openide.jar" />
23
            <pathelement location="${openide/util.dir}/lib/org-openide-util.jar" />
24
            <pathelement location="${openide/loaders.dir}/core/openide-loaders.jar" />
24
            <pathelement location="${openide/util.dir}/lib/org-openide-modules.jar" />
25
            <pathelement location="${core/bootstrap.dir}/lib/boot.jar"/>
26
            <!-- use junit with already compiled extensions -->        
27
            <pathelement location="../../lib/xtest.jar"/>
28
            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
29
            <pathelement location="../../lib/nbjunit.jar"/>
30
            <pathelement location="${ant.home}/lib/ant.jar"/>
31
            <fileset dir="../../external">
32
                <include name="junit*.jar"/>
33
            </fileset>            
34
        </path>
35
36
        <path id="dynamiccp" >
37
            <path refid="bootcp" />
38
        
25
            <pathelement location="${core.dir}/core/core.jar"/>
39
            <pathelement location="${core.dir}/core/core.jar"/>
26
            <pathelement location="${core.dir}/lib/boot.jar"/>
40
            <pathelement location="${openide/fs.dir}/core/org-openide-filesystems.jar"/>
41
        </path>    
42
    
43
        <path id="basecp">
44
            <path refid="dynamiccp" />
45
        
46
            <pathelement location="${openide/nodes.dir}/modules/org-openide-nodes.jar" />
47
            <pathelement location="${openide/loaders.dir}/modules/org-openide-loaders.jar" />
48
            <pathelement location="${core.dir}/modules/org-netbeans-core.jar" />
27
            <pathelement location="${openide/execution.dir}/modules/org-openide-execution.jar"/>
49
            <pathelement location="${openide/execution.dir}/modules/org-openide-execution.jar"/>
28
            <pathelement location="${openide/io.dir}/modules/org-openide-io.jar"/>
50
            <pathelement location="${openide/io.dir}/modules/org-openide-io.jar"/>
29
            <pathelement location="${core/execution.dir}/modules/org-netbeans-core-execution.jar"/>
51
            <pathelement location="${core/execution.dir}/modules/org-netbeans-core-execution.jar"/>
Lines 35-57 Link Here
35
            <!-- metadata repository support classpath -->
57
            <!-- metadata repository support classpath -->
36
            <pathelement location="${java/javacore.dir}/modules/org-netbeans-modules-javacore.jar"/>
58
            <pathelement location="${java/javacore.dir}/modules/org-netbeans-modules-javacore.jar"/>
37
            <pathelement location="${mdr/nbjmiutils.dir}/modules/ext/jmiutils.jar"/>
59
            <pathelement location="${mdr/nbjmiutils.dir}/modules/ext/jmiutils.jar"/>
38
            <!-- use junit with already compiled extensions -->        
39
            <pathelement location="../../lib/xtest.jar"/>
40
            <pathelement location="../../lib/xtest-junit-testrunner.jar"/>
41
            <pathelement location="../../lib/nbjunit.jar"/>
42
            <pathelement location="${ant.home}/lib/ant.jar"/>
43
            <fileset dir="../../external">
44
                <include name="junit*.jar"/>
45
            </fileset>            
46
        </path>
60
        </path>
47
        <mkdir dir="build/classes"/>
61
        <mkdir dir="build/classes"/>
62
        
63
        <javac srcdir="src" destdir="build/classes"
64
           deprecation="${build.compiler.deprecation}"
65
           debug="${build.compiler.debug}">          
66
          <classpath refid="dynamiccp"/>
67
          
68
          <selector refid="xtest.ide.main" />
69
        </javac> 
70
        
71
        
48
        <javac srcdir="src" destdir="build/classes"
72
        <javac srcdir="src" destdir="build/classes"
49
           deprecation="${build.compiler.deprecation}"
73
           deprecation="${build.compiler.deprecation}"
50
           debug="${build.compiler.debug}">          
74
           debug="${build.compiler.debug}">          
51
          <classpath refid="basecp"/>
75
          <classpath refid="basecp"/>
76
          <selector refid="xtest.ide.plugin" />
52
        </javac> 
77
        </javac> 
53
    </target>
78
    </target>
79
80
    
81
        
82
    <selector id="xtest.ide.main" >
83
      <or>
84
        <filename name="org/netbeans/xtest/plugin/ide/Main.java"/>
85
        <filename name="org/netbeans/xtest/plugin/ide/Main*.class"/>
86
        <!-- Stuff needed for xtest error manager functionality controled by xtest.ide.error.manager property -->
87
        <filename name="org/netbeans/xtest/plugin/ide/services/XTestErrorManager*"/>
88
        <filename name="META-INF/**"/>
89
      </or>
90
    </selector>
54
    
91
    
92
    <selector id="xtest.ide.plugin">
93
      <or>
94
        <filename name="org/netbeans/xtest/plugin/ide/MainWithExec*"/>
95
        <filename name="org/netbeans/xtest/plugin/ide/Ide*"/>
96
      </or>
97
    </selector>
55
    
98
    
56
    <target name="jar" depends="compile">
99
    <target name="jar" depends="compile">
57
        <!-- ant tasks used in ide_plugin_targets.xml -->
100
        <!-- ant tasks used in ide_plugin_targets.xml -->
Lines 59-65 Link Here
59
            basedir="build/classes"
102
            basedir="build/classes"
60
            excludesfile="../../../nbbuild/standard-jar-excludes.txt"
103
            excludesfile="../../../nbbuild/standard-jar-excludes.txt"
61
            compress="false">
104
            compress="false">
62
            <include name="org/netbeans/xtest/plugin/ide/Ide*.class"/>
105
            <selector refid="xtest.ide.plugin" />
63
        </jar>
106
        </jar>
64
        <!-- load by system classloader (-J-Dnetbeans.systemclassloader.patches) -->
107
        <!-- load by system classloader (-J-Dnetbeans.systemclassloader.patches) -->
65
        <jar jarfile="lib/xtest-ide-testexec.jar"
108
        <jar jarfile="lib/xtest-ide-testexec.jar"
Lines 75-85 Link Here
75
            basedir="build/classes"
118
            basedir="build/classes"
76
            excludesfile="../../../nbbuild/standard-jar-excludes.txt"
119
            excludesfile="../../../nbbuild/standard-jar-excludes.txt"
77
            compress="false">
120
            compress="false">
78
            <include name="org/netbeans/xtest/plugin/ide/Main*.class"/>
121
            
79
            <include name="org/netbeans/xtest/plugin/ide/MainWithExec*.class"/>
122
            <selector refid="xtest.ide.main" />
80
            <!-- Stuff needed for xtest error manager functionality controled by xtest.ide.error.manager property -->
81
            <include name="org/netbeans/xtest/plugin/ide/services/XTestErrorManager.class"/>
82
            <include name="META-INF/**"/>
83
        </jar>        
123
        </jar>        
84
    </target>
124
    </target>
85
    
125
    
(-)xtest/plugins_src/ide/src/org/netbeans/xtest/plugin/ide/Main.java (-7 / +9 lines)
Lines 30-41 Link Here
30
import java.net.URLClassLoader;
30
import java.net.URLClassLoader;
31
import java.util.Date;
31
import java.util.Date;
32
import org.netbeans.TopSecurityManager;
32
import org.netbeans.TopSecurityManager;
33
import org.netbeans.core.NbTopManager;
34
import org.netbeans.xtest.util.JNIKill;
33
import org.netbeans.xtest.util.JNIKill;
35
import org.netbeans.xtest.util.PNGEncoder;
34
import org.netbeans.xtest.util.PNGEncoder;
36
import org.openide.ErrorManager;
35
import org.openide.ErrorManager;
37
import org.openide.LifecycleManager;
38
import org.openide.loaders.DataObject;
39
36
40
/**
37
/**
41
 * Main part of XTest starter. Must not use anything outside lib/*.jar and lib/ext/*.jar.
38
 * Main part of XTest starter. Must not use anything outside lib/*.jar and lib/ext/*.jar.
Lines 103-108 Link Here
103
    public static void main(String args[]) {
100
    public static void main(String args[]) {
104
        
101
        
105
        System.out.println("!!!!! testlist is "+System.getProperty("testlist"));
102
        System.out.println("!!!!! testlist is "+System.getProperty("testlist"));
103
        
104
        // use the console logging
105
        System.setProperty ("netbeans.logger.console", "true");
106
                        
106
                        
107
        // create the IDE flag file
107
        // create the IDE flag file
108
        String workdir = System.getProperty("xtest.workdir");
108
        String workdir = System.getProperty("xtest.workdir");
Lines 194-199 Link Here
194
        catch (RuntimeException ex) {
194
        catch (RuntimeException ex) {
195
            ex.printStackTrace();
195
            ex.printStackTrace();
196
        }
196
        }
197
        catch (Error err) {
198
            err.printStackTrace();
199
        }
197
    }
200
    }
198
    
201
    
199
    
202
    
Lines 226-234 Link Here
226
    }
229
    }
227
    
230
    
228
    private static void doTestPart() {
231
    private static void doTestPart() {
229
        
230
        NbTopManager.get();
231
        
232
        final MainWithExecInterface handle;
232
        final MainWithExecInterface handle;
233
        try {
233
        try {
234
            handle = (MainWithExecInterface)new WithExecClassLoader().loadClass("org.netbeans.xtest.plugin.ide.MainWithExec").newInstance();
234
            handle = (MainWithExecInterface)new WithExecClassLoader().loadClass("org.netbeans.xtest.plugin.ide.MainWithExec").newInstance();
Lines 323-328 Link Here
323
                        System.out.println("Exception when terminating processes started from IDE");
323
                        System.out.println("Exception when terminating processes started from IDE");
324
                        e.printStackTrace();
324
                        e.printStackTrace();
325
                    }
325
                    }
326
                    /* JST-PENDING: Needs to be moved to some module
326
                    // discard all changes in modified files
327
                    // discard all changes in modified files
327
                    Object[] dobs = DataObject.getRegistry().getModifiedSet().toArray();
328
                    Object[] dobs = DataObject.getRegistry().getModifiedSet().toArray();
328
                    if(dobs.length > 0) {
329
                    if(dobs.length > 0) {
Lines 333-340 Link Here
333
                            obj.setModified(false);
334
                            obj.setModified(false);
334
                        }
335
                        }
335
                    }
336
                    }
337
                     */
336
                    // exit IDE
338
                    // exit IDE
337
                    LifecycleManager.getDefault().exit();
339
                    TopSecurityManager.exit (0);
338
                }
340
                }
339
            });
341
            });
340
            // try to exit nicely first
342
            // try to exit nicely first

Return to bug 58258