activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r915990 - in /activemq/trunk/activemq-xmpp: pom.xml src/main/resources/jabber-client.xsd src/main/resources/jabber-server.xsd src/main/resources/streams.xsd
Date Wed, 24 Feb 2010 21:56:31 GMT
Author: gtully
Date: Wed Feb 24 21:56:30 2010
New Revision: 915990

URL: http://svn.apache.org/viewvc?rev=915990&view=rev
Log:
resolve compilation errors with xmpp and java5

Modified:
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/activemq-xmpp/src/main/resources/jabber-client.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/jabber-server.xsd
    activemq/trunk/activemq-xmpp/src/main/resources/streams.xsd

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=915990&r1=915989&r2=915990&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Wed Feb 24 21:56:30 2010
@@ -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>

Modified: activemq/trunk/activemq-xmpp/src/main/resources/jabber-client.xsd
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/resources/jabber-client.xsd?rev=915990&r1=915989&r2=915990&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/resources/jabber-client.xsd (original)
+++ activemq/trunk/activemq-xmpp/src/main/resources/jabber-client.xsd Wed Feb 24 21:56:30
2010
@@ -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'/>

Modified: activemq/trunk/activemq-xmpp/src/main/resources/jabber-server.xsd
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/resources/jabber-server.xsd?rev=915990&r1=915989&r2=915990&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/resources/jabber-server.xsd (original)
+++ activemq/trunk/activemq-xmpp/src/main/resources/jabber-server.xsd Wed Feb 24 21:56:30
2010
@@ -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'/>

Modified: activemq/trunk/activemq-xmpp/src/main/resources/streams.xsd
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/resources/streams.xsd?rev=915990&r1=915989&r2=915990&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/resources/streams.xsd (original)
+++ activemq/trunk/activemq-xmpp/src/main/resources/streams.xsd Wed Feb 24 21:56:30 2010
@@ -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>



Mime
View raw message