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

(-)autoupdate/src/org/netbeans/modules/autoupdate/DummyModuleInfo.java (-2 / +30 lines)
Lines 13-20 Link Here
13
13
14
package org.netbeans.modules.autoupdate;
14
package org.netbeans.modules.autoupdate;
15
15
16
import java.util.Set;
16
import java.util.*;
17
import java.util.HashSet;
18
import java.util.StringTokenizer;
17
import java.util.StringTokenizer;
19
import java.util.jar.Attributes;
18
import java.util.jar.Attributes;
20
19
Lines 111-116 Link Here
111
        s.addAll(Dependency.create(Dependency.TYPE_IDE, attr.getValue("OpenIDE-Module-IDE-Dependencies"))); // NOI18N
110
        s.addAll(Dependency.create(Dependency.TYPE_IDE, attr.getValue("OpenIDE-Module-IDE-Dependencies"))); // NOI18N
112
        s.addAll(Dependency.create(Dependency.TYPE_JAVA, attr.getValue("OpenIDE-Module-Java-Dependencies"))); // NOI18N
111
        s.addAll(Dependency.create(Dependency.TYPE_JAVA, attr.getValue("OpenIDE-Module-Java-Dependencies"))); // NOI18N
113
        s.addAll(Dependency.create(Dependency.TYPE_REQUIRES, attr.getValue("OpenIDE-Module-Requires"))); // NOI18N
112
        s.addAll(Dependency.create(Dependency.TYPE_REQUIRES, attr.getValue("OpenIDE-Module-Requires"))); // NOI18N
113
        String cn = attr.getValue("OpenIDE-Module"); // NOI18N
114
        if (!cn.equals("org.openide") && !cn.startsWith("org.openide/")) { // NOI18N
115
            // #24143: treat API dependencies as dependencies on pseudomodule org.openide
116
            // (but ignore org.openide itself which needs an API dep in order to turn
117
            // off autodep on JavaHelp etc.)
118
            Iterator it = s.iterator();
119
            SpecificationVersion api = null;
120
            String major = null;
121
            while (it.hasNext()) {
122
                Dependency dep = (Dependency)it.next();
123
                if (dep.getType() == Dependency.TYPE_IDE && dep.getComparison() == Dependency.COMPARE_SPEC) {
124
                    if (api != null) {
125
                        throw new IllegalArgumentException("Duplicate OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
126
                    }
127
                    api = new SpecificationVersion(dep.getVersion());
128
                    String name = dep.getName();
129
                    int index = name.lastIndexOf('/');
130
                    if (index == -1) {
131
                        major = ""; // NOI18N
132
                    } else {
133
                        major = name.substring(index);
134
                    }
135
                    it.remove();
136
                }
137
            }
138
            if (api != null) {
139
                s.addAll(Dependency.create(Dependency.TYPE_MODULE, "org.openide" + major + " > " + api)); // NOI18N
140
            }
141
        }
114
        return s;
142
        return s;
115
    }
143
    }
116
    
144
    
(-)openide/.cvsignore (+1 lines)
Lines 10-13 Link Here
10
compatkit-work
10
compatkit-work
11
standalone
11
standalone
12
nb-api-tutorial.zip
12
nb-api-tutorial.zip
13
openide-core.nbm
13
fake
14
fake
(-)openide/apache-license.txt (+58 lines)
Added Link Here
1
/* ====================================================================
2
 * The Apache Software License, Version 1.1
3
 *
4
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
5
 * reserved.
6
 *
7
 * Redistribution and use in source and binary forms, with or without
8
 * modification, are permitted provided that the following conditions
9
 * are met:
10
 *
11
 * 1. Redistributions of source code must retain the above copyright
12
 *    notice, this list of conditions and the following disclaimer.
13
 *
14
 * 2. Redistributions in binary form must reproduce the above copyright
15
 *    notice, this list of conditions and the following disclaimer in
16
 *    the documentation and/or other materials provided with the
17
 *    distribution.
18
 *
19
 * 3. The end-user documentation included with the redistribution,
20
 *    if any, must include the following acknowledgment:
21
 *       "This product includes software developed by the
22
 *        Apache Software Foundation (http://www.apache.org/)."
23
 *    Alternately, this acknowledgment may appear in the software itself,
24
 *    if and wherever such third-party acknowledgments normally appear.
25
 *
26
 * 4. The names "Apache" and "Apache Software Foundation" must
27
 *    not be used to endorse or promote products derived from this
28
 *    software without prior written permission. For written
29
 *    permission, please contact apache@apache.org.
30
 *
31
 * 5. Products derived from this software may not be called "Apache",
32
 *    nor may "Apache" appear in their name, without prior written
33
 *    permission of the Apache Software Foundation.
34
 *
35
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
36
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
37
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
38
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
39
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
41
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
42
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
43
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
44
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
45
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
46
 * SUCH DAMAGE.
47
 * ====================================================================
48
 *
49
 * This software consists of voluntary contributions made by many
50
 * individuals on behalf of the Apache Software Foundation.  For more
51
 * information on the Apache Software Foundation, please see
52
 * <http://www.apache.org/>.
53
 *
54
 * Portions of this software are based upon public domain software
55
 * originally written at the National Center for Supercomputing Applications,
56
 * University of Illinois, Urbana-Champaign.
57
 */
