Index: autoupdate/src/org/netbeans/modules/autoupdate/DummyModuleInfo.java
===================================================================
RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/DummyModuleInfo.java,v
--- autoupdate/src/org/netbeans/modules/autoupdate/DummyModuleInfo.java 29 Jan 2002 14:38:13 -0000 1.5
+++ autoupdate/src/org/netbeans/modules/autoupdate/DummyModuleInfo.java 3 Jun 2002 21:12:10 -0000
@@ -13,8 +13,7 @@
package org.netbeans.modules.autoupdate;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import java.util.StringTokenizer;
import java.util.jar.Attributes;
@@ -111,6 +110,35 @@
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
+ String cn = attr.getValue("OpenIDE-Module"); // NOI18N
+ if (!cn.equals("org.openide") && !cn.startsWith("org.openide/")) { // NOI18N
+ // #24143: treat API dependencies as dependencies on pseudomodule org.openide
+ // (but ignore org.openide itself which needs an API dep in order to turn
+ // off autodep on JavaHelp etc.)
+ Iterator it = s.iterator();
+ SpecificationVersion api = null;
+ String major = null;
+ while (it.hasNext()) {
+ Dependency dep = (Dependency)it.next();
+ if (dep.getType() == Dependency.TYPE_IDE && dep.getComparison() == Dependency.COMPARE_SPEC) {
+ if (api != null) {
+ throw new IllegalArgumentException("Duplicate OpenIDE-Module-IDE-Dependencies found!"); // NOI18N
+ }
+ api = new SpecificationVersion(dep.getVersion());
+ String name = dep.getName();
+ int index = name.lastIndexOf('/');
+ if (index == -1) {
+ major = ""; // NOI18N
+ } else {
+ major = name.substring(index);
+ }
+ it.remove();
+ }
+ }
+ if (api != null) {
+ s.addAll(Dependency.create(Dependency.TYPE_MODULE, "org.openide" + major + " > " + api)); // NOI18N
+ }
+ }
return s;
}
Index: openide/.cvsignore
===================================================================
RCS file: /cvs/openide/.cvsignore,v
--- openide/.cvsignore 1 Jun 2002 08:27:19 -0000 1.16
+++ openide/.cvsignore 3 Jun 2002 21:12:10 -0000
@@ -10,4 +10,5 @@
compatkit-work
standalone
nb-api-tutorial.zip
+openide-core.nbm
fake
Index: openide/apache-license.txt
===================================================================
RCS file: openide/apache-license.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openide/apache-license.txt 3 Jun 2002 21:12:10 -0000
@@ -0,0 +1,58 @@
+/* ====================================================================
+ * 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
+ * .
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
--- openide/build.xml 3 Jun 2002 10:29:07 -0000 1.94
+++ openide/build.xml 3 Jun 2002 21:12:10 -0000
@@ -23,7 +23,7 @@
-
+
@@ -191,6 +191,7 @@
+
+
+
-
+
+
+
@@ -838,6 +843,7 @@
+
@@ -897,20 +903,26 @@
-
-
+
-
+ distribution="http://${dist.base}/openide-core.nbm">
+
+ For the NetBeans API and core code:
+
+ For the Crimson, Regexp, XML Commons, and Xerces software products
+included with the NetBeans core:
+
+
-
-
+
+
-
+
@@ -920,6 +932,7 @@
+
@@ -935,21 +948,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: openide/l10n.list
===================================================================
RCS file: /cvs/openide/l10n.list,v
--- openide/l10n.list 30 Jan 2002 09:38:27 -0000 1.2
+++ openide/l10n.list 3 Jun 2002 21:12:10 -0000
@@ -18,3 +18,4 @@
openide/src/org/openide/util/Bundle.properties
openide/src/org/openide/util/datatransfer/Bundle.properties
openide/src/org/openide/windows/Bundle.properties
+openide/org-openide-nbm-src/org_openide/Bundle.properties
Index: openide/manifest.mf
===================================================================
RCS file: /cvs/openide/manifest.mf,v
--- openide/manifest.mf 22 Nov 2001 12:03:57 -0000 1.27
+++ openide/manifest.mf 3 Jun 2002 21:12:10 -0000
@@ -8,6 +8,12 @@
Implementation-Version: @BUILD_NUMBER_SUBST@
Implementation-Vendor: NetBeans
@Class-Path@: ext/regexp.jar
+@OpenIDE-Module@: org.openide/1
+OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
+OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
+OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+X-Comment-3: No, the next line is _not_ supposed to be substituted
+OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.2
Name: /org/openide/
Package-Title: org.openide
Index: openide/org-openide-nbm-license.txt
===================================================================
RCS file: openide/org-openide-nbm-license.txt
--- openide/org-openide-nbm-license.txt 3 Jun 2002 10:27:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-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.
-
-
Index: openide/org-openide.mf
===================================================================
RCS file: openide/org-openide.mf
--- openide/org-openide.mf 1 Jun 2002 08:27:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-OpenIDE-Module: org.openide/1
-OpenIDE-Module-Localizing-Bundle: org-openide.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
Index: openide/org-openide.properties
===================================================================
RCS file: openide/org-openide.properties
--- openide/org-openide.properties 1 Jun 2002 08:27:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-# 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
Index: openide/src/org/openide/Bundle.properties
===================================================================
RCS file: /cvs/openide/src/org/openide/Bundle.properties,v
--- openide/src/org/openide/Bundle.properties 16 Nov 2001 08:46:25 -0000 1.33
+++ openide/src/org/openide/Bundle.properties 3 Jun 2002 21:12:10 -0000
@@ -6,10 +6,21 @@
# 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
+# 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 Open APIs and their implementation.
+OpenIDE-Module-Long-Description=\
+ This pseudomodule represents the Open APIs (org.openide.*) and their \
+ implementations (org.netbeans.core.*), as well as other files (such as \
+ XML parsers) normally bundled with the NetBeans core.
+
+
# Notify system