[jboss-svn-commits] JBL Code SVN: r17739 - in labs/jbosslabs/trunk/ng/architecture/model/ProjectModel: model/projectmodel and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jan 11 13:12:28 EST 2008


Author: wrzep
Date: 2008-01-11 13:12:28 -0500 (Fri, 11 Jan 2008)
New Revision: 17739

Removed:
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingList.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingListType.java
Modified:
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.ejb_diagram
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.png
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Forum.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTracker.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTrackerType.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/License.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Project.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectMembership.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectRole.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Release.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ReleaseCategory.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Repository.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/RepositoryType.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/User.java
Log:
JBLAB-897


Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr	2008-01-11 18:12:28 UTC (rev 17739)
@@ -49,6 +49,8 @@
          <url n="ejb:3ac3628b-0117-1000-8077-c0a80104c515" path="src/org/jboss/labs/ng/model/documentation/File.java"/>
          <url n="ejb:3b041550-0117-1000-80a5-c0a80104c515" path="src/org/jboss/labs/ng/model/download/FileType.java"/>
          <url n="ejb:5943b503-0117-1000-8001-c0a801040398" path="src/org/jboss/labs/ng/model/SignedContributorAgreement.java"/>
+         <url n="ejb:69af512a-0117-1000-8001-c0a80104f265" path="src/org/jboss/labs/ng/model/ProjectRole.java"/>
+         <url n="ejb:69bc6d54-0117-1000-8010-c0a80104f265" path="src/org/jboss/labs/ng/model/ReleaseCategory.java"/>
          <url n="ejb:fc98331d-0116-1000-8015-c0a80104e31d" path="src/org/jboss/labs/ng/model/Project.java"/>
          <url n="ejb:fcbdeb4d-0116-1000-8020-c0a80104e31d" path="src/org/jboss/labs/ng/model/Repository.java"/>
          <url n="ejb:fcd6d580-0116-1000-801e-c0a80104eb33" path="src/org/jboss/labs/ng/model/IssueTracker.java"/>
@@ -57,7 +59,6 @@
          <url n="ejb:fd806447-0116-1000-806f-c0a80104eb33" path="src/org/jboss/labs/ng/model/User.java"/>
          <url n="ejb:fd948445-0116-1000-8081-c0a80104eb33" path="src/org/jboss/labs/ng/model/ProjectMembership.java"/>
          <url n="ejb:fda72ffe-0116-1000-80b5-c0a80104eb33" path="src/org/jboss/labs/ng/model/Link.java"/>
-         <url n="ejb:fdd39443-0116-1000-80c7-c0a80104eb33" path="src/org/jboss/labs/ng/model/MailingList.java"/>
          <url n="ejb:fdde4d05-0116-1000-80fc-c0a80104eb33" path="src/org/jboss/labs/ng/model/Forum.java"/>
       </hash>
       <value n="ejbVersion" v="3.0"/>

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.ejb_diagram
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.ejb_diagram	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.ejb_diagram	2008-01-11 18:12:28 UTC (rev 17739)
@@ -12,7 +12,7 @@
       <DI:Diagram.contained>
         <DI:GraphNode xmi.id='fc98466c-0116-1000-801b-c0a80104e31d'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fcd52485-0116-1000-800e-c0a80104eb33' graphEdge='3a49f495-0117-1000-8019-c0a80104c515 3a69d342-0117-1000-802b-c0a80104c515 3a8c1ad3-0117-1000-8041-c0a80104c515 3a8c1ad3-0117-1000-8042-c0a80104c515 44213a08-0117-1000-8001-c0a80104c5a0 fcd52487-0116-1000-800f-c0a80104eb33 fcd5c586-0116-1000-8017-c0a80104eb33 fce1c15d-0116-1000-8035-c0a80104eb33 fd6a659d-0116-1000-8060-c0a80104eb33 fd6a659d-0116-1000-8061-c0a80104eb33 fda42fc2-0116-1000-80ae-c0a80104eb33 fda97ec1-0116-1000-80bf-c0a80104eb33 fdd6cc5f-0116-1000-80d9-c0a80104eb33'/>
+            <DI:GraphConnector xmi.id='fcd52485-0116-1000-800e-c0a80104eb33' graphEdge='3a49f495-0117-1000-8019-c0a80104c515 3a69d342-0117-1000-802b-c0a80104c515 3a8c1ad3-0117-1000-8041-c0a80104c515 3a8c1ad3-0117-1000-8042-c0a80104c515 44213a08-0117-1000-8001-c0a80104c5a0 6a0565f2-0117-1000-8001-c0a80104410c fcd52487-0116-1000-800f-c0a80104eb33 fcd5c586-0116-1000-8017-c0a80104eb33 fce1c15d-0116-1000-8035-c0a80104eb33 fd6a659d-0116-1000-8060-c0a80104eb33 fd6a659d-0116-1000-8061-c0a80104eb33 fda42fc2-0116-1000-80ae-c0a80104eb33 fda97ec1-0116-1000-80bf-c0a80104eb33'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fc98466c-0116-1000-801c-c0a80104e31d'>
@@ -46,7 +46,7 @@
                 <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
               </DI:GraphNode.semanticModel>
               <DI:GraphNode.size>
-                <DI:Dimension height='375.0' width='330.0'/>
+                <DI:Dimension height='405.0' width='330.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
           </DI:GraphNode.contained>
@@ -70,7 +70,7 @@
             <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:fc98331d-0116-1000-8015-c0a80104e31d' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='375.0' width='330.0'/>
+            <DI:Dimension height='405.0' width='330.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
         <DI:GraphNode xmi.id='fcbdf3ce-0116-1000-8025-c0a80104e31d'>
@@ -691,7 +691,7 @@
         </DI:GraphEdge>
         <DI:GraphNode xmi.id='fce3935f-0116-1000-8042-c0a80104eb33'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fce44a16-0116-1000-8048-c0a80104eb33' graphEdge='fcf5929f-0116-1000-804f-c0a80104eb33 fcf5929f-0116-1000-804f-c0a80104eb33 fd6a659d-0116-1000-8061-c0a80104eb33'/>
+            <DI:GraphConnector xmi.id='fce44a16-0116-1000-8048-c0a80104eb33' graphEdge='69c9ec5b-0117-1000-801e-c0a80104f265 69c9ec5b-0117-1000-801e-c0a80104f265 fcf5929f-0116-1000-804f-c0a80104eb33 fcf5929f-0116-1000-804f-c0a80104eb33 fd6a659d-0116-1000-8061-c0a80104eb33'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fce3935f-0116-1000-8043-c0a80104eb33'>
@@ -725,7 +725,7 @@
                 <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
               </DI:GraphNode.semanticModel>
               <DI:GraphNode.size>
-                <DI:Dimension height='165.0' width='285.0'/>
+                <DI:Dimension height='195.0' width='285.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
           </DI:GraphNode.contained>
@@ -749,14 +749,14 @@
             <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:fce38cc8-0116-1000-803d-c0a80104eb33' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='165.0' width='285.0'/>
+            <DI:Dimension height='195.0' width='285.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
         <DI:GraphEdge xmi.id='fcf5929f-0116-1000-804f-c0a80104eb33' anchor='fce44a16-0116-1000-8048-c0a80104eb33 fce44a16-0116-1000-8048-c0a80104eb33'>
           <DI:GraphEdge.contained>
             <DI:GraphNode xmi.id='fcf592aa-0116-1000-8050-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='-136.0' y='19.0'/>
+                <DI:Point x='-136.0' y='51.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
@@ -817,11 +817,11 @@
             <DI:CoreSemanticModelBridge element='EJB:OneToManyRelationshipEdge~javax.persistence.OneToMany at org.jboss.labs.ng.model.License@ejb:fce38cc8-0116-1000-803d-c0a80104eb33 at compatibleLicensesList@java.util.List&lt;org.jboss.labs.ng.model.License>@2 at org.jboss.labs.ng.model.License@ejb:fce38cc8-0116-1000-803d-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='-165.5' y='225.0'/>
+            <DI:Point x='-165.5' y='255.0'/>
             <DI:Point x='-165.5' y='269.5'/>
             <DI:Point x='-33.5' y='269.5'/>
-            <DI:Point x='-33.5' y='194.5'/>
-            <DI:Point x='-75.0' y='194.5'/>
+            <DI:Point x='-33.5' y='218.9545440673828'/>
+            <DI:Point x='-75.0' y='218.9545440673828'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
         <DI:GraphNode xmi.id='fd5a784e-0116-1000-805b-c0a80104eb33'>
@@ -952,8 +952,8 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToManyRelationshipEdge~javax.persistence.ManyToMany at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at requiredContributorAgreementsList@java.util.List&lt;org.jboss.labs.ng.model.ContributorAgreement>@2 at org.jboss.labs.ng.model.ContributorAgreement@ejb:fd5a2008-0116-1000-8056-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='75.0' y='358.6007995605469'/>
-            <DI:Point x='-73.0' y='358.6007995605469'/>
+            <DI:Point x='75.0' y='383.6888427734375'/>
+            <DI:Point x='-73.0' y='383.6888427734375'/>
             <DI:Point x='-73.0' y='359.42852783203125'/>
             <DI:Point x='-240.0' y='359.42852783203125'/>
             <DI:Point x='-240.0' y='390.0'/>
@@ -1024,15 +1024,15 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToManyRelationshipEdge~javax.persistence.ManyToMany at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at licensesList@java.util.List&lt;org.jboss.labs.ng.model.License>@2 at org.jboss.labs.ng.model.License@ejb:fce38cc8-0116-1000-803d-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='75.0' y='95.0'/>
-            <DI:Point x='0.0' y='95.0'/>
-            <DI:Point x='0.0' y='91.0'/>
-            <DI:Point x='-75.0' y='91.0'/>
+            <DI:Point x='75.0' y='99.0'/>
+            <DI:Point x='0.0' y='99.0'/>
+            <DI:Point x='0.0' y='96.6363525390625'/>
+            <DI:Point x='-75.0' y='96.6363525390625'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
         <DI:GraphNode xmi.id='fd8567fa-0116-1000-8074-c0a80104eb33'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fd87e86e-0116-1000-807a-c0a80104eb33' graphEdge='44213a0a-0117-1000-8002-c0a80104c5a0 5958bde8-0117-1000-801b-c0a801040398 fda1a8b3-0116-1000-80a1-c0a80104eb33'/>