58
(-)openide/build.xml (-25 / +23 lines)
Lines 23-29 Link Here
23
  <property name="binroot" location="../../nbextra"/>
23
  <property name="binroot" location="../../nbextra"/>
24
  <property name="homepage.base" value="netbeans.org"/>
24
  <property name="homepage.base" value="netbeans.org"/>
25
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
25
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
26
  <property name="license.file" location="org-openide-nbm-license.txt"/>
26
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
27
27
28
  <property name="nbm_alias" value="nb_ide"/>
28
  <property name="nbm_alias" value="nb_ide"/>
29
29
Lines 191-196 Link Here
191
  <target name="jars" depends="compile,13javac-workaround,vers-prep" description="Create JAR files.">
191
  <target name="jars" depends="compile,13javac-workaround,vers-prep" description="Create JAR files.">
192
    <mkdir dir="netbeans/lib"/>
192
    <mkdir dir="netbeans/lib"/>
193
    <filter token="Class-Path" value="Class-Path"/>
193
    <filter token="Class-Path" value="Class-Path"/>
194
    <filter token="OpenIDE-Module" value="OpenIDE-Module"/>
194
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
195
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
195
    <locjar jarfile="netbeans/lib/openide.jar"
196
    <locjar jarfile="netbeans/lib/openide.jar"
196
            manifest="manifest-subst.mf"
197
            manifest="manifest-subst.mf"
Lines 220-225 Link Here
220
    <mkdir dir="netbeans/lib/patches"/>
221
    <mkdir dir="netbeans/lib/patches"/>
221
    <!-- Use the same manifest to ensure that packages are defined correctly. -->
222
    <!-- Use the same manifest to ensure that packages are defined correctly. -->
222
    <filter token="Class-Path" value="X-Commented-Out-Class-Path"/>
223
    <filter token="Class-Path" value="X-Commented-Out-Class-Path"/>
224
    <filter token="OpenIDE-Module" value="X-Commented-Out-OpenIDE-Module"/>
223
    <copy file="manifest.mf" tofile="manifest-compat-subst.mf" filtering="on"/>
225
    <copy file="manifest.mf" tofile="manifest-compat-subst.mf" filtering="on"/>
224
    <jar jarfile="netbeans/lib/patches/openide-compat.jar"
226
    <jar jarfile="netbeans/lib/patches/openide-compat.jar"
225
         basedir="compatkit-work"
227
         basedir="compatkit-work"
Lines 231-236 Link Here
231
  <target name="jars-with-lib" depends="libs,compile,13javac-workaround,vers-prep" description="Create JAR files.">
233
  <target name="jars-with-lib" depends="libs,compile,13javac-workaround,vers-prep" description="Create JAR files.">
232
    <mkdir dir="standalone"/>
234
    <mkdir dir="standalone"/>
233
    <filter token="Class-Path" value="Class-Path"/>
235
    <filter token="Class-Path" value="Class-Path"/>
236
    <filter token="OpenIDE-Module" value="OpenIDE-Module"/>
234
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
237
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
235
    <locjar jarfile="standalone/openide-remainder.jar"
238
    <locjar jarfile="standalone/openide-remainder.jar"
236
            manifest="manifest-subst.mf"
239
            manifest="manifest-subst.mf"
Lines 310-316 Link Here
310
    -->
313
    -->
311
  </target>
314
  </target>
