Skip to content

Commit

Permalink
FORGE-1421: Moved back to ShrinkWrap Descriptors
Browse files Browse the repository at this point in the history
FORGE-1421: Moved back to ShrinkWrap Descriptors #2

FORGE-1421: Fixed package name

FORGE-1421: Fixed package name in scaffold addon
  • Loading branch information
gastaldi committed Jan 5, 2016
1 parent 6491735 commit 96a3d30
Show file tree
Hide file tree
Showing 27 changed files with 63 additions and 71 deletions.
5 changes: 2 additions & 3 deletions javaee/api/pom.xml
Expand Up @@ -39,10 +39,9 @@
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.forge.descriptors</groupId>
<artifactId>javaee-descriptors-api</artifactId>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
</dependency>

<!-- Spec JARs -->
Expand Down
Expand Up @@ -15,7 +15,7 @@
import org.jboss.forge.addon.projects.facets.ResourcesFacet;
import org.jboss.forge.addon.resource.DirectoryResource;
import org.jboss.forge.parser.java.JavaClass;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceCommonDescriptor;

/**
* If installed, this {@link Project} supports features from the JPA specification.
Expand Down
Expand Up @@ -6,7 +6,7 @@
*/
package org.jboss.forge.addon.javaee.jpa;

import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* Performs configuration on a {@link JPADataSource} to ensure it is properly set up for the this implementation.
Expand All @@ -31,7 +31,7 @@ public interface PersistenceContainer
* Set up the connection info.
*/
@SuppressWarnings("rawtypes")
PersistenceUnitCommon setupConnection(PersistenceUnitCommon unit,
PersistenceUnitCommonType setupConnection(PersistenceUnitCommonType unit,
JPADataSource dataSource);

/**
Expand Down
Expand Up @@ -9,7 +9,7 @@
import java.util.List;

import org.jboss.forge.addon.dependencies.Dependency;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* Performs configuration of a {@link JPADataSource} to ensure it is properly set up for this implementation.
Expand All @@ -34,7 +34,7 @@ public interface PersistenceProvider
* Configure the {@link PersistenceUnitDef} and {@link JPADataSource}.
*/
@SuppressWarnings("rawtypes")
PersistenceUnitCommon configure(PersistenceUnitCommon unit, JPADataSource ds);
PersistenceUnitCommonType configure(PersistenceUnitCommonType unit, JPADataSource ds);

/**
* List any dependencies required by this provider.
Expand Down
Expand Up @@ -19,7 +19,7 @@
import org.jboss.forge.addon.resource.DirectoryResource;
import org.jboss.forge.addon.resource.Resource;
import org.jboss.forge.addon.resource.ResourceFilter;
import org.jboss.shrinkwrap.descriptor.api.webapp.WebAppCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.WebAppCommonDescriptor;

/**
* If installed, this {@link Project} supports features from the Servlet specification.
Expand Down
6 changes: 3 additions & 3 deletions javaee/impl/pom.xml
Expand Up @@ -14,10 +14,10 @@
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.forge.descriptors</groupId>
<artifactId>javaee-descriptors</artifactId>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
</dependency>

<dependency>
Expand Down
Expand Up @@ -41,10 +41,10 @@
import org.jboss.forge.parser.xml.XMLParser;
import org.jboss.shrinkwrap.descriptor.api.Descriptor;
import org.jboss.shrinkwrap.descriptor.api.DescriptorImporter;
import org.jboss.shrinkwrap.descriptor.api.common.ServletMappingCommonType;
import org.jboss.shrinkwrap.descriptor.api.common.WebAppCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.javaee5.ParamValueType;
import org.jboss.shrinkwrap.descriptor.api.webapp.WebAppCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.jboss.shrinkwrap.descriptor.api.webcommon.ServletMappingCommonType;

/**
* Common Implementation for all JSF versions
Expand Down
Expand Up @@ -25,7 +25,7 @@
import org.jboss.forge.addon.resource.visit.VisitContext;
import org.jboss.forge.parser.java.JavaClass;
import org.jboss.forge.parser.java.JavaSource;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceCommonDescriptor;

/**
* @author <a href="ggastald@redhat.com">George Gastaldi</a>
Expand Down
Expand Up @@ -28,8 +28,8 @@
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.persistence.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* This class contains JPA specific operations
Expand Down Expand Up @@ -67,7 +67,7 @@ public FileResource<?> setup(String unitName, Project project,
PersistenceContainer container = dataSource.getContainer();
PersistenceProvider provider = dataSource.getProvider();
PersistenceCommonDescriptor config = facet.getConfig();
PersistenceUnitCommon unit = config.createPersistenceUnit();
PersistenceUnitCommonType unit = config.createPersistenceUnit();
unit.name(unitName).description(DEFAULT_UNIT_DESC);
unit.transactionType(container.isJTASupported() ? "JTA" : "RESOURCE_LOCAL");

Expand Down
Expand Up @@ -9,8 +9,7 @@
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.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertiesCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand All @@ -21,7 +20,7 @@ public class CustomJDBCContainer implements PersistenceContainer

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon setupConnection(PersistenceUnitCommon unit,
public PersistenceUnitCommonType setupConnection(PersistenceUnitCommonType unit,
JPADataSource dataSource)
{
unit.transactionType("RESOURCE_LOCAL");
Expand Down
Expand Up @@ -8,7 +8,7 @@

import org.jboss.forge.addon.javaee.jpa.JPADataSource;
import org.jboss.forge.addon.javaee.jpa.PersistenceContainer;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand All @@ -19,7 +19,7 @@ public class CustomJTAContainer implements PersistenceContainer

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon setupConnection(PersistenceUnitCommon unit,
public PersistenceUnitCommonType setupConnection(PersistenceUnitCommonType unit,
JPADataSource dataSource)
{
unit.transactionType("JTA");
Expand Down
Expand Up @@ -9,7 +9,7 @@
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.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand All @@ -19,7 +19,7 @@ public abstract class JavaEEDefaultContainer implements PersistenceContainer

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon setupConnection(PersistenceUnitCommon unit,
public PersistenceUnitCommonType setupConnection(PersistenceUnitCommonType unit,
JPADataSource dataSource)
{
// ShellMessages.info(getWriter(), "Setting transaction-type=\"JTA\"");
Expand Down
Expand Up @@ -9,7 +9,7 @@
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.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand All @@ -20,7 +20,7 @@ public class NonJTAContainer implements PersistenceContainer

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon setupConnection(PersistenceUnitCommon unit,
public PersistenceUnitCommonType setupConnection(PersistenceUnitCommonType unit,
JPADataSource dataSource)
{
unit.transactionType("RESOURCE_LOCAL");
Expand Down
Expand Up @@ -3,8 +3,7 @@
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.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertyCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* Weblogic 12c Persistence Container
Expand All @@ -20,7 +19,7 @@ public class WebLogic12cContainer implements PersistenceContainer

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon setupConnection(PersistenceUnitCommon unit,
public PersistenceUnitCommonType setupConnection(PersistenceUnitCommonType unit,
JPADataSource dataSource)
{
if (HibernateProvider.JPA_PROVIDER.equals(unit.getProvider()))
Expand Down
Expand Up @@ -17,8 +17,7 @@
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.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertiesCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

public class EclipseLinkProvider implements PersistenceProvider
{
Expand Down Expand Up @@ -74,7 +73,7 @@ public class EclipseLinkProvider implements PersistenceProvider

@SuppressWarnings("rawtypes")
@Override
public PersistenceUnitCommon configure(PersistenceUnitCommon unit, JPADataSource ds)
public PersistenceUnitCommonType configure(PersistenceUnitCommonType unit, JPADataSource ds)
{
unit.excludeUnlistedClasses(Boolean.FALSE);
PropertiesCommon properties = unit.getOrCreateProperties();
Expand Down
Expand Up @@ -17,6 +17,7 @@
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.common.PersistenceUnitCommonType;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertiesCommon;

Expand Down Expand Up @@ -64,7 +65,7 @@ public class HibernateProvider implements PersistenceProvider

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon configure(PersistenceUnitCommon unit, JPADataSource ds)
public PersistenceUnitCommonType configure(PersistenceUnitCommonType unit, JPADataSource ds)
{
unit.excludeUnlistedClasses(Boolean.FALSE);
PropertiesCommon properties = unit.getOrCreateProperties();
Expand Down
Expand Up @@ -14,8 +14,7 @@
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.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertyCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
Expand All @@ -27,7 +26,7 @@ public class InfinispanProvider implements PersistenceProvider

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon configure(PersistenceUnitCommon unit, JPADataSource ds)
public PersistenceUnitCommonType configure(PersistenceUnitCommonType unit, JPADataSource ds)
{
unit.excludeUnlistedClasses(Boolean.FALSE);
PropertyCommon dialectProperty = unit.getOrCreateProperties().createProperty();
Expand Down
Expand Up @@ -15,9 +15,8 @@
import org.jboss.forge.addon.javaee.jpa.MetaModelProvider;
import org.jboss.forge.addon.javaee.jpa.PersistenceProvider;
import org.jboss.forge.furnace.versions.SingleVersion;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertiesCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
*
Expand All @@ -40,7 +39,7 @@ public String getProvider()

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon configure(PersistenceUnitCommon unit, JPADataSource ds)
public PersistenceUnitCommonType configure(PersistenceUnitCommonType unit, JPADataSource ds)
{
unit.excludeUnlistedClasses(Boolean.FALSE);
PersistenceCommonDescriptor descriptor = (PersistenceCommonDescriptor) unit.up();
Expand Down
Expand Up @@ -17,6 +17,7 @@
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.common.PersistenceUnitCommonType;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.persistence.PropertyCommon;

Expand Down Expand Up @@ -63,7 +64,7 @@ public class OpenJPAProvider implements PersistenceProvider

@Override
@SuppressWarnings("rawtypes")
public PersistenceUnitCommon configure(PersistenceUnitCommon unit, JPADataSource ds)
public PersistenceUnitCommonType configure(PersistenceUnitCommonType unit, JPADataSource ds)
{
unit.excludeUnlistedClasses(Boolean.FALSE);

Expand Down
Expand Up @@ -37,8 +37,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.persistence.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

public class JPASetupConnectionStep extends AbstractJavaEECommand implements UIWizardStep
{
Expand Down Expand Up @@ -202,8 +202,8 @@ private boolean isExistingPersistenceUnitName(Project project, String unitName)
{
JPAFacet<?> facet = project.getFacet(JPAFacet.class);
PersistenceCommonDescriptor config = (PersistenceCommonDescriptor) facet.getConfig();
List<PersistenceUnitCommon> allPersistenceUnit = config.getAllPersistenceUnit();
for (PersistenceUnitCommon persistenceUnit : allPersistenceUnit)
List<PersistenceUnitCommonType> allPersistenceUnit = config.getAllPersistenceUnit();
for (PersistenceUnitCommonType persistenceUnit : allPersistenceUnit)
{
if (unitName.equals(persistenceUnit.getName()))
{
Expand Down
Expand Up @@ -46,8 +46,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.persistence.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.persistence.PersistenceUnitCommon;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.PersistenceUnitCommonType;

/**
* Generates REST endpoints from JPA Entities
Expand Down Expand Up @@ -112,8 +112,8 @@ public String convert(JavaClass source)
}
});
List<String> persistenceUnits = new ArrayList<String>();
List<PersistenceUnitCommon> allUnits = persistenceFacet.getConfig().getAllPersistenceUnit();
for (PersistenceUnitCommon persistenceUnit : allUnits)
List<PersistenceUnitCommonType> allUnits = persistenceFacet.getConfig().getAllPersistenceUnit();
for (PersistenceUnitCommonType persistenceUnit : allUnits)
{
persistenceUnits.add(persistenceUnit.getName());
}
Expand Down
Expand Up @@ -21,7 +21,7 @@
import org.jboss.forge.addon.resource.FileResource;
import org.jboss.forge.addon.resource.Resource;
import org.jboss.forge.addon.resource.ResourceFilter;
import org.jboss.shrinkwrap.descriptor.api.webapp.WebAppCommonDescriptor;
import org.jboss.shrinkwrap.descriptor.api.common.WebAppCommonDescriptor;

/**
*
Expand Down
16 changes: 6 additions & 10 deletions javaee/pom.xml
Expand Up @@ -22,7 +22,7 @@
</modules>

<properties>
<javaee.descriptors.version>0.0.4.Final</javaee.descriptors.version>
<shrinkwrap.descriptors.version>2.0.0-alpha-7-SNAPSHOT</shrinkwrap.descriptors.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -86,16 +86,12 @@
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>

<dependency>
<groupId>org.jboss.forge.descriptors</groupId>
<artifactId>javaee-descriptors-api</artifactId>
<version>${javaee.descriptors.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.forge.descriptors</groupId>
<artifactId>javaee-descriptors</artifactId>
<version>${javaee.descriptors.version}</version>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
<artifactId>shrinkwrap-descriptors-bom</artifactId>
<version>${shrinkwrap.descriptors.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 96a3d30

Please sign in to comment.