You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Ivan <xh...@gmail.com> on 2012/04/24 22:20:04 UTC
Re: svn commit: r1329978 - /geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
Thanks, Jarek !
2012/4/24 <ga...@apache.org>
> Author: gawor
> Date: Tue Apr 24 20:01:45 2012
> New Revision: 1329978
>
> URL: http://svn.apache.org/viewvc?rev=1329978&view=rev
> Log:
> fix build break
>
> Modified:
>
> geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
>
> Modified:
> geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java?rev=1329978&r1=1329977&r2=1329978&view=diff
>
> ==============================================================================
> ---
> geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
> (original)
> +++
> geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceRefBuilder.java
> Tue Apr 24 20:01:45 2012
> @@ -28,7 +28,6 @@ import java.util.Map;
> import java.util.Set;
>
> import javax.xml.namespace.QName;
> -
> import org.apache.geronimo.common.DeploymentException;
> import org.apache.geronimo.gbean.AbstractName;
> import org.apache.geronimo.gbean.AbstractNameQuery;
> @@ -97,7 +96,7 @@ public class PersistenceRefBuilder exten
> return plan != null &&
> plan.selectChildren(PersistenceRefBuilder.GER_PERSISTENCE_UNIT_REF_QNAME_SET).length
> > 0;
> }
>
> - public void buildNaming(JndiConsumer specDD, XmlObject plan,
> Module<?, ?> module, Map<EARContext.Key, Object> sharedContext) throws
> DeploymentException {
> + public void buildNaming(JndiConsumer specDD, XmlObject plan, Module
> module, Map<EARContext.Key, Object> sharedContext) throws
> DeploymentException {
> Configuration localConfiguration =
> module.getEarContext().getConfiguration();
> List<DeploymentException> problems = new
> ArrayList<DeploymentException>();
>
> @@ -208,19 +207,19 @@ public class PersistenceRefBuilder exten
> AbstractName childName =
> module.getEarContext().getNaming().createChildName(module.getModuleName(),
> "", NameFactory.PERSISTENCE_UNIT);
> Map<String, String> name = new HashMap<String,
> String>(childName.getName());
> name.remove(NameFactory.J2EE_NAME);
> -
> +
> persistenceUnitNameQuery = new AbstractNameQuery(null,
> name, PERSISTENCE_UNIT_INTERFACE_TYPES);
> Set<AbstractNameQuery> patterns =
> Collections.singleton(persistenceUnitNameQuery);
> gbeans =
> localConfiguration.findGBeanDatas(module.getEarContext().getConfiguration(),
> patterns);
> -
> +
> if (!gbeans.isEmpty()) {
> persistenceUnitNameQuery =
> checkForDefaultPersistenceUnit(gbeans);
> break;
> }
> -
> +
> module = module.getParentModule();
> } while(module!=null);
> -
> +
> if (gbeans.isEmpty()) {
> if (defaultPersistenceUnitAbstractNameQuery == null) {
> throw new DeploymentException("No default
> PersistenceUnit specified, and none located");
>
>
>
--
Ivan