[jboss-cvs] JBossAS SVN: r67164 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/javaee and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 16 03:49:37 EST 2007
Author: scott.stark at jboss.org
Date: 2007-11-16 03:49:36 -0500 (Fri, 16 Nov 2007)
New Revision: 67164
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextTypeAdapter.java
Removed:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextType.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextReferenceMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
Log:
Change the PersistenceContextType enum to javax.persistence.PersistenceContextType
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextReferenceMetaData.java 2007-11-16 05:16:19 UTC (rev 67163)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextReferenceMetaData.java 2007-11-16 08:49:36 UTC (rev 67164)
@@ -21,8 +21,11 @@
*/
package org.jboss.metadata.javaee.spec;
+import javax.persistence.PersistenceContextType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
import org.jboss.metadata.javaee.support.ResourceInjectionMetaDataWithDescriptions;
@@ -33,7 +36,6 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-//@SchemaType(name="persistence-context-refType", mandatory=false)
@XmlType(name="persistence-context-refType")
public class PersistenceContextReferenceMetaData extends ResourceInjectionMetaDataWithDescriptions
implements MergeableMappedMetaData<PersistenceContextReferenceMetaData>
@@ -118,6 +120,7 @@
* @param persistenceContextType the persistenceContextType.
* @throws IllegalArgumentException for a null persistenceContextType
*/
+ @XmlJavaTypeAdapter(PersistenceContextTypeAdapter.class)
public void setPersistenceContextType(PersistenceContextType persistenceContextType)
{
if (persistenceContextType == null)
Deleted: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextType.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextType.java 2007-11-16 05:16:19 UTC (rev 67163)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextType.java 2007-11-16 08:49:36 UTC (rev 67164)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.metadata.javaee.spec;
-
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * PersistenceContextType.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-//@SchemaType(name="persistence-context-typeType", mandatory=false)
- at XmlType(name="persistence-context-typeType")
-public enum PersistenceContextType
-{
- /** Transaction */
- Transaction,
-
- /** Extended */
- Extended,
-}
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextTypeAdapter.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextTypeAdapter.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextTypeAdapter.java 2007-11-16 08:49:36 UTC (rev 67164)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.javaee.spec;
+
+import javax.persistence.PersistenceContextType;
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+/**
+ * PersistenceContextType enum type adapter
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class PersistenceContextTypeAdapter
+ extends XmlAdapter<String, PersistenceContextType>
+{
+
+ @Override
+ public String marshal(PersistenceContextType type) throws Exception
+ {
+ String stype = null;
+ switch(type)
+ {
+ case EXTENDED:
+ stype = "Extended";
+ break;
+ case TRANSACTION:
+ stype = "Transaction";
+ break;
+ }
+ return stype;
+ }
+
+ @Override
+ public PersistenceContextType unmarshal(String string) throws Exception
+ {
+ string = string.toUpperCase();
+ return PersistenceContextType.valueOf(string);
+ }
+
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/PersistenceContextTypeAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-11-16 05:16:19 UTC (rev 67163)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-11-16 08:49:36 UTC (rev 67164)
@@ -25,6 +25,8 @@
import java.util.Map;
import java.util.Set;
+import javax.persistence.PersistenceContextType;
+
import org.jboss.annotation.javaee.Description;
import org.jboss.annotation.javaee.Descriptions;
import org.jboss.annotation.javaee.DisplayName;
@@ -67,7 +69,6 @@
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
-import org.jboss.metadata.javaee.spec.PersistenceContextType;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
import org.jboss.metadata.javaee.spec.PropertiesMetaData;
@@ -664,9 +665,9 @@
assertEquals(prefix + "PersistenceContextRef" + count + "Name", persistenceContextReferenceMetaData.getPersistenceContextRefName());
assertEquals(prefix + "PersistenceContextRef" + count + "Unit", persistenceContextReferenceMetaData.getPersistenceUnitName());
if (count == 1)
- assertEquals(PersistenceContextType.Transaction, persistenceContextReferenceMetaData.getPersistenceContextType());
+ assertEquals(PersistenceContextType.TRANSACTION, persistenceContextReferenceMetaData.getPersistenceContextType());
else
- assertEquals(PersistenceContextType.Extended, persistenceContextReferenceMetaData.getPersistenceContextType());
+ assertEquals(PersistenceContextType.EXTENDED, persistenceContextReferenceMetaData.getPersistenceContextType());
assertProperties(prefix + "PersistenceContextRef" + count, 2, persistenceContextReferenceMetaData.getProperties());
assertResourceGroup(prefix + "PersistenceContextRef" + count, persistenceContextReferenceMetaData, true, count == 1, mode);
++count;
More information about the jboss-cvs-commits
mailing list