+            <DI:GraphConnector xmi.id='fd87e86e-0116-1000-807a-c0a80104eb33' graphEdge='5958bde8-0117-1000-801b-c0a801040398 fda1a8b3-0116-1000-80a1-c0a80104eb33'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fd8567fa-0116-1000-8075-c0a80104eb33'>
@@ -1066,12 +1066,12 @@
                 <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
               </DI:GraphNode.semanticModel>
               <DI:GraphNode.size>
-                <DI:Dimension height='210.0' width='195.0'/>
+                <DI:Dimension height='210.0' width='240.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='210.0' y='630.0'/>
+            <DI:Point x='0.0' y='630.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
             <DI:Property key='showAttributeType' value='true'/>
@@ -1090,12 +1090,12 @@
             <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:fd806447-0116-1000-806f-c0a80104eb33' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='210.0' width='195.0'/>
+            <DI:Dimension height='210.0' width='240.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
         <DI:GraphNode xmi.id='fd948d87-0116-1000-8086-c0a80104eb33'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fda0966f-0116-1000-8099-c0a80104eb33' graphEdge='fda1a8b3-0116-1000-80a1-c0a80104eb33 fda42fc2-0116-1000-80ae-c0a80104eb33'/>
+            <DI:GraphConnector xmi.id='fda0966f-0116-1000-8099-c0a80104eb33' graphEdge='6a087487-0117-1000-8009-c0a801043f31 fda1a8b3-0116-1000-80a1-c0a80104eb33 fda42fc2-0116-1000-80ae-c0a80104eb33'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fd948d87-0116-1000-8087-c0a80104eb33'>
@@ -1129,12 +1129,12 @@
                 <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
               </DI:GraphNode.semanticModel>
               <DI:GraphNode.size>
-                <DI:Dimension height='150.0' width='240.0'/>
+                <DI:Dimension height='105.0' width='240.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='-135.0' y='630.0'/>
+            <DI:Point x='375.0' y='705.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
             <DI:Property key='showAttributeType' value='true'/>
@@ -1153,154 +1153,14 @@
             <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:fd948445-0116-1000-8081-c0a80104eb33' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='150.0' width='240.0'/>
+            <DI:Dimension height='105.0' width='240.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
-        <DI:GraphNode xmi.id='fd9fdc73-0116-1000-808b-c0a80104eb33'>
-          <DI:GraphNode.contained>
-            <DI:GraphNode xmi.id='fd9fdc73-0116-1000-808c-c0a80104eb33'>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='COMPACT'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='100.0' width='100.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fd9fdc73-0116-1000-808d-c0a80104eb33'>
-              <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='fd9fdc73-0116-1000-808e-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='EnumValueCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='2.3996996879577637' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fd9fdc73-0116-1000-808f-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.5334334373474121' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8090-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.5334334373474121' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8091-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='InnerCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.5334334373474121' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-              </DI:GraphNode.contained>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='91.73046875' width='120.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8092-c0a80104eb33'>
-              <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8093-c0a80104eb33'>
-                  <DI:GraphNode.contained>
-                    <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8094-c0a80104eb33'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='EnumValueCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                    <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8095-c0a80104eb33'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                    <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8096-c0a80104eb33'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                  </DI:GraphNode.contained>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='Component'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='80.0' width='33.33333206176758'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fd9fdc73-0116-1000-8097-c0a80104eb33'>
-                  <DI:GraphNode.position>
-                    <DI:Point x='0.0' y='0.0'/>
-                  </DI:GraphNode.position>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='BodyCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                </DI:GraphNode>
-              </DI:GraphNode.contained>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='EXPANDED'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='91.73046875' width='120.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-          </DI:GraphNode.contained>
-          <DI:GraphNode.position>
-            <DI:Point x='210.0' y='870.0'/>
-          </DI:GraphNode.position>
-          <DI:GraphNode.property>
-            <DI:Property key='sortMethodsAlpha' value='true'/>
-            <DI:Property key='filterAttrViz' value='PUBLIC PROTECTED PACKAGE PRIVATE'/>
-            <DI:Property key='fillColor' value='#c6d6ff'/>
-            <DI:Property key='showInnerClasses' value='false'/>
-            <DI:Property key='ShowEnumValuesCompartment' value='true'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='filterMethodViz' value='PUBLIC PROTECTED PACKAGE PRIVATE'/>
-            <DI:Property key='showMethodType' value='true'/>
-            <DI:Property key='excludeAttrFilter' value=''/>
-            <DI:Property key='showStereotype' value='true'/>
-            <DI:Property key='showAttributes' value='false'/>
-            <DI:Property key='showPackage' value='false'/>
-            <DI:Property key='showMethodStatic' value='true'/>
-            <DI:Property key='excludeMethodFilter' value=''/>
-            <DI:Property key='showOperations' value='false'/>
-            <DI:Property key='showAttributeType' value='true'/>
-            <DI:Property key='operationShowParameters' value='0'/>
-            <DI:Property key='showAttributeVisibility' value='true'/>
-            <DI:Property key='showMethodVisibility' value='true'/>
-            <DI:Property key='showAttributeStatic' value='true'/>
-            <DI:Property key='lineColor' value='#a5a5a5'/>
-            <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='sortAttributesAlpha' value='true'/>
-          </DI:GraphNode.property>
-          <DI:GraphNode.semanticModel>
-            <DI:CoreSemanticModelBridge element='JAVA:JIDE;;org.jboss.labs.ng.model;;###;;ProjectRole' presentation='SYMBOLIC'/>
-          </DI:GraphNode.semanticModel>
-          <DI:GraphNode.size>
-            <DI:Dimension height='91.73046875' width='120.0'/>
-          </DI:GraphNode.size>
-        </DI:GraphNode>
         <DI:GraphEdge xmi.id='fda1a8b3-0116-1000-80a1-c0a80104eb33' anchor='fd87e86e-0116-1000-807a-c0a80104eb33 fda0966f-0116-1000-8099-c0a80104eb33'>
           <DI:GraphEdge.contained>
             <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a2-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='-175.0' y='-52.0'/>
+                <DI:Point x='4.0' y='24.044921875'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
@@ -1308,7 +1168,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a3-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='-19.0' y='-24.955078125'/>
+                <DI:Point x='4.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
@@ -1316,7 +1176,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a4-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='-103.0' y='4.0'/>
+                <DI:Point x='0.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
@@ -1324,7 +1184,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a5-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='-79.13983154296875' y='13.214706420898438'/>
+                <DI:Point x='-64.86016845703125' y='-44.21470642089844'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
@@ -1332,7 +1192,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a6-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='-24.955078125'/>
+                <DI:Point x='-15.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
@@ -1340,7 +1200,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a7-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='4.0'/>
+                <DI:Point x='-17.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
@@ -1361,8 +1221,10 @@
             <DI:CoreSemanticModelBridge element='EJB:OneToManyRelationshipEdge~javax.persistence.OneToMany at org.jboss.labs.ng.model.User@ejb:fd806447-0116-1000-806f-c0a80104eb33 at projectMembershipsList@java.util.List&lt;org.jboss.labs.ng.model.ProjectMembership>@2 at org.jboss.labs.ng.model.ProjectMembership@ejb:fd948445-0116-1000-8081-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='210.0' y='645.0'/>
-            <DI:Point x='105.0' y='645.0'/>
+            <DI:Point x='240.0' y='736.0'/>
+            <DI:Point x='300.0' y='736.0'/>
+            <DI:Point x='300.0' y='735.5'/>
+            <DI:Point x='375.0' y='735.5'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
         <DI:GraphEdge xmi.id='fda42fc2-0116-1000-80ae-c0a80104eb33' anchor='fda0966f-0116-1000-8099-c0a80104eb33 fcd52485-0116-1000-800e-c0a80104eb33'>
@@ -1385,7 +1247,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda42fd1-0116-1000-80b1-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='-34.0' y='-19.955078125'/>
+                <DI:Point x='-67.0' y='9.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
@@ -1393,7 +1255,7 @@
             </DI:GraphNode>
             <DI:GraphNode xmi.id='fda42fd1-0116-1000-80b2-c0a80104eb33'>
               <DI:GraphNode.position>
-                <DI:Point x='0.0' y='4.0'/>
+                <DI:Point x='-154.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
@@ -1430,10 +1292,10 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.ProjectMembership@ejb:fd948445-0116-1000-8081-c0a80104eb33 at project@org.jboss.labs.ng.model.Project at 2@org.jboss.labs.ng.model.Project at ejb:fc98331d-0116-1000-8015-c0a80104e31d'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='-61.0' y='630.0'/>
-            <DI:Point x='-61.0' y='502.0'/>
-            <DI:Point x='195.00001525878906' y='502.0'/>
-            <DI:Point x='195.00001525878906' y='420.0'/>
+            <DI:Point x='392.0' y='705.0'/>
+            <DI:Point x='392.0' y='584.0'/>
+            <DI:Point x='195.00001525878906' y='584.0'/>
+            <DI:Point x='195.00001525878906' y='450.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
         <DI:GraphNode xmi.id='fda73860-0116-1000-80ba-c0a80104eb33'>
@@ -1569,143 +1431,9 @@
             <DI:Point x='-135.0' y='-30.5'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphNode xmi.id='fdd3dd7f-0116-1000-80cc-c0a80104eb33'>
