Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa
diff options
context:
space:
mode:
authorkmoore2010-06-24 18:51:48 +0000
committerkmoore2010-06-24 18:51:48 +0000
commit6293ed866fb5e01a08a44de010380562096af365 (patch)
tree0e2471d4c542b40c6225dd983d0719cb7aea6745 /jpa
parentbf9e9213774992566541478f16c999312b417d4c (diff)
downloadwebtools.dali-6293ed866fb5e01a08a44de010380562096af365.tar.gz
webtools.dali-6293ed866fb5e01a08a44de010380562096af365.tar.xz
webtools.dali-6293ed866fb5e01a08a44de010380562096af365.zip
315668 - Creating Java project loads jpt.core bundle - content type describers should not activate their bundle
Diffstat (limited to 'jpa')
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF6
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/plugin.xml2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/contenttypes/IndeterminateContentDescriber.java (renamed from jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/IndeterminateContentDescriber.java)7
3 files changed, 9 insertions, 6 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
index 9cc729b2a9..0f45878634 100644
--- a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.jpt.core;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.1.qualifier
Bundle-Activator: org.eclipse.jpt.core.JptCorePlugin
-Bundle-ActivationPolicy: lazy
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jpt.core.internal.resource.contenttypes"
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -60,7 +60,7 @@ Export-Package: org.eclipse.jpt.core,
org.eclipse.jpt.core.internal.jpa2.resource.java.source;x-internal:=true,
org.eclipse.jpt.core.internal.operations;x-internal:=true,
org.eclipse.jpt.core.internal.prefs;x-internal:=true,
- org.eclipse.jpt.core.internal.resource;x-internal:=true,
+ org.eclipse.jpt.core.internal.resource.contenttypes;x-internal:=true,
org.eclipse.jpt.core.internal.resource.java;x-internal:=true,
org.eclipse.jpt.core.internal.resource.java.binary;x-internal:=true,
org.eclipse.jpt.core.internal.resource.java.source;x-internal:=true,
diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
index 95120c12da..a0f658f8ab 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
@@ -31,7 +31,7 @@
id="org.eclipse.jpt.core.content.baseJpaContent"
name="%BASE_JPA_CONTENT"
base-type="org.eclipse.core.runtime.xml"
- describer="org.eclipse.jpt.core.internal.resource.IndeterminateContentDescriber">
+ describer="org.eclipse.jpt.core.internal.resource.contenttypes.IndeterminateContentDescriber">
</content-type>
<!-- persistence.xml content type -->
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/IndeterminateContentDescriber.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/contenttypes/IndeterminateContentDescriber.java
index 6013ccafe5..79cd8932d0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/IndeterminateContentDescriber.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/contenttypes/IndeterminateContentDescriber.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle.
+ * Copyright (c) 2008, 2010 Oracle.
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* Oracle - initial API and implementation
*******************************************************************************/
-package org.eclipse.jpt.core.internal.resource;
+package org.eclipse.jpt.core.internal.resource.contenttypes;
import java.io.InputStream;
import java.io.Reader;
@@ -21,6 +21,9 @@ import org.eclipse.core.runtime.content.ITextContentDescriber;
*
* It is used currently for org.eclipse.jpt.core.content.baseJpaContent in order
* to make that content type act as an "abstract" content type.
+ *
+ * This is in its own package so that it can be excluded from bundle activation in the plugin.xml.
+ * Content describers must be self-contained and not trigger auto-activation.
*/
public class IndeterminateContentDescriber implements ITextContentDescriber
{

Back to the top