312
315
313
  <target name="netbeans" depends="jars" description="Build everything needed for inclusion in the IDE."/>
316
  <target name="netbeans" depends="fake" description="Build everything needed for inclusion in the IDE.">
317
    <genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/>
318
  </target>
314
319
315
  
320
  
316
  <!-- Build separate libraries for the IDE -->
321
  <!-- Build separate libraries for the IDE -->
Lines 838-843 Link Here
838
    <delete dir="compatkit-work"/>
843
    <delete dir="compatkit-work"/>
839
    <delete dir="standalone"/>
844
    <delete dir="standalone"/>
840
    <delete dir="fake" />
845
    <delete dir="fake" />
846
    <delete file="openide-core.nbm"/>
841
  </target>
847
  </target>
842
  <target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area.">
848
  <target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area.">
843
    <delete dir="examplemodulereload"/>
849
    <delete dir="examplemodulereload"/>
Lines 897-916 Link Here
897
    
903
    
898
  <!-- creating a fake module for distribution of openide & core as nbm -->
904
  <!-- creating a fake module for distribution of openide & core as nbm -->
899
905
900
  <target name="nbm" depends="netbeans, preparenbm">
906
  <target name="nbm" depends="netbeans">
901
    <makenbm file="org-openide.nbm"
907
    <makenbm file="openide-core.nbm"
902
             topdir="fake"
908
             topdir="fake"
903
             module="fake/netbeans/modules/org-openide.jar"
909
             module="fake/netbeans/lib/openide.jar"
904
	     homepage="http://openide.${homepage.base}/"
910
	     homepage="http://openide.${homepage.base}/"
905
	     distribution="http://${dist.base}/org-openide.nbm">
911
	     distribution="http://${dist.base}/openide-core.nbm">
906
      <license file="${license.file}"/>
912
      <license name="org-openide-license.txt">
913
        <text>For the NetBeans API and core code:</text>
914
        <file location="${license.file}"/>
915
        <text>For the Crimson, Regexp, XML Commons, and Xerces software products
916
included with the NetBeans core:</text>
917
        <file location="apache-license.txt"/>
918
      </license>
907
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
919
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
908
    </makenbm>
920
    </makenbm>
909
  </target>
921
  </target>
910
  
922
911
  <target name="preparenbm" depends="vers-prep" >
923
  <target name="fake" depends="jars" >
912
    <!-- our fake directory, where we are going to copy all modules -->
924
    <!-- our fake directory, where we are going to copy all modules -->
913
    <mkdir dir="fake" />
925
    <mkdir dir="fake/netbeans" />
914
    <copy todir="fake/netbeans">
926
    <copy todir="fake/netbeans">
915
        <fileset dir="netbeans" />
927
        <fileset dir="netbeans" />
916
    </copy>
928
    </copy>
Lines 920-925 Link Here
920
    <antcall target="buildandcopy">   
932
    <antcall target="buildandcopy">   
921
        <param name="dir" value="../core" />
933
        <param name="dir" value="../core" />
922
    </antcall>
934
    </antcall>
935
    <!-- XXX delete when these are real modules: phrebejk's job -->
923
    <antcall target="buildandcopy">   
936
    <antcall target="buildandcopy">   
924
        <param name="dir" value="../core/compiler" />
937
        <param name="dir" value="../core/compiler" />
925
    </antcall>
938
    </antcall>
Lines 935-955 Link Here
935
    <antcall target="buildandcopy">   
948
    <antcall target="buildandcopy">   
936
        <param name="dir" value="../core/ide" />
949
        <param name="dir" value="../core/ide" />
937
    </antcall>
950
    </antcall>
938
    
939
    <copy file="org-openide.mf" tofile="org-openide-subst.mf" filtering="on"/>
940
    
941
    <locjar jarfile="fake/netbeans/modules/org-openide.jar"
942
            manifest="org-openide-subst.mf"
943
	    compress="false">
944
      <locale name="ja"/>
945
      
946
      <!-- Include just the Bundle.properties describing the module -->
947
      <fileset dir="." excludesfile="../nbbuild/standard-jar-excludes.txt" >
948
           <include name="org-openide.properties" />
949
      </fileset>
950
    </locjar>
951
    
952
    <genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/>
953
  </target>
951
  </target>
954
  
952
  
955
  <target name="buildandcopy" >