-          <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fdd611b7-0116-1000-80d2-c0a80104eb33' graphEdge='3a8ee6aa-0117-1000-804f-c0a80104c515 44213a0a-0117-1000-8002-c0a80104c5a0 fdd6cc5f-0116-1000-80d9-c0a80104eb33'/>
-          </DI:GraphNode.anchorage>
-          <DI:GraphNode.contained>
-            <DI:GraphNode xmi.id='fdd3dd7f-0116-1000-80cd-c0a80104eb33'>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='COMPACT'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='100.0' width='100.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fdd3dd7f-0116-1000-80ce-c0a80104eb33'>
-              <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='fdd3dd7f-0116-1000-80cf-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.6818647384643555' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fdd3dd7f-0116-1000-80d0-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='1.3181352615356445' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-              </DI:GraphNode.contained>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='195.0' width='315.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-          </DI:GraphNode.contained>
-          <DI:GraphNode.position>
-            <DI:Point x='465.0' y='630.0'/>
-          </DI:GraphNode.position>
-          <DI:GraphNode.property>
-            <DI:Property key='showAttributeType' value='true'/>
-            <DI:Property key='fillColor' value='#efd6ff'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='excludeAttrFilter' value=''/>
-            <DI:Property key='showStereotype' value='true'/>
-            <DI:Property key='showAttributes' value='true'/>
-            <DI:Property key='showPackage' value='true'/>
-            <DI:Property key='showOperations' value='false'/>
-            <DI:Property key='lineColor' value='#a5a5a5'/>
-            <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='sortAttributesAlpha' value='false'/>
-          </DI:GraphNode.property>
-          <DI:GraphNode.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:fdd39443-0116-1000-80c7-c0a80104eb33' presentation='SYMBOLIC'/>
-          </DI:GraphNode.semanticModel>
-          <DI:GraphNode.size>
-            <DI:Dimension height='195.0' width='315.0'/>
-          </DI:GraphNode.size>
-        </DI:GraphNode>
-        <DI:GraphEdge xmi.id='fdd6cc5f-0116-1000-80d9-c0a80104eb33' anchor='fcd52485-0116-1000-800e-c0a80104eb33 fdd611b7-0116-1000-80d2-c0a80104eb33'>
-          <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='fdd6cc6e-0116-1000-80da-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='4.0' y='60.0'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fdd6cc6e-0116-1000-80db-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='-17.0' y='4.0'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fdd6cc6e-0116-1000-80dc-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='0.0' y='-24.955078125'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fdd6cc6e-0116-1000-80dd-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='0.0' y='4.0'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='name'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fdd6cc6e-0116-1000-80de-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='4.0' y='-46.955078125'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fdd6cc6e-0116-1000-80df-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='4.0' y='-24.955078125'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-          </DI:GraphEdge.contained>
-          <DI:GraphEdge.property>
-            <DI:Property key='showAssocName' value='false'/>
-            <DI:Property key='EdgeType' value='1'/>
-            <DI:Property key='lineWidth' value='1.0'/>
-            <DI:Property key='showCardinality' value='true'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='lineColor' value='#646464'/>
-            <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='showStereotype' value='false'/>
-          </DI:GraphEdge.property>
-          <DI:GraphEdge.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:ManyToManyRelationshipEdge~javax.persistence.ManyToMany at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at mailingListList@java.util.List&lt;org.jboss.labs.ng.model.MailingList>@2 at org.jboss.labs.ng.model.MailingList@ejb:fdd39443-0116-1000-80c7-c0a80104eb33'/>
-          </DI:GraphEdge.semanticModel>
-          <DI:GraphEdge.waypoint>
-            <DI:Point x='361.0' y='420.0'/>
-            <DI:Point x='361.0' y='555.0'/>
-            <DI:Point x='507.25' y='555.0'/>
-            <DI:Point x='507.25' y='630.0'/>
-          </DI:GraphEdge.waypoint>
-        </DI:GraphEdge>
         <DI:GraphNode xmi.id='fddf263f-0116-1000-8101-c0a80104eb33'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fde2913e-0116-1000-8107-c0a80104eb33' graphEdge='3a8c1ad3-0117-1000-8041-c0a80104c515 3a8c1ad3-0117-1000-8042-c0a80104c515 3a8ee6aa-0117-1000-804f-c0a80104c515'/>
+            <DI:GraphConnector xmi.id='fde2913e-0116-1000-8107-c0a80104eb33' graphEdge='3a8c1ad3-0117-1000-8041-c0a80104c515 3a8c1ad3-0117-1000-8042-c0a80104c515'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fddf263f-0116-1000-8102-c0a80104eb33'>
@@ -1766,146 +1494,6 @@
             <DI:Dimension height='135.0' width='315.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
-        <DI:GraphNode xmi.id='fde6e98b-0116-1000-810e-c0a80104eb33'>
-          <DI:GraphNode.contained>
-            <DI:GraphNode xmi.id='fde6e98b-0116-1000-810f-c0a80104eb33'>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='COMPACT'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='100.0' width='100.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fde6e98b-0116-1000-8110-c0a80104eb33'>
-              <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='fde6e98b-0116-1000-8111-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='EnumValueCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='2.5668630599975586' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fde6e98b-0116-1000-8112-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.4777123034000397' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fde6e98b-0116-1000-8113-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.4777123034000397' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fde6e98b-0116-1000-8114-c0a80104eb33'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='InnerCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.4777123034000397' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-              </DI:GraphNode.contained>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='120.0' width='124.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fde6e98b-0116-1000-8115-c0a80104eb33'>
-              <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='fde6e98b-0116-1000-8116-c0a80104eb33'>
-                  <DI:GraphNode.contained>
-                    <DI:GraphNode xmi.id='fde6e98b-0116-1000-8117-c0a80104eb33'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='EnumValueCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                    <DI:GraphNode xmi.id='fde6e98b-0116-1000-8118-c0a80104eb33'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                    <DI:GraphNode xmi.id='fde6e98b-0116-1000-8119-c0a80104eb33'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                  </DI:GraphNode.contained>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='Component'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='80.0' width='33.33333206176758'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='fde6e98c-0116-1000-811a-c0a80104eb33'>
-                  <DI:GraphNode.position>
-                    <DI:Point x='0.0' y='0.0'/>
-                  </DI:GraphNode.position>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='BodyCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                </DI:GraphNode>
-              </DI:GraphNode.contained>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='EXPANDED'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='120.0' width='124.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
-          </DI:GraphNode.contained>
-          <DI:GraphNode.position>
-            <DI:Point x='630.0' y='855.0'/>
-          </DI:GraphNode.position>
-          <DI:GraphNode.property>
-            <DI:Property key='sortMethodsAlpha' value='true'/>
-            <DI:Property key='filterAttrViz' value='PUBLIC PROTECTED PACKAGE PRIVATE'/>
-            <DI:Property key='fillColor' value='#c6d6ff'/>
-            <DI:Property key='showInnerClasses' value='false'/>
-            <DI:Property key='ShowEnumValuesCompartment' value='true'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='filterMethodViz' value='PUBLIC PROTECTED PACKAGE PRIVATE'/>
-            <DI:Property key='showMethodType' value='true'/>
-            <DI:Property key='excludeAttrFilter' value=''/>
-            <DI:Property key='showStereotype' value='true'/>
-            <DI:Property key='showAttributes' value='false'/>
-            <DI:Property key='showPackage' value='false'/>
-            <DI:Property key='showMethodStatic' value='true'/>
-            <DI:Property key='excludeMethodFilter' value=''/>
-            <DI:Property key='showOperations' value='false'/>
-            <DI:Property key='showAttributeType' value='true'/>
-            <DI:Property key='operationShowParameters' value='0'/>
-            <DI:Property key='showAttributeVisibility' value='true'/>
-            <DI:Property key='showMethodVisibility' value='true'/>
-            <DI:Property key='showAttributeStatic' value='true'/>
-            <DI:Property key='lineColor' value='#a5a5a5'/>
-            <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='sortAttributesAlpha' value='true'/>
-          </DI:GraphNode.property>
-          <DI:GraphNode.semanticModel>
-            <DI:CoreSemanticModelBridge element='JAVA:JIDE;;org.jboss.labs.ng.model;;###;;MailingListType' presentation='SYMBOLIC'/>
-          </DI:GraphNode.semanticModel>
-          <DI:GraphNode.size>
-            <DI:Dimension height='120.0' width='124.0'/>
-          </DI:GraphNode.size>
-        </DI:GraphNode>
         <DI:GraphNode xmi.id='3a46eadd-0117-1000-8014-c0a80104c515'>
           <DI:GraphNode.anchorage>
             <DI:GraphConnector xmi.id='3a49f4a7-0117-1000-801a-c0a80104c515' graphEdge='3a49f495-0117-1000-8019-c0a80104c515 44213a08-0117-1000-8001-c0a80104c5a0'/>
@@ -1947,7 +1535,7 @@
             </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='555.0' y='105.0'/>
+            <DI:Point x='555.0' y='120.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
             <DI:Property key='showAttributes' value='true'/>
@@ -2034,15 +1622,15 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.Blog@ejb:3a46d867-0117-1000-800f-c0a80104c515 at project@org.jboss.labs.ng.model.Project at 2@org.jboss.labs.ng.model.Project at ejb:fc98331d-0116-1000-8015-c0a80104e31d'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='555.0' y='202.0'/>
-            <DI:Point x='480.0' y='202.0'/>
-            <DI:Point x='480.0' y='201.54547119140625'/>
-            <DI:Point x='405.0' y='201.54547119140625'/>
+            <DI:Point x='555.0' y='215.0'/>
+            <DI:Point x='480.0' y='215.0'/>
+            <DI:Point x='480.0' y='214.06910705566406'/>
+            <DI:Point x='405.0' y='214.06910705566406'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
         <DI:GraphNode xmi.id='3a5e9f48-0117-1000-8026-c0a80104c515'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='3a69d358-0117-1000-802c-c0a80104c515' graphEdge='3a69d342-0117-1000-802b-c0a80104c515'/>
+            <DI:GraphConnector xmi.id='3a69d358-0117-1000-802c-c0a80104c515' graphEdge='3a69d342-0117-1000-802b-c0a80104c515 6a078ba5-0117-1000-8001-c0a801043f31'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='3a5e9f48-0117-1000-8027-c0a80104c515'>
@@ -2081,7 +1669,7 @@
             </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='555.0' y='-135.0'/>
+            <DI:Point x='525.0' y='-135.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
             <DI:Property key='showAttributes' value='true'/>
@@ -2168,7 +1756,7 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.Release@ejb:3a5e6542-0117-1000-8021-c0a80104c515 at project@org.jboss.labs.ng.model.Project at 2@org.jboss.labs.ng.model.Project at ejb:fc98331d-0116-1000-8015-c0a80104e31d'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='555.0' y='3.8333740234375'/>
+            <DI:Point x='525.0' y='3.8333740234375'/>
             <DI:Point x='379.0' y='3.8333740234375'/>
             <DI:Point x='379.0' y='45.0'/>
           </DI:GraphEdge.waypoint>
