Author: solomax
Date: Thu Jun 14 06:36:11 2012
New Revision: 1350100
URL: http://svn.apache.org/viewvc?rev=1350100&view=rev
Log:
ErrorsTable.xml generation is moved to the top (to have valid html generated)
axis stylesheet is corrected to match xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xsd
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml?rev=1350100&r1=1350099&r2=1350100&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xml
Thu Jun 14 06:36:11 2012
@@ -17,7 +17,8 @@
~ under the License.
-->
-<axisconfig name="AxisJava2.0">
+<axisconfig name="AxisJava2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:noNamespaceSchemaLocation="axis2.xsd">
<!-- ================================================= -->
<!-- Parameters -->
<!-- ================================================= -->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xsd
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xsd?rev=1350100&r1=1350099&r2=1350100&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xsd
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/WEB-INF/conf/axis2.xsd
Thu Jun 14 06:36:11 2012
@@ -18,7 +18,7 @@
under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<xs:element name="axisconfig">
<xs:complexType>
<xs:sequence>
@@ -30,7 +30,7 @@
<xs:element ref="messageReceivers"/>
<xs:element ref="messageFormatters"/>
<xs:element ref="messageBuilders"/>
- <xs:element maxOccurs="unbounded" ref="transportReceiver"/>
+ <xs:element ref="transportReceiver"/>
<xs:element maxOccurs="unbounded" ref="transportSender"/>
<xs:element ref="module"/>
<xs:element ref="clustering"/>
@@ -41,11 +41,20 @@
</xs:element>
<xs:element name="deployer">
<xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded"
ref="serviceBuilderExtension"/>
+ </xs:sequence>
<xs:attribute name="class" use="required"/>
<xs:attribute name="directory" use="required" type="xs:NCName"/>
<xs:attribute name="extension" use="required" type="xs:NMTOKEN"/>
</xs:complexType>
</xs:element>
+ <xs:element name="serviceBuilderExtension">
+ <xs:complexType>
+ <xs:attribute name="class" use="required"/>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
<xs:element name="threadContextMigrators">
<xs:complexType>
<xs:sequence>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1350100&r1=1350099&r2=1350100&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Jun 14 06:36:11 2012
@@ -588,6 +588,7 @@
</classpath>
</taskdef>
+ <xslt in="WebContent/languages/errorvalues.xml"
out="${docs.src}/ErrorsTable.xml"
style="${docs.src}/stylesheets/errortable.xsl" />
<anakia basedir="${docs.src}" destdir="${docs.dest}/"
extension=".html" style="./site.vsl" projectFile="stylesheets/project.xml"
excludes="**/stylesheets/** empty.xml" includes="**/*.xml"
lastModifiedCheck="true" templatePath="xdocs/stylesheets"
velocityPropertiesFile="${build.base.dir}/velocity.properties" />
<copy todir="${docs.dest}/images" filtering="no">
<fileset dir="${docs.src}/images">
@@ -600,7 +601,6 @@
<patternset refid="css" />
</fileset>
</copy>
- <xslt in="WebContent/languages/errorvalues.xml"
out="${docs.dest}/ErrorsTable.html"
style="${docs.src}/stylesheets/errortable.xsl" />
</target>
<target name="build.only.webservice.doc" depends="anakia">
