You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2007/06/16 10:19:38 UTC
svn commit: r547886 - in /openejb/trunk/openejb3/container/openejb-jee/src:
main/java/org/apache/openejb/jee/oejb2/ test/resources/
Author: djencks
Date: Sat Jun 16 01:19:37 2007
New Revision: 547886
URL: http://svn.apache.org/viewvc?view=rev&rev=547886
Log:
GERONIMO-2687 the geronimo security schema is now at 2.0. security is supposed to be an abstract element and openejb never needs to interpret it so I hope there is a better solution
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java Sat Jun 16 01:19:37 2007
@@ -103,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/security-1.2");
+ ns.put("security", "http://geronimo.apache.org/xml/ns/security-2.0");
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");
@@ -133,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", "http://geronimo.apache.org/xml/ns/security-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-2.0"));
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"));
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java Sat Jun 16 01:19:37 2007
@@ -59,7 +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 _Security2_QNAME = new QName("http://geronimo.apache.org/xml/ns/security-2.0", "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");
@@ -795,7 +795,7 @@
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")
+ @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/security-2.0", 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: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java Sat Jun 16 01:19:37 2007
@@ -25,12 +25,12 @@
* @version $Rev$ $Date$
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "securityType", namespace = "http://geronimo.apache.org/xml/ns/security-1.2", propOrder = {
- "defaultPrincipal", "roleMappings"
+@XmlType(name = "securityType", namespace = "http://geronimo.apache.org/xml/ns/security-2.0", propOrder = {
+ "defaultSubject", "roleMappings"
})
public class SecurityType extends AbstractSecurityType {
- @XmlElement(name="default-principal", namespace = "http://geronimo.apache.org/xml/ns/security-1.2")
- protected Object defaultPrincipal;
- @XmlElement(name="role-mappings", namespace = "http://geronimo.apache.org/xml/ns/security-1.2")
+ @XmlElement(name="default-subject", namespace = "http://geronimo.apache.org/xml/ns/security-2.0")
+ protected Object defaultSubject;
+ @XmlElement(name="role-mappings", namespace = "http://geronimo.apache.org/xml/ns/security-2.0")
protected Object roleMappings;
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/daytrader-corrected.xml Sat Jun 16 01:19:37 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://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">
+<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-2.0" 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>
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml Sat Jun 16 01:19:37 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns4: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/ejb/openejb-2.0" 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://openejb.apache.org/xml/ns/pkgen-2.1">
+<ns4: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/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1">
<environment>
<moduleId>
<groupId>String</groupId>
@@ -391,14 +391,10 @@
<ns4:jndi-name>String</ns4:jndi-name>
</ns4:tss-link>
<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:default-subject xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <ns6:realm>foo</ns6:realm>
+ <ns6:id>bar</ns6:id>
+ </ns6:default-subject>
<ns6:role-mappings xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
<ns6:role xmlns:ns10="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" role-name="r1">
<ns6:realm realm-name="realm">
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml Sat Jun 16 01:19:37 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns4: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/ejb/openejb-2.0" 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://openejb.apache.org/xml/ns/pkgen-2.1">
+<ns4: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/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1">
<environment>
<moduleId>
<groupId>itests</groupId>
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml Sat Jun 16 01:19:37 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns4: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/ejb/openejb-2.0" 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://openejb.apache.org/xml/ns/pkgen-2.1">
+<ns4: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/ejb/openejb-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1">
<environment>
<moduleId>
<groupId>String</groupId>
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml Sat Jun 16 01:19:37 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://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">
+<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-2.0" 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>
@@ -535,14 +535,10 @@
</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:default-subject xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <ns6:realm>foo</ns6:realm>
+ <ns6:id>bar</ns6:id>
+ </ns6:default-subject>
<ns6:role-mappings xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
<ns6:role xmlns:ns10="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="" role-name="r1">
<ns6:realm realm-name="realm">
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml?view=diff&rev=547886&r1=547885&r2=547886
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml Sat Jun 16 01:19:37 2007
@@ -538,14 +538,10 @@
</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>
+ <default-subject>
+ <realm>foo</realm>
+ <id>bar</id>
+ </default-subject>
<role-mappings>
<role role-name="r1">
<realm realm-name="realm">