@@ -2238,8 +1826,8 @@
             <DI:CoreSemanticModelBridge element='EJB:OneToOneRelationshipEdge~javax.persistence.OneToOne at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at userForum@org.jboss.labs.ng.model.Forum at 2@org.jboss.labs.ng.model.Forum at ejb:fdde4d05-0116-1000-80fc-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='405.0' y='285.625'/>
-            <DI:Point x='621.5' y='285.625'/>
+            <DI:Point x='405.0' y='304.875'/>
+            <DI:Point x='621.5' y='304.875'/>
             <DI:Point x='621.5' y='360.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
@@ -2308,56 +1896,56 @@
             <DI:CoreSemanticModelBridge element='EJB:OneToOneRelationshipEdge~javax.persistence.OneToOne at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at devForum@org.jboss.labs.ng.model.Forum at 2@org.jboss.labs.ng.model.Forum at ejb:fdde4d05-0116-1000-80fc-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='405.0' y='335.625'/>
-            <DI:Point x='567.5' y='335.625'/>
+            <DI:Point x='405.0' y='358.875'/>
+            <DI:Point x='567.5' y='358.875'/>
             <DI:Point x='567.5' y='360.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphEdge xmi.id='3a8ee6aa-0117-1000-804f-c0a80104c515' anchor='fde2913e-0116-1000-8107-c0a80104eb33 fdd611b7-0116-1000-80d2-c0a80104eb33'>
+        <DI:GraphEdge xmi.id='44213a08-0117-1000-8001-c0a80104c5a0' anchor='fcd52485-0116-1000-800e-c0a80104eb33 3a49f4a7-0117-1000-801a-c0a80104c515'>
           <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='3a8ee6bb-0117-1000-8050-c0a80104c515'>
+            <DI:GraphNode xmi.id='44213a51-0117-1000-8009-c0a80104c5a0'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='4.0'/>
+                <DI:Point x='4.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3a8ee6bb-0117-1000-8051-c0a80104c515'>
+            <DI:GraphNode xmi.id='44213a51-0117-1000-800a-c0a80104c5a0'>
               <DI:GraphNode.position>
-                <DI:Point x='-19.0' y='4.0'/>
+                <DI:Point x='4.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3a8ee6bb-0117-1000-8052-c0a80104c515'>
+            <DI:GraphNode xmi.id='44213a51-0117-1000-800b-c0a80104c5a0'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='0.0'/>
+                <DI:Point x='3.0' y='-21.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3a8ee6bb-0117-1000-8053-c0a80104c515'>
+            <DI:GraphNode xmi.id='44213a51-0117-1000-800c-c0a80104c5a0'>
               <DI:GraphNode.position>
-                <DI:Point x='-84.0' y='-16.0'/>
+                <DI:Point x='-68.0' y='-4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3a8ee6bb-0117-1000-8054-c0a80104c515'>
+            <DI:GraphNode xmi.id='44213a51-0117-1000-800d-c0a80104c5a0'>
               <DI:GraphNode.position>
-                <DI:Point x='-45.0' y='-24.955078125'/>
+                <DI:Point x='-15.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3a8ee6bb-0117-1000-8055-c0a80104c515'>
+            <DI:GraphNode xmi.id='44213a51-0117-1000-800e-c0a80104c5a0'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='-24.955078125'/>
+                <DI:Point x='-19.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
@@ -2365,26 +1953,31 @@
             </DI:GraphNode>
           </DI:GraphEdge.contained>
           <DI:GraphEdge.property>
-            <DI:Property key='showCardinality' value='true'/>
-            <DI:Property key='lineColor' value='#646464'/>
-            <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='showStereotype' value='false'/>
             <DI:Property key='showAssocName' value='false'/>
+            <DI:Property key='lineColor' value='#646464'/>
             <DI:Property key='lineWidth' value='1.0'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='EdgeType' value='1'/>
+            <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='showCardinality' value='true'/>
+            <DI:Property key='showStereotype' value='false'/>
           </DI:GraphEdge.property>
           <DI:GraphEdge.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:OneToOneRelationshipEdge~javax.persistence.OneToOne at org.jboss.labs.ng.model.Forum@ejb:fdde4d05-0116-1000-80fc-c0a80104eb33 at mailingList@org.jboss.labs.ng.model.MailingList at 2@org.jboss.labs.ng.model.MailingList at ejb:fdd39443-0116-1000-80c7-c0a80104eb33'/>
+            <DI:CoreSemanticModelBridge element='EJB:OneToOneRelationshipEdge~javax.persistence.OneToOne at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at mainBlog@org.jboss.labs.ng.model.Blog at 2@org.jboss.labs.ng.model.Blog at ejb:3a46d867-0117-1000-800f-c0a80104c515'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='622.5' y='427.5'/>
-            <DI:Point x='622.5' y='727.5'/>
+            <DI:Point x='405.0' y='142.59912109375'/>
+            <DI:Point x='480.0' y='142.59912109375'/>
+            <DI:Point x='480.0' y='143.5'/>
+            <DI:Point x='555.0' y='143.5'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphNode xmi.id='3ad4d71f-0117-1000-808b-c0a80104c515'>
+        <DI:GraphNode xmi.id='5952efaa-0117-1000-8006-c0a801040398'>
+          <DI:GraphNode.anchorage>
+            <DI:GraphConnector xmi.id='5956548a-0117-1000-800c-c0a801040398' graphEdge='5958bde8-0117-1000-801a-c0a801040398 5958bde8-0117-1000-801b-c0a801040398'/>
+          </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
-            <DI:GraphNode xmi.id='3ad4d71f-0117-1000-808c-c0a80104c515'>
+            <DI:GraphNode xmi.id='5952efaa-0117-1000-8007-c0a801040398'>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='COMPACT'/>
               </DI:GraphNode.semanticModel>
@@ -2392,171 +1985,91 @@
                 <DI:Dimension height='100.0' width='100.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3ad4d71f-0117-1000-808d-c0a80104c515'>
+            <DI:GraphNode xmi.id='5952efaa-0117-1000-8008-c0a801040398'>
               <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='3ad4d71f-0117-1000-808e-c0a80104c515'>
+                <DI:GraphNode xmi.id='5952efaa-0117-1000-8009-c0a801040398'>
                   <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='EnumValueCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='2.814526319503784' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='3ad4d71f-0117-1000-808f-c0a80104c515'>
-                  <DI:GraphNode.semanticModel>
                     <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
                   </DI:GraphNode.semanticModel>
                   <DI:GraphNode.size>
-                    <DI:Dimension height='0.3951578736305237' width='0.0'/>
+                    <DI:Dimension height='0.6818647384643555' width='0.0'/>
                   </DI:GraphNode.size>
                 </DI:GraphNode>
-                <DI:GraphNode xmi.id='3ad4d71f-0117-1000-8090-c0a80104c515'>
+                <DI:GraphNode xmi.id='5952efaa-0117-1000-800a-c0a801040398'>
                   <DI:GraphNode.semanticModel>
                     <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
                   </DI:GraphNode.semanticModel>
                   <DI:GraphNode.size>
-                    <DI:Dimension height='0.3951578736305237' width='0.0'/>
+                    <DI:Dimension height='1.3181352615356445' width='0.0'/>
                   </DI:GraphNode.size>
                 </DI:GraphNode>
-                <DI:GraphNode xmi.id='3ad4d71f-0117-1000-8091-c0a80104c515'>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='InnerCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='0.3951578736305237' width='0.0'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
               </DI:GraphNode.contained>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
               </DI:GraphNode.semanticModel>
               <DI:GraphNode.size>
-                <DI:Dimension height='147.55078125' width='130.0'/>
+                <DI:Dimension height='120.0' width='195.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='3ad4d720-0117-1000-8092-c0a80104c515'>
-              <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='3ad4d720-0117-1000-8093-c0a80104c515'>
-                  <DI:GraphNode.contained>
-                    <DI:GraphNode xmi.id='3ad4d720-0117-1000-8094-c0a80104c515'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='EnumValueCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                    <DI:GraphNode xmi.id='3ad4d720-0117-1000-8095-c0a80104c515'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                    <DI:GraphNode xmi.id='3ad4d720-0117-1000-8096-c0a80104c515'>
-                      <DI:GraphNode.semanticModel>
-                        <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
-                      </DI:GraphNode.semanticModel>
-                      <DI:GraphNode.size>
-                        <DI:Dimension height='1.0' width='0.0'/>
-                      </DI:GraphNode.size>
-                    </DI:GraphNode>
-                  </DI:GraphNode.contained>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='Component'/>
-                  </DI:GraphNode.semanticModel>
-                  <DI:GraphNode.size>
-                    <DI:Dimension height='80.0' width='33.33333206176758'/>
-                  </DI:GraphNode.size>
-                </DI:GraphNode>
-                <DI:GraphNode xmi.id='3ad4d720-0117-1000-8097-c0a80104c515'>
-                  <DI:GraphNode.position>
-                    <DI:Point x='0.0' y='0.0'/>
-                  </DI:GraphNode.position>
-                  <DI:GraphNode.semanticModel>
-                    <DI:SimpleSemanticModelBridge typeInfo='BodyCompartment'/>
-                  </DI:GraphNode.semanticModel>
-                </DI:GraphNode>
-              </DI:GraphNode.contained>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='EXPANDED'/>
-              </DI:GraphNode.semanticModel>
-              <DI:GraphNode.size>
-                <DI:Dimension height='147.55078125' width='130.0'/>
-              </DI:GraphNode.size>
-            </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='825.0' y='-135.0'/>
+            <DI:Point x='-360.0' y='720.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
-            <DI:Property key='showAttributeStatic' value='true'/>
-            <DI:Property key='showMethodVisibility' value='true'/>
-            <DI:Property key='showAttributes' value='false'/>
-            <DI:Property key='showInnerClasses' value='false'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
+            <DI:Property key='fontColor' value='#0'/>
             <DI:Property key='excludeAttrFilter' value=''/>
             <DI:Property key='showAttributeType' value='true'/>
