[jboss-cvs] JBossAS SVN: r77236 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 20 08:43:24 EDT 2008
Author: wolfc
Date: 2008-08-20 08:43:24 -0400 (Wed, 20 Aug 2008)
New Revision: 77236
Added:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta97/
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta97/unit/
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta97/unit/EnvironmentRefsGroupMetaDataMergeTestCase.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
Log:
JBMETA-97: merging persistence context references
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java 2008-08-20 12:12:54 UTC (rev 77235)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/EnvironmentRefsGroupMetaData.java 2008-08-20 12:43:24 UTC (rev 77236)
@@ -93,6 +93,13 @@
return persistenceContextRefs;
}
+ private static PersistenceContextReferencesMetaData getPersistenceContextRefs(Environment env)
+ {
+ if(env == null)
+ return null;
+ return env.getPersistenceContextRefs();
+ }
+
/**
* Set the persistenceContextRefs.
*
@@ -124,31 +131,28 @@
EJBLocalReferencesMetaData ejbLocalRefs = null;
EJBLocalReferencesMetaData jbossEjbLocalRefs = null;
- PersistenceContextReferencesMetaData persistenceContextRefs = null;
if (specEnv != null)
{
ejbLocalRefs = specEnv.getEjbLocalReferences();
- persistenceContextRefs = specEnv.getPersistenceContextRefs();
}
if (jbossEnv != null)
{
jbossEjbLocalRefs = jbossEnv.getEjbLocalReferences();
- persistenceContextRefs = jbossEnv.getPersistenceContextRefs();
}
else
{
// Use the merge target for the static merge methods
jbossEjbLocalRefs = this.getEjbLocalReferences();
- persistenceContextRefs = getPersistenceContextRefs();
}
EJBLocalReferencesMetaData mergedEjbLocalRefs = EJBLocalReferencesMetaData.merge(jbossEjbLocalRefs, ejbLocalRefs, overridenFile, overrideFile);
if (mergedEjbLocalRefs != null)
this.setEjbLocalReferences(mergedEjbLocalRefs);
- if (persistenceContextRefs != null)
- this.setPersistenceContextRefs(persistenceContextRefs);
+ PersistenceContextReferencesMetaData persistenceContextRefs = PersistenceContextReferencesMetaData.merge(getPersistenceContextRefs(jbossEnv), getPersistenceContextRefs(specEnv), overridenFile, overrideFile);
+ if(persistenceContextRefs != null)
+ setPersistenceContextRefs(persistenceContextRefs);
}
}
Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta97/unit/EnvironmentRefsGroupMetaDataMergeTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta97/unit/EnvironmentRefsGroupMetaDataMergeTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jbmeta97/unit/EnvironmentRefsGroupMetaDataMergeTestCase.java 2008-08-20 12:43:24 UTC (rev 77236)
@@ -0,0 +1,67 @@
+/*
+ * 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.test.metadata.jbmeta97.unit;
+
+import junit.framework.TestCase;
+
+import org.jboss.metadata.javaee.spec.EnvironmentRefsGroupMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
+
+/**
+ * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class EnvironmentRefsGroupMetaDataMergeTestCase extends TestCase
+{
+ private static EnvironmentRefsGroupMetaData createSpecEnv()
+ {
+ PersistenceContextReferenceMetaData persistenceContextRef = new PersistenceContextReferenceMetaData();
+ persistenceContextRef.setName("persistence/Test");
+ persistenceContextRef.setPersistenceUnitName("EM");
+
+ PersistenceContextReferencesMetaData persistenceContextRefs = new PersistenceContextReferencesMetaData();
+ persistenceContextRefs.add(persistenceContextRef);
+
+ EnvironmentRefsGroupMetaData specEnv = new EnvironmentRefsGroupMetaData();
+ specEnv.setPersistenceContextRefs(persistenceContextRefs);
+
+ return specEnv;
+ }
+
+ public void testMergeEnvironmentEnvironmentStringStringBoolean()
+ {
+ EnvironmentRefsGroupMetaData env = new EnvironmentRefsGroupMetaData();
+ EnvironmentRefsGroupMetaData jbossEnv = new EnvironmentRefsGroupMetaData();
+ EnvironmentRefsGroupMetaData specEnv = createSpecEnv();
+ env.merge(jbossEnv, specEnv, "jboss", "spec", false);
+
+ PersistenceContextReferencesMetaData persistenceContextRefs = env.getPersistenceContextRefs();
+ assertNotNull("No persistence context references", persistenceContextRefs);
+ assertEquals(1, persistenceContextRefs.size());
+ PersistenceContextReferenceMetaData persistenceContextRef = persistenceContextRefs.iterator().next();
+ assertNotNull(persistenceContextRef);
+ assertEquals("persistence/Test", persistenceContextRef.getName());
+ assertEquals("EM", persistenceContextRef.getPersistenceUnitName());
+ }
+
+}
More information about the jboss-cvs-commits
mailing list