[Jboss-cvs] JBossAS SVN: r56286 - trunk/server/src/main/org/jboss/metamodel/descriptor
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 25 22:18:45 EDT 2006
Author: bill.burke at jboss.com
Date: 2006-08-25 22:18:44 -0400 (Fri, 25 Aug 2006)
New Revision: 56286
Modified:
trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
Log:
<persistence-context-ref> wasn't processing <injection-target>
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2006-08-26 02:18:13 UTC (rev 56285)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2006-08-26 02:18:44 UTC (rev 56286)
@@ -35,6 +35,8 @@
import org.jboss.metamodel.descriptor.SecurityRole;
import org.xml.sax.Attributes;
+import javax.persistence.PersistenceContextType;
+
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @version <tt>$Revision$</tt>
@@ -43,124 +45,137 @@
{
private static final Logger log = Logger
.getLogger(DDObjectFactory.class);
-
+
public Object newChild(PersistenceUnitRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
+ public Object newChild(PersistenceContextRef ref,
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
+ {
+ return newRefChild(ref, localName);
+ }
+
public Object newChild(EnvEntry ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(EjbRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(EjbLocalRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(ResourceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(ResourceEnvRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(MessageDestinationRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(WebServiceRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public Object newChild(JndiRef ref,
- UnmarshallingContext navigator, String namespaceURI, String localName,
- Attributes attrs)
+ UnmarshallingContext navigator, String namespaceURI, String localName,
+ Attributes attrs)
{
return newRefChild(ref, localName);
}
-
+
public void addChild(PersistenceUnitRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
+ public void addChild(PersistenceContextRef parent, InjectionTarget target,
+ UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ parent.setInjectionTarget(target);
+ }
+
public void addChild(EnvEntry parent, InjectionTarget target,
UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(EjbRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(EjbLocalRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(ResourceRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(ResourceEnvRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(MessageDestinationRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(WebServiceRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void addChild(JndiRef parent, InjectionTarget target,
- UnmarshallingContext navigator, String namespaceURI, String localName)
+ UnmarshallingContext navigator, String namespaceURI, String localName)
{
parent.setInjectionTarget(target);
}
-
+
public void setValue(EjbLocalRef ref, UnmarshallingContext navigator,
String namespaceURI, String localName, String value)
{
@@ -322,7 +337,7 @@
envRef.setMappedName(value);
}
}
-
+
public void setValue(ResourceRef ref, UnmarshallingContext navigator,
String namespaceURI, String localName, String value)
{
@@ -359,7 +374,7 @@
ref.setMappedName(value);
}
}
-
+
public void setValue(WebServiceRef ref, UnmarshallingContext navigator,
String namespaceURI, String localName, String value)
{
@@ -388,7 +403,7 @@
ref.setMappedName(value);
}
}
-
+
public void setValue(SecurityRole role, UnmarshallingContext navigator,
String namespaceURI, String localName, String value)
{
@@ -397,9 +412,9 @@
role.setRoleName(value);
}
}
-
+
public void setValue(JndiRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ String namespaceURI, String localName, String value)
{
if (localName.equals("mapped-name"))
{
@@ -410,18 +425,18 @@
ref.setJndiRefName(value);
}
}
-
+
public void setValue(RunAs runAs, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
runAs.setRoleName(value);
}
}
-
+
public void setValue(SecurityRoleRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ String namespaceURI, String localName, String value)
{
if (localName.equals("role-name"))
{
@@ -432,18 +447,18 @@
ref.setRoleLink(value);
}
}
-
+
public void setValue(Listener listener, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ String namespaceURI, String localName, String value)
{
if (localName.equals("listener-class"))
{
listener.setListenerClass(value);
}
}
-
+
public void setValue(MessageDestination destination, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ String namespaceURI, String localName, String value)
{
if (localName.equals("message-destination-name"))
{
@@ -454,9 +469,9 @@
destination.setMappedName(value);
}
}
-
+
public void setValue(PersistenceUnitRef ref, UnmarshallingContext navigator,
- String namespaceURI, String localName, String value)
+ String namespaceURI, String localName, String value)
{
if (localName.equals("persistence-unit-ref-name"))
{
@@ -508,14 +523,22 @@
{
child = new JndiRef();
}
-
+ else if (localName.equals("persistence-unit-ref"))
+ {
+ child = new PersistenceUnitRef();
+ }
+ else if (localName.equals("persistence-context-ref"))
+ {
+ child = new PersistenceContextRef();
+ }
+
return child;
}
-
+
protected Object newRefChild(Ref ref, String localName)
{
Object child = null;
-
+
if (localName.equals("ignore-dependency"))
{
ref.setIgnoreDependency(true);
@@ -525,7 +548,31 @@
InjectionTarget target = new InjectionTarget();
child = target;
}
-
+
return child;
}
+
+ public void setValue(PersistenceContextRef ref, UnmarshallingContext navigator,
+ String namespaceURI, String localName, String value)
+ {
+ if (localName.equals("persistence-context-ref-name"))
+ {
+ ref.setRefName(value);
+ }
+ else if (localName.equals("persistence-unit-name"))
+ {
+ ref.setUnitName(value);
+ }
+ else if(localName.equals("persistence-context-type"))
+ {
+ if (value.toLowerCase().equals("transaction"))
+ {
+ ref.setPersistenceContextType(PersistenceContextType.TRANSACTION);
+ }
+ else
+ {
+ ref.setPersistenceContextType(PersistenceContextType.EXTENDED);
+ }
+ }
+ }
}
More information about the jboss-cvs-commits
mailing list