-            <DI:Property key='sortMethodsAlpha' value='true'/>
-            <DI:Property key='showOperations' value='false'/>
-            <DI:Property key='operationShowParameters' value='0'/>
-            <DI:Property key='filterMethodViz' value='PUBLIC PROTECTED PACKAGE PRIVATE'/>
-            <DI:Property key='ShowEnumValuesCompartment' value='true'/>
-            <DI:Property key='showPackage' value='false'/>
-            <DI:Property key='filterAttrViz' value='PUBLIC PROTECTED PACKAGE PRIVATE'/>
-            <DI:Property key='sortAttributesAlpha' value='true'/>
-            <DI:Property key='showAttributeVisibility' value='true'/>
+            <DI:Property key='sortAttributesAlpha' value='false'/>
             <DI:Property key='lineColor' value='#a5a5a5'/>
-            <DI:Property key='excludeMethodFilter' value=''/>
-            <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='showStereotype' value='true'/>
-            <DI:Property key='showMethodType' value='true'/>
-            <DI:Property key='showMethodStatic' value='true'/>
-            <DI:Property key='fillColor' value='#c6d6ff'/>
+            <DI:Property key='showOperations' value='false'/>
+            <DI:Property key='fillColor' value='#efd6ff'/>
+            <DI:Property key='showPackage' value='true'/>
+            <DI:Property key='showAttributes' value='true'/>
           </DI:GraphNode.property>
           <DI:GraphNode.semanticModel>
-            <DI:CoreSemanticModelBridge element='JAVA:JIDE;;org.jboss.labs.ng.model;;###;;ReleaseCategory' presentation='SYMBOLIC'/>
+            <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:5943b503-0117-1000-8001-c0a801040398' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='147.55078125' width='130.0'/>
+            <DI:Dimension height='120.0' width='195.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
-        <DI:GraphEdge xmi.id='44213a0a-0117-1000-8002-c0a80104c5a0' anchor='fd87e86e-0116-1000-807a-c0a80104eb33 fdd611b7-0116-1000-80d2-c0a80104eb33'>
+        <DI:GraphEdge xmi.id='5958bde8-0117-1000-801a-c0a801040398' anchor='5956548a-0117-1000-800c-c0a801040398 fd6a65b4-0116-1000-8062-c0a80104eb33'>
           <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8003-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1a-0117-1000-801c-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='4.0'/>
+                <DI:Point x='-133.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8004-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1a-0117-1000-801d-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='-17.0' y='4.0'/>
+                <DI:Point x='4.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8005-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1a-0117-1000-801e-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='0.0' y='-24.955078125'/>
+                <DI:Point x='-103.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8006-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1a-0117-1000-801f-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='0.0' y='4.0'/>
+                <DI:Point x='-132.0' y='-37.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8007-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1a-0117-1000-8020-c0a801040398'>
               <DI:GraphNode.position>
                 <DI:Point x='4.0' y='4.0'/>
               </DI:GraphNode.position>
@@ -2564,9 +2077,9 @@
                 <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8008-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8021-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='-17.0' y='4.0'/>
+                <DI:Point x='-19.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
@@ -2574,68 +2087,68 @@
             </DI:GraphNode>
           </DI:GraphEdge.contained>
           <DI:GraphEdge.property>
-            <DI:Property key='showAssocName' value='false'/>
-            <DI:Property key='lineColor' value='#646464'/>
             <DI:Property key='lineWidth' value='1.0'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='EdgeType' value='1'/>
             <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='showCardinality' value='true'/>
+            <DI:Property key='showAssocName' value='false'/>
             <DI:Property key='showStereotype' value='false'/>
+            <DI:Property key='lineColor' value='#646464'/>
+            <DI:Property key='EdgeType' value='1'/>
           </DI:GraphEdge.property>
           <DI:GraphEdge.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:ManyToManyRelationshipEdge~javax.persistence.ManyToMany at org.jboss.labs.ng.model.User@ejb:fd806447-0116-1000-806f-c0a80104eb33 at mailingListList@java.util.List&lt;org.jboss.labs.ng.model.MailingList>@2 at org.jboss.labs.ng.model.MailingList@ejb:fdd39443-0116-1000-80c7-c0a80104eb33'/>
+            <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.SignedContributorAgreement@ejb:5943b503-0117-1000-8001-c0a801040398 at contributorAgreement@org.jboss.labs.ng.model.ContributorAgreement at 2@org.jboss.labs.ng.model.ContributorAgreement at ejb:fd5a2008-0116-1000-8056-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='376.5' y='840.0'/>
-            <DI:Point x='376.5' y='867.0'/>
-            <DI:Point x='569.5' y='867.0'/>
-            <DI:Point x='569.5' y='825.0'/>
+            <DI:Point x='-262.5' y='720.0'/>
+            <DI:Point x='-262.5' y='622.5'/>
+            <DI:Point x='-263.0' y='622.5'/>
+            <DI:Point x='-263.0' y='525.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphEdge xmi.id='44213a08-0117-1000-8001-c0a80104c5a0' anchor='fcd52485-0116-1000-800e-c0a80104eb33 3a49f4a7-0117-1000-801a-c0a80104c515'>
+        <DI:GraphEdge xmi.id='5958bde8-0117-1000-801b-c0a801040398' anchor='5956548a-0117-1000-800c-c0a801040398 fd87e86e-0116-1000-807a-c0a80104eb33'>
           <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-8009-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8022-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='-24.955078125'/>
+                <DI:Point x='-36.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-800a-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8023-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='4.0' y='4.0'/>
+                <DI:Point x='4.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-800b-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8024-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='3.0' y='-17.0'/>
+                <DI:Point x='-92.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-800c-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8025-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='-68.0' y='-4.0'/>
+                <DI:Point x='-99.0' y='-35.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-800d-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8026-c0a801040398'>
               <DI:GraphNode.position>
-                <DI:Point x='-15.0' y='4.0'/>
+                <DI:Point x='-190.0' y='20.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='44213a51-0117-1000-800e-c0a80104c5a0'>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8027-c0a801040398'>
               <DI:GraphNode.position>
                 <DI:Point x='-19.0' y='-24.955078125'/>
               </DI:GraphNode.position>
@@ -2645,31 +2158,30 @@
             </DI:GraphNode>
           </DI:GraphEdge.contained>
           <DI:GraphEdge.property>
-            <DI:Property key='showAssocName' value='false'/>
-            <DI:Property key='lineColor' value='#646464'/>
             <DI:Property key='lineWidth' value='1.0'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='EdgeType' value='1'/>
             <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='showCardinality' value='true'/>
+            <DI:Property key='showAssocName' value='false'/>
             <DI:Property key='showStereotype' value='false'/>
+            <DI:Property key='lineColor' value='#646464'/>
+            <DI:Property key='EdgeType' value='1'/>
           </DI:GraphEdge.property>
           <DI:GraphEdge.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:OneToOneRelationshipEdge~javax.persistence.OneToOne at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at mainBlog@org.jboss.labs.ng.model.Blog at 2@org.jboss.labs.ng.model.Blog at ejb:3a46d867-0117-1000-800f-c0a80104c515'/>
+            <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.SignedContributorAgreement@ejb:5943b503-0117-1000-8001-c0a801040398 at user@org.jboss.labs.ng.model.User at 2@org.jboss.labs.ng.model.User at ejb:fd806447-0116-1000-806f-c0a80104eb33'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='405.0' y='135.36956787109375'/>
-            <DI:Point x='480.0' y='135.36956787109375'/>
-            <DI:Point x='480.0' y='135.5'/>
-            <DI:Point x='555.0' y='135.5'/>
+            <DI:Point x='-197.5' y='720.0'/>
+            <DI:Point x='-197.5' y='660.0'/>
+            <DI:Point x='0.0' y='660.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphNode xmi.id='5952efaa-0117-1000-8006-c0a801040398'>
+        <DI:GraphNode xmi.id='69b1fa6f-0117-1000-8003-c0a80104f265'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='5956548a-0117-1000-800c-c0a801040398' graphEdge='5958bde8-0117-1000-801a-c0a801040398 5958bde8-0117-1000-801b-c0a801040398'/>
+            <DI:GraphConnector xmi.id='69b5f1b0-0117-1000-8009-c0a80104f265' graphEdge='6a0565f2-0117-1000-8001-c0a80104410c 6a087487-0117-1000-8009-c0a801043f31'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
-            <DI:GraphNode xmi.id='5952efaa-0117-1000-8007-c0a801040398'>
+            <DI:GraphNode xmi.id='69b1fa70-0117-1000-8004-c0a80104f265'>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='COMPACT'/>
               </DI:GraphNode.semanticModel>
@@ -2677,9 +2189,9 @@
                 <DI:Dimension height='100.0' width='100.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5952efaa-0117-1000-8008-c0a801040398'>
+            <DI:GraphNode xmi.id='69b1fa70-0117-1000-8005-c0a80104f265'>
               <DI:GraphNode.contained>
-                <DI:GraphNode xmi.id='5952efaa-0117-1000-8009-c0a801040398'>
+                <DI:GraphNode xmi.id='69b1fa70-0117-1000-8006-c0a80104f265'>
                   <DI:GraphNode.semanticModel>
                     <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
                   </DI:GraphNode.semanticModel>
@@ -2687,7 +2199,7 @@
                     <DI:Dimension height='0.6818647384643555' width='0.0'/>
                   </DI:GraphNode.size>
                 </DI:GraphNode>
-                <DI:GraphNode xmi.id='5952efaa-0117-1000-800a-c0a801040398'>
+                <DI:GraphNode xmi.id='69b1fa70-0117-1000-8007-c0a80104f265'>
                   <DI:GraphNode.semanticModel>
                     <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
                   </DI:GraphNode.semanticModel>
@@ -2705,63 +2217,268 @@
             </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='-360.0' y='720.0'/>
+            <DI:Point x='465.0' y='540.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
+            <DI:Property key='showPackage' value='true'/>
+            <DI:Property key='showAttributes' value='true'/>
+            <DI:Property key='showStereotype' value='true'/>
             <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='excludeAttrFilter' value=''/>
             <DI:Property key='showAttributeType' value='true'/>
-            <DI:Property key='sortAttributesAlpha' value='false'/>
             <DI:Property key='lineColor' value='#a5a5a5'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
-            <DI:Property key='showStereotype' value='true'/>
             <DI:Property key='showOperations' value='false'/>