953
  <target name="buildandcopy" >
(-)openide/l10n.list (+1 lines)
Lines 18-20 Link Here
18
openide/src/org/openide/util/Bundle.properties
18
openide/src/org/openide/util/Bundle.properties
19
openide/src/org/openide/util/datatransfer/Bundle.properties
19
openide/src/org/openide/util/datatransfer/Bundle.properties
20
openide/src/org/openide/windows/Bundle.properties
20
openide/src/org/openide/windows/Bundle.properties
21
openide/org-openide-nbm-src/org_openide/Bundle.properties
(-)openide/manifest.mf (+6 lines)
Lines 8-13 Link Here
8
Implementation-Version: @BUILD_NUMBER_SUBST@
8
Implementation-Version: @BUILD_NUMBER_SUBST@
9
Implementation-Vendor: NetBeans
9
Implementation-Vendor: NetBeans
10
@Class-Path@: ext/regexp.jar
10
@Class-Path@: ext/regexp.jar
11
@OpenIDE-Module@: org.openide/1
12
OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
13
OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
14
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
15
X-Comment-3: No, the next line is _not_ supposed to be substituted
16
OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
11
17
12
Name: /org/openide/
18
Name: /org/openide/
13
Package-Title: org.openide
19
Package-Title: org.openide
(-)openide/org-openide-nbm-license.txt (-26 lines)
Removed Link Here
1
This module is part of NetBeans and is open-source.
2
You can see http://www.netbeans.org/license.html for details.
3
4
The source file license is:
5
6
                Sun Public License Notice
7
8
The contents of this file are subject to the Sun Public License
9
Version 1.0 (the "License"). You may not use this file except in
10
compliance with the License. A copy of the License is available at
11
http://www.sun.com/
12
13
The Original Code is NetBeans. The Initial Developer of the Original
14
Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
15
Microsystems, Inc. All Rights Reserved.
16
17
--------------------------------------------------------------------
18
19
Additionally this module includes binary files which it needs to
20
function which are not covered under the SPL. Specifically:
21
22
The Crimson, Regexp, Xalan and Xerces software products included
23
in the org-openide module are governed by the terms of the Apache
24
Software License found at http://www.apache.org/LICENSE.txt.
25
26
(-)openide/org-openide.mf (-4 lines)
Removed Link Here
1
OpenIDE-Module: org.openide/1
2
OpenIDE-Module-Localizing-Bundle: org-openide.properties
3
OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
4
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
(-)openide/org-openide.properties (-17 lines)
Removed Link Here
1
#                 Sun Public License Notice
2
# 
3
# The contents of this file are subject to the Sun Public License
4
# Version 1.0 (the "License"). You may not use this file except in
5
# compliance with the License. A copy of the License is available at
6
# http://www.sun.com/
7
# 
8
# The Original Code is NetBeans. The Initial Developer of the Original
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
10
# Microsystems, Inc. All Rights Reserved.
11
12
# manifest.mf
13
OpenIDE-Module-Name=Open IDE
14
OpenIDE-Module-Display-Category=Infrastructure
15
OpenIDE-Module-Short-Description=The OpenIDE APIs and their implementation
16
OpenIDE-Module-Long-Description=This module represents a set of API libraries \
17
and also libraries with the implementation of the APIs
(-)openide/src/org/openide/Bundle.properties (-2 / +13 lines)
Lines 6-15 Link Here
6
# http://www.sun.com/
6
# http://www.sun.com/
7
# 
7
# 
8
# The Original Code is NetBeans. The Initial Developer of the Original
8
# The Original Code is NetBeans. The Initial Developer of the Original
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
9
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
10
# Microsystems, Inc. All Rights Reserved.
10
# Microsystems, Inc. All Rights Reserved.
11
11
12
#
12
13
# Localized text for the fake module in the openide/core NBM.
14
15
OpenIDE-Module-Name=Open APIs
16
OpenIDE-Module-Display-Category=Infrastructure
17
OpenIDE-Module-Short-Description=The Open APIs and their implementation.
18
OpenIDE-Module-Long-Description=\
19
        This pseudomodule represents the Open APIs (org.openide.*) and their \
20
        implementations (org.netbeans.core.*), as well as other files (such as \
21
        XML parsers) normally bundled with the NetBeans core.
22
23
13
24
14
# Notify system
25
# Notify system
15
26

Return to bug 24143