Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-04-06 13:55:22 +0000
committerkmoore2010-04-06 13:55:22 +0000
commit9d7ff186339405aa94d604ab7ce3535ee559dcd1 (patch)
treefa236ecaa260195b36d741272be399471c1080bc
parente5e856827aa522da5aac2ea19694edf931ef5e1a (diff)
downloadwebtools.dali-9d7ff186339405aa94d604ab7ce3535ee559dcd1.tar.gz
webtools.dali-9d7ff186339405aa94d604ab7ce3535ee559dcd1.tar.xz
webtools.dali-9d7ff186339405aa94d604ab7ce3535ee559dcd1.zip
307890 - switch to use JPA facet instead of Java Persistence facet
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/plugin.properties6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java9
2 files changed, 10 insertions, 5 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.properties b/jpa/plugins/org.eclipse.jpt.core/plugin.properties
index 81c77dcbd2..6430d6e583 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.properties
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2006, 2009 Oracle. All rights reserved.
+# Copyright (c) 2006, 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 http://www.eclipse.org/legal/epl-v10.html.
@@ -39,8 +39,8 @@ GENERIC_2_0_PLATFORM_LABEL=Generic 2.0
NO_OP_LIBRARY_PROVIDER_WARNING = Library configuration is disabled. The user may need to configure further classpath changes later.
NO_OP_LIBRARY_PROVIDER_MESSAGE = The JPA facet requires a JPA implementation library to be present on the project classpath. By disabling library configuration, the user takes on the responsibility of ensuring that the classpath is configured appropriately via alternate means.
-JPA_FACET_LABEL=Java Persistence
-JPA_FACET_DESCRIPTION=Adds support for writing persistent meta-data using Java Persistence Architecture.
+JPA_FACET_LABEL=JPA
+JPA_FACET_DESCRIPTION=Adds support for writing persistent meta-data using the Java Persistence API (JPA).
JPA_1.0_PRESET_LABEL=Minimal JPA 1.0 Configuration
JPA_2.0_PRESET_LABEL=Minimal JPA 2.0 Configuration
JPA_TEMPLATE_LABEL=JPA Project
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
index 074cf5e09f..18dabc3639 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.ui.internal.properties;
+import static org.eclipse.jst.common.project.facet.ui.libprov.LibraryProviderFrameworkUi.createInstallLibraryPanel;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Comparator;
@@ -414,8 +415,12 @@ public class JpaProjectPropertiesPage
this.buildPlatformGroup(composite);
- Control libraryProviderComposite = super.createPageContents(composite);
- libraryProviderComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ Control libraryProviderComposite = createInstallLibraryPanel(
+ composite,
+ this.getLibraryInstallDelegate(),
+ JptUiMessages.JpaFacetWizardPage_jpaImplementationLabel);
+
+ libraryProviderComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
this.buildConnectionGroup(composite);
this.buildPersistentClassManagementGroup(composite);

Back to the top