You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/21 07:20:00 UTC
svn commit: r498249 - in
/incubator/openejb/trunk/openejb3/container/openejb-jee/src:
main/java/org/apache/openejb/jee/oej2/
test/java/org/apache/openejb/jee/oej2/ test/resources/
Author: dblevins
Date: Sat Jan 20 22:19:58 2007
New Revision: 498249
URL: http://svn.apache.org/viewvc?view=rev&rev=498249
Log:
Little closer to getting the jaxb tree to unmarshal. Added a namespace filter to correct the elements that are in the wrong namespace.
Added:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/OpenejbJarTest.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-jaxb-test.xml
Modified:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigPropertyType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ApplicationType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ArtifactType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/AutoIncrementTableType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ClassFilterType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmpFieldGroupMappingType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmrFieldGroupMappingType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/DependenciesType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationshipRoleType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityBeanType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityGroupMappingType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EnvironmentType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ExtModuleType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/GroupType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/KeyGeneratorType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/MessageDrivenBeanType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ModuleType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/QueryType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ReferencesType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/RelationshipsType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ServiceModuleType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SqlGeneratorType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/WebServiceSecurityType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/package-info.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigPropertyType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigPropertyType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigPropertyType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigPropertyType.java Sat Jan 20 22:19:58 2007
@@ -44,15 +44,15 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "activation-config-propertyType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "activation-config-propertyType", propOrder = {
"activationConfigPropertyName",
"activationConfigPropertyValue"
})
public class ActivationConfigPropertyType {
- @XmlElement(name = "activation-config-property-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "activation-config-property-name", required = true)
protected java.lang.String activationConfigPropertyName;
- @XmlElement(name = "activation-config-property-value", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "activation-config-property-value", required = true)
protected java.lang.String activationConfigPropertyValue;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ActivationConfigType.java Sat Jan 20 22:19:58 2007
@@ -46,15 +46,15 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "activation-configType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "activation-configType", propOrder = {
"description",
"activationConfigProperty"
})
public class ActivationConfigType {
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement()
protected List<java.lang.String> description;
- @XmlElement(name = "activation-config-property", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "activation-config-property", required = true)
protected List<ActivationConfigPropertyType> activationConfigProperty;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ApplicationType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ApplicationType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ApplicationType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ApplicationType.java Sat Jan 20 22:19:58 2007
@@ -62,13 +62,13 @@
})
public class ApplicationType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
+ @XmlElement(name="environment", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
protected EnvironmentType environment;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="module", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected List<ModuleType> module;
@XmlElement(name = "ext-module", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected List<ExtModuleType> extModule;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="security", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected AbstractSecurityType security;
@XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractServiceType>> service;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ArtifactType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ArtifactType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ArtifactType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ArtifactType.java Sat Jan 20 22:19:58 2007
@@ -87,13 +87,13 @@
})
public class ArtifactType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="groupId", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected java.lang.String groupId;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
+ @XmlElement(name="artifactId", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
protected java.lang.String artifactId;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="version", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected java.lang.String version;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="type", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected java.lang.String type;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/AutoIncrementTableType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/AutoIncrementTableType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/AutoIncrementTableType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/AutoIncrementTableType.java Sat Jan 20 22:19:58 2007
@@ -62,7 +62,7 @@
})
public class AutoIncrementTableType {
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1", required = true)
+ @XmlElement(name="sql", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1", required = true)
protected java.lang.String sql;
@XmlElement(name = "return-type", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1", required = true)
protected java.lang.String returnType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ClassFilterType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ClassFilterType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ClassFilterType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ClassFilterType.java Sat Jan 20 22:19:58 2007
@@ -50,7 +50,7 @@
})
public class ClassFilterType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="filter", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected List<java.lang.String> filter;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmpFieldGroupMappingType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmpFieldGroupMappingType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmpFieldGroupMappingType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmpFieldGroupMappingType.java Sat Jan 20 22:19:58 2007
@@ -44,15 +44,15 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmp-field-group-mappingType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "cmp-field-group-mappingType", propOrder = {
"groupName",
"cmpFieldName"
})
public class CmpFieldGroupMappingType {
- @XmlElement(name = "group-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "group-name", required = true)
protected java.lang.String groupName;
- @XmlElement(name = "cmp-field-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "cmp-field-name", required = true)
protected java.lang.String cmpFieldName;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmrFieldGroupMappingType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmrFieldGroupMappingType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmrFieldGroupMappingType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/CmrFieldGroupMappingType.java Sat Jan 20 22:19:58 2007
@@ -44,15 +44,15 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "cmr-field-group-mappingType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "cmr-field-group-mappingType", propOrder = {
"groupName",
"cmrFieldName"
})
public class CmrFieldGroupMappingType {
- @XmlElement(name = "group-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "group-name", required = true)
protected java.lang.String groupName;
- @XmlElement(name = "cmr-field-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "cmr-field-name", required = true)
protected java.lang.String cmrFieldName;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/DependenciesType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/DependenciesType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/DependenciesType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/DependenciesType.java Sat Jan 20 22:19:58 2007
@@ -50,7 +50,7 @@
})
public class DependenciesType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="dependency", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected List<DependencyType> dependency;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationType.java Sat Jan 20 22:19:58 2007
@@ -47,18 +47,18 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ejb-relationType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "ejb-relationType", propOrder = {
"ejbRelationName",
"manyToManyTableName",
"ejbRelationshipRole"
})
public class EjbRelationType {
- @XmlElement(name = "ejb-relation-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "ejb-relation-name")
protected java.lang.String ejbRelationName;
- @XmlElement(name = "many-to-many-table-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "many-to-many-table-name")
protected java.lang.String manyToManyTableName;
- @XmlElement(name = "ejb-relationship-role", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "ejb-relationship-role", required = true)
protected List<EjbRelationshipRoleType> ejbRelationshipRole;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationshipRoleType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationshipRoleType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationshipRoleType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EjbRelationshipRoleType.java Sat Jan 20 22:19:58 2007
@@ -90,7 +90,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ejb-relationship-roleType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "ejb-relationship-roleType", propOrder = {
"ejbRelationshipRoleName",
"relationshipRoleSource",
"cmrField",
@@ -99,15 +99,15 @@
})
public class EjbRelationshipRoleType {
- @XmlElement(name = "ejb-relationship-role-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "ejb-relationship-role-name")
protected java.lang.String ejbRelationshipRoleName;
- @XmlElement(name = "relationship-role-source", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "relationship-role-source", required = true)
protected EjbRelationshipRoleType.RelationshipRoleSource relationshipRoleSource;
- @XmlElement(name = "cmr-field", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cmr-field")
protected EjbRelationshipRoleType.CmrField cmrField;
- @XmlElement(name = "foreign-key-column-on-source", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "foreign-key-column-on-source")
protected Object foreignKeyColumnOnSource;
- @XmlElement(name = "role-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "role-mapping", required = true)
protected EjbRelationshipRoleType.RoleMapping roleMapping;
/**
@@ -256,7 +256,7 @@
})
public static class CmrField {
- @XmlElement(name = "cmr-field-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "cmr-field-name", required = true)
protected java.lang.String cmrFieldName;
/**
@@ -311,7 +311,7 @@
})
public static class RelationshipRoleSource {
- @XmlElement(name = "ejb-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "ejb-name", required = true)
protected java.lang.String ejbName;
/**
@@ -377,7 +377,7 @@
})
public static class RoleMapping {
- @XmlElement(name = "cmr-field-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "cmr-field-mapping", required = true)
protected List<EjbRelationshipRoleType.RoleMapping.CmrFieldMapping> cmrFieldMapping;
/**
@@ -437,9 +437,9 @@
})
public static class CmrFieldMapping {
- @XmlElement(name = "key-column", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "key-column", required = true)
protected java.lang.String keyColumn;
- @XmlElement(name = "foreign-key-column", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "foreign-key-column", required = true)
protected java.lang.String foreignKeyColumn;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityBeanType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityBeanType.java Sat Jan 20 22:19:58 2007
@@ -113,7 +113,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "entity-beanType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "entity-beanType", propOrder = {
"ejbName",
"jndiName",
"localJndiName",
@@ -137,46 +137,66 @@
})
public class EntityBeanType {
- @XmlElement(name = "ejb-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "ejb-name", required = true)
protected java.lang.String ejbName;
- @XmlElement(name = "jndi-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "jndi-name")
protected List<java.lang.String> jndiName;
- @XmlElement(name = "local-jndi-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "local-jndi-name")
protected List<java.lang.String> localJndiName;
- @XmlElement(name = "tss-link", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "tss-link")
protected java.lang.String tssLink;
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement()
protected PatternType tss;
- @XmlElement(name = "table-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "table-name")
protected java.lang.String tableName;
- @XmlElement(name = "static-sql", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "static-sql")
protected EmptyType staticSql;
- @XmlElement(name = "cmp-field-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "cmp-field-mapping")
protected List<EntityBeanType.CmpFieldMapping> cmpFieldMapping;
- @XmlElement(name = "primkey-field", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "primkey-field")
protected java.lang.String primkeyField;
+
@XmlElement(name = "key-generator", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1")
protected KeyGeneratorType keyGenerator;
- @XmlElement(name = "prefetch-group", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "prefetch-group")
protected EntityBeanType.PrefetchGroup prefetchGroup;
- @XmlElement(name = "select-for-update", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "select-for-update")
protected EmptyType selectForUpdate;
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement()
protected EntityBeanType.Cache cache;
+
@XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
- @XmlElement(name = "ejb-ref")
+
+ @XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbRefType> ejbRef;
- @XmlElement(name = "ejb-local-ref")
+
+ @XmlElement(name = "ejb-local-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbLocalRefType> ejbLocalRef;
- @XmlElement(name = "service-ref")
+
+ @XmlElement(name = "service-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ServiceRefType> serviceRef;
- @XmlElement(name = "resource-ref")
+
+ @XmlElement(name = "resource-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ResourceRefType> resourceRef;
- @XmlElement(name = "resource-env-ref")
+
+ @XmlElement(name = "resource-env-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ResourceEnvRefType> resourceEnvRef;
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement()
protected List<QueryType> query;
+
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -775,9 +795,9 @@
})
public static class Cache {
- @XmlElement(name = "isolation-level", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "isolation-level", required = true)
protected java.lang.String isolationLevel;
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement()
protected int size;
/**
@@ -856,15 +876,15 @@
})
public static class CmpFieldMapping {
- @XmlElement(name = "cmp-field-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "cmp-field-name", required = true)
protected java.lang.String cmpFieldName;
- @XmlElement(name = "cmp-field-class", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cmp-field-class")
protected java.lang.String cmpFieldClass;
- @XmlElement(name = "table-column", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "table-column", required = true)
protected java.lang.String tableColumn;
- @XmlElement(name = "sql-type", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "sql-type")
protected java.lang.String sqlType;
- @XmlElement(name = "type-converter", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "type-converter")
protected java.lang.String typeConverter;
/**
@@ -1021,13 +1041,13 @@
})
public static class PrefetchGroup {
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement()
protected List<GroupType> group;
- @XmlElement(name = "entity-group-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "entity-group-mapping")
protected EntityGroupMappingType entityGroupMapping;
- @XmlElement(name = "cmp-field-group-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cmp-field-group-mapping")
protected List<CmpFieldGroupMappingType> cmpFieldGroupMapping;
- @XmlElement(name = "cmr-field-group-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cmr-field-group-mapping")
protected List<CmrFieldGroupMappingType> cmrFieldGroupMapping;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityGroupMappingType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityGroupMappingType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityGroupMappingType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EntityGroupMappingType.java Sat Jan 20 22:19:58 2007
@@ -43,12 +43,12 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "entity-group-mappingType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "entity-group-mappingType", propOrder = {
"groupName"
})
public class EntityGroupMappingType {
- @XmlElement(name = "group-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "group-name", required = true)
protected java.lang.String groupName;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EnvironmentType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EnvironmentType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EnvironmentType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/EnvironmentType.java Sat Jan 20 22:19:58 2007
@@ -58,9 +58,9 @@
})
public class EnvironmentType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="moduleId", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected ArtifactType moduleId;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name="dependencies", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected DependenciesType dependencies;
@XmlElement(name = "hidden-classes", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected ClassFilterType hiddenClasses;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ExtModuleType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ExtModuleType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ExtModuleType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ExtModuleType.java Sat Jan 20 22:19:58 2007
@@ -73,13 +73,13 @@
})
public class ExtModuleType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="connector", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType connector;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="ejb", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType ejb;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="java", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType java;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="web", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType web;
@XmlElement(name = "internal-path", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/GroupType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/GroupType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/GroupType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/GroupType.java Sat Jan 20 22:19:58 2007
@@ -58,18 +58,18 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "groupType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "groupType", propOrder = {
"groupName",
"cmpFieldName",
"cmrField"
})
public class GroupType {
- @XmlElement(name = "group-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "group-name", required = true)
protected java.lang.String groupName;
- @XmlElement(name = "cmp-field-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cmp-field-name")
protected List<java.lang.String> cmpFieldName;
- @XmlElement(name = "cmr-field", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cmr-field")
protected List<GroupType.CmrField> cmrField;
/**
@@ -182,9 +182,9 @@
})
public static class CmrField {
- @XmlElement(name = "cmr-field-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "cmr-field-name", required = true)
protected java.lang.String cmrFieldName;
- @XmlElement(name = "group-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "group-name")
protected java.lang.String groupName;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/KeyGeneratorType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/KeyGeneratorType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/KeyGeneratorType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/KeyGeneratorType.java Sat Jan 20 22:19:58 2007
@@ -63,7 +63,7 @@
})
public class KeyGeneratorType {
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1")
+ @XmlElement(name="uuid", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1")
protected EmptyType uuid;
@XmlElement(name = "sequence-table", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1")
protected SequenceTableType sequenceTable;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/MessageDrivenBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/MessageDrivenBeanType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/MessageDrivenBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/MessageDrivenBeanType.java Sat Jan 20 22:19:58 2007
@@ -55,7 +55,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "message-driven-beanType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "message-driven-beanType", propOrder = {
"ejbName",
"resourceAdapter",
"activationConfig",
@@ -68,24 +68,33 @@
})
public class MessageDrivenBeanType {
- @XmlElement(name = "ejb-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "ejb-name", required = true)
protected java.lang.String ejbName;
+
@XmlElement(name = "resource-adapter", required = true)
protected ResourceLocatorType resourceAdapter;
- @XmlElement(name = "activation-config", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+
+ @XmlElement(name = "activation-config")
protected ActivationConfigType activationConfig;
+
@XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
- @XmlElement(name = "ejb-ref")
+
+ @XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbRefType> ejbRef;
- @XmlElement(name = "ejb-local-ref")
+
+ @XmlElement(name = "ejb-local-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbLocalRefType> ejbLocalRef;
- @XmlElement(name = "service-ref")
+
+ @XmlElement(name = "service-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ServiceRefType> serviceRef;
- @XmlElement(name = "resource-ref")
+
+ @XmlElement(name = "resource-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ResourceRefType> resourceRef;
- @XmlElement(name = "resource-env-ref")
+
+ @XmlElement(name = "resource-env-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ResourceEnvRefType> resourceEnvRef;
+
@XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ModuleType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ModuleType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ModuleType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ModuleType.java Sat Jan 20 22:19:58 2007
@@ -69,13 +69,13 @@
})
public class ModuleType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="connector", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType connector;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="ejb", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType ejb;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="java", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType java;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="web", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType web;
@XmlElement(name = "alt-dd", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected PathType altDd;
Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java?view=auto&rev=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/NamespaceFilter.java Sat Jan 20 22:19:58 2007
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.jee.oej2;
+
+import org.xml.sax.helpers.XMLFilterImpl;
+import org.xml.sax.XMLReader;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import java.lang.String;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class NamespaceFilter extends XMLFilterImpl {
+
+ static Map<String,String> correctNamespaces = new HashMap();
+
+ static {
+ correctNamespaces.put("abstract-naming-entry", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("alt-dd", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("application", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("artifactId", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("attribute", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("auto-increment-table", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("batch-size", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("client-environment", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("clustering", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("cmp-connection-factory", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("connector", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("custom-generator", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("dependencies", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("dependency", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("ejb", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("ejb-local-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("ejb-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("entity-manager-factory-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("environment", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("ext-module", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("external-path", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("filter", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("gbean", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("gbean-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("generator-name", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("groupId", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("hidden-classes", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("identity-column", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("import", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("internal-path", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("inverse-classloading", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("java", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("key-generator", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("message-destination", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("module", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("module", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("moduleId", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("non-overridable-classes", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("openejb-jar", "http://openejb.apache.org/xml/ns/openejb-jar-2.2" );
+ correctNamespaces.put("pattern", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("persistence-context-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("primary-key-class", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("reference", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("references", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("resource-adapter", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("resource-env-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("resource-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("return-type", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("security", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("sequence-name", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("sequence-table", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("server-environment", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("service", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("service-ref", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("sql", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("sql-generator", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("suppress-default-environment", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("table-name", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("tss", "http://openejb.apache.org/xml/ns/openejb-jar-2.2" );
+ correctNamespaces.put("type", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("uuid", "http://openejb.apache.org/xml/ns/pkgen-2.1" );
+ correctNamespaces.put("version", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("web", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2" );
+ correctNamespaces.put("web-container", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("workmanager", "http://geronimo.apache.org/xml/ns/naming-1.2" );
+ correctNamespaces.put("xml-attribute", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ correctNamespaces.put("xml-reference", "http://geronimo.apache.org/xml/ns/deployment-1.2" );
+ }
+
+ public NamespaceFilter(XMLReader xmlReader) {
+ super(xmlReader);
+ }
+
+ //String uri, String localName, String qName, Attributes atts
+ public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+ String correctNamespace = correctNamespaces.get(localName);
+ if (uri.equals("http://openejb.apache.org/xml/ns/openejb-jar-2.2") && correctNamespace != null){
+ super.startElement(correctNamespace, localName, qname, atts);
+ } else {
+ super.startElement(uri, localName, qname, atts);
+ }
+ }
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/OpenejbJarType.java Sat Jan 20 22:19:58 2007
@@ -17,8 +17,15 @@
package org.apache.openejb.jee.oej2;
+import org.xml.sax.helpers.XMLFilterImpl;
+import org.xml.sax.XMLReader;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
import java.util.ArrayList;
import java.util.List;
+import java.lang.*;
+import java.lang.String;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -69,7 +76,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "openejb-jarType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "openejb-jarType", propOrder = {
"environment",
"cmpConnectionFactory",
"ejbQlCompilerFactory",
@@ -83,31 +90,31 @@
})
public class OpenejbJarType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ @XmlElement(name = "environment", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected EnvironmentType environment;
@XmlElement(name = "cmp-connection-factory")
protected ResourceLocatorType cmpConnectionFactory;
- @XmlElement(name = "ejb-ql-compiler-factory", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "ejb-ql-compiler-factory")
protected java.lang.String ejbQlCompilerFactory;
- @XmlElement(name = "db-syntax-factory", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "db-syntax-factory")
protected java.lang.String dbSyntaxFactory;
- @XmlElement(name = "enforce-foreign-key-constraints", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "enforce-foreign-key-constraints")
protected EmptyType enforceForeignKeyConstraints;
- @XmlElement(name = "enterprise-beans", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "enterprise-beans", required = true)
protected OpenejbJarType.EnterpriseBeans enterpriseBeans;
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement()
protected RelationshipsType relationships;
- @XmlElement(name = "message-destination")
+ @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<MessageDestinationType> messageDestination;
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ @XmlElement(name="security", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
protected AbstractSecurityType security;
@XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", type = JAXBElement.class)
@@ -393,9 +400,9 @@
public static class EnterpriseBeans {
@XmlElements({
- @XmlElement(name = "entity", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", type = EntityBeanType.class),
- @XmlElement(name = "session", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", type = SessionBeanType.class),
- @XmlElement(name = "message-driven", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", type = MessageDrivenBeanType.class)
+ @XmlElement(name = "entity", type = EntityBeanType.class),
+ @XmlElement(name = "session", type = SessionBeanType.class),
+ @XmlElement(name = "message-driven", type = MessageDrivenBeanType.class)
})
protected List<Object> sessionOrEntityOrMessageDriven;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/QueryType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/QueryType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/QueryType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/QueryType.java Sat Jan 20 22:19:58 2007
@@ -70,7 +70,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "queryType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "queryType", propOrder = {
"queryMethod",
"resultTypeMapping",
"ejbQl",
@@ -79,15 +79,15 @@
})
public class QueryType {
- @XmlElement(name = "query-method", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "query-method", required = true)
protected QueryType.QueryMethod queryMethod;
- @XmlElement(name = "result-type-mapping", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "result-type-mapping")
protected java.lang.String resultTypeMapping;
- @XmlElement(name = "ejb-ql", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "ejb-ql")
protected java.lang.String ejbQl;
- @XmlElement(name = "no-cache-flush", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "no-cache-flush")
protected Object noCacheFlush;
- @XmlElement(name = "group-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "group-name")
protected java.lang.String groupName;
/**
@@ -248,9 +248,9 @@
})
public static class QueryMethod {
- @XmlElement(name = "method-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "method-name", required = true)
protected java.lang.String methodName;
- @XmlElement(name = "method-params", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "method-params", required = true)
protected QueryType.QueryMethod.MethodParams methodParams;
/**
@@ -327,7 +327,7 @@
})
public static class MethodParams {
- @XmlElement(name = "method-param", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "method-param")
protected List<java.lang.String> methodParam;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ReferencesType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ReferencesType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ReferencesType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ReferencesType.java Sat Jan 20 22:19:58 2007
@@ -52,7 +52,7 @@
})
public class ReferencesType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
+ @XmlElement(name="pattern", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
protected List<PatternType> pattern;
@XmlAttribute
protected java.lang.String name;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/RelationshipsType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/RelationshipsType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/RelationshipsType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/RelationshipsType.java Sat Jan 20 22:19:58 2007
@@ -45,12 +45,12 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "relationshipsType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "relationshipsType", propOrder = {
"ejbRelation"
})
public class RelationshipsType {
- @XmlElement(name = "ejb-relation", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "ejb-relation", required = true)
protected List<EjbRelationType> ejbRelation;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ServiceModuleType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ServiceModuleType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ServiceModuleType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/ServiceModuleType.java Sat Jan 20 22:19:58 2007
@@ -54,7 +54,7 @@
})
public class ServiceModuleType {
- @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
+ @XmlElement(name="environment", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", required = true)
protected EnvironmentType environment;
@XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractServiceType>> service;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SessionBeanType.java Sat Jan 20 22:19:58 2007
@@ -60,7 +60,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "session-beanType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "session-beanType", propOrder = {
"ejbName",
"jndiName",
"localJndiName",
@@ -79,17 +79,17 @@
})
public class SessionBeanType {
- @XmlElement(name = "ejb-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "ejb-name", required = true)
protected java.lang.String ejbName;
- @XmlElement(name = "jndi-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "jndi-name")
protected List<java.lang.String> jndiName;
- @XmlElement(name = "local-jndi-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "local-jndi-name")
protected List<java.lang.String> localJndiName;
- @XmlElement(name = "cache-size", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "cache-size")
protected Integer cacheSize;
- @XmlElement(name = "tss-link", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "tss-link")
protected java.lang.String tssLink;
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name="tss", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
protected PatternType tss;
@XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
@@ -110,13 +110,13 @@
@XmlElement(name = "resource-env-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<ResourceEnvRefType> resourceEnvRef;
- @XmlElement(name = "web-service-address", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "web-service-address")
protected java.lang.String webServiceAddress;
- @XmlElement(name = "web-service-virtual-host", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "web-service-virtual-host")
protected List<java.lang.String> webServiceVirtualHost;
- @XmlElement(name = "web-service-security", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "web-service-security")
protected WebServiceSecurityType webServiceSecurity;
@XmlAttribute
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SqlGeneratorType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SqlGeneratorType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SqlGeneratorType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/SqlGeneratorType.java Sat Jan 20 22:19:58 2007
@@ -55,7 +55,7 @@
})
public class SqlGeneratorType {
- @XmlElement(namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1", required = true)
+ @XmlElement(name="sql", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1", required = true)
protected java.lang.String sql;
@XmlElement(name = "return-type", namespace = "http://openejb.apache.org/xml/ns/pkgen-2.1", required = true)
protected java.lang.String returnType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/WebServiceSecurityType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/WebServiceSecurityType.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/WebServiceSecurityType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/WebServiceSecurityType.java Sat Jan 20 22:19:58 2007
@@ -46,7 +46,7 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "web-service-securityType", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", propOrder = {
+@XmlType(name = "web-service-securityType", propOrder = {
"securityRealmName",
"realmName",
"transportGuarantee",
@@ -54,13 +54,13 @@
})
public class WebServiceSecurityType {
- @XmlElement(name = "security-realm-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "security-realm-name", required = true)
protected java.lang.String securityRealmName;
- @XmlElement(name = "realm-name", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2")
+ @XmlElement(name = "realm-name")
protected java.lang.String realmName;
- @XmlElement(name = "transport-guarantee", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "transport-guarantee", required = true)
protected TransportGuaranteeType transportGuarantee;
- @XmlElement(name = "auth-method", namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", required = true)
+ @XmlElement(name = "auth-method", required = true)
protected AuthMethodType authMethod;
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/package-info.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/package-info.java?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/package-info.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oej2/package-info.java Sat Jan 20 22:19:58 2007
@@ -14,6 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value=javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class,type=String.class)
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.openejb.jee.oej2;
+@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value = javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class, type = String.class)
+@javax.xml.bind.annotation.XmlSchema(
+ namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+ xmlns = {
+ @javax.xml.bind.annotation.XmlNs(prefix = "o", namespaceURI = "http://openejb.apache.org/xml/ns/openejb-jar-2.2"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "sys", namespaceURI = "http://geronimo.apache.org/xml/ns/deployment-1.2"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "pkgen", namespaceURI = "http://openejb.apache.org/xml/ns/pkgen-2.1"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "naming", namespaceURI = "http://geronimo.apache.org/xml/ns/naming-1.2"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "app", namespaceURI = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
+ }
+) package org.apache.openejb.jee.oej2;
Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/OpenejbJarTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/OpenejbJarTest.java?view=auto&rev=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/OpenejbJarTest.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/OpenejbJarTest.java Sat Jan 20 22:19:58 2007
@@ -0,0 +1,132 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.jee.oej2;
+
+import junit.framework.TestCase;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.Application;
+import org.apache.openejb.jee.ApplicationClient;
+import org.apache.openejb.jee.JeeTest;
+import org.xml.sax.InputSource;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.ValidationEventHandler;
+import javax.xml.bind.ValidationEvent;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.transform.sax.SAXSource;
+import java.lang.*;
+import java.lang.String;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.BufferedInputStream;
+import java.io.StringReader;
+
+/**
+ * @version $Revision: 471447 $ $Date: 2006-11-05 07:42:50 -0800 (Sun, 05 Nov 2006) $
+ */
+public class OpenejbJarTest extends TestCase {
+
+ public void testNothing(){}
+ /**
+ * @throws Exception
+ */
+ public void _testEjbJar() throws Exception {
+ marshalAndUnmarshal(OpenejbJarType.class, "openejb-jar-2.2.xml");
+ }
+
+ private <T> void marshalAndUnmarshal(Class<T> type, java.lang.String xmlFileName) throws Exception {
+ JAXBContext ctx = JAXBContext.newInstance(type);
+ Unmarshaller unmarshaller = ctx.createUnmarshaller();
+ ValidationEventHandler o = new ValidationEventHandler(){
+ public boolean handleEvent(ValidationEvent validationEvent) {
+ System.out.println(validationEvent);
+ return false;
+ }
+ };
+ unmarshaller.setEventHandler(o);
+ unmarshaller.setListener(new Unmarshaller.Listener(){
+ public void afterUnmarshal(Object object, Object object1) {
+ System.out.println("object = " + object);
+ System.out.println("object1 = " + object1);
+ super.afterUnmarshal(object, object1);
+ }
+
+ public void beforeUnmarshal(Object object, Object object1) {
+ System.out.println("object = " + object);
+ System.out.println("object1 = " + object1);
+ super.beforeUnmarshal(object, object1);
+ }
+ });
+ InputStream in = this.getClass().getClassLoader().getResourceAsStream(xmlFileName);
+
+ String expected = readContent(in);
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setValidating(true);
+ SAXParser parser = factory.newSAXParser();
+
+ // Create a filter to intercept events
+ NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
+
+ // Be sure the filter has the JAXB content handler set (or it wont
+ // work)
+ xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
+
+ SAXSource source = new SAXSource(xmlFilter, new InputSource(new StringReader(expected)));
+
+ Object object = unmarshaller.unmarshal(source);
+// JAXBElement element = (JAXBElement) object;
+ unmarshaller.setEventHandler(new OpenejbJarTest.TestValidationEventHandler());
+// T app = (T) element.getValue();
+// System.out.println("unmarshalled");
+
+ Marshaller marshaller = ctx.createMarshaller();
+ marshaller.setProperty("jaxb.formatted.output", true);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ marshaller.marshal(object, baos);
+
+ String actual = new String(baos.toByteArray());
+
+ assertEquals(expected, actual);
+ }
+
+ private String readContent(InputStream in) throws IOException {
+ StringBuffer sb = new StringBuffer();
+ in = new BufferedInputStream(in);
+ int i = in.read();
+ while (i != -1) {
+ sb.append((char) i);
+ i = in.read();
+ }
+ String content = sb.toString();
+ return content;
+ }
+
+ private static class TestValidationEventHandler implements ValidationEventHandler {
+ public boolean handleEvent(ValidationEvent validationEvent) {
+ System.out.println(validationEvent.getMessage());
+ return true;
+ }
+ }
+}
Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-jaxb-test.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-jaxb-test.xml?view=auto&rev=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-jaxb-test.xml (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-jaxb-test.xml Sat Jan 20 22:19:58 2007
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"
+ xmlns:n="http://geronimo.apache.org/xml/ns/naming-1.2"
+>
+ <environment>
+ <moduleId>
+ <groupId>itests</groupId>
+ <artifactId>itests</artifactId>
+ <version>1</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ <n:resource-ref>
+ <n:ref-name>database</n:ref-name>
+ <n:pattern>
+ <n:groupId>org.apache.geronimo.configs</n:groupId>
+ <n:artifactId>system-database</n:artifactId>
+ <n:name>SystemDatasource</n:name>
+ </n:pattern>
+ </n:resource-ref>
+ <n:resource-ref>
+ <n:ref-name>datasource</n:ref-name>
+ <n:pattern>
+ <n:groupId>org.apache.geronimo.configs</n:groupId>
+ <n:artifactId>system-database</n:artifactId>
+ <n:name>SystemDatasource</n:name>
+ </n:pattern>
+ </n:resource-ref>
+ <n:resource-ref>
+ <n:ref-name>jdbc/basic/entityDatabase</n:ref-name>
+ <n:pattern>
+ <n:groupId>org.apache.geronimo.configs</n:groupId>
+ <n:artifactId>system-database</n:artifactId>
+ <n:name>SystemDatasource</n:name>
+ </n:pattern>
+ </n:resource-ref>
+ <n:resource-ref>
+ <n:ref-name>stateless/references/Resource_manager_access</n:ref-name>
+ <n:pattern>
+ <n:groupId>org.apache.geronimo.configs</n:groupId>
+ <n:artifactId>system-database</n:artifactId>
+ <n:name>SystemDatasource</n:name>
+ </n:pattern>
+ </n:resource-ref>
+ <n:persistence-context-ref>
+ <n:persistence-context-ref-name>persistence/TestContext</n:persistence-context-ref-name>
+ <n:persistence-unit-name>openjpa-test-unit</n:persistence-unit-name>
+ <n:persistence-context-type>Transactional</n:persistence-context-type>
+ </n:persistence-context-ref>
+ <n:persistence-context-ref>
+ <n:persistence-context-ref-name>persistence/ExtendedTestContext</n:persistence-context-ref-name>
+ <n:persistence-unit-name>openjpa-test-unit</n:persistence-unit-name>
+ <n:persistence-context-type>Extended</n:persistence-context-type>
+ </n:persistence-context-ref>
+ <n:persistence-context-ref>
+ <n:persistence-context-ref-name>openejb/cmp</n:persistence-context-ref-name>
+ <n:persistence-unit-name>cmp</n:persistence-unit-name>
+ <n:persistence-context-type>Transactional</n:persistence-context-type>
+ </n:persistence-context-ref>
+ <n:persistence-unit-ref>
+ <n:persistence-unit-ref-name>persistence/TestUnit</n:persistence-unit-ref-name>
+ <n:persistence-unit-name>openjpa-test-unit</n:persistence-unit-name>
+ </n:persistence-unit-ref>
+
+ <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+ <persistence-unit transaction-type="JTA" name="cmp">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>?name=SystemDatasource</jta-data-source>
+ <non-jta-data-source>?name=NoTxDatasource</non-jta-data-source>
+ <mapping-file>META-INF/jpa.mapping.xml</mapping-file>
+ <class>org.apache.openejb.test.entity.cmp.BasicCmpBean</class>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ </persistence-unit>
+ <persistence-unit transaction-type="JTA" name="openjpa-test-unit">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <jta-data-source>?name=SystemDatasource</jta-data-source>
+ <non-jta-data-source>?name=NoTxDatasource</non-jta-data-source>
+ <class>org.apache.openejb.test.entity.Customer</class>
+ </persistence-unit>
+ </persistence>
+</ejb-jar>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml?view=diff&rev=498249&r1=498248&r2=498249
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2.2.xml Sat Jan 20 22:19:58 2007
@@ -1,21 +1,4 @@
<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
@@ -55,11 +38,6 @@
</cmp-connection-factory>
<enterprise-beans>
- <!--
- ########################################################
- Stateless
- ########################################################
- -->
<session>
<ejb-name>BasicStatelessBean</ejb-name>
<jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
@@ -146,12 +124,6 @@
<ejb-name>SessionFacadeBean</ejb-name>
<jndi-name>client/tests/entity/cmp/SessionFacadeBean</jndi-name>
</session>
-
- <!--
- ########################################################
- Stateless
- ########################################################
- -->
<session>
<ejb-name>BasicStatefulBean</ejb-name>
<jndi-name>client/tests/stateful/BasicStatefulHome</jndi-name>
@@ -208,12 +180,6 @@
<ejb-name>StatefulRMIIIOPBean</ejb-name>
<jndi-name>client/tests/stateful/RMI-over-IIOP/EJBHome</jndi-name>
</session>
-
- <!--
- ########################################################
- BMP
- ########################################################
- -->
<entity>
<ejb-name>BasicBmpBean</ejb-name>
<jndi-name>client/tests/entity/bmp/BasicBmpHome</jndi-name>
@@ -275,13 +241,6 @@
<ejb-name>BmpRMIIIOPBean</ejb-name>
<jndi-name>client/tests/entity/bmp/RMI-over-IIOP/EJBHome</jndi-name>
</entity>
-
- <!--
- ########################################################
- CMP 2
- ########################################################
- -->
-
<entity>
<ejb-name>BasicCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp2/BasicCmpHome</jndi-name>
@@ -437,13 +396,6 @@
</ejb-ql>
</query>
</entity>
-
- <!--
- ########################################################
- CMP
- ########################################################
- -->
-
<entity>
<ejb-name>BasicCmpBean</ejb-name>
<jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
@@ -687,13 +639,6 @@
</ejb-ql>
</query>
</entity>
-
- <!--
- ########################################################
- CMP2 - CMRMapping
- ########################################################
- -->
-
<entity>
<ejb-name>OneOwningSideBean</ejb-name>
<table-name>OneOwning</table-name>
@@ -822,11 +767,6 @@
</ejb-relationship-role>
</ejb-relation>
</relationships>
-
- <!--
- ########################################################
- ########################################################
- -->
<gbean name="ORBConfigAdapter" class="org.apache.openejb.yoko.ORBConfigAdapterGBean"/>