Author: dblevins
Date: Mon Feb 15 17:14:01 2010
New Revision: 910265
URL: http://svn.apache.org/viewvc?rev=910265&view=rev
Log:
Addition to OPENEJB-1232: Client Failover and ConnnectionStrategy configurable
on a per bean basis
Configuration for openejb 2.x style descriptors
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java?rev=910265&r1=910264&r2=910265&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
Mon Feb 15 17:14:01 2010
@@ -121,6 +121,8 @@
continue;
}
+ deployment.getProperties().putAll(enterpriseBean.getProperties());
+
for (String name : enterpriseBean.getLocalJndiName()) {
deployment.getJndi().add(new
org.apache.openejb.jee.oejb3.Jndi(name, "LocalHome"));
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java?rev=910265&r1=910264&r2=910265&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
Mon Feb 15 17:14:01 2010
@@ -18,6 +18,7 @@
import javax.xml.bind.JAXBElement;
import java.util.List;
+import java.util.Properties;
/**
* @version $Rev$ $Date$
@@ -49,6 +50,6 @@
List<ResourceEnvRefType> getResourceEnvRef();
-
+ Properties getProperties();
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java?rev=910265&r1=910264&r2=910265&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
Mon Feb 15 17:14:01 2010
@@ -17,8 +17,11 @@
package org.apache.openejb.jee.oejb2;
+import org.apache.openejb.jee.oejb3.PropertiesAdapter;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -118,6 +121,7 @@
"jndiName",
"localJndiName",
"jndi",
+ "properties",
"tssLink",
"tss",
"tableName",
@@ -209,6 +213,11 @@
@XmlElement()
protected List<QueryType> query;
+ @XmlElement(name = "properties")
+ @XmlJavaTypeAdapter(PropertiesAdapter.class)
+ protected Properties properties;
+
+
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -1196,4 +1205,11 @@
}
+ public Properties getProperties() {
+ if (properties == null) {
+ properties = new Properties();
+ }
+ return properties;
+ }
+
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java?rev=910265&r1=910264&r2=910265&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
Mon Feb 15 17:14:01 2010
@@ -17,9 +17,12 @@
package org.apache.openejb.jee.oejb2;
+import org.apache.openejb.jee.oejb3.PropertiesAdapter;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Collections;
+import java.util.Properties;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -59,6 +62,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "message-driven-beanType", propOrder = {
"ejbName",
+ "properties",
"resourceAdapter",
"activationConfig",
"abstractNamingEntry",
@@ -75,6 +79,10 @@
@XmlElement(name = "ejb-name", required = true)
protected String ejbName;
+ @XmlElement(name = "properties")
+ @XmlJavaTypeAdapter(PropertiesAdapter.class)
+ protected Properties properties;
+
@XmlElement(name = "resource-adapter", namespace =
"http://geronimo.apache.org/xml/ns/naming-1.2";, required = true)
protected ResourceLocatorType resourceAdapter;
@@ -412,4 +420,11 @@
this.id = value;
}
+ public Properties getProperties() {
+ if (properties == null) {
+ properties = new Properties();
+ }
+ return properties;
+ }
+
}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java?rev=910265&r1=910264&r2=910265&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
Mon Feb 15 17:14:01 2010
@@ -17,8 +17,11 @@
package org.apache.openejb.jee.oejb2;
+import org.apache.openejb.jee.oejb3.PropertiesAdapter;
+
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -69,6 +72,7 @@
"tssLink",
"tss",
"abstractNamingEntry",
+ "properties",
"persistenceContextRef",
"persistenceUnitRef",
"ejbRef",
@@ -97,6 +101,10 @@
@XmlElement(name="tss", namespace =
"http://openejb.apache.org/xml/ns/openejb-jar-2.2";)
protected PatternType tss;
+ @XmlElement(name = "properties")
+ @XmlJavaTypeAdapter(PropertiesAdapter.class)
+ protected Properties properties;
+
@XmlElementRef(name = "abstract-naming-entry", namespace =
"http://geronimo.apache.org/xml/ns/naming-1.2";, type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractNamingEntryType>>
abstractNamingEntry;
@@ -453,4 +461,11 @@
this.id = value;
}
+ public Properties getProperties() {
+ if (properties == null) {
+ properties = new Properties();
+ }
+ return properties;
+ }
+
}