+            <DI:Property key='sortAttributesAlpha' value='false'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='fillColor' value='#efd6ff'/>
+            <DI:Property key='excludeAttrFilter' value=''/>
+          </DI:GraphNode.property>
+          <DI:GraphNode.semanticModel>
+            <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:69af512a-0117-1000-8001-c0a80104f265' presentation='SYMBOLIC'/>
+          </DI:GraphNode.semanticModel>
+          <DI:GraphNode.size>
+            <DI:Dimension height='120.0' width='195.0'/>
+          </DI:GraphNode.size>
+        </DI:GraphNode>
+        <DI:GraphNode xmi.id='69bd9f1e-0117-1000-8011-c0a80104f265'>
+          <DI:GraphNode.anchorage>
+            <DI:GraphConnector xmi.id='6a078bee-0117-1000-8002-c0a801043f31' graphEdge='6a078ba5-0117-1000-8001-c0a801043f31'/>
+          </DI:GraphNode.anchorage>
+          <DI:GraphNode.contained>
+            <DI:GraphNode xmi.id='69bd9f1e-0117-1000-8012-c0a80104f265'>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='COMPACT'/>
+              </DI:GraphNode.semanticModel>
+              <DI:GraphNode.size>
+                <DI:Dimension height='100.0' width='100.0'/>
+              </DI:GraphNode.size>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='69bd9f1e-0117-1000-8013-c0a80104f265'>
+              <DI:GraphNode.contained>
+                <DI:GraphNode xmi.id='69bd9f1e-0117-1000-8014-c0a80104f265'>
+                  <DI:GraphNode.semanticModel>
+                    <DI:SimpleSemanticModelBridge typeInfo='FieldCompartment'/>
+                  </DI:GraphNode.semanticModel>
+                  <DI:GraphNode.size>
+                    <DI:Dimension height='0.6818647384643555' width='0.0'/>
+                  </DI:GraphNode.size>
+                </DI:GraphNode>
+                <DI:GraphNode xmi.id='69bd9f1e-0117-1000-8015-c0a80104f265'>
+                  <DI:GraphNode.semanticModel>
+                    <DI:SimpleSemanticModelBridge typeInfo='MethodCompartment'/>
+                  </DI:GraphNode.semanticModel>
+                  <DI:GraphNode.size>
+                    <DI:Dimension height='1.3181352615356445' width='0.0'/>
+                  </DI:GraphNode.size>
+                </DI:GraphNode>
+              </DI:GraphNode.contained>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
+              </DI:GraphNode.semanticModel>
+              <DI:GraphNode.size>
+                <DI:Dimension height='120.0' width='120.0'/>
+              </DI:GraphNode.size>
+            </DI:GraphNode>
+          </DI:GraphNode.contained>
+          <DI:GraphNode.position>
+            <DI:Point x='855.0' y='-135.0'/>
+          </DI:GraphNode.position>
+          <DI:GraphNode.property>
             <DI:Property key='showPackage' value='true'/>
             <DI:Property key='showAttributes' value='true'/>
+            <DI:Property key='showStereotype' value='true'/>
+            <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='showAttributeType' value='true'/>
+            <DI:Property key='lineColor' value='#a5a5a5'/>
+            <DI:Property key='showOperations' value='false'/>
+            <DI:Property key='sortAttributesAlpha' value='false'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
+            <DI:Property key='fillColor' value='#efd6ff'/>
+            <DI:Property key='excludeAttrFilter' value=''/>
           </DI:GraphNode.property>
           <DI:GraphNode.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:5943b503-0117-1000-8001-c0a801040398' presentation='SYMBOLIC'/>
+            <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:69bc6d54-0117-1000-8010-c0a80104f265' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='120.0' width='195.0'/>
+            <DI:Dimension height='120.0' width='120.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
-        <DI:GraphEdge xmi.id='5958bde8-0117-1000-801a-c0a801040398' anchor='5956548a-0117-1000-800c-c0a801040398 fd6a65b4-0116-1000-8062-c0a80104eb33'>
+        <DI:GraphEdge xmi.id='69c9ec5b-0117-1000-801e-c0a80104f265' anchor='fce44a16-0116-1000-8048-c0a80104eb33 fce44a16-0116-1000-8048-c0a80104eb33'>
           <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='5958be1a-0117-1000-801c-c0a801040398'>
+            <DI:GraphNode xmi.id='69c9ec72-0117-1000-801f-c0a80104f265'>
               <DI:GraphNode.position>
-                <DI:Point x='-133.0' y='-24.955078125'/>
+                <DI:Point x='-140.0' y='35.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1a-0117-1000-801d-c0a801040398'>
+            <DI:GraphNode xmi.id='69c9ec72-0117-1000-8020-c0a80104f265'>
               <DI:GraphNode.position>
+                <DI:Point x='-19.0' y='4.0'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='69c9ec73-0117-1000-8021-c0a80104f265'>
+              <DI:GraphNode.position>
+                <DI:Point x='-107.0' y='-20.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='69c9ec73-0117-1000-8022-c0a80104f265'>
+              <DI:GraphNode.position>
+                <DI:Point x='4.0' y='-20.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='name'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='69c9ec73-0117-1000-8023-c0a80104f265'>
+              <DI:GraphNode.position>
+                <DI:Point x='-117.0' y='4.0'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='69c9ec73-0117-1000-8024-c0a80104f265'>
+              <DI:GraphNode.position>
+                <DI:Point x='-19.0' y='-24.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+          </DI:GraphEdge.contained>
+          <DI:GraphEdge.property>
+            <DI:Property key='showAssocName' value='false'/>
+            <DI:Property key='lineColor' value='#646464'/>
+            <DI:Property key='EdgeType' value='1'/>
+            <DI:Property key='showCardinality' value='true'/>
+            <DI:Property key='showStereotype' value='false'/>
+            <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
+            <DI:Property key='lineWidth' value='1.0'/>
+          </DI:GraphEdge.property>
+          <DI:GraphEdge.semanticModel>
+            <DI:CoreSemanticModelBridge element='EJB:OneToOneRelationshipEdge~javax.persistence.OneToOne at org.jboss.labs.ng.model.License@ejb:fce38cc8-0116-1000-803d-c0a80104eb33 at previousVersionLicense@org.jboss.labs.ng.model.License at 2@org.jboss.labs.ng.model.License at ejb:fce38cc8-0116-1000-803d-c0a80104eb33'/>
+          </DI:GraphEdge.semanticModel>
+          <DI:GraphEdge.waypoint>
+            <DI:Point x='-320.5' y='255.0'/>
+            <DI:Point x='-320.5' y='273.0'/>
+            <DI:Point x='-435.0' y='273.0'/>
+            <DI:Point x='-435.0' y='200.5'/>
+            <DI:Point x='-360.0' y='200.5'/>
+          </DI:GraphEdge.waypoint>
+        </DI:GraphEdge>
+        <DI:GraphEdge xmi.id='6a0565f2-0117-1000-8001-c0a80104410c' anchor='fcd52485-0116-1000-800e-c0a80104eb33 69b5f1b0-0117-1000-8009-c0a80104f265'>
+          <DI:GraphEdge.contained>
+            <DI:GraphNode xmi.id='6a05663e-0117-1000-8002-c0a80104410c'>
+              <DI:GraphNode.position>
+                <DI:Point x='-92.0' y='4.0'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='6a05663e-0117-1000-8003-c0a80104410c'>
+              <DI:GraphNode.position>
+                <DI:Point x='-19.0' y='4.0'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='6a05663e-0117-1000-8004-c0a80104410c'>
+              <DI:GraphNode.position>
+                <DI:Point x='0.0' y='-20.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='6a05663e-0117-1000-8005-c0a80104410c'>
+              <DI:GraphNode.position>
+                <DI:Point x='-3.0' y='-46.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='name'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='6a05663e-0117-1000-8006-c0a80104410c'>
+              <DI:GraphNode.position>
+                <DI:Point x='-15.0' y='-24.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='6a05663e-0117-1000-8007-c0a80104410c'>
+              <DI:GraphNode.position>
+                <DI:Point x='-17.0' y='-24.955078125'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+          </DI:GraphEdge.contained>
+          <DI:GraphEdge.property>
+            <DI:Property key='lineColor' value='#646464'/>
+            <DI:Property key='showStereotype' value='false'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
+            <DI:Property key='EdgeType' value='1'/>
+            <DI:Property key='fontColor' value='#0'/>
+            <DI:Property key='lineWidth' value='1.0'/>
+            <DI:Property key='showCardinality' value='true'/>
+            <DI:Property key='showAssocName' value='false'/>
+          </DI:GraphEdge.property>
+          <DI:GraphEdge.semanticModel>
+            <DI:CoreSemanticModelBridge element='EJB:OneToManyRelationshipEdge~javax.persistence.OneToMany at org.jboss.labs.ng.model.Project@ejb:fc98331d-0116-1000-8015-c0a80104e31d at projectRoleList@java.util.List&lt;org.jboss.labs.ng.model.ProjectRole>@2 at org.jboss.labs.ng.model.ProjectRole@ejb:69af512a-0117-1000-8001-c0a80104f265'/>
+          </DI:GraphEdge.semanticModel>
+          <DI:GraphEdge.waypoint>
+            <DI:Point x='338.5' y='450.0'/>
+            <DI:Point x='338.5' y='558.0'/>
+            <DI:Point x='465.0' y='558.0'/>
+          </DI:GraphEdge.waypoint>
+        </DI:GraphEdge>
+        <DI:GraphEdge xmi.id='6a078ba5-0117-1000-8001-c0a801043f31' anchor='3a69d358-0117-1000-802c-c0a80104c515 6a078bee-0117-1000-8002-c0a801043f31'>
+          <DI:GraphEdge.contained>
+            <DI:GraphNode xmi.id='6a078bef-0117-1000-8003-c0a801043f31'>
+              <DI:GraphNode.position>
                 <DI:Point x='4.0' y='-24.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+            <DI:GraphNode xmi.id='6a078bef-0117-1000-8004-c0a801043f31'>
+              <DI:GraphNode.position>
+                <DI:Point x='4.0' y='4.0'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1a-0117-1000-801e-c0a801040398'>
+            <DI:GraphNode xmi.id='6a078bef-0117-1000-8005-c0a801043f31'>
               <DI:GraphNode.position>
