geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1098802 [2/3] - in /geronimo/server/branches/3.0-osgi: ./ framework/ framework/modules/geronimo-deployment/ framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/ framework/modules/geronimo-service-bui...
Date Mon, 02 May 2011 21:49:25 GMT
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Mon May  2 21:49:22 2011
@@ -41,7 +41,16 @@
         </dependency>
 
         <dependency>
-            <!-- g-schema-jee_5 comes via g-j2ee-builder from this -->
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${project.version}</version>
@@ -89,57 +98,98 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.codehaus.mojo</groupId>-->
+                <!--<artifactId>jaxb2-maven-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>xjc</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+                <!--<configuration>-->
+                    <!--<packageName>org.apache.geronimo.web25.deployment.model</packageName>-->
+                    <!--<extension>true</extension>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <instructions>
-                        <!--packages containing "impl" or "internal" are excluded by default -->
-                        <Export-Package>
-                            org.apache.geronimo.web.deployment,
-                            org.apache.geronimo.web25.deployment,
-                            org.apache.geronimo.web25.deployment.security,
-                            org.apache.geronimo.xbeans.geronimo.web,
-                            org.apache.geronimo.xbeans.geronimo.web.impl,
-                            org.apache.geronimo.web25.deployment.merge,
-                            org.apache.geronimo.web25.deployment.merge.annotation,
-                            org.apache.geronimo.web25.deployment.merge.webfragment,
-                            org.apache.geronimo.web25.deployment.utils
-                        </Export-Package>
-                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
-                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                        <Import-Package>
-                            org.apache.geronimo.deployment.xbeans.impl,
-                            org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans,
-                            org.apache.geronimo.deployment.javabean.xbeans,
-                            org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service,
-                            org.apache.geronimo.deployment.service.jsr88,
-                            org.apache.xmlbeans.impl.schema;version="2.4",
-                            org.apache.geronimo.xbeans.geronimo.j2ee,
-                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
-                            org.apache.geronimo.j2ee.deployment,
-                            org.apache.geronimo.j2ee.deployment.annotation,
-                            org.apache.geronimo.j2ee.jsr88,
-                            org.apache.geronimo.xbeans.geronimo.naming,
-                            org.apache.geronimo.xbeans.geronimo.naming.impl,
-                            org.apache.geronimo.naming.deployment,
-                            org.apache.geronimo.naming.deployment.jsr88,
-                            org.apache.geronimo.xbeans.geronimo.jaspi,
-                            org.apache.geronimo.xbeans.geronimo.jaspi.impl,
-                            *
-                        </Import-Package>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                    </instructions>
+                    <!--<instructions>-->
+                        <!--&lt;!&ndash;packages containing "impl" or "internal" are excluded by default &ndash;&gt;-->
+                        <!--<Export-Package>-->
+                            <!--org.apache.geronimo.web.deployment,-->
+                            <!--org.apache.geronimo.web25.deployment,-->
+                            <!--org.apache.geronimo.web25.deployment.security,-->
+                            <!--org.apache.geronimo.web25.deployment.merge,-->
+                            <!--org.apache.geronimo.web25.deployment.merge.annotation,-->
+                            <!--org.apache.geronimo.web25.deployment.merge.webfragment,-->
+                            <!--org.apache.geronimo.web25.deployment.utils-->
+                        <!--</Export-Package>-->
+                        <!--<Import-Package>-->
+                            <!--org.apache.geronimo.deployment.service,-->
+                            <!--org.apache.geronimo.j2ee.deployment,-->
+                            <!--org.apache.geronimo.j2ee.deployment.annotation,-->
+                            <!--org.apache.geronimo.naming.deployment,-->
+                            <!--*-->
+                        <!--</Import-Package>-->
+                        <!--&lt;!&ndash;<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>&ndash;&gt;-->
+                    <!--</instructions>-->
                 </configuration>
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jaxb</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jvnet.jaxb2.maven2</groupId>
+                        <artifactId>maven-jaxb2-plugin</artifactId>
+                        <configuration>
+                            <debug>true</debug>
+                            <verbose>true</verbose>
+                            <generatePackage>org.apache.geronimo.web25.deployment.model</generatePackage>
+                            <catalog>src/main/resources/catalog.cat</catalog>
+                            <catalogResolver>org.jvnet.jaxb2.maven2.resolver.tools.ClasspathCatalogResolver</catalogResolver>
+                            <episodes>
+                                <episode>
+                                    <groupId>org.apache.geronimo.framework</groupId>
+                                    <artifactId>geronimo-service-builder</artifactId>
+                                </episode>
+                                <episode>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                </episode>
+                                <episode>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-security-builder</artifactId>
+                                </episode>
+                            </episodes>
+                            <plugins>
+                                <plugin>
+                                    <groupId>org.apache.geronimo.framework</groupId>
+                                    <artifactId>geronimo-service-builder</artifactId>
+                                </plugin>
+                                <plugin>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                </plugin>
+                                <plugin>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-security-builder</artifactId>
+                                </plugin>
+                            </plugins>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java Mon May  2 21:49:22 2011
@@ -16,179 +16,179 @@
  */
 package org.apache.geronimo.web.deployment;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.xbeans.ModuleDocument;
