tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r511186 - in /incubator/openejb/trunk/openejb3/container/openejb-jee/src: main/java/org/apache/openejb/jee/oejb2/ test/resources/
Date Sat, 24 Feb 2007 01:42:48 GMT
Author: dblevins
Date: Fri Feb 23 17:42:48 2007
New Revision: 511186

URL: http://svn.apache.org/viewvc?view=rev&rev=511186
Log:
Fixed the openejb-jar v2 and geronimo-openejb trees to support the more extensible security
element

Added:
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
Modified:
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/AbstractSecurityType.java
Fri Feb 23 17:42:48 2007
@@ -20,6 +20,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAnyElement;
 
 
 /**
@@ -43,6 +44,5 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "abstract-securityType", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
 public abstract class AbstractSecurityType {
-
 
 }

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
Fri Feb 23 17:42:48 2007
@@ -91,8 +91,8 @@
     @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<MessageDestinationType> messageDestination;
 
-    @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
-    protected AbstractSecurityType security;
+    @XmlElementRef(name="security", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
type = JAXBElement.class)
+    protected JAXBElement<? extends AbstractSecurityType> security;
 
     @XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2",
type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractServiceType>> service;
@@ -256,28 +256,12 @@
         return this.messageDestination;
     }
 
-    /**
-     * Gets the value of the security property.
-     *
-     * @return
-     *     possible object is
-     *     {@link AbstractSecurityType }
-     *
-     */
-    public AbstractSecurityType getSecurity() {
+    public JAXBElement<? extends AbstractSecurityType> getSecurity() {
         return security;
     }
 
-    /**
-     * Sets the value of the security property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link AbstractSecurityType }
-     *
-     */
-    public void setSecurity(AbstractSecurityType value) {
-        this.security = value;
+    public void setSecurity(JAXBElement<? extends AbstractSecurityType> security) {
+        this.security = security;
     }
 
     /**

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
Fri Feb 23 17:42:48 2007
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Stack;
 
 /**
  * @version $Rev$ $Date$
@@ -102,7 +103,7 @@
         ns.put("resource-link", "http://geronimo.apache.org/xml/ns/naming-1.2");
         ns.put("resource-ref", "http://geronimo.apache.org/xml/ns/naming-1.2");
         ns.put("return-type", "http://openejb.apache.org/xml/ns/pkgen-2.1");
-        ns.put("security", "http://geronimo.apache.org/xml/ns/j2ee/application-1.2");
+        ns.put("security", "http://geronimo.apache.org/xml/ns/security-1.2");
         ns.put("sequence-name", "http://openejb.apache.org/xml/ns/pkgen-2.1");
         ns.put("sequence-table", "http://openejb.apache.org/xml/ns/pkgen-2.1");
         ns.put("server-environment", "http://geronimo.apache.org/xml/ns/deployment-1.2");
@@ -132,7 +133,7 @@
         duplicates.put("artifactId", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2",
"http://geronimo.apache.org/xml/ns/naming-1.2"));
         duplicates.put("groupId", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2",
"http://geronimo.apache.org/xml/ns/naming-1.2"));
         duplicates.put("module", Arrays.asList("http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
"http://geronimo.apache.org/xml/ns/deployment-1.2", "http://geronimo.apache.org/xml/ns/naming-1.2"));
-        duplicates.put("name", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2",
"http://geronimo.apache.org/xml/ns/naming-1.2"));
+        duplicates.put("name", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2",
"http://geronimo.apache.org/xml/ns/naming-1.2", "http://geronimo.apache.org/xml/ns/security-1.2"));
         duplicates.put("pattern", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2",
"http://geronimo.apache.org/xml/ns/naming-1.2"));
         duplicates.put("version", Arrays.asList("http://geronimo.apache.org/xml/ns/deployment-1.2",
"http://geronimo.apache.org/xml/ns/naming-1.2"));
         duplicates.put("table-name", Arrays.asList("http://openejb.apache.org/xml/ns/openejb-jar-2.2",
"http://openejb.apache.org/xml/ns/pkgen-2.1"));
@@ -142,12 +143,21 @@
         super(xmlReader);
     }
 
+    private final Stack<String> visibleNamespaces = new Stack<String>();
+
+    public void startDocument() throws SAXException {
+        visibleNamespaces.push("");
+        super.startDocument();
+    }
+
     //String uri, String localName, String qName, Attributes atts
     public void startElement(String uri, String localName, String qname, Attributes atts)
throws SAXException {
         if (uri.startsWith("http://www.openejb.org/xml/ns/openejb-jar-2")){
             uri = "http://openejb.apache.org/xml/ns/openejb-jar-2.2";
         }
-        
+
+        String previousNs = visibleNamespaces.peek();
+
         String correctNamespace = ns.get(localName);
         boolean correctable = (uri.equals("http://openejb.apache.org/xml/ns/openejb-jar-2.2")
|| uri.equals("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0"));
         if (correctable && correctNamespace != null) {
@@ -161,8 +171,16 @@
             } else {
                 uri = possibleNamespaces.get(0);
             }
+        } else if (correctable && !previousNs.equals(uri) && !previousNs.equals(""))
{
+            uri = previousNs;
         }
-        previousNs = uri;
+
+        visibleNamespaces.push(uri);
         super.startElement(uri, localName, qname, atts);
+    }
+
+    public void endElement(String uri, String localName, String qName) throws SAXException
{
+        visibleNamespaces.pop();
+        super.endElement(uri, localName, qName);
     }
 }

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
Fri Feb 23 17:42:48 2007
@@ -59,6 +59,7 @@
     private final static QName _KeyGenerator_QNAME = new QName("http://openejb.apache.org/xml/ns/pkgen-2.1",
"key-generator");
     private final static QName _Environment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2",
"environment");
     private final static QName _Security_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
"security");
+    private final static QName _Security2_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-1.2",
"security");
     private final static QName _ResourceAdapter_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2",
"resource-adapter");
     private final static QName _EjbLocalRef_QNAME = new QName("http://geronimo.apache.org/xml/ns/naming-1.2",
"ejb-local-ref");
     private final static QName _ServerEnvironment_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.2",
"server-environment");
@@ -777,12 +778,26 @@
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractServiceType }{@code
>}}
+     *
+     */
+//    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/application-1.2", name
= "security")
+//    public JAXBElement<AbstractSecurityType> createSecurity(AbstractSecurityType
value) {
+//        return new JAXBElement<AbstractSecurityType>(_Security_QNAME, AbstractSecurityType.class,
null, value);
+//    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link GbeanType }{@code >}}
      * 
      */
     @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", name
