From fded93ac2000d97f9b89eead386d4d70ea553a99 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Wed, 24 Feb 2010 21:56:30 +0000
Subject: [PATCH] resolve compilation errors with xmpp and java5

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@915990 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-xmpp/pom.xml                         | 23 +++++++++++++++++++
 .../src/main/resources/jabber-client.xsd      |  2 +-
 .../src/main/resources/jabber-server.xsd      |  2 +-
 activemq-xmpp/src/main/resources/streams.xsd  | 18 +++++++--------
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
index 5d7451872f..04d910020e 100755
--- a/activemq-xmpp/pom.xml
+++ b/activemq-xmpp/pom.xml
@@ -77,6 +77,29 @@
       <artifactId>stax2-api</artifactId>
       <version>3.0.1</version>
     </dependency>
+    <dependency>
+     <groupId>com.sun.xml.bind</groupId>
+     <artifactId>jaxb-impl</artifactId>
+     <version>2.1.12</version>
+     <exclusions>
+       <exclusion>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>jsr173_api</artifactId>
+       </exclusion>
+       <exclusion>
+         <groupId>javax.xml</groupId>
+         <artifactId>jsr173</artifactId>
+       </exclusion>
+       <exclusion>
+         <groupId>javax.activation</groupId>
+         <artifactId>activation</artifactId>
+       </exclusion>
+       <exclusion>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>activation</artifactId>
+       </exclusion>
+      </exclusions>
+    </dependency>
 
     <dependency>
       <groupId>jivesoftware</groupId>
diff --git a/activemq-xmpp/src/main/resources/jabber-client.xsd b/activemq-xmpp/src/main/resources/jabber-client.xsd
index 69642bca8b..88b10bd200 100755
--- a/activemq-xmpp/src/main/resources/jabber-client.xsd
+++ b/activemq-xmpp/src/main/resources/jabber-client.xsd
@@ -170,7 +170,7 @@
     <xs:complexType>
       <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
         <xs:group   ref='err:stanzaErrorGroup'/>
-        <xs:element ref='err:text'
+        <xs:element xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas' ref='err:text'
                     minOccurs='0'/>
       </xs:sequence>
       <xs:attribute name='code' type='xs:unsignedShort' use='optional'/>
diff --git a/activemq-xmpp/src/main/resources/jabber-server.xsd b/activemq-xmpp/src/main/resources/jabber-server.xsd
index bebe343878..a0477881d8 100755
--- a/activemq-xmpp/src/main/resources/jabber-server.xsd
+++ b/activemq-xmpp/src/main/resources/jabber-server.xsd
@@ -170,7 +170,7 @@
     <xs:complexType>
       <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
         <xs:group   ref='err:stanzaErrorGroup'/>
-        <xs:element ref='err:text'
+        <xs:element xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas' ref='err:text'
                     minOccurs='0'/>
       </xs:sequence>
       <xs:attribute name='code' type='xs:unsignedShort' use='optional'/>
diff --git a/activemq-xmpp/src/main/resources/streams.xsd b/activemq-xmpp/src/main/resources/streams.xsd
index 51ec6fa66d..f713ad905f 100755
--- a/activemq-xmpp/src/main/resources/streams.xsd
+++ b/activemq-xmpp/src/main/resources/streams.xsd
@@ -54,9 +54,9 @@
                                 <jaxb:property name="clientMessages"/>
                             </xs:appinfo>
                         </xs:annotation>
-                        <xs:element ref='client:message'/>
-                        <xs:element ref='client:presence'/>
-                        <xs:element ref='client:iq'/>
+                        <xs:element xmlns:client='jabber:client' ref='client:message'/>
+                        <xs:element xmlns:client='jabber:client' ref='client:presence'/>
+                        <xs:element xmlns:client='jabber:client' ref='client:iq'/>
                     </xs:choice>
                     <xs:choice minOccurs='0' maxOccurs='unbounded'>
                         <xs:annotation>
@@ -64,11 +64,11 @@
                                 <jaxb:property name="serverMessages"/>
                             </xs:appinfo>
                         </xs:annotation>
-                        <xs:element ref='server:message'/>
-                        <xs:element ref='server:presence'/>
-                        <xs:element ref='server:iq'/>
-                        <xs:element ref='db:result'/>
-                        <xs:element ref='db:verify'/>
+                        <xs:element xmlns:server='jabber:server' ref='server:message'/>
+                        <xs:element xmlns:server='jabber:server' ref='server:presence'/>
+                        <xs:element xmlns:server='jabber:server' ref='server:iq'/>
+                        <xs:element xmlns:db='jabber:server:dialback' ref='db:result'/>
+                        <xs:element xmlns:db='jabber:server:dialback' ref='db:verify'/>
                     </xs:choice>
                 </xs:choice>
                 <xs:element ref='error' minOccurs='0' maxOccurs='1'/>
@@ -93,7 +93,7 @@
         <xs:complexType>
             <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
                 <xs:group   ref='err:streamErrorGroup'/>
-                <xs:element ref='err:text'
+                <xs:element xmlns:err='urn:ietf:params:xml:ns:xmpp-streams' ref='err:text'
                     minOccurs='0'
                     maxOccurs='1'/>
             </xs:sequence>