Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=383448
diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF
index 038f0f5..5ac6dcf 100644
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName
Bundle-SymbolicName: org.eclipse.pde.api.tools.ee.osgiminimum12
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.pde.api.tools;bundle-version="1.0.300"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip
index 4d57618..6f2a73e 100644
--- a/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip
+++ b/apitools/org.eclipse.pde.api.tools.ee.osgiminimum12/src/org/eclipse/pde/api/tools/internal/api_stubs/OSGi_Minimum-1.2.zip
Binary files differ
diff --git a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
index 8c9c3e9..5b2ef50 100644
--- a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
+++ b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
@@ -793,6 +793,12 @@
// initialize known packages
String osgiProfileName = this.OSGiProfile;
Set<String> knownPackages = initializePackages(osgiProfileName);
+ // known packages should be part of the white list by default
+ if (this.whiteList != null && !this.whiteList.isEmpty()) {
+ this.whiteList.addAll(knownPackages);
+ } else {
+ this.whiteList = Collections.unmodifiableSet(knownPackages);
+ }
Map<String, Type> allVisibleTypes = new HashMap<String, Type>();
Map<String, Type> allTypes = new HashMap<String, Type>();
this.totalSize = 0;
@@ -924,7 +930,7 @@
return this.blackList.contains(typeName);
}
private boolean isOnWhiteList(String packageName) {
- return packageName.startsWith("java.") || this.whiteList.contains(packageName); //$NON-NLS-1$
+ return packageName.startsWith("java.") || packageName.startsWith("javax.") || this.whiteList.contains(packageName); //$NON-NLS-1$ //$NON-NLS-2$
}
private boolean isOnWhiteList(Type type) {
return isOnWhiteList(type.getPackage());