-                <DI:Point x='-103.0' y='4.0'/>
+                <DI:Point x='-55.0' y='4.044921875'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1a-0117-1000-801f-c0a801040398'>
+            <DI:GraphNode xmi.id='6a078bef-0117-1000-8006-c0a801043f31'>
               <DI:GraphNode.position>
-                <DI:Point x='-132.0' y='-37.955078125'/>
+                <DI:Point x='-27.0' y='23.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1a-0117-1000-8020-c0a801040398'>
+            <DI:GraphNode xmi.id='6a078bef-0117-1000-8007-c0a801043f31'>
               <DI:GraphNode.position>
                 <DI:Point x='4.0' y='4.0'/>
               </DI:GraphNode.position>
@@ -2769,7 +2486,7 @@
                 <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8021-c0a801040398'>
+            <DI:GraphNode xmi.id='6a078bf0-0117-1000-8008-c0a801043f31'>
               <DI:GraphNode.position>
                 <DI:Point x='-19.0' y='4.0'/>
               </DI:GraphNode.position>
@@ -2779,28 +2496,27 @@
             </DI:GraphNode>
           </DI:GraphEdge.contained>
           <DI:GraphEdge.property>
+            <DI:Property key='EdgeType' value='1'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='lineWidth' value='1.0'/>
+            <DI:Property key='showAssocName' value='false'/>
             <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='showCardinality' value='true'/>
-            <DI:Property key='showAssocName' value='false'/>
             <DI:Property key='showStereotype' value='false'/>
             <DI:Property key='lineColor' value='#646464'/>
-            <DI:Property key='EdgeType' value='1'/>
           </DI:GraphEdge.property>
           <DI:GraphEdge.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.SignedContributorAgreement@ejb:5943b503-0117-1000-8001-c0a801040398 at contributorAgreement@org.jboss.labs.ng.model.ContributorAgreement at 2@org.jboss.labs.ng.model.ContributorAgreement at ejb:fd5a2008-0116-1000-8056-c0a80104eb33'/>
+            <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.Release@ejb:3a5e6542-0117-1000-8021-c0a80104c515 at releaseCategory@org.jboss.labs.ng.model.ReleaseCategory at 2@org.jboss.labs.ng.model.ReleaseCategory at ejb:69bc6d54-0117-1000-8010-c0a80104f265'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='-262.5' y='720.0'/>
-            <DI:Point x='-262.5' y='622.5'/>
-            <DI:Point x='-263.0' y='622.5'/>
-            <DI:Point x='-263.0' y='525.0'/>
+            <DI:Point x='750.0' y='36.0'/>
+            <DI:Point x='915.0' y='36.0'/>
+            <DI:Point x='915.0' y='-15.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphEdge xmi.id='5958bde8-0117-1000-801b-c0a801040398' anchor='5956548a-0117-1000-800c-c0a801040398 fd87e86e-0116-1000-807a-c0a80104eb33'>
+        <DI:GraphEdge xmi.id='6a087487-0117-1000-8009-c0a801043f31' anchor='fda0966f-0116-1000-8099-c0a80104eb33 69b5f1b0-0117-1000-8009-c0a80104f265'>
           <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8022-c0a801040398'>
+            <DI:GraphNode xmi.id='6a0874a2-0117-1000-800a-c0a801043f31'>
               <DI:GraphNode.position>
                 <DI:Point x='4.0' y='-24.955078125'/>
               </DI:GraphNode.position>
@@ -2808,7 +2524,7 @@
                 <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8023-c0a801040398'>
+            <DI:GraphNode xmi.id='6a0874a2-0117-1000-800b-c0a801043f31'>
               <DI:GraphNode.position>
                 <DI:Point x='4.0' y='4.0'/>
               </DI:GraphNode.position>
@@ -2816,33 +2532,33 @@
                 <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8024-c0a801040398'>
+            <DI:GraphNode xmi.id='6a0874a2-0117-1000-800c-c0a801043f31'>
               <DI:GraphNode.position>
-                <DI:Point x='-92.0' y='-24.955078125'/>
+                <DI:Point x='-95.0' y='-34.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8025-c0a801040398'>
+            <DI:GraphNode xmi.id='6a0874a2-0117-1000-800d-c0a801043f31'>
               <DI:GraphNode.position>
-                <DI:Point x='-138.0' y='1.0'/>
+                <DI:Point x='4.0' y='-20.955078125'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='name'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8026-c0a801040398'>
+            <DI:GraphNode xmi.id='6a0874a2-0117-1000-800e-c0a801043f31'>
               <DI:GraphNode.position>
-                <DI:Point x='-190.0' y='20.0'/>
+                <DI:Point x='4.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationname'/>
               </DI:GraphNode.semanticModel>
             </DI:GraphNode>
-            <DI:GraphNode xmi.id='5958be1b-0117-1000-8027-c0a801040398'>
+            <DI:GraphNode xmi.id='6a0874a2-0117-1000-800f-c0a801043f31'>
               <DI:GraphNode.position>
-                <DI:Point x='-19.0' y='-24.955078125'/>
+                <DI:Point x='-17.0' y='4.0'/>
               </DI:GraphNode.position>
               <DI:GraphNode.semanticModel>
                 <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
@@ -2850,21 +2566,22 @@
             </DI:GraphNode>
           </DI:GraphEdge.contained>
           <DI:GraphEdge.property>
+            <DI:Property key='EdgeType' value='1'/>
+            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='lineWidth' value='1.0'/>
+            <DI:Property key='showAssocName' value='false'/>
             <DI:Property key='fontColor' value='#0'/>
-            <DI:Property key='font' value='SansSerif,plain,11'/>
             <DI:Property key='showCardinality' value='true'/>
-            <DI:Property key='showAssocName' value='false'/>
             <DI:Property key='showStereotype' value='false'/>
             <DI:Property key='lineColor' value='#646464'/>
-            <DI:Property key='EdgeType' value='1'/>
           </DI:GraphEdge.property>
           <DI:GraphEdge.semanticModel>
-            <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.SignedContributorAgreement@ejb:5943b503-0117-1000-8001-c0a801040398 at user@org.jboss.labs.ng.model.User at 2@org.jboss.labs.ng.model.User at ejb:fd806447-0116-1000-806f-c0a80104eb33'/>
+            <DI:CoreSemanticModelBridge element='EJB:ManyToManyRelationshipEdge~javax.persistence.ManyToMany at org.jboss.labs.ng.model.ProjectMembership@ejb:fd948445-0116-1000-8081-c0a80104eb33 at projectRoleList@java.util.List&lt;org.jboss.labs.ng.model.ProjectRole>@2 at org.jboss.labs.ng.model.ProjectRole@ejb:69af512a-0117-1000-8001-c0a80104f265'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='-165.0' y='806.0'/>
-            <DI:Point x='210.0' y='806.0'/>
+            <DI:Point x='615.0' y='757.5'/>
+            <DI:Point x='644.0' y='757.5'/>
+            <DI:Point x='644.0' y='660.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
       </DI:Diagram.contained>
@@ -2880,13 +2597,13 @@
         <DI:Property key='minLayoutDistance' value='40'/>
         <DI:Property key='antialiasText' value='true'/>
         <DI:Property key='snapToGrid' value='true'/>
-        <DI:Property key='PaperOrientation' value='Portrait'/>
+        <DI:Property key='PaperOrientation' value='Landscape'/>
         <DI:Property key='PaperWidth' value='595.0'/>
-        <DI:Property key='PaperHeight' value='842.0'/>
+        <DI:Property key='PaperHeight' value='595.0'/>
         <DI:Property key='PaperLeftMargin' value='18.0'/>
         <DI:Property key='PaperTopMargin' value='18.0'/>
-        <DI:Property key='PaperRightMargin' value='18.0'/>
-        <DI:Property key='PaperBottomMargin' value='41.0'/>
+        <DI:Property key='PaperRightMargin' value='17.724426'/>
+        <DI:Property key='PaperBottomMargin' value='41.272373'/>
         <DI:Property key='PrintAreaX' value='0'/>
         <DI:Property key='PrintAreaY' value='0'/>
         <DI:Property key='PrintAreaWidth' value='0'/>

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.png
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Forum.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Forum.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Forum.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -21,9 +21,8 @@
 
     private String name;
     private String url;
+    private String forumId;
 //    private ForumType type;
-    @OneToOne
-    private MailingList mailingList;
 
     public Forum() {
     }
@@ -59,6 +58,7 @@
     public String getUrl() {
         return url;
     }
+    
 /*
     public void setType(ForumType newtype) {
         this.type = newtype;
@@ -68,13 +68,12 @@
         return type;
     }*/
 
-    public MailingList getMailingList() {
-        return mailingList;
-    }
 
