mirror of https://github.com/apache/activemq.git
resolve compilation errors with xmpp and java5
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@915990 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
156a6095c4
commit
fded93ac20
|
@ -77,6 +77,29 @@
|
||||||
<artifactId>stax2-api</artifactId>
|
<artifactId>stax2-api</artifactId>
|
||||||
<version>3.0.1</version>
|
<version>3.0.1</version>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>jivesoftware</groupId>
|
<groupId>jivesoftware</groupId>
|
||||||
|
|
|
@ -170,7 +170,7 @@
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
|
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
|
||||||
<xs:group ref='err:stanzaErrorGroup'/>
|
<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'/>
|
minOccurs='0'/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
<xs:attribute name='code' type='xs:unsignedShort' use='optional'/>
|
<xs:attribute name='code' type='xs:unsignedShort' use='optional'/>
|
||||||
|
|
|
@ -170,7 +170,7 @@
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
|
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
|
||||||
<xs:group ref='err:stanzaErrorGroup'/>
|
<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'/>
|
minOccurs='0'/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
<xs:attribute name='code' type='xs:unsignedShort' use='optional'/>
|
<xs:attribute name='code' type='xs:unsignedShort' use='optional'/>
|
||||||
|
|
|
@ -54,9 +54,9 @@
|
||||||
<jaxb:property name="clientMessages"/>
|
<jaxb:property name="clientMessages"/>
|
||||||
</xs:appinfo>
|
</xs:appinfo>
|
||||||
</xs:annotation>
|
</xs:annotation>
|
||||||
<xs:element ref='client:message'/>
|
<xs:element xmlns:client='jabber:client' ref='client:message'/>
|
||||||
<xs:element ref='client:presence'/>
|
<xs:element xmlns:client='jabber:client' ref='client:presence'/>
|
||||||
<xs:element ref='client:iq'/>
|
<xs:element xmlns:client='jabber:client' ref='client:iq'/>
|
||||||
</xs:choice>
|
</xs:choice>
|
||||||
<xs:choice minOccurs='0' maxOccurs='unbounded'>
|
<xs:choice minOccurs='0' maxOccurs='unbounded'>
|
||||||
<xs:annotation>
|
<xs:annotation>
|
||||||
|
@ -64,11 +64,11 @@
|
||||||
<jaxb:property name="serverMessages"/>
|
<jaxb:property name="serverMessages"/>
|
||||||
</xs:appinfo>
|
</xs:appinfo>
|
||||||
</xs:annotation>
|
</xs:annotation>
|
||||||
<xs:element ref='server:message'/>
|
<xs:element xmlns:server='jabber:server' ref='server:message'/>
|
||||||
<xs:element ref='server:presence'/>
|
<xs:element xmlns:server='jabber:server' ref='server:presence'/>
|
||||||
<xs:element ref='server:iq'/>
|
<xs:element xmlns:server='jabber:server' ref='server:iq'/>
|
||||||
<xs:element ref='db:result'/>
|
<xs:element xmlns:db='jabber:server:dialback' ref='db:result'/>
|
||||||
<xs:element ref='db:verify'/>
|
<xs:element xmlns:db='jabber:server:dialback' ref='db:verify'/>
|
||||||
</xs:choice>
|
</xs:choice>
|
||||||
</xs:choice>
|
</xs:choice>
|
||||||
<xs:element ref='error' minOccurs='0' maxOccurs='1'/>
|
<xs:element ref='error' minOccurs='0' maxOccurs='1'/>
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
<xs:complexType>
|
<xs:complexType>
|
||||||
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
|
<xs:sequence xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
|
||||||
<xs:group ref='err:streamErrorGroup'/>
|
<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'
|
minOccurs='0'
|
||||||
maxOccurs='1'/>
|
maxOccurs='1'/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
|
|
Loading…
Reference in New Issue