User: rinkrank
  Date: 02/09/29 17:38:59

  Modified:    samples  build.xml xgg.properties
  Log:
  -DTDs are now converted to HTML, and there are cross-links between the bean 
interfaces' javadocs and the DTD. This should make the documentation of the XGG 
generated stuff quite good.
  
  -Generation of a factory class for each DTD, that will return the impl bean.
  
  -Impl beans are now package private. Let's try to keep them package private.
  
  Revision  Changes    Path
  1.6       +57 -8     xgg/samples/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/xdoclet/xgg/samples/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- build.xml 27 Sep 2002 13:20:22 -0000      1.5
  +++ build.xml 30 Sep 2002 00:38:59 -0000      1.6
  @@ -36,26 +36,56 @@
            classpathref="xgg.class.path"
         />
   
  -      <xgg destination="target/src">
  +      <!--
  +      Default is *not* to generate bean implementations. This should only
  +      be done the first time, to generate a skeletal implementation to
  +      get started. The bean implementations should be put under source
  +      control and be hand edited.
  +      -->
  +      <property name="xgg.generateImpl" value="false"/>
  +
  +      <xgg>
            <dtdParser
               url="file:./dtds/ejb20-jar.dtd"
  -            package="xdoclet.modules.ejb.ejb20.xbeans"
               publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
               systemId="http://java.sun.com/dtd/ejb-jar_2_0.dtd";
  +            destination="target/src/java"
  +            package="xdoclet.modules.ejb.ejb20.xbeans"
  +            implDestination="src/java"
  +            generateImpl="${xgg.generateImpl}"
  +            htmlDestination="target/api/dtds"
            />
            <dtdParser
               url="file:./dtds/jbosscmp-jdbc_3_0.dtd"
  -            package="xdoclet.modules.jboss.cmpjdbc30.xbeans"
               publicId="-//JBoss//DTD JBOSSCMP-JDBC 3.0//EN"
               systemId="http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_0.dtd";
  +            destination="target/src/java"
  +            package="xdoclet.modules.jboss.cmpjdbc30.xbeans"
  +            implDestination="src/java"
  +            generateImpl="${xgg.generateImpl}"
  +            htmlDestination="target/api/dtds"
            />
         </xgg>
  +      
  +      <javadoc 
  +         use="true" 
  +         private="true" 
  +         destdir="target/api" 
  +         author="true" 
  +         version="true" 
  +         sourcepath="target/src/java" 
  +         packagenames="xdoclet.*"
  +      >
  +         <classpath>
  +            <pathelement location="../src/java"/>
  +         </classpath>
  +      </javadoc>
      </target>
   
      <target name="compile" depends="xgg">
         <mkdir dir="target/classes"/>
         <javac
  -         srcdir="target/src;src/java"
  +         srcdir="target/src/java;src/java"
            destdir="target/classes"
            classpathref="xdoclet2.class.path"
         >
  @@ -76,8 +106,7 @@
         <xdoclet2
            template="xdoclet/modules/ejb/ejb20/xbeans/resources/ejb-jar.vm"
            destination="target/xgg-generated-xml/ejb-jar.xml"
  -         rootclass="xdoclet.modules.ejb.ejb20.xbeans.impl.EjbJarImpl"
  -         root="ejbJar"
  +         rootfactory="xdoclet.modules.ejb.ejb20.xbeans.impl.EjbJarFactory"
            encoding="ISO-8859-1"
         />
   
  @@ -96,8 +125,7 @@
         <xdoclet2
            
template="xdoclet/modules/jboss/cmpjdbc30/xbeans/resources/jbosscmp-jdbc.vm"
            destination="target/xgg-generated-xml/jbosscmp-jdbc.xml"
  -         rootclass="xdoclet.modules.jboss.cmpjdbc30.xbeans.impl.JbosscmpJdbcImpl"
  -         root="jbosscmpJdbc"
  +         
rootfactory="xdoclet.modules.jboss.cmpjdbc30.xbeans.impl.JbosscmpJdbcFactory"
            encoding="ISO-8859-1"
         />
   
  @@ -115,4 +143,25 @@
         <delete dir="target"/>
      </target>
   
  +   <!-- This is just for testing JAXB and comparing the output       -->
  +   <!-- JAXB is too heavyweight for XDoclet. XGG is lightweight JAXB -->
  +   <target name="jaxb">
  +      <mkdir dir="target/jaxb"/>
  +      <path id="jaxb.class.path">
  +         <fileset dir="${jaxb.home}/lib">
  +            <include name="*.jar"/>
  +         </fileset>
  +      </path>
  +      <java 
  +         fork="yes" 
  +         classname="com.sun.tools.xjc.Main"
  +         dir="." 
  +         classpathref="jaxb.class.path"
  +      >
  +         <arg value="${jaxb.home}/examples/checkbook/checkbook.dtd"/>
  +         <arg value="${jaxb.home}/examples/checkbook/checkbook.xjs"/>
  +         <arg value="-d"/>
  +         <arg value="target/jaxb"/>
  +      </java>
  +   </target>
   </project>
  
  
  
  1.4       +1 -1      xgg/samples/xgg.properties
  
  Index: xgg.properties
  ===================================================================
  RCS file: /cvsroot/xdoclet/xgg/samples/xgg.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- xgg.properties    25 Sep 2002 13:27:14 -0000      1.3
  +++ xgg.properties    30 Sep 2002 00:38:59 -0000      1.4
  @@ -2,7 +2,7 @@
   resource.loader           = file, jar
   
   file.resource.loader.class = 
org.apache.velocity.runtime.resource.loader.FileResourceLoader
  -file.resource.loader.path  = ../src/java,./target/src
  +file.resource.loader.path  = ../src/java,./target/src/java
   
   jar.resource.loader.class = 
org.apache.velocity.runtime.resource.loader.JarResourceLoader
   jar.resource.loader.path  = jar:file:../target/xgg-1.0.jar
  
  
  


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to