-import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.xbeans.geronimo.security.GerSecurityDocument;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlObject;
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.HashSet;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.Set;
+//
+//import javax.xml.namespace.QName;
+//
+//import org.apache.geronimo.common.DeploymentException;
+//import org.apache.geronimo.deployment.xbeans.ModuleDocument;
+//import org.apache.geronimo.schema.SchemaConversionUtils;
+//import org.apache.geronimo.xbeans.geronimo.security.GerSecurityDocument;
+//import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
+//import org.apache.xmlbeans.XmlCursor;
+//import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
  */
 public class GenericToSpecificPlanConverter {
 
-    private static final QName GENERIC_QNAME = GerWebAppDocument.type.getDocumentElementName();
-    private static final String GENERIC_NAMESPACE = GENERIC_QNAME.getNamespaceURI();
-    private static final String OLD_GENERIC_NAMESPACE = "http://geronimo.apache.org/xml/ns/web";
-
-    private static final QName GENERIC_CONFIG_QNAME = new QName(GENERIC_NAMESPACE, "container-config");
-    private static final QName OLD_GENERIC_CONFIG_QNAME = new QName(OLD_GENERIC_NAMESPACE, "container-config");
-    private static final String SYSTEM_NAMESPACE = ModuleDocument.type.getDocumentElementName().getNamespaceURI();
-    private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
-    private final String configNamespace;
-    private final String namespace;
-    private final String element;
-    private final Set<String> excludedNamespaces = new HashSet<String>();
-
-    public GenericToSpecificPlanConverter(String configNamespace, String namespace, String element) {
-        this.configNamespace = configNamespace;
-        this.namespace = namespace;
-        this.element = element;
-        excludedNamespaces.add("http://geronimo.apache.org/xml/ns/geronimo-jaspi");
-    }
-
-    public XmlObject convertToSpecificPlan(XmlObject plan) throws DeploymentException {
-        XmlCursor rawCursor = plan.newCursor();
-        try {
-            if (SchemaConversionUtils.findNestedElement(rawCursor, "web-app")) {
-                XmlCursor temp = rawCursor.newCursor();
-                String namespace = temp.getName().getNamespaceURI();
-                temp.dispose();
-                if(!namespace.equals(GENERIC_NAMESPACE) && !namespace.equals(this.namespace) && !namespace.equals(OLD_GENERIC_NAMESPACE)) {
-                    throw new DeploymentException("Cannot handle web plan with namespace "+namespace+" -- expecting "+GENERIC_NAMESPACE+" or "+this.namespace);
-                }
-
-                XmlObject webPlan = rawCursor.getObject().copy();
-
-                XmlCursor cursor = webPlan.newCursor();
-                XmlCursor end = cursor.newCursor();
-                try {
-                    cursor.push();
-                    if (cursor.toChild(GENERIC_CONFIG_QNAME) || cursor.toChild(OLD_GENERIC_CONFIG_QNAME)) {
-                        XmlCursor source = cursor.newCursor();
-                        cursor.push();
-                        cursor.toEndToken();
-                        cursor.toNextToken();
-                        try {
-                            if (source.toChild(configNamespace, element)) {
-                                source.copyXmlContents(cursor);
-                            }
-
-                        } finally {
-                            source.dispose();
-                        }
-                        cursor.pop();
-                        cursor.removeXml();
-                    }
-                    cursor.pop();
-
-                    cursor.push();
-                    while (cursor.hasNextToken()) {
-                        if (cursor.isStart()) {
-                            if (!SchemaConversionUtils.convertSingleElementToGeronimoSubSchemas(cursor, end)
-                            && !this.namespace.equals(cursor.getName().getNamespaceURI())
-                                    && !excludedNamespaces.contains(cursor.getName().getNamespaceURI())) {
-                                cursor.setName(new QName(this.namespace, cursor.getName().getLocalPart()));
-                            }
-                        }
-                        cursor.toNextToken();
-                    }
-                    cursor.pop();
-
-                    cursor.push();
-                    Map<Object, List<XmlCursor>> map = createElementMap(cursor);
-                    cursor.pop();
-
-                    moveToBottom(cursor, map.get("security-realm-name"));
-                    moveToBottom(cursor, map.get("authentication"));
-                    moveToBottom(cursor, map.get("security"));
-                    moveToBottom(cursor, map.get("gbean"));
-                    // Convert Persistent Document
-                    convertPersistenceSchemaVersion(cursor, map.get("persistence"));
-                    moveToBottom(cursor, map.get("persistence"));
-
-                    clearElementMap(map);
-
-                    return webPlan;
-                } finally {
-                    cursor.dispose();
-                    end.dispose();
-                }
-            } else {
-                throw new DeploymentException("No web-app element");
-            }
-        } finally {
-            rawCursor.dispose();
-        }
-    }
-
-    private static Map<Object, List<XmlCursor>> createElementMap(XmlCursor cursor) {
-        Map<Object, List<XmlCursor>> map = new HashMap<Object, List<XmlCursor>>();
-        cursor.toStartDoc();
-        if (cursor.toFirstChild()) {
-            do {
-                QName name = cursor.getName();
-                List<XmlCursor> locations = map.get(name);
-                if (locations == null) {
-                    locations = new ArrayList<XmlCursor>();
-                    map.put(name, locations);
-                    map.put(name.getLocalPart(), locations);
-                }
-                locations.add(cursor.newCursor());
-            } while(cursor.toNextSibling());
-        }
-        return map;
-    }
-
-    private static void clearElementMap(Map<Object, List<XmlCursor>> map) {
-        for (Map.Entry<Object, List<XmlCursor>> entry : map.entrySet()) {
-            for (XmlCursor cursor : entry.getValue()) {
-                cursor.dispose();
-            }
-        }
-        map.clear();
-    }
-
-    private static void moveToBottom(XmlCursor cursor, List<XmlCursor> locations) {
-        if (locations != null) {
-            for (XmlCursor location : locations) {
-                cursor.toEndDoc();
-                location.moveXml(cursor);
-            }
-        }
-    }
-
-    protected void convertPersistenceSchemaVersion(XmlCursor cursor, List<XmlCursor> locations) {
-        if (locations != null) {
-            for (XmlCursor location : locations) {
-                location.push();
-                XmlCursor end = null;
-                try {
-                    end = location.newCursor();
-                    end.toCursor(location);
-                    end.toEndToken();
-                    SchemaConversionUtils.convertSchemaVersion(location, end, SchemaConversionUtils.JPA_PERSISTENCE_NAMESPACE, "http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd", "2.0");
-                } finally {
-                    if (end != null) {
-                        try {
-                            end.dispose();
-                        } catch (Exception e) {
-                        }
-                    }
-                    location.pop();
-                }
-            }
-        }
-    }
+//    private static final QName GENERIC_QNAME = GerWebAppDocument.type.getDocumentElementName();
+//    private static final String GENERIC_NAMESPACE = GENERIC_QNAME.getNamespaceURI();
+//    private static final String OLD_GENERIC_NAMESPACE = "http://geronimo.apache.org/xml/ns/web";
+//
+//    private static final QName GENERIC_CONFIG_QNAME = new QName(GENERIC_NAMESPACE, "container-config");
+//    private static final QName OLD_GENERIC_CONFIG_QNAME = new QName(OLD_GENERIC_NAMESPACE, "container-config");
+//    private static final String SYSTEM_NAMESPACE = ModuleDocument.type.getDocumentElementName().getNamespaceURI();
+//    private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
+//    private final String configNamespace;
+//    private final String namespace;
+//    private final String element;
+//    private final Set<String> excludedNamespaces = new HashSet<String>();
+//
+//    public GenericToSpecificPlanConverter(String configNamespace, String namespace, String element) {
+//        this.configNamespace = configNamespace;
+//        this.namespace = namespace;
+//        this.element = element;
+//        excludedNamespaces.add("http://geronimo.apache.org/xml/ns/geronimo-jaspi");
+//    }
+//
+//    public XmlObject convertToSpecificPlan(XmlObject plan) throws DeploymentException {
+//        XmlCursor rawCursor = plan.newCursor();
+//        try {
+//            if (SchemaConversionUtils.findNestedElement(rawCursor, "web-app")) {
+//                XmlCursor temp = rawCursor.newCursor();
+//                String namespace = temp.getName().getNamespaceURI();
+//                temp.dispose();
+//                if(!namespace.equals(GENERIC_NAMESPACE) && !namespace.equals(this.namespace) && !namespace.equals(OLD_GENERIC_NAMESPACE)) {
+//                    throw new DeploymentException("Cannot handle web plan with namespace "+namespace+" -- expecting "+GENERIC_NAMESPACE+" or "+this.namespace);
+//                }
+//
+//                XmlObject webPlan = rawCursor.getObject().copy();
+//
+//                XmlCursor cursor = webPlan.newCursor();
+//                XmlCursor end = cursor.newCursor();
+//                try {
+//                    cursor.push();
+//                    if (cursor.toChild(GENERIC_CONFIG_QNAME) || cursor.toChild(OLD_GENERIC_CONFIG_QNAME)) {
+//                        XmlCursor source = cursor.newCursor();
+//                        cursor.push();
+//                        cursor.toEndToken();
+//                        cursor.toNextToken();
+//                        try {
+//                            if (source.toChild(configNamespace, element)) {
+//                                source.copyXmlContents(cursor);
+//                            }
+//
+//                        } finally {
+//                            source.dispose();
+//                        }
+//                        cursor.pop();
+//                        cursor.removeXml();
+//                    }
+//                    cursor.pop();
+//
+//                    cursor.push();
+//                    while (cursor.hasNextToken()) {
+//                        if (cursor.isStart()) {
+//                            if (!SchemaConversionUtils.convertSingleElementToGeronimoSubSchemas(cursor, end)
+//                            && !this.namespace.equals(cursor.getName().getNamespaceURI())
+//                                    && !excludedNamespaces.contains(cursor.getName().getNamespaceURI())) {
+//                                cursor.setName(new QName(this.namespace, cursor.getName().getLocalPart()));
+//                            }
+//                        }
+//                        cursor.toNextToken();
+//                    }
+//                    cursor.pop();
+//
+//                    cursor.push();
+//                    Map<Object, List<XmlCursor>> map = createElementMap(cursor);
+//                    cursor.pop();
+//
+//                    moveToBottom(cursor, map.get("security-realm-name"));
+//                    moveToBottom(cursor, map.get("authentication"));
+//                    moveToBottom(cursor, map.get("security"));
+//                    moveToBottom(cursor, map.get("gbean"));
+//                    // Convert Persistent Document
+//                    convertPersistenceSchemaVersion(cursor, map.get("persistence"));
+//                    moveToBottom(cursor, map.get("persistence"));
+//
+//                    clearElementMap(map);
+//
+//                    return webPlan;
+//                } finally {
+//                    cursor.dispose();
+//                    end.dispose();
+//                }
+//            } else {
+//                throw new DeploymentException("No web-app element");
+//            }
+//        } finally {
+//            rawCursor.dispose();
+//        }
+//    }
+//
+//    private static Map<Object, List<XmlCursor>> createElementMap(XmlCursor cursor) {
+//        Map<Object, List<XmlCursor>> map = new HashMap<Object, List<XmlCursor>>();
+//        cursor.toStartDoc();
+//        if (cursor.toFirstChild()) {
+//            do {
+//                QName name = cursor.getName();
+//                List<XmlCursor> locations = map.get(name);
+//                if (locations == null) {
+//                    locations = new ArrayList<XmlCursor>();
+//                    map.put(name, locations);
+//                    map.put(name.getLocalPart(), locations);
+//                }
+//                locations.add(cursor.newCursor());
+//            } while(cursor.toNextSibling());
+//        }
+//        return map;
+//    }
+//
+//    private static void clearElementMap(Map<Object, List<XmlCursor>> map) {
+//        for (Map.Entry<Object, List<XmlCursor>> entry : map.entrySet()) {
+//            for (XmlCursor cursor : entry.getValue()) {
+//                cursor.dispose();
+//            }
+//        }
+//        map.clear();
+//    }
+//
+//    private static void moveToBottom(XmlCursor cursor, List<XmlCursor> locations) {
+//        if (locations != null) {
+//            for (XmlCursor location : locations) {
+//                cursor.toEndDoc();
+//                location.moveXml(cursor);
+//            }
+//        }
+//    }
+//
+//    protected void convertPersistenceSchemaVersion(XmlCursor cursor, List<XmlCursor> locations) {
+//        if (locations != null) {
+//            for (XmlCursor location : locations) {
+//                location.push();
+//                XmlCursor end = null;
+//                try {
+//                    end = location.newCursor();
+//                    end.toCursor(location);
+//                    end.toEndToken();
+//                    SchemaConversionUtils.convertSchemaVersion(location, end, SchemaConversionUtils.JPA_PERSISTENCE_NAMESPACE, "http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd", "2.0");
+//                } finally {
+//                    if (end != null) {
+//                        try {
+//                            end.dispose();
+//                        } catch (Exception e) {
+//                        }
+//                    }
+//                    location.pop();
+//                }
+//            }
+//        }
+//    }
 }
