1.1 --- a/mdr/test/build.xml	Wed Jul 24 08:41:37 2002 +0000
     1.2 +++ b/mdr/test/build.xml	Wed Jul 24 11:51:31 2002 +0000
     1.3 @@ -27,7 +27,7 @@
     1.4      <property name="xtest.home" location="../../xtest"/>
     1.5  
     1.6      <!-- default testtypes, attributes used when no value is supplied from command line -->
     1.7 -    <property name="xtest.testtype" value="perf"/>
     1.8 +    <property name="xtest.testtype" value="unit"/>
     1.9      <property name="xtest.attribs" value="stable"/>
    1.10      
    1.11      <!-- Points to antfile with module's harness. 

     2.1 --- a/mdr/test/perf/src/org/netbeans/mdr/test/data/java-model.xml	Wed Jul 24 08:41:37 2002 +0000
     2.2 +++ b/mdr/test/perf/src/org/netbeans/mdr/test/data/java-model.xml	Wed Jul 24 11:51:31 2002 +0000
     2.3 @@ -14,10 +14,10 @@
     2.4    name = 'Source' annotation = '' 
     2.5    isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' >
     2.6    <Model:Namespace.contents>
     2.7 -    <!-- ==================== Source.org.omg.mof.java_prefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
     2.8 +    <!-- ==================== Source.javax.jmi.packagePrefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
     2.9      <Model:Tag xmi.id = 'G.133' 
    2.10 -      name = 'org.omg.mof.java_prefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.11 -      tagId = 'org.omg.mof.java_prefix' 
    2.12 +      name = 'javax.jmi.packagePrefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.13 +      tagId = 'javax.jmi.packagePrefix' 
    2.14        elements = 'a3A9CF1A803B9' >
    2.15        <Model:Tag.values>
    2.16          <XMI.any xmi.type = 'string' xmi.name = ''>org.netbeans.modules.java.api.model</XMI.any>
    2.17 @@ -65,10 +65,10 @@
    2.18          </Model:Attribute>
    2.19        </Model:Namespace.contents>
    2.20      </Model:Class>
    2.21 -    <!-- ==================== Source.org.omg.mof.java_substitute_name=extendsName    [Tag] ==================== -->
    2.22 +    <!-- ==================== Source.javax.jmi.substituteName=extendsName    [Tag] ==================== -->
    2.23      <Model:Tag xmi.id = 'G.134' 
    2.24 -      name = 'org.omg.mof.java_substitute_name=extendsName' annotation = '' 
    2.25 -      tagId = 'org.omg.mof.java_substitute_name' 
    2.26 +      name = 'javax.jmi.substituteName=extendsName' annotation = '' 
    2.27 +      tagId = 'javax.jmi.substituteName' 
    2.28        elements = 'a3C43A0F10397' >
    2.29        <Model:Tag.values>
    2.30          <XMI.any xmi.type = 'string' xmi.name = ''>extendsName</XMI.any>
    2.31 @@ -87,10 +87,10 @@
    2.32        name = 'Physical' annotation = '' 
    2.33        visibility = 'public_vis' isClustered = 'false' 
    2.34        importedNamespace = 'a3BCE91460399' />
    2.35 -    <!-- ==================== Source.org.omg.mof.java_substitute_name=implementsNames    [Tag] ==================== -->
    2.36 +    <!-- ==================== Source.javax.jmi.substituteName=implementsNames    [Tag] ==================== -->
    2.37      <Model:Tag xmi.id = 'G.137' 
    2.38 -      name = 'org.omg.mof.java_substitute_name=implementsNames' annotation = '' 
    2.39 -      tagId = 'org.omg.mof.java_substitute_name' 
    2.40 +      name = 'javax.jmi.substituteName=implementsNames' annotation = '' 
    2.41 +      tagId = 'javax.jmi.substituteName' 
    2.42        elements = 'a3C43A11F019E' >
    2.43        <Model:Tag.values>
    2.44          <XMI.any xmi.type = 'string' xmi.name = ''>implementsNames</XMI.any>
    2.45 @@ -163,10 +163,10 @@
    2.46          </Model:Reference>
    2.47        </Model:Namespace.contents>
    2.48      </Model:Class>
    2.49 -    <!-- ==================== Source.org.omg.mof.java_substitute_name=throwsNames    [Tag] ==================== -->
    2.50 +    <!-- ==================== Source.javax.jmi.substituteName=throwsNames    [Tag] ==================== -->
    2.51      <Model:Tag xmi.id = 'G.138' 
    2.52 -      name = 'org.omg.mof.java_substitute_name=throwsNames' annotation = '' 
    2.53 -      tagId = 'org.omg.mof.java_substitute_name' 
    2.54 +      name = 'javax.jmi.substituteName=throwsNames' annotation = '' 
    2.55 +      tagId = 'javax.jmi.substituteName' 
    2.56        elements = 'a3C43A4DE0388' >
    2.57        <Model:Tag.values>
    2.58          <XMI.any xmi.type = 'string' xmi.name = ''>throwsNames</XMI.any>
    2.59 @@ -469,10 +469,10 @@
    2.60    name = 'Physical' annotation = '' 
    2.61    isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' >
    2.62    <Model:Namespace.contents>
    2.63 -    <!-- ==================== Physical.org.omg.mof.java_prefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
    2.64 +    <!-- ==================== Physical.javax.jmi.packagePrefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
    2.65      <Model:Tag xmi.id = 'G.139' 
    2.66 -      name = 'org.omg.mof.java_prefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.67 -      tagId = 'org.omg.mof.java_prefix' 
    2.68 +      name = 'javax.jmi.packagePrefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.69 +      tagId = 'javax.jmi.packagePrefix' 
    2.70        elements = 'a3BCE91460399' >
    2.71        <Model:Tag.values>
    2.72          <XMI.any xmi.type = 'string' xmi.name = ''>org.netbeans.modules.java.api.model</XMI.any>
    2.73 @@ -2497,10 +2497,10 @@
    2.74    name = 'ClassPath' annotation = '' 
    2.75    isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' >
    2.76    <Model:Namespace.contents>
    2.77 -    <!-- ==================== ClassPath.org.omg.mof.java_prefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
    2.78 +    <!-- ==================== ClassPath.javax.jmi.packagePrefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
    2.79      <Model:Tag xmi.id = 'G.145' 
    2.80 -      name = 'org.omg.mof.java_prefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.81 -      tagId = 'org.omg.mof.java_prefix' 
    2.82 +      name = 'javax.jmi.packagePrefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.83 +      tagId = 'javax.jmi.packagePrefix' 
    2.84        elements = 'a3C50056303AB' >
    2.85        <Model:Tag.values>
    2.86          <XMI.any xmi.type = 'string' xmi.name = ''>org.netbeans.modules.java.api.model</XMI.any>
    2.87 @@ -2685,10 +2685,10 @@
    2.88    name = 'Usage' annotation = '' 
    2.89    isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' >
    2.90    <Model:Namespace.contents>
    2.91 -    <!-- ==================== Usage.org.omg.mof.java_prefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
    2.92 +    <!-- ==================== Usage.javax.jmi.packagePrefix=org.netbeans.modules.java.api.model    [Tag] ==================== -->
    2.93      <Model:Tag xmi.id = 'G.147' 
    2.94 -      name = 'org.omg.mof.java_prefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.95 -      tagId = 'org.omg.mof.java_prefix' 
    2.96 +      name = 'javax.jmi.packagePrefix=org.netbeans.modules.java.api.model' annotation = '' 
    2.97 +      tagId = 'javax.jmi.packagePrefix' 
    2.98        elements = 'a3C6D337C01A8' >
    2.99        <Model:Tag.values>
   2.100          <XMI.any xmi.type = 'string' xmi.name = ''>org.netbeans.modules.java.api.model</XMI.any>

     3.1 --- a/mdr/test/unit/src/org/netbeans/mdr/test/data/Java.xml	Wed Jul 24 08:41:37 2002 +0000
     3.2 +++ b/mdr/test/unit/src/org/netbeans/mdr/test/data/Java.xml	Wed Jul 24 11:51:31 2002 +0000
     3.3 @@ -19,8 +19,8 @@
     3.4      <Model:Package xmi.id = 'a4' name = 'Core' annotation = '' isRoot = 'false'
     3.5        isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'>
     3.6        <Model:Namespace.contents>
     3.7 -        <Model:Tag xmi.id = 'a5' name = 'org.omg.mof.java_prefix=org.netbeans.modules.mdrjava.jmi'
     3.8 -          annotation = '' tagId = 'org.omg.mof.java_prefix' values = 'org.netbeans.modules.mdrjava.jmi'>
     3.9 +        <Model:Tag xmi.id = 'a5' name = 'javax.jmi.packagePrefix=org.netbeans.modules.mdrjava.jmi'
    3.10 +          annotation = '' tagId = 'javax.jmi.packagePrefix' values = 'org.netbeans.modules.mdrjava.jmi'>
    3.11            <Model:Tag.elements>
    3.12              <Model:Package xmi.idref = 'a4'/>
    3.13            </Model:Tag.elements>
    3.14 @@ -396,12 +396,6 @@
    3.15              <Model:PrimitiveType xmi.idref = 'a3'/>
    3.16            </Model:TypedElement.type>
    3.17          </Model:AliasType>
    3.18 -        <Model:Tag xmi.id = 'a57' name = 'Java name for class' annotation = '' tagId = 'javax.jmi.java_substitute_name'
    3.19 -          values = 'JavaClass'>
    3.20 -          <Model:Tag.elements>
    3.21 -            <Model:Class xmi.idref = 'a8'/>
    3.22 -          </Model:Tag.elements>
    3.23 -        </Model:Tag>
    3.24          <Model:Association xmi.id = 'a58' name = 'Contains' annotation = '' isRoot = 'true'
    3.25            isLeaf = 'true' isAbstract = 'false' visibility = 'public_vis' isDerived = 'false'>
    3.26            <Model:Namespace.contents>