maven-xsddoc-plugin plugin.properties,1.3,1.4 project.properties,1.2,1.3 plugin.jelly,1.8,1.9

Update of /cvsroot/xframe/maven-xsddoc-plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23593

Modified Files:
	plugin.properties project.properties plugin.jelly 
Log Message:
impl for feature request [1176236] Add option to include raw XSDs in docs
and equal bug report [1188658] Option to include XSDs in generated docs

Index: project.properties
===================================================================
RCS file: /cvsroot/xframe/maven-xsddoc-plugin/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.properties	3 Nov 2004 17:23:47 -0000	1.2
--- project.properties	9 May 2005 23:02:52 -0000	1.3
***************
*** 29,34 ****
  maven.xdoc.date=left
  maven.xdoc.version=${pom.currentVersion}
! maven.xdoc.jsl = xdocs/site.jsl
! # maven.xdoc.developmentProcessUrl = 
! 
! google.ad.client = pub-3210557671772622
--- 29,35 ----
  maven.xdoc.date=left
  maven.xdoc.version=${pom.currentVersion}
! maven.xdoc.jsl=xdocs/site.jsl
! maven.xsddoc.header=
! maven.xsddoc.bottom=
! maven.xsddoc.footer=
! google.ad.client=pub-3210557671772622

Index: plugin.properties
===================================================================
RCS file: /cvsroot/xframe/maven-xsddoc-plugin/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugin.properties	26 Feb 2005 14:43:41 -0000	1.3
--- plugin.properties	9 May 2005 23:02:52 -0000	1.4
***************
*** 29,32 ****
  maven.xsddoc.exclude=
  maven.xsddoc.dest=${maven.docs.dest}/xsddocs
  maven.xsddoc.summary=true
! maven.xsddoc.css=
\ No newline at end of file
--- 29,36 ----
  maven.xsddoc.exclude=
  maven.xsddoc.dest=${maven.docs.dest}/xsddocs
+ maven.xsddoc.xsd.dest=${maven.docs.dest}/xsd-src
  maven.xsddoc.summary=true
! maven.xsddoc.css=
! maven.xsddoc.header=
! maven.xsddoc.bottom=
! maven.xsddoc.footer=

Index: plugin.jelly
===================================================================
RCS file: /cvsroot/xframe/maven-xsddoc-plugin/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** plugin.jelly	26 Feb 2005 14:43:41 -0000	1.8
--- plugin.jelly	9 May 2005 23:02:52 -0000	1.9
***************
*** 52,55 ****
--- 52,60 ----
        description="Generate XML Schema documentation using xsddoc tool.">
      ${systemScope.setProperty('javax.xml.transform.TransformerFactory', 'org.apache.xalan.processor.TransformerFactoryImpl')}
+     <ant:copy todir="${maven.xsddoc.xsd.dest}">
+       <ant:fileset dir="${maven.xsddoc.src}">
+         <ant:patternset includes="${maven.xsddoc.include}"/>
+       </ant:fileset>
+     </ant:copy>
      <ant:fileScanner var="xsdFiles">
        <ant:fileset dir="${maven.xsddoc.src}">
***************
*** 65,78 ****
            <j:set var="sourcefile" value="${srcbasepath}/${relpath}"/>
            <j:set var="targetpath" value="${maven.xsddoc.dest}/${relpath}"/>
            <ant:echo>Processing schema ${relpath}</ant:echo>
            <ant:mkdir dir="${targetpath}"/>
            <j:new className="net.sf.xframe.xsddoc.Processor" var="xsddocprocessor"/>
            <j:set var="result" value="${xsddocprocessor.setDebug(true)}"/>
!           <j:set var="result" value="${xsddocprocessor.setTitle(targetpath)}"/>
            <j:set var="result" value="${xsddocprocessor.setSchemaLocation(sourcefile)}"/>
            <j:set var="result" value="${xsddocprocessor.setOut(targetpath)}"/>
            <j:set var="result" value="${xsddocprocessor.setCss(maven.xsddoc.css)}"/>
