Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Gary Tully 2010-02-24 21:56:30 +00:00
parent 156a6095c4
commit fded93ac20
4 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
activemq-xmpp/pom.xml
View File

@ -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>

2
activemq-xmpp/src/main/resources/jabber-client.xsd
View File

@ -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'/>

2
activemq-xmpp/src/main/resources/jabber-server.xsd
View File

@ -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'/>

18
activemq-xmpp/src/main/resources/streams.xsd
View File

@ -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>