You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/08/12 05:59:04 UTC
svn commit: r685029 - in /geronimo/server/trunk: ./
framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/
framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/
testsuite/concurrent-testsuite/concurrent-basic/...
Author: gawor
Date: Mon Aug 11 20:59:03 2008
New Revision: 685029
URL: http://svn.apache.org/viewvc?rev=685029&view=rev
Log:
upgrade to jaxb 2.1 (GERONIMO-4234)
Modified:
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=685029&r1=685028&r2=685029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml Mon Aug 11 20:59:03 2008
@@ -210,7 +210,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
+ <version>2.1.7</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -280,7 +280,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=685029&r1=685028&r2=685029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml Mon Aug 11 20:59:03 2008
@@ -32,7 +32,7 @@
<dependency start="false">
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
+ <version>2.1.7</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -98,7 +98,7 @@
<dependency start="false">
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<type>jar</type>
</dependency>
<dependency start="false">
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=685029&r1=685028&r2=685029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml Mon Aug 11 20:59:03 2008
@@ -32,7 +32,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
+ <version>2.1.7</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -109,7 +109,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=685029&r1=685028&r2=685029&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Aug 11 20:59:03 2008
@@ -1165,11 +1165,15 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<exclusions>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1189,17 +1193,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.0.5</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.1.7</version>
</dependency>
<!--JSF 1.2 JARs from Apache MyFaces -->
@@ -1337,7 +1331,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.0.5</version>
+ <version>2.1.7</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=685029&r1=685028&r2=685029&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb/src/main/resources/META-INF/openejb-jar.xml Mon Aug 11 20:59:03 2008
@@ -48,13 +48,13 @@
</session>
</enterprise-beans>
- <security>
- <role-mappings>
- <role role-name="employee">
- <principal name="admin"
+ <s:security xmlns:s="http://geronimo.apache.org/xml/ns/security-2.0">
+ <s:role-mappings>
+ <s:role role-name="employee">
+ <s:principal name="admin"
class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" />
- </role>
- </role-mappings>
- </security>
+ </s:role>
+ </s:role-mappings>
+ </s:security>
</openejb-jar>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=685029&r1=685028&r2=685029&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml Mon Aug 11 20:59:03 2008
@@ -78,43 +78,43 @@
</gbean>
<gbean name="TestCredentialStore" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
<xml-attribute name="credentialStore">
- <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
- <realm name="test-realm">
- <subject>
- <id>foo-subject</id>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
- <value>foo</value>
- </credential>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
- <value>foo</value>
- </credential>
- </subject>
- <subject>
- <id>bar-subject</id>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
- <value>bar</value>
- </credential>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
- <value>bar</value>
- </credential>
- </subject>
- <subject>
- <id>baz-subject</id>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
- <value>baz</value>
- </credential>
- <credential>
- <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
- <value>baz</value>
- </credential>
- </subject>
- </realm>
- </credential-store>
+ <c:credential-store xmlns:c="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
+ <c:realm name="test-realm">
+ <c:subject>
+ <c:id>foo-subject</c:id>
+ <c:credential>
+ <c:type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</c:type>
+ <c:value>foo</c:value>
+ </c:credential>
+ <c:credential>
+ <c:type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</c:type>
+ <c:value>foo</c:value>
+ </c:credential>
+ </c:subject>
+ <c:subject>
+ <c:id>bar-subject</c:id>
+ <c:credential>
+ <c:type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</c:type>
+ <c:value>bar</c:value>
+ </c:credential>
+ <c:credential>
+ <c:type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</c:type>
+ <c:value>bar</c:value>
+ </c:credential>
+ </c:subject>
+ <c:subject>
+ <c:id>baz-subject</c:id>
+ <c:credential>
+ <c:type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</c:type>
+ <c:value>baz</c:value>
+ </c:credential>
+ <c:credential>
+ <c:type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</c:type>
+ <c:value>baz</c:value>
+ </c:credential>
+ </c:subject>
+ </c:realm>
+ </c:credential-store>
</xml-attribute>
<dependency>
<n:name xmlns:n="http://geronimo.apache.org/xml/ns/naming-1.2">test-realm</n:name>