\ No newline at end of file

Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=1098802&r1=1098801&r2=1098802&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Mon May  2 21:49:22 2011
@@ -41,11 +41,9 @@ import javax.security.auth.message.modul
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.components.jaspi.model.AuthModuleType;
 import org.apache.geronimo.components.jaspi.model.ConfigProviderType;
@@ -55,13 +53,13 @@ import org.apache.geronimo.components.ja
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
 import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.annotation.Holder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
@@ -81,7 +79,6 @@ import org.apache.geronimo.kernel.config
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.ImportType;
 import org.apache.geronimo.kernel.util.FileUtils;
 import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
 import org.apache.geronimo.security.jacc.ComponentPermissions;
@@ -92,8 +89,8 @@ import org.apache.geronimo.security.jasp
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.geronimo.web.security.SpecSecurityBuilder;
 import org.apache.geronimo.web25.deployment.merge.MergeHelper;
-import org.apache.geronimo.web25.deployment.security.AuthenticationWrapper;
-import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
+import org.apache.geronimo.web25.deployment.model.AuthenticationType;
+import org.apache.geronimo.web25.deployment.model.WebAppType;
 import org.apache.openejb.jee.Filter;
 import org.apache.openejb.jee.JaxbJavaee;
 import org.apache.openejb.jee.Listener;