= "gbean", substitutionHeadNamespace = "http://geronimo.apache.org/xml/ns/deployment-1.2",
substitutionHeadName = "service")
     public JAXBElement<GbeanType> createGbean(GbeanType value) {
         return new JAXBElement<GbeanType>(_Gbean_QNAME, GbeanType.class, null, value);
+    }
+
+    @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/security-1.2", name =
"security", substitutionHeadNamespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
substitutionHeadName = "security")
+    public JAXBElement<SecurityType> createSecurity(SecurityType value) {
+        return new JAXBElement<SecurityType>(_Security2_QNAME, SecurityType.class,
null, value);
     }
 
     /**

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
Fri Feb 23 17:42:48 2007
@@ -116,8 +116,8 @@
     @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<MessageDestinationType> messageDestination;
 
-    @XmlElement(name="security", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
-    protected AbstractSecurityType security;
+    @XmlElementRef(name="security", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
type = JAXBElement.class)
+    protected JAXBElement<? extends AbstractSecurityType> security;
 
     @XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2",
type = JAXBElement.class)
     protected List<JAXBElement<? extends AbstractServiceType>> service;
@@ -243,12 +243,12 @@
         return this.messageDestination;
     }
 
-    public AbstractSecurityType getSecurity() {
+    public JAXBElement<? extends AbstractSecurityType> getSecurity() {
         return security;
     }
 
-    public void setSecurity(AbstractSecurityType value) {
-        this.security = value;
+    public void setSecurity(JAXBElement<? extends AbstractSecurityType> security) {
+        this.security = security;
     }
 
     public List<JAXBElement<? extends AbstractServiceType>> getService() {

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java?view=auto&rev=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
(added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
Fri Feb 23 17:42:48 2007
@@ -0,0 +1,34 @@
+/**
+ * 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.oejb2;
+
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAnyElement;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "securityType", namespace = "http://geronimo.apache.org/xml/ns/security-1.2",
propOrder = {
+    "data"
+})
+public class SecurityType extends AbstractSecurityType {
+    @XmlAnyElement(lax = true)
+    protected Object data;
+}

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml
Fri Feb 23 17:42:48 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-1.2"
xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
     <ns2:cmp-connection-factory>
         <ns2:resource-link>jdbc/TradeDataSource</ns2:resource-link>
     </ns2:cmp-connection-factory>
@@ -348,21 +348,21 @@
             </ns3:ejb-relationship-role>
         </ns3:ejb-relation>
     </ns3:relationships>
-    <ns6:persistence version="1.0">
-        <ns6:persistence-unit transaction-type="JTA" name="daytrader">
-            <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
-            <ns6:jta-data-source>?name=jdbc/TradeDataSource</ns6:jta-data-source>
-            <ns6:non-jta-data-source>?name=jdbc/NoTxTradeDataSource</ns6:non-jta-data-source>
-            <ns6:class>org.apache.geronimo.samples.daytrader.AccountDataBean</ns6:class>
-            <ns6:class>org.apache.geronimo.samples.daytrader.AccountProfileDataBean</ns6:class>
-            <ns6:class>org.apache.geronimo.samples.daytrader.HoldingDataBean</ns6:class>
-            <ns6:class>org.apache.geronimo.samples.daytrader.OrderDataBean</ns6:class>
-            <ns6:class>org.apache.geronimo.samples.daytrader.QuoteDataBean</ns6:class>
-            <ns6:exclude-unlisted-classes>false</ns6:exclude-unlisted-classes>
-            <ns6:properties>
-                <ns6:property value="org.apache.openjpa.jdbc.sql.DerbyDictionary" name="openjpa.jdbc.DBDictionary"/>
-                <ns6:property value="table(Table=OPENJPASEQ, Increment=100)" name="openjpa.Sequence"/>
-            </ns6:properties>
-        </ns6:persistence-unit>
-    </ns6:persistence>
+    <ns7:persistence version="1.0">
+        <ns7:persistence-unit transaction-type="JTA" name="daytrader">
+            <ns7:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns7:provider>
+            <ns7:jta-data-source>?name=jdbc/TradeDataSource</ns7:jta-data-source>
+            <ns7:non-jta-data-source>?name=jdbc/NoTxTradeDataSource</ns7:non-jta-data-source>
+            <ns7:class>org.apache.geronimo.samples.daytrader.AccountDataBean</ns7:class>
+            <ns7:class>org.apache.geronimo.samples.daytrader.AccountProfileDataBean</ns7:class>
+            <ns7:class>org.apache.geronimo.samples.daytrader.HoldingDataBean</ns7:class>
+            <ns7:class>org.apache.geronimo.samples.daytrader.OrderDataBean</ns7:class>
+            <ns7:class>org.apache.geronimo.samples.daytrader.QuoteDataBean</ns7:class>
+            <ns7:exclude-unlisted-classes>false</ns7:exclude-unlisted-classes>
+            <ns7:properties>
+                <ns7:property value="org.apache.openjpa.jdbc.sql.DerbyDictionary" name="openjpa.jdbc.DBDictionary"/>
+                <ns7:property value="table(Table=OPENJPASEQ, Increment=100)" name="openjpa.Sequence"/>
+            </ns7:properties>
+        </ns7:persistence-unit>
+    </ns7:persistence>
 </ns3:openejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
Fri Feb 23 17:42:48 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:ns5="http://java.sun.com/xml/ns/persistence" xmlns:ns6="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns8:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:ns5="http://geronimo.apache.org/xml/ns/security-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
     <environment>
         <moduleId>
             <groupId>String</groupId>
@@ -378,6 +378,16 @@
             <ns2:name>String</ns2:name>
         </ns2:pattern>
     </ns2:message-destination>
+    <ns5:security>
+        <ns5:default-principal xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <ns5:principal xmlns:ns10="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns="" class="String" name="String"/>
+            <ns5:named-username-password-credential>
+                <ns5:name>String</ns5:name>
+                <ns5:username>String</ns5:username>
+                <ns5:password>String</ns5:password>
+            </ns5:named-username-password-credential>
+        </ns5:default-principal>
+    </ns5:security>
     <gbean name="String" class="String">
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>
@@ -386,4 +396,4 @@
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>
     </gbean>
-</ns7:ejb-jar>
+</ns8:ejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
Fri Feb 23 17:42:48 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:ns5="http://java.sun.com/xml/ns/persistence" xmlns:ns6="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns8:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:ns5="http://geronimo.apache.org/xml/ns/security-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
     <environment>
         <moduleId>
             <groupId>itests</groupId>
@@ -89,20 +89,20 @@
             <ns2:name>SystemDatasource</ns2:name>
         </ns2:pattern>
     </ns2:resource-ref>
-    <ns5:persistence version="1.0">
-        <ns5:persistence-unit transaction-type="JTA" name="cmp">
-            <ns5:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns5:provider>
-            <ns5:jta-data-source>?name=SystemDatasource</ns5:jta-data-source>
-            <ns5:non-jta-data-source>?name=NoTxDatasource</ns5:non-jta-data-source>
-            <ns5:mapping-file>META-INF/jpa.mapping.xml</ns5:mapping-file>
-            <ns5:class>org.apache.openejb.test.entity.cmp.BasicCmpBean</ns5:class>
-            <ns5:exclude-unlisted-classes>false</ns5:exclude-unlisted-classes>
-        </ns5:persistence-unit>
-        <ns5:persistence-unit transaction-type="JTA" name="openjpa-test-unit">
-            <ns5:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns5:provider>
-            <ns5:jta-data-source>?name=SystemDatasource</ns5:jta-data-source>
-            <ns5:non-jta-data-source>?name=NoTxDatasource</ns5:non-jta-data-source>
-            <ns5:class>org.apache.openejb.test.entity.Customer</ns5:class>
-        </ns5:persistence-unit>
-    </ns5:persistence>
-</ns7:ejb-jar>
+    <ns6:persistence version="1.0">
+        <ns6:persistence-unit transaction-type="JTA" name="cmp">
+            <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
+            <ns6:jta-data-source>?name=SystemDatasource</ns6:jta-data-source>
+            <ns6:non-jta-data-source>?name=NoTxDatasource</ns6:non-jta-data-source>
+            <ns6:mapping-file>META-INF/jpa.mapping.xml</ns6:mapping-file>
+            <ns6:class>org.apache.openejb.test.entity.cmp.BasicCmpBean</ns6:class>
+            <ns6:exclude-unlisted-classes>false</ns6:exclude-unlisted-classes>
+        </ns6:persistence-unit>
+        <ns6:persistence-unit transaction-type="JTA" name="openjpa-test-unit">
+            <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
+            <ns6:jta-data-source>?name=SystemDatasource</ns6:jta-data-source>
+            <ns6:non-jta-data-source>?name=NoTxDatasource</ns6:non-jta-data-source>
+            <ns6:class>org.apache.openejb.test.entity.Customer</ns6:class>
+        </ns6:persistence-unit>
+    </ns6:persistence>
+</ns8:ejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
Fri Feb 23 17:42:48 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:ns5="http://java.sun.com/xml/ns/persistence" xmlns:ns6="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns8:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:ns5="http://geronimo.apache.org/xml/ns/security-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
     <environment>
         <moduleId>
             <groupId>String</groupId>
@@ -34,8 +34,8 @@
         <inverse-classloading/>
         <suppress-default-environment/>
     </environment>
-    <ns7:openejb-jar xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-	</ns7:openejb-jar>
+    <ns8:openejb-jar xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+	</ns8:openejb-jar>
     <ns2:persistence-context-ref>
         <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
         <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
@@ -388,4 +388,4 @@
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>
     </gbean>
-</ns7:ejb-jar>
+</ns8:ejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
Fri Feb 23 17:42:48 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-1.2"
xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
     <environment>
         <moduleId>
             <groupId>String</groupId>
@@ -534,6 +534,16 @@
             <ns2:name>String</ns2:name>
         </ns2:pattern>
     </ns2:message-destination>
+    <ns6:security>
+        <ns6:default-principal xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <ns6:principal xmlns:ns10="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns="" class="String" name="String"/>
+            <ns6:named-username-password-credential>
+                <ns6:name>String</ns6:name>
+                <ns6:username>String</ns6:username>
+                <ns6:password>String</ns6:password>
+            </ns6:named-username-password-credential>
+        </ns6:default-principal>
+    </ns6:security>
     <gbean name="String" class="String">
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml?view=diff&rev=511186&r1=511185&r2=511186
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
Fri Feb 23 17:42:48 2007
@@ -537,6 +537,16 @@
             <name>String</name>
         </pattern>
     </message-destination>
+    <security>
+        <default-principal>
+            <principal class="String" name="String"/>
+            <named-username-password-credential>
+                <name>String</name>
+                <username>String</username>
+                <password>String</password>
+            </named-username-password-credential>
+        </default-principal>
+    </security>
     <gbean name="String" class="String">
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>



Mime
View raw message