diff options
| author | Curtis Windatt | 2012-09-24 19:48:54 +0000 |
|---|---|---|
| committer | Curtis Windatt | 2012-09-24 19:48:54 +0000 |
| commit | f6fe4505be53de83820709e4300c3bb32ded07d7 (patch) | |
| tree | d85c1809fa106438960a1fc2ebc5153403e4cd2b | |
| parent | 0bc3a97962fa02067d7de9b5eacb42212747f248 (diff) | |
| download | eclipse.pde.ui-f6fe4505be53de83820709e4300c3bb32ded07d7.tar.gz eclipse.pde.ui-f6fe4505be53de83820709e4300c3bb32ded07d7.tar.xz eclipse.pde.ui-f6fe4505be53de83820709e4300c3bb32ded07d7.zip | |
Bug 383581 - ee.osgiminimum 1.2 is missing X500Principal
4 files changed, 9 insertions, 3 deletions
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 038f0f56ac..1fa4210a9d 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 @@ Manifest-Version: 1.0 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.201.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 Binary files differindex 4d57618480..6f2a73eef0 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 diff --git a/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF index 655818e4dc..ff680e2077 100644 --- a/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF +++ b/apitools/org.eclipse.pde.api.tools.generator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.pde.api.tools.generator;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.objectweb.asm;bundle-version="3.3.1", 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 8c9c3e97a3..5b2ef506e4 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 @@ public class EEGenerator { // 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 @@ public class EEGenerator { 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());
|