@@ -102,16 +99,12 @@ import org.apache.openejb.jee.ServletMap
 import org.apache.openejb.jee.WebApp;
 import org.apache.xbean.finder.AbstractFinder;
 import org.apache.xbean.finder.ClassFinder;
-import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlDocumentProperties;
-import org.apache.xmlbeans.XmlObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
 
 /**
  * @version $Rev$ $Date$
@@ -212,8 +205,6 @@ public abstract class AbstractWebModuleB
 
     protected final Collection<ModuleBuilderExtension> moduleBuilderExtensions;
 
-    private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
-
     private final PackageAdmin packageAdmin;
 
 
@@ -342,7 +333,7 @@ public abstract class AbstractWebModuleB
             Artifact earConfigId = earContext.getConfigID();
             Artifact configId = new Artifact(earConfigId.getGroupId(), earConfigId.getArtifactId() + "_" + module.getTargetPath(), earConfigId.getVersion(), "car");
             environment.setConfigId(configId);
-            environment.addDependency(earConfigId, ImportType.ALL);
+//            environment.addDependency(earConfigId, ImportType.ALL);
             File configurationDir = new File(earContext.getBaseDir(), module.getTargetPath());
             configurationDir.mkdirs();
             // construct the web app deployment context... this is the same class used by the ear context
@@ -418,11 +409,11 @@ public abstract class AbstractWebModuleB
     public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
         WebModule webModule = (WebModule)module;
         preInitContext(earContext, webModule, bundle);
-        basicInitContext(earContext, webModule, bundle, (XmlObject) module.getVendorDD());
+        basicInitContext(earContext, webModule, bundle, module.getVendorDD());
         postInitContext(earContext, webModule, bundle);
     }
 
-    protected void basicInitContext(EARContext earContext, WebModule webModule, Bundle bundle, XmlObject gerWebApp) throws DeploymentException {
+    protected void basicInitContext(EARContext earContext, WebModule webModule, Bundle bundle, Object gerWebApp) throws DeploymentException {
         //complete manifest classpath
         EARContext moduleContext = webModule.getEarContext();
         Collection<String> manifestcp = webModule.getClassPath();
@@ -431,7 +422,7 @@ public abstract class AbstractWebModuleB
         URI resolutionUri = invertURI(baseUri);
         earContext.getCompleteManifestClassPath(webModule.getDeployable(), baseUri, resolutionUri, manifestcp, moduleLocations);
         //Security Configuration Validation
-        WebApp webApp = webModule.getSpecDD();
+        WebApp webApp = (WebApp) webModule.getSpecDD();
         boolean hasSecurityRealmName = (Boolean) webModule.getEarContext().getGeneralData().get(WEB_MODULE_HAS_SECURITY_REALM);
         if ((!webApp.getSecurityConstraint().isEmpty() || !webApp.getSecurityRole().isEmpty())) {
             if (!hasSecurityRealmName) {
@@ -443,14 +434,14 @@ public abstract class AbstractWebModuleB
             earContext.setHasSecurity(true);
         }
         //TODO think about how to provide a default security realm name
-        XmlObject[] securityElements = XmlBeansUtil.selectSubstitutionGroupElements(SECURITY_QNAME, gerWebApp);
-        if (securityElements.length > 0 && !hasSecurityRealmName) {
-            throw new DeploymentException("You have supplied a security configuration for web app " + webModule.getName() + " but no security-realm-name to allow login");
-        }
+//         securityElements = XmlBeansUtil.selectSubstitutionGroupElements(SECURITY_QNAME, gerWebApp);
+//        if (securityElements.length > 0 && !hasSecurityRealmName) {
+//            throw new DeploymentException("You have supplied a security configuration for web app " + webModule.getName() + " but no security-realm-name to allow login");
+//        }
 
         //Process Naming
-        getNamingBuilders().buildEnvironment(webApp, webModule.getVendorDD(), webModule.getEnvironment());
-        getNamingBuilders().initContext(webApp, gerWebApp, webModule);
+        getNamingBuilders().buildEnvironment(webApp, (JndiPlan)webModule.getVendorDD(), webModule.getEnvironment());
+        getNamingBuilders().initContext(webApp, (JndiPlan)gerWebApp, webModule);
 
         float originalSpecDDVersion;
         String originalSpecDD = webModule.getOriginalSpecDD();
@@ -488,38 +479,39 @@ public abstract class AbstractWebModuleB
      */
     private float identifySpecDDSchemaVersion(String originalSpecDD) {
         float schemaVersion = 0f;
-        XmlCursor cursor = null;
-        try {
-            cursor = XmlBeansUtil.parse(originalSpecDD).newCursor();
-            cursor.toStartDoc();
-            cursor.toFirstChild();
-            String nameSpaceURI = cursor.getName().getNamespaceURI();
-            if (nameSpaceURI != null && nameSpaceURI.length() > 0) {
-                String version = cursor.getAttributeText(new QName("", "version"));
-                if (version != null) {
-                    schemaVersion = Float.parseFloat(version);
-                }
-            } else {
-                XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
-                String publicId = xmlDocumentProperties.getDoctypePublicId();
-                if ("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN".equals(publicId)) {
-                    schemaVersion = 2.2f;
-                } else if ("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN".equals(publicId)) {
-                    schemaVersion = 2.3f;
-                }
-            }
-        } catch (Exception e) {
-            log.error("Fail to identify web.xml schema version", e);
-            //Should never happen, as we have checked the deployment plan  in the previous code
-        } finally {
-            if (cursor != null) {
-                try {
-                    cursor.dispose();
-                } catch (Exception e) {
-                    //ignore
-                }
-            }
-        }
+        //TODO figure this out at a better time!!
+//        XmlCursor cursor = null;
+//        try {
+//            cursor = XmlBeansUtil.parse(originalSpecDD).newCursor();
+//            cursor.toStartDoc();
+//            cursor.toFirstChild();
+//            String nameSpaceURI = cursor.getName().getNamespaceURI();
+//            if (nameSpaceURI != null && nameSpaceURI.length() > 0) {
+//                String version = cursor.getAttributeText(new QName("", "version"));
+//                if (version != null) {
+//                    schemaVersion = Float.parseFloat(version);
+//                }
+//            } else {
+//                XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
+//                String publicId = xmlDocumentProperties.getDoctypePublicId();
+//                if ("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN".equals(publicId)) {
+//                    schemaVersion = 2.2f;
+//                } else if ("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN".equals(publicId)) {
+//                    schemaVersion = 2.3f;
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error("Fail to identify web.xml schema version", e);
+//            //Should never happen, as we have checked the deployment plan  in the previous code
+//        } finally {
+//            if (cursor != null) {
+//                try {
+//                    cursor.dispose();
+//                } catch (Exception e) {
+//                    //ignore
+//                }
+//            }
+//        }
         return schemaVersion;
     }
 
