tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r585036 [3/7] - in /openejb/trunk/openejb3: ./ assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/ container/openejb-core/src/main/java/org/apache/openejb/assembler/ container/openejb-core/src/main/java/org/apache/openejb/assem...
Date Tue, 16 Oct 2007 04:39:10 GMT
Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TagFile.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,178 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Defines an action in this tag library that is implemented
+ * as a .tag file.
+ * <p/>
+ * The tag-file element has two required subelements:
+ * <p/>
+ * description       Optional tag-specific information
+ * <p/>
+ * display-name      A short name that is intended to be
+ * displayed by tools
+ * <p/>
+ * icon              Optional icon element that can be used
+ * by tools
+ * <p/>
+ * name              The unique action name
+ * <p/>
+ * path              Where to find the .tag file implementing this
+ * action, relative to the root of the web
+ * application or the root of the JAR file for a
+ * tag library packaged in a JAR.  This must
+ * begin with /WEB-INF/tags if the .tag file
+ * resides in the WAR, or /META-INF/tags if the
+ * .tag file resides in a JAR.
+ * <p/>
+ * example           Optional informal description of an
+ * example of a use of this tag
+ * <p/>
+ * tag-extension     Zero or more extensions that provide extra
+ * information about this tag, for tool
+ * consumption
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tagFileType", propOrder = {
+    "descriptions",
+    "displayNames",
+    "icon",
+    "name",
+    "path",
+    "example",
+    "tagExtension"
+})
+public class TagFile {
+    @XmlTransient
+    protected TextMap description = new TextMap();
+    @XmlTransient
+    protected TextMap displayName = new TextMap();
+    @XmlElement(name = "icon", required = true)
+    protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+
+    @XmlElement(required = true)
+    protected String name;
+    @XmlElement(required = true)
+    protected String path;
+    protected String example;
+    @XmlElement(name = "tag-extension")
+    protected List<TldExtension> tagExtension;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+
+    @XmlElement(name = "description", required = true)
+    public Text[] getDescriptions() {
+        return description.toArray();
+    }
+
+    public void setDescriptions(Text[] text) {
+        description.set(text);
+    }
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    @XmlElement(name = "display-name", required = true)
+    public Text[] getDisplayNames() {
+        return displayName.toArray();
+    }
+
+    public void setDisplayNames(Text[] text) {
+        displayName.set(text);
+    }
+
+    public String getDisplayName() {
+        return displayName.get();
+    }
+
+    public Collection<Icon> getIcons() {
+        if (icon == null) {
+            icon = new LocalCollection<Icon>();
+        }
+        return icon;
+    }
+
+    public Map<String, Icon> getIconMap() {
+        if (icon == null) {
+            icon = new LocalCollection<Icon>();
+        }
+        return icon.toMap();
+    }
+
+    public Icon getIcon() {
+        return icon.getLocal();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String value) {
+        this.path = value;
+    }
+
+    public String getExample() {
+        return example;
+    }
+
+    public void setExample(String value) {
+        this.example = value;
+    }
+
+    public List<TldExtension> getTagExtension() {
+        if (tagExtension == null) {
+            tagExtension = new ArrayList<TldExtension>();
+        }
+        return this.tagExtension;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldAttribute.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldAttribute.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldAttribute.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldAttribute.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,158 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ * The attribute element defines an attribute for the nesting
+ * tag.  The attribute element may have several subelements
+ * defining:
+ * <p/>
+ * description     a description of the attribute
+ * <p/>
+ * name            the name of the attribute
+ * <p/>
+ * required        whether the attribute is required or
+ * optional
+ * <p/>
+ * rtexprvalue     whether the attribute is a runtime attribute
+ * <p/>
+ * type            the type of the attributes
+ * <p/>
+ * fragment        whether this attribute is a fragment
+ * <p/>
+ * deferred-value  present if this attribute is to be parsed as a
+ * javax.el.ValueExpression
+ * <p/>
+ * deferred-method present if this attribute is to be parsed as a
+ * javax.el.MethodExpression
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tld-attributeType", propOrder = {
+    "descriptions",
+    "name",
+    "required",
+    "rtexprvalue",
+    "type",
+    "deferredValue",
+    "deferredMethod",
+    "fragment"
+})
+public class TldAttribute {
+    @XmlTransient
+    protected TextMap description = new TextMap();
+    @XmlElement(required = true)
+    protected String name;
+    protected String required;
+    protected String rtexprvalue;
+    protected String type;
+    @XmlElement(name = "deferred-value")
+    protected TldDeferredValue deferredValue;
+    @XmlElement(name = "deferred-method")
+    protected TldDeferredMethod deferredMethod;
+    protected String fragment;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+
+    @XmlElement(name = "description", required = true)
+    public Text[] getDescriptions() {
+        return description.toArray();
+    }
+
+    public void setDescriptions(Text[] text) {
+        description.set(text);
+    }
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    public String getRequired() {
+        return required;
+    }
+
+    public void setRequired(String value) {
+        this.required = value;
+    }
+
+    public String getRtexprvalue() {
+        return rtexprvalue;
+    }
+
+    public void setRtexprvalue(String value) {
+        this.rtexprvalue = value;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    public TldDeferredValue getDeferredValue() {
+        return deferredValue;
+    }
+
+    public void setDeferredValue(TldDeferredValue value) {
+        this.deferredValue = value;
+    }
+
+    public TldDeferredMethod getDeferredMethod() {
+        return deferredMethod;
+    }
+
+    public void setDeferredMethod(TldDeferredMethod value) {
+        this.deferredMethod = value;
+    }
+
+    public String getFragment() {
+        return fragment;
+    }
+
+    public void setFragment(String value) {
+        this.fragment = value;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredMethod.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredMethod.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredMethod.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredMethod.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,64 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ * Defines information about how to provide the value for a
+ * tag handler attribute that accepts a javax.el.MethodExpression.
+ * <p/>
+ * The deferred-method element has one optional subelement:
+ * <p/>
+ * method-signature  Provides the signature, as in the Java
+ * Language Specifies, that is expected for
+ * the method being identified by the
+ * expression.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tld-deferred-methodType", propOrder = {"methodSignature"})
+public class TldDeferredMethod {
+    @XmlElement(name = "method-signature")
+    protected String methodSignature;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+
+    public String getMethodSignature() {
+        return methodSignature;
+    }
+
+    public void setMethodSignature(String value) {
+        this.methodSignature = value;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredValue.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredValue.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredValue.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldDeferredValue.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,59 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ * Defines information about how to provide the value for a
+ * tag handler attribute that accepts a javax.el.ValueExpression.
+ * <p/>
+ * The deferred-value element has one optional subelement:
+ * <p/>
+ * type the expected type of the attribute
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tld-deferred-valueType", propOrder = {"type"})
+public class TldDeferredValue {
+    protected String type;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldExtension.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,79 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * The tld-extensionType is used to indicate
+ * extensions to a specific TLD element.
+ * <p/>
+ * It is used by elements to designate an extension block
+ * that is targeted to a specific extension designated by
+ * a set of extension elements that are declared by a
+ * namespace. The namespace identifies the extension to
+ * the tool that processes the extension.
+ * <p/>
+ * The type of the extension-element is abstract. Therefore,
+ * a concrete type must be specified by the TLD using
+ * xsi:type attribute for each extension-element.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tld-extensionType", propOrder = {"extensionElement"})
+public class TldExtension {
+    @XmlElement(name = "extension-element", required = true)
+    protected List<String> extensionElement;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(required = true)
+    protected String namespace;
+
+    public List<String> getExtensionElement() {
+        if (extensionElement == null) {
+            extensionElement = new ArrayList<String>();
+        }
+        return this.extensionElement;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    public String getNamespace() {
+        return namespace;
+    }
+
+    public void setNamespace(String value) {
+        this.namespace = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,245 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The taglib tag is the document root, it defines:
+ * <p/>
+ * description     a simple string describing the "use" of this
+ * taglib, should be user discernable
+ * <p/>
+ * display-name    the display-name element contains a
+ * short name that is intended to be displayed
+ * by tools
+ * <p/>
+ * icon            optional icon that can be used by tools
+ * <p/>
+ * tlib-version    the version of the tag library implementation
+ * <p/>
+ * short-name      a simple default short name that could be
+ * used by a JSP authoring tool to create
+ * names with a mnemonic value; for example,
+ * the it may be used as the prefered prefix
+ * value in taglib directives
+ * <p/>
+ * uri             a uri uniquely identifying this taglib
+ * <p/>
+ * validator       optional TagLibraryValidator information
+ * <p/>
+ * listener        optional event listener specification
+ * <p/>
+ * tag             tags in this tag library
+ * <p/>
+ * tag-file        tag files in this tag library
+ * <p/>
+ * function        zero or more EL functions defined in this
+ * tag library
+ * <p/>
+ * taglib-extension zero or more extensions that provide extra
+ * information about this taglib, for tool
+ * consumption
+ */
+@XmlRootElement(name = "taglib")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tldTaglibType", propOrder = {
+    "descriptions",
+    "displayNames",
+    "icon",      
+    "tlibVersion",
+    "shortName",
+    "uri",
+    "validator",
+    "listener",
+    "tag",
+    "tagFile",
+    "function",
+    "taglibExtension"
+})
+public class TldTaglib {
+    @XmlTransient
+    protected TextMap description = new TextMap();
+    @XmlTransient
+    protected TextMap displayName = new TextMap();
+    @XmlElement(name = "icon", required = true)
+    protected LocalCollection<Icon> icon = new LocalCollection<Icon>();
+
+    @XmlElement(name = "tlib-version", required = true)
+    protected String tlibVersion;
+    @XmlElement(name = "short-name", required = true)
+    protected String shortName;
+    protected String uri;
+    protected Validator validator;
+    protected List<Listener> listener;
+    protected List<Tag> tag;
+    @XmlElement(name = "tag-file")
+    protected List<TagFile> tagFile;
+    protected List<Function> function;
+    @XmlElement(name = "taglib-extension")
+    protected List<TldExtension> taglibExtension;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+    @XmlAttribute(required = true)
+    protected String version;
+
+    @XmlElement(name = "description", required = true)
+    public Text[] getDescriptions() {
+        return description.toArray();
+    }
+
+    public void setDescriptions(Text[] text) {
+        description.set(text);
+    }
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    @XmlElement(name = "display-name", required = true)
+    public Text[] getDisplayNames() {
+        return displayName.toArray();
+    }
+
+    public void setDisplayNames(Text[] text) {
+        displayName.set(text);
+    }
+
+    public String getDisplayName() {
+        return displayName.get();
+    }
+
+    public Collection<Icon> getIcons() {
+        if (icon == null) {
+            icon = new LocalCollection<Icon>();
+        }
+        return icon;
+    }
+
+    public Map<String, Icon> getIconMap() {
+        if (icon == null) {
+            icon = new LocalCollection<Icon>();
+        }
+        return icon.toMap();
+    }
+
+    public Icon getIcon() {
+        return icon.getLocal();
+    }
+
+    public String getTlibVersion() {
+        return tlibVersion;
+    }
+
+    public void setTlibVersion(String value) {
+        this.tlibVersion = value;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String value) {
+        this.shortName = value;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String value) {
+        this.uri = value;
+    }
+
+    public Validator getValidator() {
+        return validator;
+    }
+
+    public void setValidator(Validator value) {
+        this.validator = value;
+    }
+
+    public List<Listener> getListener() {
+        if (listener == null) {
+            listener = new ArrayList<Listener>();
+        }
+        return this.listener;
+    }
+
+    public List<Tag> getTag() {
+        if (tag == null) {
+            tag = new ArrayList<Tag>();
+        }
+        return this.tag;
+    }
+
+    public List<TagFile> getTagFile() {
+        if (tagFile == null) {
+            tagFile = new ArrayList<TagFile>();
+        }
+        return this.tagFile;
+    }
+
+    public List<Function> getFunction() {
+        if (function == null) {
+            function = new ArrayList<Function>();
+        }
+        return this.function;
+    }
+
+    public List<TldExtension> getTaglibExtension() {
+        if (taglibExtension == null) {
+            taglibExtension = new ArrayList<TldExtension>();
+        }
+        return this.taglibExtension;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+
+    public String getVersion() {
+        if (version == null) {
+            return "2.1";
+        } else {
+            return version;
+        }
+    }
+
+    public void setVersion(String value) {
+        this.version = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Validator.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,89 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A validator that can be used to validate
+ * the conformance of a JSP page to using this tag library is
+ * defined by a validatorType.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "validatorType", propOrder = {
+    "descriptions",
+    "validatorClass",
+    "initParam"
+})
+public class Validator {
+    @XmlTransient
+    protected TextMap description = new TextMap();
+    @XmlElement(name = "validator-class", required = true)
+    protected String validatorClass;
+    @XmlElement(name = "init-param")
+    protected List<ParamValue> initParam;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+
+    @XmlElement(name = "description", required = true)
+    public Text[] getDescriptions() {
+        return description.toArray();
+    }
+
+    public void setDescriptions(Text[] text) {
+        description.set(text);
+    }
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    public String getValidatorClass() {
+        return validatorClass;
+    }
+
+    public void setValidatorClass(String value) {
+        this.validatorClass = value;
+    }
+
+    public List<ParamValue> getInitParam() {
+        if (initParam == null) {
+            initParam = new ArrayList<ParamValue>();
+        }
+        return this.initParam;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Variable.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Variable.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Variable.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Variable.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,143 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ * The variableType provides information on the scripting
+ * variables defined by using this tag.  It is a (translation
+ * time) error for a tag that has one or more variable
+ * subelements to have a TagExtraInfo class that returns a
+ * non-null value from a call to getVariableInfo().
+ * <p/>
+ * The subelements of variableType are of the form:
+ * <p/>
+ * description              Optional description of this
+ * variable
+ * <p/>
+ * name-given               The variable name as a constant
+ * <p/>
+ * name-from-attribute      The name of an attribute whose
+ * (translation time) value will
+ * give the name of the
+ * variable.  One of name-given or
+ * name-from-attribute is required.
+ * <p/>
+ * variable-class           Name of the class of the variable.
+ * java.lang.String is default.
+ * <p/>
+ * declare                  Whether the variable is declared
+ * or not.  True is the default.
+ * <p/>
+ * scope                    The scope of the scripting varaible
+ * defined.  NESTED is default.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "variableType", propOrder = {
+    "descriptions",
+    "nameGiven",
+    "nameFromAttribute",
+    "variableClass",
+    "declare",
+    "scope"
+})
+public class Variable {
+    @XmlTransient
+    protected TextMap description = new TextMap();
+    @XmlElement(name = "name-given")
+    protected String nameGiven;
+    @XmlElement(name = "name-from-attribute")
+    protected String nameFromAttribute;
+    @XmlElement(name = "variable-class")
+    protected String variableClass;
+    protected String declare;
+    protected String scope;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    protected String id;
+
+    @XmlElement(name = "description", required = true)
+    public Text[] getDescriptions() {
+        return description.toArray();
+    }
+
+    public void setDescriptions(Text[] text) {
+        description.set(text);
+    }
+
+    public String getDescription() {
+        return description.get();
+    }
+
+    public String getNameGiven() {
+        return nameGiven;
+    }
+
+    public void setNameGiven(String value) {
+        this.nameGiven = value;
+    }
+
+    public String getNameFromAttribute() {
+        return nameFromAttribute;
+    }
+
+    public void setNameFromAttribute(String value) {
+        this.nameFromAttribute = value;
+    }
+
+    public String getVariableClass() {
+        return variableClass;
+    }
+
+    public void setVariableClass(String value) {
+        this.variableClass = value;
+    }
+
+    public String getDeclare() {
+        return declare;
+    }
+
+    public void setDeclare(String value) {
+        this.declare = value;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String value) {
+        this.scope = value;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String value) {
+        this.id = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/VariableScope.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/VariableScope.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/VariableScope.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/VariableScope.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,35 @@
+/**
+ * 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;
+
+import javax.xml.bind.annotation.XmlEnum;
+
+@XmlEnum
+public enum VariableScope {
+    NESTED,
+    AT_BEGIN,
+    AT_END;
+
+    public String value() {
+        return name();
+    }
+
+    public static VariableScope fromValue(String v) {
+        return valueOf(v);
+    }
+
+}

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java Mon Oct 15 21:38:53 2007
@@ -17,7 +17,6 @@
  */
 package org.apache.openejb.jee.jpa.unit;
 
-import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
@@ -30,6 +29,8 @@
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.sax.SAXSource;
 import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.net.URL;
 
 /**
@@ -73,14 +74,14 @@
 
     // Inject the proper namespace
     public static class PersistenceFilter extends XMLFilterImpl {
+        private static final InputSource EMPTY_INPUT_SOURCE = new InputSource(new ByteArrayInputStream(new byte[0]));
 
-        public PersistenceFilter(XMLReader arg0) {
-            super(arg0);
+        public PersistenceFilter(XMLReader xmlReader) {
+            super(xmlReader);
         }
 
-        @Override
-        public void startElement(String arg0, String arg1, String arg2, Attributes arg3) throws SAXException {
-            super.startElement(PERSISTENCE_SCHEMA, arg1, arg2, arg3);
+        public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+            return EMPTY_INPUT_SOURCE;
         }
     }
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java Mon Oct 15 21:38:53 2007
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.LinkedHashMap;
+import java.util.Iterator;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(propOrder = {"ejbLink", "resourceLink", "query"})
@@ -136,6 +137,15 @@
 
     public void addResourceLink(ResourceLink resourceLink) {
         getResourceLink().add(resourceLink);
+    }
+
+    public void removeResourceLink(String resRefName) {
+        for (Iterator<ResourceLink> iterator = resourceLink.iterator(); iterator.hasNext();) {
+            ResourceLink link =  iterator.next();
+            if (resRefName.equals(link.getResRefName())) {
+                iterator.remove();
+            }
+        }
     }
 
     public void addEjbLink(EjbLink ejbLink) {

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java Mon Oct 15 21:38:53 2007
@@ -36,6 +36,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 /**
  * @version $Rev$ $Date$
@@ -98,9 +100,14 @@
     }
 
     public static class NamespaceFilter extends XMLFilterImpl {
+        private static final InputSource EMPTY_INPUT_SOURCE = new InputSource(new ByteArrayInputStream(new byte[0]));
 
         public NamespaceFilter(XMLReader xmlReader) {
             super(xmlReader);
+        }
+
+        public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
+            return EMPTY_INPUT_SOURCE;
         }
 
         public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfig.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfig.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfig.java Mon Oct 15 21:38:53 2007
@@ -14,79 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "description",
     "activationConfigProperty"
 })
-@XmlRootElement(name = "activation-config")
 public class ActivationConfig {
-
     protected String description;
     @XmlElement(name = "activation-config-property", required = true)
     protected List<ActivationConfigProperty> activationConfigProperty;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getDescription() {
         return description;
     }
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setDescription(String value) {
         this.description = value;
     }
 
-    /**
-     * Gets the value of the activationConfigProperty property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the activationConfigProperty property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getActivationConfigProperty().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ActivationConfigProperty }
-     * 
-     * 
-     */
     public List<ActivationConfigProperty> getActivationConfigProperty() {
         if (activationConfigProperty == null) {
             activationConfigProperty = new ArrayList<ActivationConfigProperty>();

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfigProperty.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfigProperty.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfigProperty.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ActivationConfigProperty.java Mon Oct 15 21:38:53 2007
@@ -14,78 +14,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "activationConfigPropertyName",
     "activationConfigPropertyValue"
 })
-@XmlRootElement(name = "activation-config-property")
 public class ActivationConfigProperty {
-
     @XmlElement(name = "activation-config-property-name", required = true)
     protected String activationConfigPropertyName;
     @XmlElement(name = "activation-config-property-value", required = true)
     protected String activationConfigPropertyValue;
 
-    /**
-     * Gets the value of the activationConfigPropertyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getActivationConfigPropertyName() {
         return activationConfigPropertyName;
     }
 
-    /**
-     * Sets the value of the activationConfigPropertyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setActivationConfigPropertyName(String value) {
         this.activationConfigPropertyName = value;
     }
 
-    /**
-     * Gets the value of the activationConfigPropertyValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getActivationConfigPropertyValue() {
         return activationConfigPropertyValue;
     }
 
-    /**
-     * Sets the value of the activationConfigPropertyValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setActivationConfigPropertyValue(String value) {
         this.activationConfigPropertyValue = value;
     }
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/AsContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/AsContext.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/AsContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/AsContext.java Mon Oct 15 21:38:53 2007
@@ -14,28 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "authMethod",
     "realm",
     "required"
 })
-@XmlRootElement(name = "as-context")
 public class AsContext {
-
     @XmlElement(name = "auth-method", required = true)
     protected String authMethod;
     @XmlElement(required = true)
@@ -43,76 +35,27 @@
     @XmlElement(required = true)
     protected String required;
 
-    /**
-     * Gets the value of the authMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getAuthMethod() {
         return authMethod;
     }
 
-    /**
-     * Sets the value of the authMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setAuthMethod(String value) {
         this.authMethod = value;
     }
 
-    /**
-     * Gets the value of the realm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getRealm() {
         return realm;
     }
 
-    /**
-     * Sets the value of the realm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setRealm(String value) {
         this.realm = value;
     }
 
-    /**
-     * Gets the value of the required property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getRequired() {
         return required;
     }
 
-    /**
-     * Sets the value of the required property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setRequired(String value) {
         this.required = value;
     }
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanCache.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanCache.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanCache.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanCache.java Mon Oct 15 21:38:53 2007
@@ -14,19 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "maxCacheSize",
@@ -36,9 +30,7 @@
     "removalTimeoutInSeconds",
     "victimSelectionPolicy"
 })
-@XmlRootElement(name = "bean-cache")
 public class BeanCache {
-
     @XmlElement(name = "max-cache-size")
     protected String maxCacheSize;
     @XmlElement(name = "resize-quantity")
@@ -52,148 +44,51 @@
     @XmlElement(name = "victim-selection-policy")
     protected String victimSelectionPolicy;
 
-    /**
-     * Gets the value of the maxCacheSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getMaxCacheSize() {
         return maxCacheSize;
     }
 
-    /**
-     * Sets the value of the maxCacheSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setMaxCacheSize(String value) {
         this.maxCacheSize = value;
     }
 
-    /**
-     * Gets the value of the resizeQuantity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getResizeQuantity() {
         return resizeQuantity;
     }
 
-    /**
-     * Sets the value of the resizeQuantity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setResizeQuantity(String value) {
         this.resizeQuantity = value;
     }
 
-    /**
-     * Gets the value of the isCacheOverflowAllowed property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getIsCacheOverflowAllowed() {
         return isCacheOverflowAllowed;
     }
 
-    /**
-     * Sets the value of the isCacheOverflowAllowed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setIsCacheOverflowAllowed(String value) {
         this.isCacheOverflowAllowed = value;
     }
 
-    /**
-     * Gets the value of the cacheIdleTimeoutInSeconds property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getCacheIdleTimeoutInSeconds() {
         return cacheIdleTimeoutInSeconds;
     }
 
-    /**
-     * Sets the value of the cacheIdleTimeoutInSeconds property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setCacheIdleTimeoutInSeconds(String value) {
         this.cacheIdleTimeoutInSeconds = value;
     }
 
-    /**
-     * Gets the value of the removalTimeoutInSeconds property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getRemovalTimeoutInSeconds() {
         return removalTimeoutInSeconds;
     }
 
-    /**
-     * Sets the value of the removalTimeoutInSeconds property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setRemovalTimeoutInSeconds(String value) {
         this.removalTimeoutInSeconds = value;
     }
 
-    /**
-     * Gets the value of the victimSelectionPolicy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getVictimSelectionPolicy() {
         return victimSelectionPolicy;
     }
 
-    /**
-     * Sets the value of the victimSelectionPolicy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setVictimSelectionPolicy(String value) {
         this.victimSelectionPolicy = value;
     }
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanPool.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanPool.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanPool.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/BeanPool.java Mon Oct 15 21:38:53 2007
@@ -14,19 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "steadyPoolSize",
@@ -35,9 +29,7 @@
     "poolIdleTimeoutInSeconds",
     "maxWaitTimeInMillis"
 })
-@XmlRootElement(name = "bean-pool")
 public class BeanPool {
-
     @XmlElement(name = "steady-pool-size")
     protected String steadyPoolSize;
     @XmlElement(name = "resize-quantity")
@@ -49,124 +41,43 @@
     @XmlElement(name = "max-wait-time-in-millis")
     protected String maxWaitTimeInMillis;
 
-    /**
-     * Gets the value of the steadyPoolSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getSteadyPoolSize() {
         return steadyPoolSize;
     }
 
-    /**
-     * Sets the value of the steadyPoolSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setSteadyPoolSize(String value) {
         this.steadyPoolSize = value;
     }
 
-    /**
-     * Gets the value of the resizeQuantity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getResizeQuantity() {
         return resizeQuantity;
     }
 
-    /**
-     * Sets the value of the resizeQuantity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setResizeQuantity(String value) {
         this.resizeQuantity = value;
     }
 
-    /**
-     * Gets the value of the maxPoolSize property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getMaxPoolSize() {
         return maxPoolSize;
     }
 
-    /**
-     * Sets the value of the maxPoolSize property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setMaxPoolSize(String value) {
         this.maxPoolSize = value;
     }
 
-    /**
-     * Gets the value of the poolIdleTimeoutInSeconds property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getPoolIdleTimeoutInSeconds() {
         return poolIdleTimeoutInSeconds;
     }
 
-    /**
-     * Sets the value of the poolIdleTimeoutInSeconds property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setPoolIdleTimeoutInSeconds(String value) {
         this.poolIdleTimeoutInSeconds = value;
     }
 
-    /**
-     * Gets the value of the maxWaitTimeInMillis property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getMaxWaitTimeInMillis() {
         return maxWaitTimeInMillis;
     }
 
-    /**
-     * Sets the value of the maxWaitTimeInMillis property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setMaxWaitTimeInMillis(String value) {
         this.maxWaitTimeInMillis = value;
     }
-
 }

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cache.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,119 @@
+/**
+ * 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.sun;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "cacheHelper",
+    "defaultHelper",
+    "property",
+    "cacheMapping"
+})
+public class Cache {
+    @XmlAttribute(name = "max-entries")
+    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
+    protected String maxEntries;
+    @XmlAttribute(name = "timeout-in-seconds")
+    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
+    protected String timeoutInSeconds;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String enabled;
+    @XmlElement(name = "cache-helper")
+    protected List<CacheHelper> cacheHelper;
+    @XmlElement(name = "default-helper")
+    protected DefaultHelper defaultHelper;
+    protected List<Property> property;
+    @XmlElement(name = "cache-mapping")
+    protected List<CacheMapping> cacheMapping;
+
+    public String getMaxEntries() {
+        if (maxEntries == null) {
+            return "4096";
+        } else {
+            return maxEntries;
+        }
+    }
+
+    public void setMaxEntries(String value) {
+        this.maxEntries = value;
+    }
+
+    public String getTimeoutInSeconds() {
+        if (timeoutInSeconds == null) {
+            return "30";
+        } else {
+            return timeoutInSeconds;
+        }
+    }
+
+    public void setTimeoutInSeconds(String value) {
+        this.timeoutInSeconds = value;
+    }
+
+    public String getEnabled() {
+        if (enabled == null) {
+            return "true";
+        } else {
+            return enabled;
+        }
+    }
+
+    public void setEnabled(String value) {
+        this.enabled = value;
+    }
+
+    public List<CacheHelper> getCacheHelper() {
+        if (cacheHelper == null) {
+            cacheHelper = new ArrayList<CacheHelper>();
+        }
+        return this.cacheHelper;
+    }
+
+    public DefaultHelper getDefaultHelper() {
+        return defaultHelper;
+    }
+
+    public void setDefaultHelper(DefaultHelper value) {
+        this.defaultHelper = value;
+    }
+
+    public List<Property> getProperty() {
+        if (property == null) {
+            property = new ArrayList<Property>();
+        }
+        return this.property;
+    }
+
+    public List<CacheMapping> getCacheMapping() {
+        if (cacheMapping == null) {
+            cacheMapping = new ArrayList<CacheMapping>();
+        }
+        return this.cacheMapping;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelper.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelper.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelper.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,63 @@
+/**
+ * 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.sun;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "property"
+})
+public class CacheHelper {
+    @XmlAttribute(required = true)
+    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
+    protected String name;
+    @XmlAttribute(name = "class-name", required = true)
+    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
+    protected String className;
+    protected List<Property> property;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String value) {
+        this.className = value;
+    }
+
+    public List<Property> getProperty() {
+        if (property == null) {
+            property = new ArrayList<Property>();
+        }
+        return this.property;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelperRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelperRef.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelperRef.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheHelperRef.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,39 @@
+/**
+ * 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.sun;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "value"
+})
+public class CacheHelperRef {
+    @XmlValue
+    protected String value;
+
+    public String getvalue() {
+        return value;
+    }
+
+    public void setvalue(String value) {
+        this.value = value;
+    }
+}

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheMapping.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheMapping.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheMapping.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CacheMapping.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,62 @@
+/**
+ * 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.sun;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "servletNameOrUrlPattern",
+    "cacheHelperRefOrDispatcherOrTimeoutOrRefreshFieldOrHttpMethodOrKeyFieldOrConstraintField"
+})
+public class CacheMapping {
+    @XmlElements({
+        @XmlElement(name = "servlet-name", required = true, type = ServletName.class),
+        @XmlElement(name = "url-pattern", required = true, type = UrlPattern.class)
+    })
+    protected List<Object> servletNameOrUrlPattern;
+    @XmlElements({
+        @XmlElement(name = "cache-helper-ref", type = CacheHelperRef.class),
+        @XmlElement(name = "dispatcher", type = Dispatcher.class),
+        @XmlElement(name = "timeout", type = Timeout.class),
+        @XmlElement(name = "refresh-field", type = RefreshField.class),
+        @XmlElement(name = "http-method", type = HttpMethod.class),
+        @XmlElement(name = "key-field", type = KeyField.class),
+        @XmlElement(name = "constraint-field", type = ConstraintField.class)
+    })
+    protected List<Object> cacheHelperRefOrDispatcherOrTimeoutOrRefreshFieldOrHttpMethodOrKeyFieldOrConstraintField;
+
+    public List<Object> getServletNameOrUrlPattern() {
+        if (servletNameOrUrlPattern == null) {
+            servletNameOrUrlPattern = new ArrayList<Object>();
+        }
+        return this.servletNameOrUrlPattern;
+    }
+
+    public List<Object> getCacheHelperRefOrDispatcherOrTimeoutOrRefreshFieldOrHttpMethodOrKeyFieldOrConstraintField() {
+        if (cacheHelperRefOrDispatcherOrTimeoutOrRefreshFieldOrHttpMethodOrKeyFieldOrConstraintField == null) {
+            cacheHelperRefOrDispatcherOrTimeoutOrRefreshFieldOrHttpMethodOrKeyFieldOrConstraintField = new ArrayList<Object>();
+        }
+        return this.cacheHelperRefOrDispatcherOrTimeoutOrRefreshFieldOrHttpMethodOrKeyFieldOrConstraintField;
+    }
+}

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CallProperty.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CallProperty.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CallProperty.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CallProperty.java Mon Oct 15 21:38:53 2007
@@ -14,78 +14,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "name",
     "value"
 })
-@XmlRootElement(name = "call-property")
 public class CallProperty {
-
     @XmlElement(required = true)
     protected String name;
     @XmlElement(required = true)
     protected String value;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getName() {
         return name;
     }
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setName(String value) {
         this.name = value;
     }
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getValue() {
         return value;
     }
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setValue(String value) {
         this.value = value;
     }
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckAllAtCommit.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckAllAtCommit.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckAllAtCommit.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckAllAtCommit.java Mon Oct 15 21:38:53 2007
@@ -14,22 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
-@XmlRootElement(name = "check-all-at-commit")
 public class CheckAllAtCommit {
-
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckModifiedAtCommit.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckModifiedAtCommit.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckModifiedAtCommit.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckModifiedAtCommit.java Mon Oct 15 21:38:53 2007
@@ -14,22 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
-@XmlRootElement(name = "check-modified-at-commit")
 public class CheckModifiedAtCommit {
-
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckVersionOfAccessedInstances.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckVersionOfAccessedInstances.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckVersionOfAccessedInstances.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckVersionOfAccessedInstances.java Mon Oct 15 21:38:53 2007
@@ -14,58 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "columnName"
-})
-@XmlRootElement(name = "check-version-of-accessed-instances")
+@XmlType(name = "", propOrder = {"columnName"})
 public class CheckVersionOfAccessedInstances {
-
     @XmlElement(name = "column-name", required = true)
     protected List<ColumnName> columnName;
 
-    /**
-     * Gets the value of the columnName property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the columnName property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getColumnName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ColumnName }
-     * 
-     * 
-     */
     public List<ColumnName> getColumnName() {
         if (columnName == null) {
             columnName = new ArrayList<ColumnName>();
         }
         return this.columnName;
     }
-
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckpointAtEndOfMethod.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckpointAtEndOfMethod.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckpointAtEndOfMethod.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/CheckpointAtEndOfMethod.java Mon Oct 15 21:38:53 2007
@@ -14,58 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "method"
-})
-@XmlRootElement(name = "checkpoint-at-end-of-method")
+@XmlType(name = "", propOrder = {"method"})
 public class CheckpointAtEndOfMethod {
-
     @XmlElement(required = true)
     protected List<Method> method;
 
-    /**
-     * Gets the value of the method property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the method property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMethod().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Method }
-     * 
-     * 
-     */
     public List<Method> getMethod() {
         if (method == null) {
             method = new ArrayList<Method>();
         }
         return this.method;
     }
-
 }

Added: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java?rev=585036&view=auto
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java (added)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/ClassLoader.java Mon Oct 15 21:38:53 2007
@@ -0,0 +1,77 @@
+/**
+ * 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.sun;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {"property"})
+public class ClassLoader {
+    @XmlAttribute(name = "extra-class-path")
+    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
+    protected String extraClassPath;
+    @XmlAttribute
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String delegate;
+    @XmlAttribute(name = "dynamic-reload-interval")
+    @XmlJavaTypeAdapter(NormalizedStringAdapter.class)
+    protected String dynamicReloadInterval;
+    protected List<Property> property;
+
+    public String getExtraClassPath() {
+        return extraClassPath;
+    }
+
+    public void setExtraClassPath(String value) {
+        this.extraClassPath = value;
+    }
+
+    public String getDelegate() {
+        if (delegate == null) {
+            return "true";
+        } else {
+            return delegate;
+        }
+    }
+
+    public void setDelegate(String value) {
+        this.delegate = value;
+    }
+
+    public String getDynamicReloadInterval() {
+        return dynamicReloadInterval;
+    }
+
+    public void setDynamicReloadInterval(String value) {
+        this.dynamicReloadInterval = value;
+    }
+
+    public List<Property> getProperty() {
+        if (property == null) {
+            property = new ArrayList<Property>();
+        }
+        return this.property;
+    }
+}

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cmp.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cmp.java?rev=585036&r1=585035&r2=585036&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cmp.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/sun/Cmp.java Mon Oct 15 21:38:53 2007
@@ -14,19 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.openejb.jee.sun;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-
-/**
- * 
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
     "mappingProperties",
@@ -34,9 +28,7 @@
     "oneOneFinders",
     "prefetchDisabled"
 })
-@XmlRootElement(name = "cmp")
 public class Cmp {
-
     @XmlElement(name = "mapping-properties")
     protected String mappingProperties;
     @XmlElement(name = "is-one-one-cmp")
@@ -46,100 +38,35 @@
     @XmlElement(name = "prefetch-disabled")
     protected PrefetchDisabled prefetchDisabled;
 
-    /**
-     * Gets the value of the mappingProperties property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getMappingProperties() {
         return mappingProperties;
     }
 
-    /**
-     * Sets the value of the mappingProperties property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setMappingProperties(String value) {
         this.mappingProperties = value;
     }
 
-    /**
-     * Gets the value of the isOneOneCmp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
     public String getIsOneOneCmp() {
         return isOneOneCmp;
     }
 
-    /**
-     * Sets the value of the isOneOneCmp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
     public void setIsOneOneCmp(String value) {
         this.isOneOneCmp = value;
     }
 
-    /**
-     * Gets the value of the oneOneFinders property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OneOneFinders }
-     *     
-     */
     public OneOneFinders getOneOneFinders() {
         return oneOneFinders;
     }
 
-    /**
-     * Sets the value of the oneOneFinders property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OneOneFinders }
-     *     
-     */
     public void setOneOneFinders(OneOneFinders value) {
         this.oneOneFinders = value;
     }
 
-    /**
-     * Gets the value of the prefetchDisabled property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PrefetchDisabled }
-     *     
-     */
     public PrefetchDisabled getPrefetchDisabled() {
         return prefetchDisabled;
     }
 
-    /**
-     * Sets the value of the prefetchDisabled property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PrefetchDisabled }
-     *     
-     */
     public void setPrefetchDisabled(PrefetchDisabled value) {
         this.prefetchDisabled = value;
     }
-
 }



Mime
View raw message