Author: dain
Date: Wed Sep 19 16:42:10 2007
New Revision: 577470
URL: http://svn.apache.org/viewvc?rev=577470&view=rev
Log:
Merging 575817 from trunk
Added jaxb objects to process web.xml file
Added:
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthConstraint.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ErrorPage.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ErrorPage.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Filter.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FilterMapping.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/FormLoginConfig.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/FormLoginConfig.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspConfig.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspConfig.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspPropertyGroup.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JspPropertyGroup.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMapping.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMapping.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMappingList.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LocaleEncodingMappingList.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoginConfigType.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoginConfigType.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/MimeMapping.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MimeMapping.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityConstraint.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityConstraint.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Servlet.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServletMapping.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionConfig.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SessionConfig.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/Taglib.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Taglib.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/UserDataConstraint.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebResourceCollection.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/WelcomeFileList.java
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WelcomeFileList.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/resources/web-example.xml
- copied unchanged from r575817,
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/web-example.xml
Modified:
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
Modified:
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java?rev=577470&r1=577469&r2=577470&view=diff
==============================================================================
---
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
(original)
+++
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
Wed Sep 19 16:42:10 2007
@@ -21,6 +21,8 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
@@ -44,6 +46,8 @@
private final static QName _EjbRelationTypeEjbRelationName_QNAME = new
QName("http://java.sun.com/xml/ns/javaee";, "ejb-relation-name");
private final static QName _EjbRelationTypeEjbRelationshipRole_QNAME = new
QName("http://java.sun.com/xml/ns/javaee";, "ejb-relationship-role");
private final static QName _EjbRelationTypeDescription_QNAME = new
QName("http://java.sun.com/xml/ns/javaee";, "description");
+ private final static QName _WebResourceCollectionTypeHttpMethod_QNAME =
new QName("http://java.sun.com/xml/ns/javaee";, "http-method");
+ private final static QName _WebApp_QNAME = new
QName("http://java.sun.com/xml/ns/javaee";, "web-app");
/**
* Create a new ObjectFactory that can be used to create new instances of
schema derived classes for package: org.apache.openejb.jee2
@@ -81,6 +85,25 @@
@XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee";, name =
"description", scope = EjbRelation.class)
public JAXBElement<Text> createEjbRelationTypeDescription(Text value) {
return new JAXBElement<Text>(_EjbRelationTypeDescription_QNAME,
Text.class, EjbRelation.class, value);
+ }
+
+ /**
+ * Create an instance of [EMAIL PROTECTED] JAXBElement [EMAIL PROTECTED]
<[EMAIL PROTECTED] String [EMAIL PROTECTED] >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee";, name =
"http-method", scope = WebResourceCollection.class)
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ public JAXBElement<String>
createWebResourceCollectionTypeHttpMethod(String value) {
+ return new
JAXBElement<String>(_WebResourceCollectionTypeHttpMethod_QNAME, String.class,
WebResourceCollection.class, value);
+ }
+
+ /**
+ * Create an instance of [EMAIL PROTECTED] JAXBElement [EMAIL PROTECTED]
<[EMAIL PROTECTED] WebApp [EMAIL PROTECTED] >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee";, name =
"web-app")
+ public JAXBElement<WebApp> createWebApp(WebApp value) {
+ return new JAXBElement<WebApp>(_WebApp_QNAME, WebApp.class, null,
value);
}
}
Modified:
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java?rev=577470&r1=577469&r2=577470&view=diff
==============================================================================
---
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
(original)
+++
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
Wed Sep 19 16:42:10 2007
@@ -51,6 +51,10 @@
marshalAndUnmarshal(ApplicationClient.class,
"application-client-example.xml");
}
+ public void testWar() throws Exception {
+ marshalAndUnmarshal(WebApp.class, "web-example.xml");
+ }
+
private <T> void marshalAndUnmarshal(Class<T> type, String xmlFileName)
throws JAXBException, IOException {
JAXBContext ctx = JAXBContext.newInstance(type);
Unmarshaller unmarshaller = ctx.createUnmarshaller();
