Attachment #6057 for bug #24143

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





package org.netbeans.modules.autoupdate;

import java.util.*;
import java.util.HashSet;
import java.util.StringTokenizer;
import java.util.jar.Attributes;


        s.addAll(Dependency.create(Dependency.TYPE_IDE, attr.getValue("OpenIDE-Module-IDE-Dependencies"))); // NOI18N
        s.addAll(Dependency.create(Dependency.TYPE_JAVA, attr.getValue("OpenIDE-Module-Java-Dependencies"))); // NOI18N
        s.addAll(Dependency.create(Dependency.TYPE_REQUIRES, attr.getValue("OpenIDE-Module-Requires"))); // NOI18N
        // #24143: treat API dependencies as dependencies on pseudomodule org.openide
        Iterator it = s.iterator();
        SpecificationVersion api = null;
        String impl = null;
        String major = null;
        while (it.hasNext()) {
            Dependency dep = (Dependency)it.next();
            if (dep.getType() == Dependency.TYPE_IDE) {
                if (dep.getComparison() == Dependency.COMPARE_SPEC) {
                    if (api != null) {
                        throw new IllegalArgumentException("Duplicate OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
                    }
                    api = new SpecificationVersion(dep.getVersion());
                } else {
                    // Must be impl comparison.
                    if (impl != null) {
                        throw new IllegalArgumentException("Duplicate OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
                    }
                    impl = dep.getVersion();
                }
                String name = dep.getName();
                int index = name.lastIndexOf('/');
                String newmajor;
                if (index == -1) {
                    newmajor = ""; // NOI18N
                } else {
                    newmajor = name.substring(index);
                }
                if (major != null && !major.equals(newmajor)) {
                    throw new IllegalArgumentException("Clashing OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
                }
                major = newmajor;
                it.remove();
            }
        }
        if (api != null) {
            s.addAll(Dependency.create(Dependency.TYPE_MODULE, "org.openide" + major + " > " + api)); // NOI18N
        }
        if (impl != null) {
            s.addAll(Dependency.create(Dependency.TYPE_MODULE, "org.openide" + major + " = " + impl)); // NOI18N
        }
        return s;
    }
    

Lines 1-3 Link Here

(-)core/.cvsignore (+2 lines)
1	netbeans	1	netbeans
2	modules-lib	2	modules-lib
3	manifest-subst.mf	3	manifest-subst.mf
		4	core.nbm
		5	Info




/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 *
 * Portions of this software are based upon public domain software
 * originally written at the National Center for Supercomputing Applications,
 * University of Illinois, Urbana-Champaign.
 */


Lines 1-4 Link Here

(-)core/build.xml (-3 / +26 lines)
1	<?xml version='1.0' encoding='ISO-8859-1' ?>	1	<?xml version='1.0' encoding='ISO-8859-1' ?><!-- -- sgml-indent-step: 2 -- -->
2	<!--	2	<!--
3	Sun Public License Notice	3	Sun Public License Notice
4		4
Lines 15-22 Link Here
15	<project name="core" default="netbeans" basedir=".">	15	<project name="core" default="netbeans" basedir=".">
16		16
17	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>	17	<taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="../nbbuild/nbantext.jar"/>
		18	<taskdef name="makenbm" classname="org.netbeans.nbbuild.MakeNBM" classpath="../nbbuild/nbantext.jar"/>
		19	<taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="../nbbuild/nbantext.jar"/>
18	<property name="binroot" location="../../nbextra"/>	20	<property name="binroot" location="../../nbextra"/>
19	<property name="xml-apis" value="xml-apis.jar"/>	21	<property name="xml-apis" value="xml-apis.jar"/>
		22	<property name="homepage.base" value="netbeans.org"/>
		23	<property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
		24	<property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>
20		25
21	<target name="compile">	26	<target name="compile">
22	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">	27	<javac srcdir="libsrc" destdir="libsrc" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}">
Lines 84-89 Link Here
84	<target name="netbeans" depends="jars,release" description="Build everything.">	89	<target name="netbeans" depends="jars,release" description="Build everything.">
85	<mkdir dir="netbeans/lib/patches"/>	90	<mkdir dir="netbeans/lib/patches"/>
86	<mkdir dir="netbeans/modules"/>	91	<mkdir dir="netbeans/modules"/>
		92	<genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/>
		93	</target>
		94
		95	<target name="nbm" depends="netbeans" description="Build an NBM.">
		96	<makenbm file="core.nbm"
		97	topdir="."
		98	module="netbeans/lib/core.jar"
		99	homepage="http://core.${homepage.base}/"
		100	distribution="http://${dist.base}/core.nbm">
		101	<license name="core-license.txt">
		102	<text>For the NetBeans core code itself:</text>
		103	<file location="${license.file}"/>
		104	<text>For the Crimson, Regexp, XML Commons, and Xerces software products
		105	included with the NetBeans core:</text>
		106	<file location="apache-license.txt"/>
		107	</license>
		108	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
		109	</makenbm>
87	</target>	110	</target>
88		111
89	<target name="lib-modules" description="Create a standalone Modules API and implementation.">	112	<target name="lib-modules" description="Create a standalone Modules API and implementation.">
Lines 148-155 Link Here
148	</delete>	171	</delete>
149	<delete dir="netbeans"/>	172	<delete dir="netbeans"/>
150	<delete dir="modules-lib"/>	173	<delete dir="modules-lib"/>
		174	<delete dir="Info"/>
		175	<delete file="core.nbm"/>
151	</target>	176	</target>
152
153	<target name="nbm" depends="netbeans" description="Dummy target."/>
154		177
155	</project>	178	</project>

Lines 1-6 Link Here

(-)core/manifest.mf (+1 lines)
1	OpenIDE-Module: org.netbeans.core/1	1	OpenIDE-Module: org.netbeans.core/1
2	OpenIDE-Module-Specification-Version: 1.4	2	OpenIDE-Module-Specification-Version: 1.4
3	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	3	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
		4	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.21
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/core/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/core/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/core/resources/mf-layer.xml	6	OpenIDE-Module-Layer: org/netbeans/core/resources/mf-layer.xml
6	Class-Path: ext/regexp.jar	7	Class-Path: ext/regexp.jar

Lines 20-26 Link Here

(-)core/src/org/netbeans/core/Bundle.properties (-1 / +1 lines)
20	OpenIDE-Module-Long-Description=\	20	OpenIDE-Module-Long-Description=\
21	This is not really a module, rather the central infrastructure \	21	This is not really a module, rather the central infrastructure \
22	that causes the IDE to exist as an application. \	22	that causes the IDE to exist as an application. \
23	As such, it cannot be disabled, nor upgraded without an IDE restart.	23	As such, it cannot be disabled.
24		24
25	# TopManager properties	25	# TopManager properties
26	CTL_Netbeanshome_property=netbeans.home is not set.\nPlease check your NetBeans startup script.	26	CTL_Netbeanshome_property=netbeans.home is not set.\nPlease check your NetBeans startup script.

Lines 685-690 Link Here

(-)core/src/org/netbeans/core/modules/NbInstaller.java (+1 lines)
685	// Handle JavaHelp. For modules before API 2.2, they should have an	685	// Handle JavaHelp. For modules before API 2.2, they should have an
686	// automatic dependency on token org.netbeans.api.javahelp.Help.	686	// automatic dependency on token org.netbeans.api.javahelp.Help.
687	if (!m.getCodeNameBase().equals("org.netbeans.modules.javahelp") && // NOI18N	687	if (!m.getCodeNameBase().equals("org.netbeans.modules.javahelp") && // NOI18N
		688	!m.getCodeNameBase().equals("org.openide") && // NOI18N
688	(openide == null \|\| openide.compareTo(new SpecificationVersion("2.2")) < 0)) { // NOI18N	689	(openide == null \|\| openide.compareTo(new SpecificationVersion("2.2")) < 0)) { // NOI18N
689	// Older than 2.2, or at least does not claim to be newer.	690	// Older than 2.2, or at least does not claim to be newer.
690	// First make sure it does not already depend on this module.	691	// First make sure it does not already depend on this module.

Lines 824-829 Link Here

(-)nbbuild/build.xml (+1 lines)
824	<echo message="Making NBM for module ui/welcome..."/>	824	<echo message="Making NBM for module ui/welcome..."/>
825	<ant dir="../ui/welcome" target="nbm"/>	825	<ant dir="../ui/welcome" target="nbm"/>
826	<makeupdatedesc desc="../www/www/updates/40_1.1_.xml">	826	<makeupdatedesc desc="../www/www/updates/40_1.1_.xml">
		827	<!-- XXX missing openide.nbm, core.nbm, core-*.nbm -->
827	<!-- Not for now:	828	<!-- Not for now:
828	<group name="Standard">	829	<group name="Standard">
829	<fileset dir=".">	830	<fileset dir=".">

Lines 10-13 Link Here

(-)openide/.cvsignore (-1 / +2 lines)
10	compatkit-work	10	compatkit-work
11	standalone	11	standalone
12	nb-api-tutorial.zip	12	nb-api-tutorial.zip
13	fake	13	openide.nbm
		14	Info




  <property name="binroot" location="../../nbextra"/>
  <property name="homepage.base" value="netbeans.org"/>
  <property name="dist.base" value="www.netbeans.org/download/nbms/40"/>
  <property name="license.file" location="../nbbuild/standard-nbm-license.txt"/>

  <property name="nbm_alias" value="nb_ide"/>


  <target name="jars" depends="compile,13javac-workaround,vers-prep" description="Create JAR files.">
    <mkdir dir="netbeans/lib"/>
    <filter token="Class-Path" value="Class-Path"/>
    <filter token="OpenIDE-Module" value="OpenIDE-Module"/>
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
    <locjar jarfile="netbeans/lib/openide.jar"
            manifest="manifest-subst.mf"

    <mkdir dir="netbeans/lib/patches"/>
    <!-- Use the same manifest to ensure that packages are defined correctly. -->
    <filter token="Class-Path" value="X-Commented-Out-Class-Path"/>
    <filter token="OpenIDE-Module" value="X-Commented-Out-OpenIDE-Module"/>
    <copy file="manifest.mf" tofile="manifest-compat-subst.mf" filtering="on"/>
    <jar jarfile="netbeans/lib/patches/openide-compat.jar"
         basedir="compatkit-work"

  <target name="jars-with-lib" depends="libs,compile,13javac-workaround,vers-prep" description="Create JAR files.">
    <mkdir dir="standalone"/>
    <filter token="Class-Path" value="Class-Path"/>
    <filter token="OpenIDE-Module" value="OpenIDE-Module"/>
    <copy file="manifest.mf" tofile="manifest-subst.mf" filtering="on"/>
    <locjar jarfile="standalone/openide-remainder.jar"
            manifest="manifest-subst.mf"

    -->
  </target>

  <target name="netbeans" depends="jars" description="Build everything needed for inclusion in the IDE.">
    <genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/>
  </target>

  <target name="nbm" depends="netbeans">
    <makenbm file="openide.nbm"
             topdir="."
             module="netbeans/lib/openide.jar"
	     homepage="http://openide.${homepage.base}/"
	     distribution="http://${dist.base}/openide.nbm">
      <license file="${license.file}"/>
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
    </makenbm>
  </target>

  
  <!-- Build separate libraries for the IDE -->

    <delete dir="examplemodules"/>
    <delete dir="compatkit-work"/>
    <delete dir="standalone"/>
    <delete dir="Info"/>
    <delete file="openide.nbm"/>
  </target>
  <target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area.">
    <delete dir="examplemodulereload"/>

        <style in="api/doc/changes/apichanges.xml" out="www/apichanges.html" destdir="www" style="${basedir}/api/doc/changes/apichanges.xsl"/>
    </target>
    
  <!-- creating a fake module for distribution of openide & core as nbm -->

  <target name="nbm" depends="netbeans, preparenbm">
    <makenbm file="org-openide.nbm"
             topdir="fake"
             module="fake/netbeans/modules/org-openide.jar"
	     homepage="http://openide.${homepage.base}/"
	     distribution="http://${dist.base}/org-openide.nbm">
      <license file="${license.file}"/>
      <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
    </makenbm>
  </target>
  
  <target name="preparenbm" depends="vers-prep" >
    <!-- our fake directory, where we are going to copy all modules -->
    <mkdir dir="fake" />
    <copy todir="fake/netbeans">
        <fileset dir="netbeans" />
    </copy>
    
  
    <!-- we need to build also core -->
    <antcall target="buildandcopy">   
        <param name="dir" value="../core" />
    </antcall>
    <antcall target="buildandcopy">   
        <param name="dir" value="../core/compiler" />
    </antcall>
    <antcall target="buildandcopy">   
        <param name="dir" value="../core/execution" />
    </antcall>
    <antcall target="buildandcopy">   
        <param name="dir" value="../core/ui" />
    </antcall>
    <antcall target="buildandcopy">   
        <param name="dir" value="../core/windows" />
    </antcall>
    <antcall target="buildandcopy">   
        <param name="dir" value="../core/ide" />
    </antcall>
    
    <copy file="org-openide.mf" tofile="org-openide-subst.mf" filtering="on"/>
    
    <locjar jarfile="fake/netbeans/modules/org-openide.jar"
            manifest="org-openide-subst.mf"
	    compress="false">
      <locale name="ja"/>
      
      <!-- Include just the Bundle.properties describing the module -->
      <fileset dir="." excludesfile="../nbbuild/standard-jar-excludes.txt" >
           <include name="org-openide.properties" />
      </fileset>
    </locjar>
    
    <genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/>
  </target>
  
  <target name="buildandcopy" >
    <ant dir="${dir}" />   
    <copy todir="fake/netbeans">
        <fileset dir="${dir}/netbeans" />
    </copy>
  </target>
</project>

Lines 8-13 Link Here

(-)openide/manifest.mf (+4 lines)
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@
11		15
12	Name: /org/openide/	16	Name: /org/openide/
13	Package-Title: org.openide	17	Package-Title: org.openide




This module is part of NetBeans and is open-source.
You can see http://www.netbeans.org/license.html for details.

The source file license is:

                Sun Public License Notice

The contents of this file are subject to the Sun Public License
Version 1.0 (the "License"). You may not use this file except in
compliance with the License. A copy of the License is available at
http://www.sun.com/

The Original Code is NetBeans. The Initial Developer of the Original
Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
Microsystems, Inc. All Rights Reserved.

--------------------------------------------------------------------

Additionally this module includes binary files which it needs to
function which are not covered under the SPL. Specifically:

The Crimson, Regexp, Xalan and Xerces software products included
in the org-openide module are governed by the terms of the Apache
Software License found at http://www.apache.org/LICENSE.txt.



Removed Link Here

(-)openide/org-openide.mf (-4 lines)
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@




#                 Sun Public License Notice
# 
# The contents of this file are subject to the Sun Public License
# Version 1.0 (the "License"). You may not use this file except in
# compliance with the License. A copy of the License is available at
# http://www.sun.com/
# 
# The Original Code is NetBeans. The Initial Developer of the Original
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
# Microsystems, Inc. All Rights Reserved.

# manifest.mf
OpenIDE-Module-Name=Open IDE
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Short-Description=The OpenIDE APIs and their implementation
OpenIDE-Module-Long-Description=This module represents a set of API libraries \
and also libraries with the implementation of the APIs




# http://www.sun.com/
# 
# The Original Code is NetBeans. The Initial Developer of the Original
# Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
# Microsystems, Inc. All Rights Reserved.


# Localized text for the fake module in the openide/core NBM.

OpenIDE-Module-Name=Open APIs
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Short-Description=The NetBeans Open APIs.
OpenIDE-Module-Long-Description=\
        This pseudomodule represents the Open APIs (org.openide.*) which \
        are used by all other NetBeans modules.



# Notify system


Lines 249-254 Link Here

(-)openide/www/versioning-policy.html (+4 lines)
249	changes, run <samp>cvs diff</samp>, and commit the code changes	249	changes, run <samp>cvs diff</samp>, and commit the code changes
250	and manifest in one CVS commit.	250	and manifest in one CVS commit.
251		251
		252	<p>Note that the NetBeans core (<code>org.netbeans.core/1</code>) now
		253	needs to declare a dependency on the Open APIs in the exact same way
		254	as any module.
		255
252	<p>Avoid increasing your dependency on the API version unless you need	256	<p>Avoid increasing your dependency on the API version unless you need
253	to, as it would prevent a user interested in trying out a new version	257	to, as it would prevent a user interested in trying out a new version
254	of your module from running it in an older build (such as the last	258	of your module from running it in an older build (such as the last

Return to bug 24143

Lines 23-29 Link Here

(-)openide/build.xml (-66 / +20 lines)
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="jars" description="Build everything needed for inclusion in the IDE.">
		317	<genlist targetname="nbm" outputfiledir="../nbbuild/netbeans"/>
		318	</target>
		319
		320	<target name="nbm" depends="netbeans">
		321	<makenbm file="openide.nbm"
		322	topdir="."
		323	module="netbeans/lib/openide.jar"
		324	homepage="http://openide.${homepage.base}/"
		325	distribution="http://${dist.base}/openide.nbm">
		326	<license file="${license.file}"/>
		327	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
		328	</makenbm>
		329	</target>
314		330
315		331
316	<!-- Build separate libraries for the IDE -->	332	<!-- Build separate libraries for the IDE -->
Lines 837-843 Link Here
837	<delete dir="examplemodules"/>	853	<delete dir="examplemodules"/>
838	<delete dir="compatkit-work"/>	854	<delete dir="compatkit-work"/>
839	<delete dir="standalone"/>	855	<delete dir="standalone"/>
840	<delete dir="fake" />	856	<delete dir="Info"/>
		857	<delete file="openide.nbm"/>
841	</target>	858	</target>
842	<target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area.">	859	<target name="real-clean" depends="clean" description="As for clean, but also remove example module reload area.">
843	<delete dir="examplemodulereload"/>	860	<delete dir="examplemodulereload"/>
Lines 895-961 Link Here
895	<style in="api/doc/changes/apichanges.xml" out="www/apichanges.html" destdir="www" style="${basedir}/api/doc/changes/apichanges.xsl"/>	912	<style in="api/doc/changes/apichanges.xml" out="www/apichanges.html" destdir="www" style="${basedir}/api/doc/changes/apichanges.xsl"/>
896	</target>	913	</target>
897		914
898	<!-- creating a fake module for distribution of openide & core as nbm -->
899
900	<target name="nbm" depends="netbeans, preparenbm">
901	<makenbm file="org-openide.nbm"
902	topdir="fake"
903	module="fake/netbeans/modules/org-openide.jar"
904	homepage="http://openide.${homepage.base}/"
905	distribution="http://${dist.base}/org-openide.nbm">
906	<license file="${license.file}"/>
907	<signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/>
908	</makenbm>
909	</target>
910
911	<target name="preparenbm" depends="vers-prep" >
912	<!-- our fake directory, where we are going to copy all modules -->
913	<mkdir dir="fake" />
914	<copy todir="fake/netbeans">
915	<fileset dir="netbeans" />
916	</copy>
917
918
919	<!-- we need to build also core -->
920	<antcall target="buildandcopy">
921	<param name="dir" value="../core" />
922	</antcall>
923	<antcall target="buildandcopy">
924	<param name="dir" value="../core/compiler" />
925	</antcall>
926	<antcall target="buildandcopy">
927	<param name="dir" value="../core/execution" />
928	</antcall>
929	<antcall target="buildandcopy">
930	<param name="dir" value="../core/ui" />
931	</antcall>
932	<antcall target="buildandcopy">
933	<param name="dir" value="../core/windows" />
934	</antcall>
935	<antcall target="buildandcopy">
936	<param name="dir" value="../core/ide" />
937	</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>
954
955	<target name="buildandcopy" >
956	<ant dir="${dir}" />
957	<copy todir="fake/netbeans">
958	<fileset dir="${dir}/netbeans" />
959	</copy>
960	</target>
961	</project>	915	</project>

Lines 13-20 Link Here

(-)autoupdate/src/org/netbeans/modules/autoupdate/DummyModuleInfo.java (-2 / +42 lines)
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	// #24143: treat API dependencies as dependencies on pseudomodule org.openide
		114	Iterator it = s.iterator();
		115	SpecificationVersion api = null;
		116	String impl = null;
		117	String major = null;
		118	while (it.hasNext()) {
		119	Dependency dep = (Dependency)it.next();
		120	if (dep.getType() == Dependency.TYPE_IDE) {
		121	if (dep.getComparison() == Dependency.COMPARE_SPEC) {
		122	if (api != null) {
		123	throw new IllegalArgumentException("Duplicate OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
		124	}
		125	api = new SpecificationVersion(dep.getVersion());
		126	} else {
		127	// Must be impl comparison.
		128	if (impl != null) {
		129	throw new IllegalArgumentException("Duplicate OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
		130	}
		131	impl = dep.getVersion();
		132	}
		133	String name = dep.getName();
		134	int index = name.lastIndexOf('/');
		135	String newmajor;
		136	if (index == -1) {
		137	newmajor = ""; // NOI18N
		138	} else {
		139	newmajor = name.substring(index);
		140	}
		141	if (major != null && !major.equals(newmajor)) {
		142	throw new IllegalArgumentException("Clashing OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
		143	}
		144	major = newmajor;
		145	it.remove();
		146	}
		147	}
		148	if (api != null) {
		149	s.addAll(Dependency.create(Dependency.TYPE_MODULE, "org.openide" + major + " > " + api)); // NOI18N
		150	}
		151	if (impl != null) {
		152	s.addAll(Dependency.create(Dependency.TYPE_MODULE, "org.openide" + major + " = " + impl)); // NOI18N
		153	}
114	return s;	154	return s;
115	}	155	}
116		156

Added Link Here

(-)core/apache-license.txt (+58 lines)
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

Removed Link Here

(-)openide/org-openide-nbm-license.txt (-26 lines)
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

Removed Link Here

(-)openide/org-openide.properties (-17 lines)
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

Lines 6-15 Link Here

(-)openide/src/org/openide/Bundle.properties (-2 / +12 lines)
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 NetBeans Open APIs.
		18	OpenIDE-Module-Long-Description=\
		19	This pseudomodule represents the Open APIs (org.openide.*) which \
		20	are used by all other NetBeans modules.
		21
		22
13		23
14	# Notify system	24	# Notify system
15		25