-    public void setMailingList(MailingList mailingList) {
-        this.mailingList = mailingList;
+    public void setForumId(String newforumId) {
+        this.forumId = newforumId;
     }
 
-
+    public String getForumId() {
+        return forumId;
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTracker.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTracker.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTracker.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -13,6 +13,7 @@
     private Integer version;
 
     private String url;
+    private String key;
     private IssueTrackerType type;
 
     public IssueTracker() {
@@ -51,4 +52,12 @@
     public IssueTrackerType getType() {
         return type;
     }
+
+    public void setKey(String newkey) {
+        this.key = newkey;
+    }
+
+    public String getKey() {
+        return key;
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTrackerType.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTrackerType.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/IssueTrackerType.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -1,5 +1,5 @@
 package org.jboss.labs.ng.model;
 
 public enum IssueTrackerType {
-    JIRA, BUGZILLA, TRAC
+    JIRA, BUGZILLA, TRAC, OTHER
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/License.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/License.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/License.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -9,6 +9,7 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Version;
 
 @Entity
@@ -26,6 +27,11 @@
     private String url;
     @OneToMany
     private List<License> compatibleLicensesList;
+    private String agreementVersion;
+    @OneToOne
+    private License previousVersionLicense;
+    @OneToOne(mappedBy = "previousVersionLicense")
+    private License nextVersionLicense;
 
     public License() {
     }
@@ -86,4 +92,28 @@
     public void setCompatibleLicensesList(List<License> compatibleLicensesList) {
         this.compatibleLicensesList = compatibleLicensesList;
     }
+
+    public void setAgreementVersion(String newagreementVersion) {
+        this.agreementVersion = newagreementVersion;
+    }
+
+    public String getAgreementVersion() {
+        return agreementVersion;
+    }
+
+    public License getPreviousVersionLicense() {
+        return previousVersionLicense;
+    }
+
+    public void setPreviousVersionLicense(License license) {
+        this.previousVersionLicense = license;
+    }
+
+    public License getNextVersionLicense() {
+        return nextVersionLicense;
+    }
+
+    public void setNextVersionLicense(License license1) {
+        this.nextVersionLicense = license1;
+    }
 }

Deleted: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingList.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingList.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingList.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -1,108 +0,0 @@
-package org.jboss.labs.ng.model;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Version;
-
- at Entity
-public class MailingList implements Serializable {
-    @Id @GeneratedValue
-    private Integer id;
-    @Version
-    private Integer version;
-    
-    private String address;
-    private String name;
-    private String description;
-    @ManyToMany(mappedBy = "mailingListList")
-    private List<Project> projectList;
-
-    private MailingListType type;
-    @OneToOne(mappedBy = "mailingList")
-    private Forum forum;
-    @ManyToMany(mappedBy = "mailingListList")
-    private List<User> userList;
-
-    public MailingList() {
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
-    public void setAddress(String newaddress) {
-        this.address = newaddress;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setName(String newname) {
-        this.name = newname;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setDescription(String newdescription) {
-        this.description = newdescription;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-
-    public List<Project> getProjectList() {
-        return projectList;
-    }
-
-    public void setProjectList(List<Project> projectList) {
-        this.projectList = projectList;
-    }
-
-    public void setType(MailingListType newtype) {
-        this.type = newtype;
-    }
-
-    public MailingListType getType() {
-        return type;
-    }
-
-    public Forum getForum() {
-        return forum;
-    }
-
-    public void setForum(Forum forum) {
-        this.forum = forum;
-    }
-
-    public List<User> getUserList() {
-        return userList;
-    }
-
-    public void setUserList(List<User> userList) {
-        this.userList = userList;
-    }
-}

Deleted: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingListType.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingListType.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingListType.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -1,5 +0,0 @@
-package org.jboss.labs.ng.model;
-
-public enum MailingListType {
-    ANNOUNCE, REPOSITORY_LOG, ISSUES_LOG, FORUM, OTHER
-}

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Project.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Project.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Project.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -8,10 +8,13 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import javax.persistence.Transient;
 import javax.persistence.Version;
 
+
 @Entity
 public class Project implements Serializable {
     
@@ -24,11 +27,9 @@
     private String projectId;
     private String name;
     private String description;
-    private String logoURL;
     private String downloadsURL;
     private String documentationURL;
-    private String metricsURL;
-    private String ohlohURL;
+    private String ohlohId;
     
     @OneToOne
     private Repository anonymusRepository;
@@ -44,8 +45,6 @@
     private List<ProjectMembership> projectMembershipsList;
     @OneToMany
     private List<Link> linksList;
-    @ManyToMany
-    private List<MailingList> mailingListList;
     @OneToMany(mappedBy = "project")
     private List<Blog> blogList;
     @OneToMany(mappedBy = "project")
@@ -56,6 +55,8 @@
     private Forum userForum;
     @OneToOne
     private Blog mainBlog;
+    @OneToMany
+    private List<ProjectRole> projectRoleList;
 
 
     public Project() {
@@ -94,12 +95,9 @@
         return name;
     }
 
-    public void setLogoURL(String newlogoURL) {
-        this.logoURL = newlogoURL;
-    }
-
+    @Transient
     public String getLogoURL() {
-        return logoURL;
+        return null; //TODO some generated value
     }
 
     public void setDownloadsURL(String newdownloadsURL) {
@@ -178,29 +176,17 @@
         this.linksList = linksList;
     }
 
-    public List<MailingList> getMailingListList() {
-        return mailingListList;
-    }
-
-    public void setMailingListList(List<MailingList> mailingListList) {
-        this.mailingListList = mailingListList;
-    }
-
-
-    public void setMetricsURL(String newmetricsURL) {
-        this.metricsURL = newmetricsURL;
-    }
-
+    @Transient
     public String getMetricsURL() {
-        return metricsURL;
+        return null; //TODO
     }
 
-    public void setOhlohURL(String newohlohURL) {
-        this.ohlohURL = newohlohURL;
+    public void setOhlohId(String newohlohURL) {
+        this.ohlohId = newohlohURL;
     }
 
-    public String getOhlohURL() {
-        return ohlohURL;
+    public String getOhlohId() {
+        return ohlohId;
     }
 
 
@@ -251,4 +237,18 @@
     public String getDescription() {
         return description;
     }
+
+
+    public List<ProjectRole> getProjectRoleList() {
+        return projectRoleList;
+    }
+
+    public void setProjectRoleList(List<ProjectRole> projectRoleList) {
+        this.projectRoleList = projectRoleList;
+    }
+    
+    @Transient
+    public String getOhlohURL() {
+        return null; //TODO
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectMembership.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectMembership.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectMembership.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -2,9 +2,12 @@
 
 import java.io.Serializable;
 
+import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.Version;
 
@@ -15,9 +18,10 @@
     @Version
     private Integer version;
     
-    private ProjectRole projectRole;
     @ManyToOne
     private Project project;
+    @ManyToMany
+    private List<ProjectRole> projectRoleList;
 
     public ProjectMembership() {
     }
@@ -38,15 +42,6 @@
         this.version = version;
     }
 
-
-    public void setProjectRole(ProjectRole newprojectRole) {
-        this.projectRole = newprojectRole;
-    }
-
-    public ProjectRole getProjectRole() {
-        return projectRole;
-    }
-
     public Project getProject() {
         return project;
     }
@@ -54,4 +49,12 @@
     public void setProject(Project project) {
         this.project = project;
     }
+
+    public List<ProjectRole> getProjectRoleList() {
+        return projectRoleList;
+    }
+
+    public void setProjectRoleList(List<ProjectRole> projectRoleList) {
+        this.projectRoleList = projectRoleList;
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectRole.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectRole.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ProjectRole.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -1,5 +1,62 @@
 package org.jboss.labs.ng.model;
 
-public enum ProjectRole {
-    LEAD, COMMITTER, CONTRIBUTOR
+import java.io.Serializable;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+
+ at Entity
+public class ProjectRole implements Serializable {
+    @Id @GeneratedValue
+    private Integer id;
+    @Version
+    private Integer version;
+    
+    private String name;
+    @ManyToMany(mappedBy = "projectRoleList")
+    private List<ProjectMembership> projectMembershipList;
+
+    public ProjectRole() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public void setName(String newname) {
+        this.name = newname;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
+    public List<ProjectMembership> getProjectMembershipList() {
+        return projectMembershipList;
+    }
+
+    public void setProjectMembershipList(List<ProjectMembership> projectMembershipList) {
+        this.projectMembershipList = projectMembershipList;
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Release.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Release.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Release.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -2,14 +2,18 @@
 
 import java.io.Serializable;
 
+import java.util.List;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.persistence.Version;
 
 import java.util.Calendar;
 
+
 @Entity
 public class Release implements Serializable {
     @Id @GeneratedValue
@@ -24,10 +28,11 @@
     private String releaseNotesURL;
     private String downloadsURL;
     private String documentationURL;
-    private ReleaseCategory category;
     
     @ManyToOne
     private Project project;
+    @ManyToOne
+    private ReleaseCategory releaseCategory;
 
     public Release() {
     }
@@ -112,11 +117,12 @@
         this.project = project;
     }
 
-    public void setCategory(ReleaseCategory newcategory) {
-        this.category = newcategory;
+
+    public ReleaseCategory getReleaseCategory() {
+        return releaseCategory;
     }
 
-    public ReleaseCategory getCategory() {
-        return category;
+    public void setReleaseCategory(ReleaseCategory releaseCategory) {
+        this.releaseCategory = releaseCategory;
     }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ReleaseCategory.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ReleaseCategory.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ReleaseCategory.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -1,5 +1,52 @@
 package org.jboss.labs.ng.model;
 
-public enum ReleaseCategory {
-   ALPHA, BETA, CR, DR, GA, SP, OTHER
+import java.io.Serializable;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+
+ at Entity
+public class ReleaseCategory implements Serializable {
+    @Id @GeneratedValue
+    private Integer id;
+    @Version
+    private Integer version;
+    
+    private String name;
+
+    public ReleaseCategory() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public void setName(String newname) {
+        this.name = newname;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Repository.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Repository.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/Repository.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -13,6 +13,7 @@
     private Integer id;
     private Integer version;
     private RepositoryType type;
+    private String url;
 
     public Repository() {
     }
@@ -42,4 +43,12 @@
     public RepositoryType getType() {
         return type;
     }
+
+    public void setUrl(String newurl) {
+        this.url = newurl;
+    }
+
+    public String getUrl() {
+        return url;
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/RepositoryType.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/RepositoryType.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/RepositoryType.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -1,5 +1,5 @@
 package org.jboss.labs.ng.model;
 
 public enum RepositoryType {
-    SVN, CVS
+    SVN, CVS, OTHER
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/User.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/User.java	2008-01-11 17:58:41 UTC (rev 17738)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/User.java	2008-01-11 18:12:28 UTC (rev 17739)
@@ -27,8 +27,6 @@
     private String pictureURL;
     @OneToMany
     private List<ProjectMembership> projectMembershipsList;
-    @ManyToMany
-    private List<MailingList> mailingListList;
     @OneToMany(mappedBy = "user")
     private List<SignedContributorAgreement> signedContributorAgreementList;
 
@@ -101,15 +99,6 @@
     }
 
 
-    public List<MailingList> getMailingListList() {
-        return mailingListList;
-    }
-
-    public void setMailingListList(List<MailingList> mailingListList) {
-        this.mailingListList = mailingListList;
-    }
-
-
     public List<SignedContributorAgreement> getSignedContributorAgreementList() {
         return signedContributorAgreementList;
     }




More information about the jboss-svn-commits mailing list