Update of 
/cvsroot/xdoclet/xdoclet/modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb
In directory 
sc8-pr-cvs1:/tmp/cvs-serv28707/xdoclet/modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb

Modified Files:
        JonasSubTask.java 
Log Message:
patch XDT-323

Index: JonasSubTask.java
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/objectweb/src/xdoclet/modules/objectweb/jonas/ejb/JonasSubTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** JonasSubTask.java   13 Oct 2002 10:21:29 -0000      1.4
--- JonasSubTask.java   24 Feb 2003 15:08:17 -0000      1.5
***************
*** 15,18 ****
--- 15,19 ----
   * @author        Richard Chuo ([EMAIL PROTECTED])
   * @author        Mathieu Peltier ([EMAIL PROTECTED])
+  * @author        Philippe Charaux ([EMAIL PROTECTED])
   * @created       11 juillet 2002
   * @ant.element   display-name="JOnAS" name="jonas" 
parent="xdoclet.modules.ejb.EjbDocletTask"
***************
*** 86,89 ****
--- 87,108 ----
  
      /**
+      * JOnAS 3.0 deployment descriptor public ID.
+      */
+     private final static String JONAS_DD_PUBLICID_3_0
+          = "-//ObjectWeb//DTD JOnAS 3.0//EN";
+ 
+     /**
+      * JOnAS 3.0 deployment descriptor system ID.
+      */
+     private final static String JONAS_DD_SYSTEMID_3_0
+          = "http://www.objectweb.org/jonas/dtds/jonas-ejb-jar_3_0.dtd";;
+ 
+     /**
+      * Location of local copy of JOnAS 3.0 DTD.
+      */
+     private final static String JONAS_DTD_FILE_NAME_3_0
+          = "resources/jonas-ejb-jar_3_0.dtd";
+ 
+     /**
       * JOnAS version to generate files for.
       */
***************
*** 111,117 ****
  
      /**
!      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6.
       *
!      * @param version      The new version value. Supported versions are: 2.3, 2.4, 
2.5, 2.6.
       * @ant.not-required   No, default is "2.6".
       */
--- 130,136 ----
  
      /**
!      * Sets the version of JOnAS. Supported versions are: 2.3, 2.4, 2.5, 2.6, 3.0
       *
!      * @param version      The new version value. Supported versions are: 2.3, 2.4, 
2.5, 2.6, 3.0
       * @ant.not-required   No, default is "2.6".
       */
***************
*** 123,127 ****
      public void execute() throws XDocletException
      {
!         if (getVersion().equals(JonasVersionTypes.VERSION_2_5)
              || getVersion().equals(JonasVersionTypes.VERSION_2_6)) {
              // nothing changed between 2.5 & 2.6 for EJBs, so use 2.5 DTD for both
--- 142,155 ----
      public void execute() throws XDocletException
      {
! 
!         if (getVersion().equals(JonasVersionTypes.VERSION_3_0)) {
!             if (getPublicId() == null)
!                 setPublicId(JONAS_DD_PUBLICID_3_0);
!             if (getSystemId() == null)
!                 setSystemId(JONAS_DD_SYSTEMID_3_0);
!             if (getDtdURL() == null)
!                 setDtdURL(getClass().getResource(JONAS_DTD_FILE_NAME_3_0));
!         }
!         else if (getVersion().equals(JonasVersionTypes.VERSION_2_5)
              || getVersion().equals(JonasVersionTypes.VERSION_2_6)) {
              // nothing changed between 2.5 & 2.6 for EJBs, so use 2.5 DTD for both
***************
*** 166,169 ****
--- 194,198 ----
          public final static String VERSION_2_5 = "2.5";
          public final static String VERSION_2_6 = "2.6";
+         public final static String VERSION_3_0 = "3.0";
          public final static String DEFAULT_VERSION = VERSION_2_6;
  
***************
*** 175,179 ****
          public String[] getValues()
          {
!             return (new String[]{VERSION_2_3, VERSION_2_4, VERSION_2_5, 
VERSION_2_6});
          }
      }
--- 204,208 ----
          public String[] getValues()
          {
!             return (new String[]{VERSION_2_3, VERSION_2_4, VERSION_2_5, VERSION_2_6, 
VERSION_3_0});
          }
      }



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