[jboss-cvs] JBossAS SVN: r75541 - in projects/jpa/trunk/deployers/src: test/java/org/jboss/jpa/deployers/test and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 9 07:36:37 EDT 2008
Author: wolfc
Date: 2008-07-09 07:36:37 -0400 (Wed, 09 Jul 2008)
New Revision: 75541
Added:
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java
Modified:
projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java
projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java
projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/SimpleJavaEEModuleInformer.java
Log:
Added resolving of the default persistence unit
Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java 2008-07-09 11:09:40 UTC (rev 75540)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java 2008-07-09 11:36:37 UTC (rev 75541)
@@ -28,6 +28,8 @@
import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
/**
+ * The default implementation of a PersistenceUnitDependencyResolver.
+ *
* @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
* @version $Revision: $
*/
@@ -62,6 +64,10 @@
return null;
}
+ /*
+ * When finding the default persistence unit, the first persistence unit encountered is returned.
+ * TODO: Maybe the name of unscoped persistence units should be changed, so only one can be deployed anyway.
+ */
private String findWithinModule(DeploymentUnit unit, String persistenceUnitName, boolean allowScoped)
{
if(!allowScoped && isScoped(unit))
@@ -72,8 +78,8 @@
return null;
for(PersistenceUnitMetaData persistenceUnit : persistenceMetaData.getPersistenceUnits())
{
- if(persistenceUnit.getName().equals(persistenceUnitName))
- return createBeanName(unit, persistenceUnitName);
+ if(persistenceUnitName == null || persistenceUnit.getName().equals(persistenceUnitName))
+ return createBeanName(unit, persistenceUnit.getName());
}
return null;
}
@@ -117,7 +123,7 @@
public String resolvePersistenceUnitSupplier(DeploymentUnit deploymentUnit, String persistenceUnitName)
{
- int i = persistenceUnitName.indexOf('#');
+ int i = (persistenceUnitName == null ? -1 : persistenceUnitName.indexOf('#'));
if(i != -1)
{
String path = persistenceUnitName.substring(0, i);
Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java 2008-07-09 11:09:40 UTC (rev 75540)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java 2008-07-09 11:36:37 UTC (rev 75541)
@@ -42,7 +42,7 @@
/**
* @param deploymentUnit the deployment unit that has a persistence unit reference
- * @param persistenceUnitName the (relative) name of a persistence unit
+ * @param persistenceUnitName the (relative) name of a persistence unit or null for the default persistence unit
* @return the bean name of the persistence unit
*/
String resolvePersistenceUnitSupplier(DeploymentUnit deploymentUnit, String persistenceUnitName);
Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/SimpleJavaEEModuleInformer.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/SimpleJavaEEModuleInformer.java 2008-07-09 11:09:40 UTC (rev 75540)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/common/SimpleJavaEEModuleInformer.java 2008-07-09 11:36:37 UTC (rev 75541)
@@ -51,6 +51,6 @@
public ModuleType getModuleType(DeploymentUnit deploymentUnit)
{
- throw new RuntimeException("NYI");
+ return ModuleType.JAVA;
}
}
Added: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java (rev 0)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java 2008-07-09 11:36:37 UTC (rev 75541)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jpa.deployers.test.resolvers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.URL;
+import java.util.Collections;
+
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentContext;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.jpa.deployers.PersistenceParsingDeployer;
+import org.jboss.jpa.deployers.test.common.SimpleJavaEEModuleInformer;
+import org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver;
+import org.jboss.metadata.jpa.spec.PersistenceMetaData;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class DefaultPersistenceUnitDependencyResolverTestCase
+{
+ @Test
+ public void resolveDefaultPersistenceUnit() throws Exception
+ {
+ DefaultPersistenceUnitDependencyResolver resolver = new DefaultPersistenceUnitDependencyResolver();
+ resolver.setJavaEEModuleInformer(new SimpleJavaEEModuleInformer());
+
+ String common = "/org/jboss/jpa/deployers/test/parsing";
+ URL url = getClass().getResource(common);
+ assertNotNull(url);
+ VirtualFile root = VFS.getRoot(url);
+ assertNotNull(root);
+
+ // Create some PersistenceMetaData
+ PersistenceParsingDeployer deployer = new PersistenceParsingDeployer();
+ // TODO: Use MC?
+ deployer.create();
+ deployer.start();
+
+ VFSDeploymentContext deploymentContext = new AbstractVFSDeploymentContext(root, "");
+ deploymentContext.setMetaDataLocations(Collections.singletonList(root));
+ VFSDeploymentUnit deploymentUnit = new AbstractVFSDeploymentUnit(deploymentContext);
+
+ deployer.deploy(deploymentUnit);
+ PersistenceMetaData metaData = deploymentUnit.getAttachment(PersistenceMetaData.class);
+ assertNotNull(metaData);
+
+ // We want the default persistence unit
+ String persistenceUnitName = null;
+ String beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
+ assertEquals("persistence.unit:unitName=#dummy", beanName);
+ }
+}
More information about the jboss-cvs-commits
mailing list