svn commit: r14595 - trunk/src/argouml-app: META-INF src/org/argouml/profile src/org/argouml/profile/profiles src/org/argouml/profile/profiles/uml14

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]>
Author: tfmorris
Date: 2008-05-02 10:26:36-0700
New Revision: 14595

Added:
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt
      - copied, changed from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/andromda-profile-31.xmi
      - copied unchanged from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-31.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/andromda-profile-32-noextensions.xmi
      - copied unchanged from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-32-noextensions.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi
      - copied, changed from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-uml14-uml20-deprecated.xmi
      - copied unchanged from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-deprecated.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-uml14-uml20-subset.xmi
      - copied unchanged from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-subset.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-uml14.xmi
      - copied unchanged from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14.xmi
Removed:
   trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt
   trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-31.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-32-noextensions.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-deprecated.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-subset.xmi
   trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14.xmi
Modified:
   trunk/src/argouml-app/META-INF/MANIFEST.MF
   trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java
   trunk/src/argouml-app/src/org/argouml/profile/Profile.java

Log:
Move profiles to UML version specific directory in preparation for publish.

Update Java profile with documentation and <<profile>> stereotype

Modified: trunk/src/argouml-app/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/META-INF/MANIFEST.MF?view=diff&rev=14595&p1=trunk/src/argouml-app/META-INF/MANIFEST.MF&p2=trunk/src/argouml-app/META-INF/MANIFEST.MF&r1=14594&r2=14595
==============================================================================
--- trunk/src/argouml-app/META-INF/MANIFEST.MF	(original)
+++ trunk/src/argouml-app/META-INF/MANIFEST.MF	2008-05-02 10:26:36-0700
@@ -69,7 +69,7 @@
  org.argouml.profile,
  org.argouml.profile.init,
  org.argouml.profile.internal,
- org.argouml.profile.profiles,
+ org.argouml.profile.profiles.uml14,
  org.argouml.resource,
  org.argouml.swingext,
  org.argouml.taskmgmt,

Modified: trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java?view=diff&rev=14595&p1=trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java&p2=trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java&r1=14594&r2=14595
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/CoreProfileReference.java	2008-05-02 10:26:36-0700
@@ -35,7 +35,7 @@
 public class CoreProfileReference extends ProfileReference {
     
     static final String PROFILES_RESOURCE_PATH = 
-        "/org/argouml/profile/profiles/";
+        "/org/argouml/profile/profiles/uml14/";
     
     static final String PROFILES_BASE_URL = 
         "http://argouml.org/profiles/uml14/";

Modified: trunk/src/argouml-app/src/org/argouml/profile/Profile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/Profile.java?view=diff&rev=14595&p1=trunk/src/argouml-app/src/org/argouml/profile/Profile.java&p2=trunk/src/argouml-app/src/org/argouml/profile/Profile.java&r1=14594&r2=14595
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/Profile.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/Profile.java	2008-05-02 10:26:36-0700
@@ -41,11 +41,6 @@
  */
 public abstract class Profile {
     
-    /**
-     * Base directory/resource path to use for searching for profiles
-     */
-    public static final String PROFILE_DIR = "/org/argouml/profile/profiles/";
-    
     private Set<Profile> importedProfiles  = new HashSet<Profile>();
     private Set<Profile> importingProfiles = new HashSet<Profile>();
         

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt?view=auto&rev=14594

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-31.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-31.xmi?view=auto&rev=14594

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-32-noextensions.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/andromda-profile-32-noextensions.xmi?view=auto&rev=14594

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi?view=auto&rev=14594

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-deprecated.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-deprecated.xmi?view=auto&rev=14594

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-subset.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14-uml20-subset.xmi?view=auto&rev=14594

Removed: trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/default-uml14.xmi?view=auto&rev=14594

Copied: trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt (from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt?view=diff&rev=14595&p1=/trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt&p2=trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt&r1=14589&r2=14595
==============================================================================
--- /trunk/src/argouml-app/src/org/argouml/profile/profiles/README.txt	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt	2008-05-02 10:26:36-0700
@@ -8,6 +8,10 @@
        deprecated.

 - default-uml14-uml20-subset.xmi - subset of standard model elements

        from UML 1.4 spec which are also in UML 2.0 spec.

+       

+- default-java.xmi - Java profile items which were split out from old ArgoUML

+       default profile which contained both UML and Java items.  Currently

+       only contains very basic types.

 

 - andromda-profile-31.xmi - Modeling profile for standard AndroMDA 3.1 cartridges

 - andromda-profile-32-noextensions.xmi - Modeling profile for standard 


Copied: trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi (from r14589, /trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi?view=diff&rev=14595&p1=/trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi&p2=trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi&r1=14589&r2=14595
==============================================================================
--- /trunk/src/argouml-app/src/org/argouml/profile/profiles/default-java.xmi	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/default-java.xmi	2008-05-02 10:26:36-0700
@@ -1,13 +1,25 @@
 <?xml version = '1.0' encoding = 'UTF-8' ?>

-<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Aug 13 17:12:31 BRT 2007'>

+<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Fri May 02 13:16:12 EDT 2008'>

   <XMI.header>    <XMI.documentation>
       <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter>
-      <XMI.exporterVersion>PRE-0.25.4(5) revised on $Date: 2007-05-12 03:08:08 -0300 $ </XMI.exporterVersion>
+      <XMI.exporterVersion>PRE-0.25.5(5) revised on $Date: 2007-05-12 02:08:08 -0400 (Sat, 12 May 2007) $ </XMI.exporterVersion>
     </XMI.documentation>
     <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header>

   <XMI.content>

     <UML:Model xmi.id = '.:000000000000087A' name = 'UML Profile for Java' isSpecification = 'false'

       isRoot = 'false' isLeaf = 'false' isAbstract = 'false'>

+      <UML:ModelElement.stereotype>

+        <UML:Stereotype xmi.idref = '-64--88-1-3--3c483fe3:119aa9cff00:-8000:00000000000007A3'/>

+      </UML:ModelElement.stereotype>

+      <UML:ModelElement.taggedValue>

+        <UML:TaggedValue xmi.id = '-64--88-1-3--3c483fe3:119aa9cff00:-8000:00000000000007A4'

+          isSpecification = 'false'>

+          <UML:TaggedValue.dataValue>This profile contains common Java classes and datatypes which are not contained in the UML Standard Elements profile.  It only includes the basics, but may be easily extended to include anything else which is useful.</UML:TaggedValue.dataValue>

+          <UML:TaggedValue.type>

+            <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/>

+          </UML:TaggedValue.type>

+        </UML:TaggedValue>

+      </UML:ModelElement.taggedValue>

       <UML:Namespace.ownedElement>

         <UML:Package xmi.id = '.:0000000000000869' name = 'java' isSpecification = 'false'

           isRoot = 'false' isLeaf = 'false' isAbstract = 'false'>

@@ -94,6 +106,11 @@
           isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/>

         <UML:DataType xmi.id = '.:0000000000000873' name = 'boolean' isSpecification = 'false'

           isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/>

+        <UML:Stereotype xmi.id = '-64--88-1-3--3c483fe3:119aa9cff00:-8000:00000000000007A3'

+          name = 'profile' isSpecification = 'false' isRoot = 'false' isLeaf = 'false'

+          isAbstract = 'false'>

+          <UML:Stereotype.baseClass>Model</UML:Stereotype.baseClass>

+        </UML:Stereotype>

       </UML:Namespace.ownedElement>

     </UML:Model>

   </XMI.content>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.