@@ -528,54 +520,33 @@ public abstract class AbstractWebModuleB
         return builder.buildSpecSecurityConfig();
     }
 
-    protected void configureLocalJaspicProvider(AuthenticationWrapper authType, String contextPath, Module module, GBeanData securityFactoryData) throws DeploymentException,
+    protected void configureLocalJaspicProvider(AuthenticationType authType, String contextPath, Module module, GBeanData securityFactoryData) throws DeploymentException,
             GBeanAlreadyExistsException {
         EARContext moduleContext = module.getEarContext();
         GBeanData authConfigProviderData = null;
         AbstractName providerName = moduleContext.getNaming().createChildName(module.getModuleName(), "authConfigProvider", GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
         try {
-            if (authType.isSetConfigProvider()) {
+            if (authType.getConfigProvider() != null) {
                 authConfigProviderData = new GBeanData(providerName, AuthConfigProviderGBean.class);
-                final XmlCursor xmlCursor = authType.getConfigProvider().newCursor();
-                try {
-                    XMLStreamReader reader = new InternWrapper(xmlCursor.newXMLStreamReader());
-                    ConfigProviderType configProviderType = JaspiXmlUtil.loadConfigProvider(reader);
+                    ConfigProviderType configProviderType = authType.getConfigProvider();
                     StringWriter out = new StringWriter();
                     JaspiXmlUtil.writeConfigProvider(configProviderType, out);
                     authConfigProviderData.setAttribute("config", out.toString());
-                } finally {
-                    xmlCursor.dispose();
-                }
-            } else if (authType.isSetServerAuthConfig()) {
+            } else if (authType.getServerAuthConfig() != null) {
                 authConfigProviderData = new GBeanData(providerName, ServerAuthConfigGBean.class);
-                final XmlCursor xmlCursor = authType.getServerAuthConfig().newCursor();
-                try {
-                    XMLStreamReader reader = new InternWrapper(xmlCursor.newXMLStreamReader());
-                    ServerAuthConfigType serverAuthConfigType = JaspiXmlUtil.loadServerAuthConfig(reader);
+                    ServerAuthConfigType serverAuthConfigType = authType.getServerAuthConfig();
                     StringWriter out = new StringWriter();
                     JaspiXmlUtil.writeServerAuthConfig(serverAuthConfigType, out);
                     authConfigProviderData.setAttribute("config", out.toString());
-                } finally {
-                    xmlCursor.dispose();
-                }
-            } else if (authType.isSetServerAuthContext()) {
+            } else if (authType.getServerAuthContext() != null) {
                 authConfigProviderData = new GBeanData(providerName, ServerAuthContextGBean.class);
-                final XmlCursor xmlCursor = authType.getServerAuthContext().newCursor();
-                try {
-                    XMLStreamReader reader = new InternWrapper(xmlCursor.newXMLStreamReader());
-                    ServerAuthContextType serverAuthContextType = JaspiXmlUtil.loadServerAuthContext(reader);
+                    ServerAuthContextType serverAuthContextType = authType.getServerAuthContext();
                     StringWriter out = new StringWriter();
                     JaspiXmlUtil.writeServerAuthContext(serverAuthContextType, out);
                     authConfigProviderData.setAttribute("config", out.toString());
-                } finally {
-                    xmlCursor.dispose();
-                }
-            } else if (authType.isSetServerAuthModule()) {
+            } else if (authType.getServerAuthModule() != null) {
                 authConfigProviderData = new GBeanData(providerName, ServerAuthModuleGBean.class);
-                final XmlCursor xmlCursor = authType.getServerAuthModule().newCursor();
-                try {
-                    XMLStreamReader reader = new InternWrapper(xmlCursor.newXMLStreamReader());
-                    AuthModuleType<ServerAuthModule> authModuleType = JaspiXmlUtil.loadServerAuthModule(reader);
+                    AuthModuleType<ServerAuthModule> authModuleType = authType.getServerAuthModule();
                     StringWriter out = new StringWriter();
                     JaspiXmlUtil.writeServerAuthModule(authModuleType, out);
                     authConfigProviderData.setAttribute("config", out.toString());
@@ -583,16 +554,7 @@ public abstract class AbstractWebModuleB
                     authConfigProviderData.setAttribute("appContext", "server " + contextPath);
                     //TODO ??
                     authConfigProviderData.setAttribute("authenticationID", contextPath);
-                } finally {
-                    xmlCursor.dispose();
-                }
             }
-        } catch (ParserConfigurationException e) {
-            throw new DeploymentException("Could not read auth config", e);
-        } catch (IOException e) {
-            throw new DeploymentException("Could not read auth config", e);
-        } catch (SAXException e) {
-            throw new DeploymentException("Could not read auth config", e);
         } catch (JAXBException e) {
             throw new DeploymentException("Could not read auth config", e);
         } catch (XMLStreamException e) {
@@ -646,11 +608,11 @@ public abstract class AbstractWebModuleB
         }
     }
 
-    protected void configureBasicWebModuleAttributes(WebApp webApp, XmlObject vendorPlan, EARContext moduleContext, EARContext earContext, WebModule webModule, GBeanData webModuleData)
+    protected void configureBasicWebModuleAttributes(WebApp webApp, WebAppType vendorPlan, EARContext moduleContext, EARContext earContext, WebModule webModule, GBeanData webModuleData)
             throws DeploymentException {
         Map<EARContext.Key, Object> buildingContext = new HashMap<EARContext.Key, Object>();
         buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleContext.getModuleName());
-        webModule.getJndiContext().get(JndiScope.module).put("module/ModuleName", webModule.getName());
+        webModule.getJndiScope(JndiScope.module).put("module/ModuleName", webModule.getName());
         if (!webApp.isMetadataComplete()) {
             // Create a classfinder and populate it for the naming builder(s). The absence of a
             // classFinder in the module will convey whether metadata-complete is set (or not)

Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java Mon May  2 21:49:22 2011
@@ -0,0 +1,157 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.27 at 07:52:24 PM PDT 
+//
+
+
+package org.apache.geronimo.web25.deployment.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.geronimo.components.jaspi.model.AuthModuleType;
+import org.apache.geronimo.components.jaspi.model.ConfigProviderType;
+import org.apache.geronimo.components.jaspi.model.ServerAuthConfigType;
+import org.apache.geronimo.components.jaspi.model.ServerAuthContextType;
+
+
+/**
+ * <p>Java class for authenticationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="authenticationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/geronimo-jaspi}configProvider"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/geronimo-jaspi}serverAuthConfig"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/geronimo-jaspi}serverAuthContext"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/geronimo-jaspi}serverAuthModule"/>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "authenticationType", propOrder = {
+    "configProvider",
+    "serverAuthConfig",
+    "serverAuthContext",
+    "serverAuthModule"
+})
+public class AuthenticationType {
+
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi")
+    protected ConfigProviderType configProvider;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi")
+    protected ServerAuthConfigType serverAuthConfig;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi")
+    protected ServerAuthContextType serverAuthContext;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi")
+    protected AuthModuleType serverAuthModule;
+
+    /**
+     * Gets the value of the configProvider property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ConfigProviderType }
+     *     
+     */
+    public ConfigProviderType getConfigProvider() {
+        return configProvider;
+    }
+
+    /**
+     * Sets the value of the configProvider property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ConfigProviderType }
+     *     
+     */
+    public void setConfigProvider(ConfigProviderType value) {
+        this.configProvider = value;
+    }
+
+    /**
+     * Gets the value of the serverAuthConfig property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServerAuthConfigType }
+     *     
+     */
+    public ServerAuthConfigType getServerAuthConfig() {
+        return serverAuthConfig;
+    }
+
+    /**
+     * Sets the value of the serverAuthConfig property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServerAuthConfigType }
+     *     
+     */
+    public void setServerAuthConfig(ServerAuthConfigType value) {
+        this.serverAuthConfig = value;
+    }
+
+    /**
+     * Gets the value of the serverAuthContext property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ServerAuthContextType }
+     *     
+     */
+    public ServerAuthContextType getServerAuthContext() {
+        return serverAuthContext;
+    }
+
+    /**
+     * Sets the value of the serverAuthContext property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ServerAuthContextType }
+     *     
+     */
+    public void setServerAuthContext(ServerAuthContextType value) {
+        this.serverAuthContext = value;
+    }
+
+    /**
+     * Gets the value of the serverAuthModule property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AuthModuleType }
+     *     
+     */
+    public AuthModuleType getServerAuthModule() {
+        return serverAuthModule;
+    }
+
+    /**
+     * Sets the value of the serverAuthModule property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AuthModuleType }
+     *     
+     */
+    public void setServerAuthModule(AuthModuleType value) {
+        this.serverAuthModule = value;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/AuthenticationType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java Mon May  2 21:49:22 2011
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.27 at 07:52:24 PM PDT 
+//
+
+
+package org.apache.geronimo.web25.deployment.model;
+
+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.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for container-configType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="container-configType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "container-configType", propOrder = {
+    "any"
+})
+public class ContainerConfigType {
+
+    @XmlAnyElement(lax = true)
+    protected List<Object> any;
+
+    /**
+     * Gets the value of the any 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 any property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAny().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Element }
+     * {@link Object }
+     * 
+     * 
+     */
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ContainerConfigType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java Mon May  2 21:49:22 2011
@@ -0,0 +1,175 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.27 at 07:52:24 PM PDT 
+//
+
+
+package org.apache.geronimo.web25.deployment.model;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+import org.apache.geronimo.deployment.service.plan.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.model.naming.AbstractNamingEntryType;
+import org.apache.geronimo.j2ee.deployment.model.naming.MessageDestinationType;
+import org.apache.geronimo.security.deployment.model.jaspi.AuthModuleType;
+import org.apache.geronimo.security.deployment.model.jaspi.ConfigProviderType;
+import org.apache.geronimo.security.deployment.model.jaspi.ServerAuthConfigType;
+import org.apache.geronimo.security.deployment.model.jaspi.ServerAuthContextType;
+import org.apache.geronimo.security.deployment.model.security.SecurityRefType;
+import org.apache.geronimo.security.deployment.model.security.SecurityType;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the org.apache.geronimo.web25.deployment.model package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _ServerAuthModule_QNAME = new QName("http://geronimo.apache.org/xml/ns/geronimo-jaspi", "serverAuthModule");
+    private final static QName _ServerAuthContext_QNAME = new QName("http://geronimo.apache.org/xml/ns/geronimo-jaspi", "serverAuthContext");
+    private final static QName _ConfigProvider_QNAME = new QName("http://geronimo.apache.org/xml/ns/geronimo-jaspi", "configProvider");
+    private final static QName _ServerAuthConfig_QNAME = new QName("http://geronimo.apache.org/xml/ns/geronimo-jaspi", "serverAuthConfig");
+    private final static QName _MessageDestination_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "message-destination");
+    private final static QName _WebApp_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", "web-app");
+    private final static QName _Security_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security");
+    private final static QName _AbstractNamingEntry_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2", "abstract-naming-entry");
+    private final static QName _Environment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2", "environment");
+    private final static QName _SecurityRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "security-ref");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.web25.deployment.model
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link WebAppType }
+     * 
+     */
+    public WebAppType createWebAppType() {
+        return new WebAppType();
+    }
+
+    /**
+     * Create an instance of {@link ContainerConfigType }
+     * 
+     */
+    public ContainerConfigType createContainerConfigType() {
+        return new ContainerConfigType();
+    }
+
+    /**
+     * Create an instance of {@link AuthenticationType }
+     * 
+     */
+    public AuthenticationType createAuthenticationType() {
+        return new AuthenticationType();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AuthModuleType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi", name = "serverAuthModule")
+    public JAXBElement<AuthModuleType> createServerAuthModule(AuthModuleType value) {
+        return new JAXBElement<AuthModuleType>(_ServerAuthModule_QNAME, AuthModuleType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServerAuthContextType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi", name = "serverAuthContext")
+    public JAXBElement<ServerAuthContextType> createServerAuthContext(ServerAuthContextType value) {
+        return new JAXBElement<ServerAuthContextType>(_ServerAuthContext_QNAME, ServerAuthContextType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ConfigProviderType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi", name = "configProvider")
+    public JAXBElement<ConfigProviderType> createConfigProvider(ConfigProviderType value) {
+        return new JAXBElement<ConfigProviderType>(_ConfigProvider_QNAME, ConfigProviderType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ServerAuthConfigType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/geronimo-jaspi", name = "serverAuthConfig")
+    public JAXBElement<ServerAuthConfigType> createServerAuthConfig(ServerAuthConfigType value) {
+        return new JAXBElement<ServerAuthConfigType>(_ServerAuthConfig_QNAME, ServerAuthConfigType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link MessageDestinationType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "message-destination")
+    public JAXBElement<MessageDestinationType> createMessageDestination(MessageDestinationType value) {
+        return new JAXBElement<MessageDestinationType>(_MessageDestination_QNAME, MessageDestinationType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link WebAppType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", name = "web-app")
+    public JAXBElement<WebAppType> createWebApp(WebAppType value) {
+        return new JAXBElement<WebAppType>(_WebApp_QNAME, WebAppType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/security-2.0", name = "security")
+    public JAXBElement<SecurityType> createSecurity(SecurityType value) {
+        return new JAXBElement<SecurityType>(_Security_QNAME, SecurityType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractNamingEntryType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "abstract-naming-entry")
+    public JAXBElement<AbstractNamingEntryType> createAbstractNamingEntry(AbstractNamingEntryType value) {
+        return new JAXBElement<AbstractNamingEntryType>(_AbstractNamingEntry_QNAME, AbstractNamingEntryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", name = "environment")
+    public JAXBElement<EnvironmentType> createEnvironment(EnvironmentType value) {
+        return new JAXBElement<EnvironmentType>(_Environment_QNAME, EnvironmentType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityRefType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/security-2.0", name = "security-ref")
+    public JAXBElement<SecurityRefType> createSecurityRef(SecurityRefType value) {
+        return new JAXBElement<SecurityRefType>(_SecurityRef_QNAME, SecurityRefType.class, null, value);
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/ObjectFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java Mon May  2 21:49:22 2011
@@ -0,0 +1,596 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.27 at 07:52:24 PM PDT 
+//
+
+
+package org.apache.geronimo.web25.deployment.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlType;
+import org.apache.geronimo.deployment.service.plan.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.JndiPlan;
+import org.apache.geronimo.j2ee.deployment.model.naming.AbstractNamingEntryType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EjbLocalRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EjbRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.EnvEntryType;
+import org.apache.geronimo.j2ee.deployment.model.naming.GbeanRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.MessageDestinationType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceContextRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.PersistenceUnitRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceEnvRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ResourceRefType;
+import org.apache.geronimo.j2ee.deployment.model.naming.ServiceRefType;
+import org.apache.geronimo.security.deployment.model.security.SecurityRefType;
+import org.apache.geronimo.security.deployment.model.security.SecurityType;
+
+
+/**
+ * <p>Java class for web-appType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="web-appType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/deployment-1.2}environment" minOccurs="0"/>
+ *         &lt;element name="context-root" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="work-dir" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="web-container" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="container-config" type="{http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1}container-configType" minOccurs="0"/>
+ *         &lt;group ref="{http://geronimo.apache.org/xml/ns/naming-1.2}jndiEnvironmentRefsGroup"/>
+ *         &lt;element ref="{http://geronimo.apache.org/xml/ns/naming-1.2}message-destination" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;sequence minOccurs="0">
+ *           &lt;element name="security-realm-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="authentication" type="{http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1}authenticationType" minOccurs="0"/>
+ *           &lt;choice minOccurs="0">
+ *             &lt;element ref="{http://geronimo.apache.org/xml/ns/security-2.0}security"/>
+ *             &lt;element ref="{http://geronimo.apache.org/xml/ns/security-2.0}security-ref"/>
+ *           &lt;/choice>
+ *         &lt;/sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "web-appType", propOrder = {
+    "environment",
+    "contextRoot",
+    "workDir",
+    "webContainer",
+    "containerConfig",
+    "abstractNamingEntry",
+    "envEntry",
+    "ejbRef",
+    "ejbLocalRef",
+    "serviceRef",
+    "resourceRef",
+    "resourceEnvRef",
+    "messageDestination",
+    "securityRealmName",
+    "authentication",
+    "security",
+    "securityRef"
+})
+public class WebAppType implements JndiPlan {
+
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+    protected EnvironmentType environment;
+    @XmlElement(name = "context-root")
+    protected String contextRoot;
+    @XmlElement(name = "work-dir")
+    protected String workDir;
+    @XmlElement(name = "web-container")
+    protected String webContainer;
+    @XmlElement(name = "container-config")
+    protected ContainerConfigType containerConfig;
+    @XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
+    protected List<JAXBElement<AbstractNamingEntryType>> abstractNamingEntry;
+    @XmlElement(name = "env-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EnvEntryType> envEntry;
+    @XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EjbRefType> ejbRef;
+    @XmlElement(name = "ejb-local-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<EjbLocalRefType> ejbLocalRef;
+    @XmlElement(name = "service-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ServiceRefType> serviceRef;
+    @XmlElement(name = "resource-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ResourceRefType> resourceRef;
+    @XmlElement(name = "resource-env-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<ResourceEnvRefType> resourceEnvRef;
+    @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
+    protected List<MessageDestinationType> messageDestination;
+    @XmlElement(name = "security-realm-name")
+    protected String securityRealmName;
+    protected AuthenticationType authentication;
+    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/security-2.0")
+    protected SecurityType security;
+    @XmlElement(name = "security-ref", namespace = "http://geronimo.apache.org/xml/ns/security-2.0")
+    protected SecurityRefType securityRef;
+
+    /**
+     *                          
+     *                         This is the first part of the URL used to access the web application.
+     *                         For example context-root of "Sample-App" will have URL of 
+     *                         http://host:port/Sample-App" and a context-root of "/" would be make this the default web application to the server.
+     * 
+     *                         If the web application is packaged as an EAR that can use application context
+     *                         in the "application.xml". This element is necessary unless you want context root to default to the WAR 
+     *                         name.
+     *                     
+     * 
+     * @return
+     *     possible object is
+     *     {@link EnvironmentType }
+     *     
+     */
+    public EnvironmentType getEnvironment() {
+        return environment;
+    }
+
+    /**
+     * Sets the value of the environment property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EnvironmentType }
+     *     
+     */
+    public void setEnvironment(EnvironmentType value) {
+        this.environment = value;
+    }
+
+    /**
+     * Gets the value of the contextRoot property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getContextRoot() {
+        return contextRoot;
+    }
+
+    /**
+     * Sets the value of the contextRoot property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setContextRoot(String value) {
+        this.contextRoot = value;
+    }
+
+    /**
+     * Gets the value of the workDir property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWorkDir() {
+        return workDir;
+    }
+
+    /**
+     * Sets the value of the workDir property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWorkDir(String value) {
+        this.workDir = value;
+    }
+
+    /**
+     * Gets the value of the webContainer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getWebContainer() {
+        return webContainer;
+    }
+
+    /**
+     * Sets the value of the webContainer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setWebContainer(String value) {
+        this.webContainer = value;
+    }
+
+    /**
+     * Gets the value of the containerConfig property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ContainerConfigType }
+     *     
+     */
+    public ContainerConfigType getContainerConfig() {
+        return containerConfig;
+    }
+
+    /**
+     * Sets the value of the containerConfig property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ContainerConfigType }
+     *     
+     */
+    public void setContainerConfig(ContainerConfigType value) {
+        this.containerConfig = value;
+    }
+
+    /**
+     * Gets the value of the abstractNamingEntry 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 abstractNamingEntry property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAbstractNamingEntry().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link JAXBElement }{@code <}{@link AbstractNamingEntryType }{@code >}
+     * 
+     * 
+     */
+    public List<JAXBElement<AbstractNamingEntryType>> getAbstractNamingEntry() {
+        if (abstractNamingEntry == null) {
+            abstractNamingEntry = new ArrayList<JAXBElement<AbstractNamingEntryType>>();
+        }
+        return this.abstractNamingEntry;
+    }
+
+    /**
+     * Gets the value of the envEntry 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 envEntry property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getEnvEntry().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EnvEntryType }
+     * 
+     * 
+     */
+    public List<EnvEntryType> getEnvEntry() {
+        if (envEntry == null) {
+            envEntry = new ArrayList<EnvEntryType>();
+        }
+        return this.envEntry;
+    }
+
+    /**
+     * Gets the value of the ejbRef 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 ejbRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getEjbRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EjbRefType }
+     * 
+     * 
+     */
+    public List<EjbRefType> getEjbRef() {
+        if (ejbRef == null) {
+            ejbRef = new ArrayList<EjbRefType>();
+        }
+        return this.ejbRef;
+    }
+
+    /**
+     * Gets the value of the ejbLocalRef 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 ejbLocalRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getEjbLocalRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link EjbLocalRefType }
+     * 
+     * 
+     */
+    public List<EjbLocalRefType> getEjbLocalRef() {
+        if (ejbLocalRef == null) {
+            ejbLocalRef = new ArrayList<EjbLocalRefType>();
+        }
+        return this.ejbLocalRef;
+    }
+
+    /**
+     * Gets the value of the serviceRef 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 serviceRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getServiceRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ServiceRefType }
+     * 
+     * 
+     */
+    public List<ServiceRefType> getServiceRef() {
+        if (serviceRef == null) {
+            serviceRef = new ArrayList<ServiceRefType>();
+        }
+        return this.serviceRef;
+    }
+
+    /**
+     * Gets the value of the resourceRef 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 resourceRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getResourceRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceRefType }
+     * 
+     * 
+     */
+    public List<ResourceRefType> getResourceRef() {
+        if (resourceRef == null) {
+            resourceRef = new ArrayList<ResourceRefType>();
+        }
+        return this.resourceRef;
+    }
+
+    /**
+     * Gets the value of the resourceEnvRef 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 resourceEnvRef property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getResourceEnvRef().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ResourceEnvRefType }
+     * 
+     * 
+     */
+    public List<ResourceEnvRefType> getResourceEnvRef() {
+        if (resourceEnvRef == null) {
+            resourceEnvRef = new ArrayList<ResourceEnvRefType>();
+        }
+        return this.resourceEnvRef;
+    }
+
+    @Override
+    public List<PersistenceContextRefType> getPersistenceContextRef() {
+        return null;
+    }
+
+    @Override
+    public List<PersistenceUnitRefType> getPersistenceUnitRef() {
+        return null;
+    }
+
+    @Override
+    public List<GbeanRefType> getGBeanRef() {
+        return null;
+    }
+
+    /**
+     * Gets the value of the messageDestination 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 messageDestination property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMessageDestination().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MessageDestinationType }
+     * 
+     * 
+     */
+    public List<MessageDestinationType> getMessageDestination() {
+        if (messageDestination == null) {
+            messageDestination = new ArrayList<MessageDestinationType>();
+        }
+        return this.messageDestination;
+    }
+
+    /**
+     * Gets the value of the securityRealmName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getSecurityRealmName() {
+        return securityRealmName;
+    }
+
+    /**
+     * Sets the value of the securityRealmName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSecurityRealmName(String value) {
+        this.securityRealmName = value;
+    }
+
+    /**
+     * Gets the value of the authentication property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AuthenticationType }
+     *     
+     */
+    public AuthenticationType getAuthentication() {
+        return authentication;
+    }
+
+    /**
+     * Sets the value of the authentication property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AuthenticationType }
+     *     
+     */
+    public void setAuthentication(AuthenticationType value) {
+        this.authentication = value;
+    }
+
+    /**
+     * Gets the value of the security property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SecurityType }
+     *     
+     */
+    public SecurityType getSecurity() {
+        return security;
+    }
+
+    /**
+     * Sets the value of the security property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SecurityType }
+     *     
+     */
+    public void setSecurity(SecurityType value) {
+        this.security = value;
+    }
+
+    /**
+     * Gets the value of the securityRef property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SecurityRefType }
+     *     
+     */
+    public SecurityRefType getSecurityRef() {
+        return securityRef;
+    }
+
+    /**
+     * Sets the value of the securityRef property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SecurityRefType }
+     *     
+     */
+    public void setSecurityRef(SecurityRefType value) {
+        this.securityRef = value;
+    }
+
+}

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/WebAppType.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java?rev=1098802&view=auto
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java (added)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java Mon May  2 21:49:22 2011
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2011.04.27 at 07:52:24 PM PDT 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.web25.deployment.model;

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/3.0-osgi/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/model/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message