1.1 --- a/mdr/extras/uml2mof/build.xml	Sun Feb 02 06:27:59 2003 +0000
     1.2 +++ b/mdr/extras/uml2mof/build.xml	Sun Feb 02 06:34:05 2003 +0000
     1.3 @@ -27,20 +27,21 @@
     1.4    <property name="build.classes.dir" location="src"/>
     1.5  
     1.6    <!-- all external files and directories -->
     1.7 -  <!--property name="nbantext.jar" location="${nbext}/nbantext.jar"/-->
     1.8 -  <property name="openide-lookup.jar" location="${nbroot}/openide/standalone/openide-lookup.jar"/>
     1.9 -  <property name="standard-jar-excludes.txt" location="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
    1.10 -  <property name="standard-nbm-license.txt" location="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    1.11 -  <property name="xml-apis.jar" location="${nbroot}/core/netbeans/lib/ext/xml-apis-1.0b2.jar"/>
    1.12 -  <property name="xmlparser.jar" location="${nbroot}/core/netbeans/lib/ext/crimson-1.1.3.jar"/>
    1.13 -  <property name="jmi.jar" location="${nbroot}/mdr/netbeans/modules/autoload/jmi.jar"/>
    1.14 -  <property name="mof.jar" location="${nbroot}/mdr/netbeans/modules/autoload/mof.jar"/>
    1.15 -  <property name="mdrapi.jar" location="${nbroot}/mdr/netbeans/modules/autoload/mdrapi.jar"/>
    1.16 -  <property name="jmiutils.jar" location="${nbroot}/mdr/netbeans/modules/autoload/ext/jmiutils.jar"/>
    1.17 -  <property name="nbmdr.jar" location="${nbroot}/mdr/netbeans/modules/ext/nbmdr.jar"/>
    1.18 -  <property name="umlclasses.dir" location="uml"/>
    1.19 -  <property name="umlmetamodel.xml" location="${nbroot}/mdr/xmidiffs/01-02-15.xml"/>
    1.20 -  <property name="umlmetamodel.diff" location="${nbroot}/mdr/xmidiffs/01-02-15_Diff.xml"/>
    1.21 +  <property name="openide-lookup.jar" value="${nbroot}/openide/standalone/openide-lookup.jar"/>
    1.22 +  <property name="standard-jar-excludes.txt" value="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
    1.23 +  <property name="standard-nbm-license.txt" value="${nbroot}/nbbuild/standard-nbm-license.txt"/>
    1.24 +  <property name="xml-apis.jar" value="${nbroot}/core/netbeans/lib/ext/xml-apis-1.0b2.jar"/>
    1.25 +  <property name="xmlparser.jar" value="${nbroot}/core/netbeans/lib/ext/crimson-1.1.3.jar"/>
    1.26 +  <property name="jmi.jar" value="${nbroot}/mdr/netbeans/modules/autoload/jmi.jar"/>
    1.27 +  <property name="mof.jar" value="${nbroot}/mdr/netbeans/modules/autoload/mof.jar"/>
    1.28 +  <property name="mdrapi.jar" value="${nbroot}/mdr/netbeans/modules/autoload/mdrapi.jar"/>
    1.29 +  <property name="jmiutils.jar" value="${nbroot}/mdr/netbeans/modules/autoload/ext/jmiutils.jar"/>
    1.30 +  <property name="nbmdr.jar" value="${nbroot}/mdr/netbeans/modules/ext/nbmdr.jar"/>
    1.31 +  <property name="umlclasses.dir" value="uml"/>
    1.32 +  <property name="umlmetamodel.xml" value="${nbroot}/mdr/xmidiffs/01-02-15.xml"/>
    1.33 +  <property name="umlmetamodel.diff" value="${nbroot}/mdr/xmidiffs/01-02-15_Diff.xml"/>
    1.34 +  <property name="mdrant.jar" value="${nbroot}/mdr/extras/mdrant/release/mdrant.jar"/>
    1.35 +  <property name="storage.file" value="build"/>
    1.36    
    1.37    <!-- =========================================================== -->
    1.38    <!-- == Taskdefs =============================================== -->
    1.39 @@ -50,6 +51,17 @@
    1.40    <!--taskdef name="genlist" classname="org.netbeans.nbbuild.MakeListOfNBM" classpath="${nbantext.jar}"/-->
    1.41    <!--taskdef name="locjar" classname="org.netbeans.nbbuild.LocalizedJar" classpath="${nbantext.jar}"/-->
    1.42  
    1.43 +    <taskdef name="mdr" classname="org.netbeans.mdrant.MdrTask">
    1.44 +        <classpath>                
    1.45 +            <pathelement location="${mdrant.jar}"/>                    
    1.46 +            <pathelement location="${nbmdr.jar}"/>            
    1.47 +            <pathelement location="${mdrapi.jar}"/>
    1.48 +            <pathelement location="${jmiutils.jar}"/>
    1.49 +            <pathelement location="${mof.jar}"/>
    1.50 +            <pathelement location="${jmi.jar}"/>
    1.51 +            <pathelement location="${openide-lookup.jar}"/>
    1.52 +        </classpath>
    1.53 +    </taskdef>
    1.54    <!-- =========================================================== -->
    1.55    <!-- == Initialization ========================================= -->
    1.56    <!-- =========================================================== -->
    1.57 @@ -62,15 +74,29 @@
    1.58      <echo message="buildnumber = ${buildnumber}"/-->
    1.59      
    1.60      <mkdir dir="${build.classes.dir}"/>
    1.61 -
    1.62 +    <condition property="storageExists">
    1.63 +        <and>
    1.64 +            <available property="storageExists" file="${storage.file}.btd"/>
    1.65 +            <available file="${storage.file}.btx"/>
    1.66 +            <not><available file="${storage.file}.btb"/></not>
    1.67 +        </and>
    1.68 +    </condition>
    1.69      <!--ant dir="external" target="unscramble"/-->
    1.70    </target>
    1.71  
    1.72 +  <target name="jmi" unless="storageExists">
    1.73 +        <mkdir dir="${umlclasses.dir}"/>
    1.74 +        <mdr storageFile="${storage.file}">
    1.75 +            <instantiate name="uml"/>
    1.76 +            <readXMI file="${umlmetamodel.diff}" extent="uml"/>
    1.77 +            <mapClass dir="${umlclasses.dir}" extent="uml"/>                    
    1.78 +        </mdr>
    1.79 +  </target>
    1.80    <!-- =========================================================== -->
    1.81    <!-- == Compilation of all parts =============================== -->
    1.82    <!-- =========================================================== -->
    1.83  
    1.84 -  <target name="compile" depends="init">
    1.85 +  <target name="compile" depends="init,jmi">
    1.86      <!-- sources -->
    1.87      <javac srcdir="src" destdir="${build.classes.dir}"
    1.88             debug="${build.compiler.debug}" 
    1.89 @@ -134,7 +160,12 @@
    1.90      </delete>
    1.91      <delete dir="${umlclasses.dir}/org/omg/uml/resouces"/>
    1.92      <delete dir="${build.dir}"/>
    1.93 -    <delete file="manifest.mf"/>
    1.94 +  </target>
    1.95 +  <target name="real-clean" depends="clean">
    1.96 +    <delete dir="${umlclasses.dir}"/>
    1.97 +    <delete file="${storage.file}.btd"/>
    1.98 +    <delete file="${storage.file}.btx"/>
    1.99 +    <delete file="${storage.file}.btb"/>
   1.100    </target>
   1.101  
   1.102  </project>

     2.1 --- a/mdr/extras/uml2mof/src/org/netbeans/lib/jmi/uml2mof/Transformer.java	Sun Feb 02 06:27:59 2003 +0000
     2.2 +++ b/mdr/extras/uml2mof/src/org/netbeans/lib/jmi/uml2mof/Transformer.java	Sun Feb 02 06:34:05 2003 +0000
     2.3 @@ -105,7 +105,7 @@
     2.4  
     2.5      private static final String TAG_RAISED_EXCEPTIONS = "org.netbeans.uml2mof.raisedExceptions";
     2.6      private static final String TAG_ALIAS_FOR = "org.netbeans.uml2mof.aliasFor";
     2.7 -    private static final String TAG_ASSOC_DERIVED = "org.netbeans.uml2mof.isDerived";
     2.8 +    private static final String TAG_ASSOC_DERIVED = "org.omg.uml2mof.isDerived";
     2.9      
    2.10      // special attributes
    2.11      private static final String ATTR_ITEMS = "items";