Revert "Using JPA 2.1 descriptor (TODO: Change to common interface)"

This reverts commit 9b507e5.
forge · Oct 18, 2013 · 968b770 · 968b770
1 parent ac68a66
commit 968b770
Show file tree

Hide file tree

Showing 18 changed files with 48 additions and 48 deletions.
diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceContainer.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceContainer.java
@@ -6,8 +6,8 @@
  */
 package org.jboss.forge.addon.javaee.jpa;
 
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
 
 /**
  * Performs configuration on a {@link JPADataSource} to ensure it is properly set up for the this implementation.

diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacet.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacet.java
@@ -13,7 +13,7 @@
 import org.jboss.forge.addon.projects.Project;
 import org.jboss.forge.addon.resource.DirectoryResource;
 import org.jboss.forge.parser.java.JavaClass;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
 
 /**
  * If installed, this {@link Project} supports features from the JPA specification.

diff --git a/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceProvider.java b/javaee/api/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceProvider.java
@@ -9,8 +9,8 @@
 import java.util.List;
 
 import org.jboss.forge.addon.dependencies.Dependency;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
 
 /**
  * Performs configuration of a {@link JPADataSource} to ensure it is properly set up for this implementation.

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacetImpl.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacetImpl.java
@@ -33,7 +33,7 @@
 import org.jboss.forge.parser.java.JavaClass;
 import org.jboss.forge.parser.java.JavaSource;
 import org.jboss.shrinkwrap.descriptor.api.DescriptorImporter;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceOperations.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceOperations.java
@@ -28,9 +28,9 @@
 import org.jboss.forge.parser.java.Field;
 import org.jboss.forge.parser.java.JavaClass;
 import org.jboss.forge.parser.java.util.Refactory;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnitTransactionType;
 
 /**
  * This class contains JPA specific operations

diff --git a/...e/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/CustomJDBCContainer.java b/...e/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/CustomJDBCContainer.java
@@ -9,10 +9,10 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
 import org.jboss.forge.parser.java.util.Strings;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Properties;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnitTransactionType;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/CustomJTAContainer.java b/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/CustomJTAContainer.java
@@ -8,9 +8,9 @@
 
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnitTransactionType;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/...mpl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/JavaEEDefaultContainer.java b/...mpl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/JavaEEDefaultContainer.java
@@ -9,9 +9,9 @@
 import org.jboss.forge.addon.javaee.jpa.DatabaseType;
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnitTransactionType;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/NonJTAContainer.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/NonJTAContainer.java
@@ -9,9 +9,9 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
 import org.jboss.forge.parser.java.util.Strings;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnitTransactionType;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/.../impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/WebLogic12cContainer.java b/.../impl/src/main/java/org/jboss/forge/addon/javaee/jpa/containers/WebLogic12cContainer.java
@@ -3,11 +3,11 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
 import org.jboss.forge.addon.javaee.jpa.providers.HibernateProvider;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Properties;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Property;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnitTransactionType;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Property;
 
 /**
  * Weblogic 12c Persistence Container

diff --git a/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/EclipseLinkProvider.java b/...ee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/EclipseLinkProvider.java
@@ -17,9 +17,9 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.MetaModelProvider;
 import org.jboss.forge.addon.javaee.jpa.PersistenceProvider;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Properties;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties;
 
 public class EclipseLinkProvider implements PersistenceProvider
 {

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/HibernateProvider.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/HibernateProvider.java
@@ -17,9 +17,9 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.MetaModelProvider;
 import org.jboss.forge.addon.javaee.jpa.PersistenceProvider;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Properties;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/InfinispanProvider.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/InfinispanProvider.java
@@ -14,10 +14,10 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.MetaModelProvider;
 import org.jboss.forge.addon.javaee.jpa.PersistenceProvider;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Properties;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Property;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Property;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/OpenJPAProvider.java b/javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/providers/OpenJPAProvider.java
@@ -17,10 +17,10 @@
 import org.jboss.forge.addon.javaee.jpa.JPADataSource;
 import org.jboss.forge.addon.javaee.jpa.MetaModelProvider;
 import org.jboss.forge.addon.javaee.jpa.PersistenceProvider;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Properties;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.Property;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Properties;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.Property;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

diff --git a/...c/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupConnectionStep.java b/...c/main/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupConnectionStep.java
@@ -33,8 +33,8 @@
 import org.jboss.forge.addon.ui.result.Results;
 import org.jboss.forge.addon.ui.util.Metadata;
 import org.jboss.forge.addon.ui.wizard.UIWizardStep;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
 
 public class PersistenceSetupConnectionStep extends AbstractJavaEECommand implements UIWizardStep
 {

diff --git a/...impl/src/main/java/org/jboss/forge/addon/javaee/rest/ui/RestEndpointFromEntityWizard.java b/...impl/src/main/java/org/jboss/forge/addon/javaee/rest/ui/RestEndpointFromEntityWizard.java
@@ -43,8 +43,8 @@
 import org.jboss.forge.addon.ui.util.Metadata;
 import org.jboss.forge.addon.ui.wizard.UIWizard;
 import org.jboss.forge.parser.java.JavaClass;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
 
 /**
  * Generates REST endpoints from JPA Entities

diff --git a/...s/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizardTest.java b/...s/src/test/java/org/jboss/forge/addon/javaee/jpa/ui/setup/PersistenceSetupWizardTest.java
@@ -33,8 +33,8 @@
 import org.jboss.forge.ui.test.WizardListener;
 import org.jboss.forge.ui.test.WizardTester;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnit;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceUnit;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/...main/java/org/jboss/forge/addon/maven/projects/javaee/MavenPersistenceMetaModelFacet.java b/...main/java/org/jboss/forge/addon/maven/projects/javaee/MavenPersistenceMetaModelFacet.java
@@ -36,7 +36,7 @@
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.services.Imported;
 import org.jboss.forge.parser.java.util.Strings;
-import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
 
 /**
  * Implementation of {@link PersistenceMetaModelFacet}