!           <j:set var="result" value="${xsddocprocessor.setProxyHost(maven.proxy.host)}"/>
!           <j:set var="result" value="${xsddocprocessor.setProxyPort(maven.proxy.port)}"/>
            <j:invoke method="run" on="${xsddocprocessor}" var="xsddocresult"/>
            <j:file name="${targetpath}.txt" var="log" omitXmlDeclaration="true" outputMode="HTML">
--- 70,93 ----
            <j:set var="sourcefile" value="${srcbasepath}/${relpath}"/>
            <j:set var="targetpath" value="${maven.xsddoc.dest}/${relpath}"/>
+           <j:set var="css" value="${maven.xsddoc.css}"/>
+           <j:set var="header" value="${maven.xsddoc.header}"/>
+           <j:set var="footer" value="${maven.xsddoc.footer}"/>
+           <j:set var="bottom" value="${maven.xsddoc.bottom}"/>
+           <j:set var="proxy.host" value="${maven.proxy.host}"/>
+           <j:set var="proxy.port" value="${maven.proxy.port}"/>
            <ant:echo>Processing schema ${relpath}</ant:echo>
            <ant:mkdir dir="${targetpath}"/>
            <j:new className="net.sf.xframe.xsddoc.Processor" var="xsddocprocessor"/>
            <j:set var="result" value="${xsddocprocessor.setDebug(true)}"/>
!           <j:set var="result" value="${xsddocprocessor.setDoctitle(relpath)}"/>
            <j:set var="result" value="${xsddocprocessor.setSchemaLocation(sourcefile)}"/>
            <j:set var="result" value="${xsddocprocessor.setOut(targetpath)}"/>
            <j:set var="result" value="${xsddocprocessor.setCss(maven.xsddoc.css)}"/>
!           <j:set var="result" value="${xsddocprocessor.setHeader(relpath)}"/>
!           <j:set var="result" value="${xsddocprocessor.setBottom(bottom)}"/>
!           <j:set var="result" value="${xsddocprocessor.setFooter(footer)}"/>
!           <j:set var="result" value="${xsddocprocessor.setCss(css)}"/>
!           <j:set var="result" value="${xsddocprocessor.setProxyHost(proxy.host)}"/>
!           <j:set var="result" value="${xsddocprocessor.setProxyPort(proxy.port)}"/>
            <j:invoke method="run" on="${xsddocprocessor}" var="xsddocresult"/>
            <j:file name="${targetpath}.txt" var="log" omitXmlDeclaration="true" outputMode="HTML">
***************
*** 97,113 ****
            <j:choose>
              <j:when test="${xsddocresult.indexOf('xsddoc failed with exception') > 0}">
!               <xsddoc schema="${maven.xsddoc.src}/${relpath}" report="${relpath}" result="failed" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:when test="${xsddocresult.indexOf('xsddoc caused a fatal error') > 0}">
!               <xsddoc schema="${maven.xsddoc.src}/${relpath}" report="${relpath}" result="fatal error" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:when test="${xsddocresult.indexOf('xsddoc caused an error') > 0}">
!               <xsddoc schema="${maven.xsddoc.src}/${relpath}" report="${relpath}" result="error" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:when test="${xsddocresult.indexOf('xsddoc caused a warning') > 0}">
!               <xsddoc schema="${maven.xsddoc.src}/${relpath}" report="${relpath}" result="warning" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:otherwise>
!               <xsddoc schema="${maven.xsddoc.src}/${relpath}" report="${relpath}" result="success" linkcheck="${xsddoclinkcheck}"/>
              </j:otherwise>
            </j:choose>
--- 112,128 ----
            <j:choose>
              <j:when test="${xsddocresult.indexOf('xsddoc failed with exception') > 0}">
!               <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="failed" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:when test="${xsddocresult.indexOf('xsddoc caused a fatal error') > 0}">
!               <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="fatal error" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:when test="${xsddocresult.indexOf('xsddoc caused an error') > 0}">
!               <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="error" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:when test="${xsddocresult.indexOf('xsddoc caused a warning') > 0}">
!               <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="warning" linkcheck="${xsddoclinkcheck}"/>
              </j:when>
              <j:otherwise>
!               <xsddoc schema="${maven.xsddoc.dest.xsd}/${relpath}" report="${relpath}" result="success" linkcheck="${xsddoclinkcheck}"/>
              </j:otherwise>
            </j:choose>



-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20