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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jan 8 07:53:41 EST 2008


Author: wrzep
Date: 2008-01-08 07:53:41 -0500 (Tue, 08 Jan 2008)
New Revision: 17621

Added:
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/SignedContributorAgreement.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectService.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceBean.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceWebService.java
Removed:
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/database/
Modified:
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/DocumentationAndDownloadsModel.ejb_diagram
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/DocumentationAndDownloadsModel.png
   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/ContributorAgreement.java
   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/User.java
   labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/download/File.java
Log:
JBLAB-897



Property changes on: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel
___________________________________________________________________
Name: svn:ignore
   + classes


Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr	2008-01-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/ProjectModel.jpr	2008-01-08 12:53:41 UTC (rev 17621)
@@ -48,6 +48,7 @@
          <url n="ejb:3aae01ac-0117-1000-8072-c0a80104c515" path="src/org/jboss/labs/ng/model/download/File.java"/>
          <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: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"/>

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/DocumentationAndDownloadsModel.ejb_diagram
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/DocumentationAndDownloadsModel.ejb_diagram	2008-01-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/DocumentationAndDownloadsModel.ejb_diagram	2008-01-08 12:53:41 UTC (rev 17621)
@@ -172,7 +172,7 @@
                 <DI:SimpleSemanticModelBridge typeInfo='SYMBOLIC'/>
               </DI:GraphNode.semanticModel>
               <DI:GraphNode.size>
-                <DI:Dimension height='180.0' width='255.0'/>
+                <DI:Dimension height='195.0' width='255.0'/>
               </DI:GraphNode.size>
             </DI:GraphNode>
           </DI:GraphNode.contained>
@@ -196,7 +196,7 @@
             <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:3aae01ac-0117-1000-8072-c0a80104c515' presentation='SYMBOLIC'/>
           </DI:GraphNode.semanticModel>
           <DI:GraphNode.size>
-            <DI:Dimension height='180.0' width='255.0'/>
+            <DI:Dimension height='195.0' width='255.0'/>
           </DI:GraphNode.size>
         </DI:GraphNode>
         <DI:GraphNode xmi.id='3ac4d747-0117-1000-807d-c0a80104c515'>
@@ -600,7 +600,7 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.download.File@ejb:3aae01ac-0117-1000-8072-c0a80104c515 at fileType@org.jboss.labs.ng.model.download.FileType at 2@org.jboss.labs.ng.model.download.FileType at ejb:3b041550-0117-1000-80a5-c0a80104c515'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='-28.0' y='270.0'/>
+            <DI:Point x='-28.0' y='300.0'/>
             <DI:Point x='-28.0' y='414.0'/>
             <DI:Point x='108.0' y='414.0'/>
           </DI:GraphEdge.waypoint>
@@ -670,8 +670,8 @@
             <DI:CoreSemanticModelBridge element='EJB:ManyToOneRelationshipEdge~javax.persistence.ManyToOne at org.jboss.labs.ng.model.download.File@ejb:3aae01ac-0117-1000-8072-c0a80104c515 at license@org.jboss.labs.ng.model.download.License at 2@org.jboss.labs.ng.model.download.License at ejb:3a9eecee-0117-1000-805c-c0a80104c515'/>
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
-            <DI:Point x='105.0' y='123.0'/>
-            <DI:Point x='345.0' y='123.0'/>
+            <DI:Point x='105.0' y='124.5'/>
+            <DI:Point x='345.0' y='124.5'/>
             <DI:Point x='345.0' y='150.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>

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

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-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/model/projectmodel/ProjectModel.ejb_diagram	2008-01-08 12:53:41 UTC (rev 17621)
@@ -826,7 +826,7 @@
         </DI:GraphEdge>
         <DI:GraphNode xmi.id='fd5a784e-0116-1000-805b-c0a80104eb33'>
           <DI:GraphNode.anchorage>
-            <DI:GraphConnector xmi.id='fd6a65b4-0116-1000-8062-c0a80104eb33' graphEdge='fd6a659d-0116-1000-8060-c0a80104eb33 fda1a8b2-0116-1000-80a0-c0a80104eb33'/>
+            <DI:GraphConnector xmi.id='fd6a65b4-0116-1000-8062-c0a80104eb33' graphEdge='5958bde8-0117-1000-801a-c0a801040398 fd6a659d-0116-1000-8060-c0a80104eb33'/>
           </DI:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fd5a784e-0116-1000-805c-c0a80104eb33'>
@@ -1032,7 +1032,7 @@
         </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 fda1a8b2-0116-1000-80a0-c0a80104eb33 fda1a8b3-0116-1000-80a1-c0a80104eb33'/>
+            <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:GraphNode.anchorage>
           <DI:GraphNode.contained>
             <DI:GraphNode xmi.id='fd8567fa-0116-1000-8075-c0a80104eb33'>
@@ -1134,7 +1134,7 @@
             </DI:GraphNode>
           </DI:GraphNode.contained>
           <DI:GraphNode.position>
-            <DI:Point x='-150.0' y='630.0'/>
+            <DI:Point x='-135.0' y='630.0'/>
           </DI:GraphNode.position>
           <DI:GraphNode.property>
             <DI:Property key='showAttributeType' value='true'/>
@@ -1362,79 +1362,9 @@
           </DI:GraphEdge.semanticModel>
           <DI:GraphEdge.waypoint>
             <DI:Point x='210.0' y='645.0'/>
-            <DI:Point x='90.0' y='645.0'/>
+            <DI:Point x='105.0' y='645.0'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
-        <DI:GraphEdge xmi.id='fda1a8b2-0116-1000-80a0-c0a80104eb33' anchor='fd87e86e-0116-1000-807a-c0a80104eb33 fd6a65b4-0116-1000-8062-c0a80104eb33'>
-          <DI:GraphEdge.contained>
-            <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a8-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='-196.0' y='4.0'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='sourcename'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80a9-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='-17.0' y='-24.955078125'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='sourcemultiplicity'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80aa-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='-164.0' y='3.0'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='stereotype'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fda1a8c1-0116-1000-80ab-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='-185.0' y='-21.955078125'/>
-              </DI:GraphNode.position>
-              <DI:GraphNode.semanticModel>
-                <DI:SimpleSemanticModelBridge typeInfo='name'/>
-              </DI:GraphNode.semanticModel>
-            </DI:GraphNode>
-            <DI:GraphNode xmi.id='fda1a8c2-0116-1000-80ac-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <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='fda1a8c2-0116-1000-80ad-c0a80104eb33'>
-              <DI:GraphNode.position>
-                <DI:Point x='-17.0' y='4.0'/>
-              </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.User@ejb:fd806447-0116-1000-806f-c0a80104eb33 at signedContributorAgreementsList@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='210.0' y='817.0'/>
-            <DI:Point x='-240.0' y='817.0'/>
-            <DI:Point x='-240.0' y='525.0'/>
-          </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'>
           <DI:GraphEdge.contained>
             <DI:GraphNode xmi.id='fda42fd1-0116-1000-80af-c0a80104eb33'>
@@ -1500,8 +1430,8 @@
             <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='-76.0' y='630.0'/>
-            <DI:Point x='-76.0' y='502.0'/>
+            <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:GraphEdge.waypoint>
@@ -2734,6 +2664,209 @@
             <DI:Point x='555.0' y='135.5'/>
           </DI:GraphEdge.waypoint>
         </DI:GraphEdge>
+        <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='5952efaa-0117-1000-8007-c0a801040398'>
+              <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='5952efaa-0117-1000-8008-c0a801040398'>
+              <DI:GraphNode.contained>
+                <DI:GraphNode xmi.id='5952efaa-0117-1000-8009-c0a801040398'>
+                  <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='5952efaa-0117-1000-800a-c0a801040398'>
+                  <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='195.0'/>
+              </DI:GraphNode.size>
+            </DI:GraphNode>
+          </DI:GraphNode.contained>
+          <DI:GraphNode.position>
+            <DI:Point x='-360.0' y='720.0'/>
+          </DI:GraphNode.position>
+          <DI:GraphNode.property>
+            <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='fillColor' value='#efd6ff'/>
+            <DI:Property key='showPackage' value='true'/>
+            <DI:Property key='showAttributes' value='true'/>
+          </DI:GraphNode.property>
+          <DI:GraphNode.semanticModel>
+            <DI:CoreSemanticModelBridge element='EJB:EntityEJB~ejb:5943b503-0117-1000-8001-c0a801040398' presentation='SYMBOLIC'/>
+          </DI:GraphNode.semanticModel>
+          <DI:GraphNode.size>
+            <DI:Dimension height='120.0' width='195.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.contained>
+            <DI:GraphNode xmi.id='5958be1a-0117-1000-801c-c0a801040398'>
+              <DI:GraphNode.position>
+                <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='5958be1a-0117-1000-801d-c0a801040398'>
+              <DI:GraphNode.position>
+                <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='5958be1a-0117-1000-801e-c0a801040398'>
+              <DI:GraphNode.position>
+                <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='5958be1a-0117-1000-801f-c0a801040398'>
+              <DI:GraphNode.position>
+                <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='5958be1a-0117-1000-8020-c0a801040398'>
+              <DI:GraphNode.position>
+                <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-8021-c0a801040398'>
+              <DI:GraphNode.position>
+                <DI:Point x='-19.0' y='4.0'/>
+              </DI:GraphNode.position>
+              <DI:GraphNode.semanticModel>
+                <DI:SimpleSemanticModelBridge typeInfo='destinationmultiplicity'/>
+              </DI:GraphNode.semanticModel>
+            </DI:GraphNode>
+          </DI:GraphEdge.contained>
+          <DI:GraphEdge.property>
+            <DI:Property key='lineWidth' value='1.0'/>
+            <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: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: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.contained>
+            <DI:GraphNode xmi.id='5958be1b-0117-1000-8022-c0a801040398'>
+              <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='5958be1b-0117-1000-8023-c0a801040398'>
+              <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='5958be1b-0117-1000-8024-c0a801040398'>
+              <DI:GraphNode.position>
+                <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='5958be1b-0117-1000-8025-c0a801040398'>
+              <DI:GraphNode.position>
+                <DI:Point x='-138.0' y='1.0'/>
+              </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.position>
+                <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='5958be1b-0117-1000-8027-c0a801040398'>
+              <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='lineWidth' value='1.0'/>
+            <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:GraphEdge.semanticModel>
+          <DI:GraphEdge.waypoint>
+            <DI:Point x='-165.0' y='806.0'/>
+            <DI:Point x='210.0' y='806.0'/>
+          </DI:GraphEdge.waypoint>
+        </DI:GraphEdge>
       </DI:Diagram.contained>
       <DI:Diagram.property>
         <DI:Property key='gridSize' value='15'/>

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/ContributorAgreement.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ContributorAgreement.java	2008-01-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/ContributorAgreement.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -8,8 +8,10 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.persistence.Version;
 
+
 @Entity
 public class ContributorAgreement implements Serializable {
     @Id @GeneratedValue
@@ -24,6 +26,8 @@
     private List<User> usersList;
     
     private boolean visible;
+    @OneToMany(mappedBy = "contributorAgreement")
+    private List<SignedContributorAgreement> signedContributorAgreementList;
 
     public ContributorAgreement() {
     }
@@ -75,4 +79,12 @@
     public boolean isVisible() {
         return visible;
     }
+
+    public List<SignedContributorAgreement> getSignedContributorAgreementList() {
+        return signedContributorAgreementList;
+    }
+
+    public void setSignedContributorAgreementList(List<SignedContributorAgreement> signedContributorAgreementList) {
+        this.signedContributorAgreementList = signedContributorAgreementList;
+    }
 }

Modified: 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-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/MailingList.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -27,6 +27,8 @@
     private MailingListType type;
     @OneToOne(mappedBy = "mailingList")
     private Forum forum;
+    @ManyToMany(mappedBy = "mailingListList")
+    private List<User> userList;
 
     public MailingList() {
     }
@@ -95,4 +97,12 @@
     public void setForum(Forum forum) {
         this.forum = forum;
     }
+
+    public List<User> getUserList() {
+        return userList;
+    }
+
+    public void setUserList(List<User> userList) {
+        this.userList = userList;
+    }
 }

Added: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/SignedContributorAgreement.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/SignedContributorAgreement.java	                        (rev 0)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/SignedContributorAgreement.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -0,0 +1,72 @@
+package org.jboss.labs.ng.model;
+
+import java.io.Serializable;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+import java.util.Calendar;
+
+
+ at Entity
+public class SignedContributorAgreement implements Serializable {
+    @Id
+    private Integer id;
+    @Version
+    private Integer version;
+
+    private Calendar date;
+    @ManyToOne
+    private User user;
+    @ManyToOne
+    private ContributorAgreement contributorAgreement;
+
+    public SignedContributorAgreement() {
+    }
+
+    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 setDate(Calendar newdate) {
+        this.date = newdate;
+    }
+
+    public Calendar getDate() {
+        return date;
+    }
+
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public ContributorAgreement getContributorAgreement() {
+        return contributorAgreement;
+    }
+
+    public void setContributorAgreement(ContributorAgreement contributorAgreement) {
+        this.contributorAgreement = contributorAgreement;
+    }
+}

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-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/User.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -8,9 +8,11 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Version;
 
+
 @Entity
 public class User implements Serializable {
     @Id @GeneratedValue
@@ -23,10 +25,12 @@
     private String bio;
     private String website;
     private String pictureURL;
-    @ManyToMany
-    private List<ContributorAgreement> signedContributorAgreementsList;
     @OneToMany
     private List<ProjectMembership> projectMembershipsList;
+    @ManyToMany
+    private List<MailingList> mailingListList;
+    @OneToMany(mappedBy = "user")
+    private List<SignedContributorAgreement> signedContributorAgreementList;
 
     public User() {
     }
@@ -87,14 +91,7 @@
         return pictureURL;
     }
 
-    public List<ContributorAgreement> getSignedContributorAgreementsList() {
-        return signedContributorAgreementsList;
-    }
 
-    public void setSignedContributorAgreementsList(List<ContributorAgreement> contributorAgreementList) {
-        this.signedContributorAgreementsList = contributorAgreementList;
-    }
-
     public List<ProjectMembership> getProjectMembershipsList() {
         return projectMembershipsList;
     }
@@ -104,4 +101,20 @@
     }
 
 
+    public List<MailingList> getMailingListList() {
+        return mailingListList;
+    }
+
+    public void setMailingListList(List<MailingList> mailingListList) {
+        this.mailingListList = mailingListList;
+    }
+
+
+    public List<SignedContributorAgreement> getSignedContributorAgreementList() {
+        return signedContributorAgreementList;
+    }
+
+    public void setSignedContributorAgreementList(List<SignedContributorAgreement> signedContributorAgreementList) {
+        this.signedContributorAgreementList = signedContributorAgreementList;
+    }
 }

Modified: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/download/File.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/download/File.java	2008-01-08 12:43:38 UTC (rev 17620)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/model/download/File.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -21,6 +21,7 @@
     private Calendar date;
     private Long sizeInBytes;
     private PackageType packageType;
+    private int counter;
     @ManyToOne
     private FileType fileType;
     @ManyToOne
@@ -100,4 +101,12 @@
     public PackageType getPackageType() {
         return packageType;
     }
+
+    public void setCounter(int newcounter) {
+        this.counter = newcounter;
+    }
+
+    public int getCounter() {
+        return counter;
+    }
 }

Added: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectService.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectService.java	                        (rev 0)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectService.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -0,0 +1,7 @@
+package org.jboss.labs.ng.service;
+
+import javax.ejb.Local;
+
+ at Local
+public interface ProjectService {
+}

Added: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceBean.java	                        (rev 0)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceBean.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -0,0 +1,19 @@
+package org.jboss.labs.ng.service;
+
+import javax.ejb.Stateless;
+
+import javax.jws.WebService;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+ at Stateless(name="ProjectService")
+ at WebService(endpointInterface="org.jboss.labs.ng.service.ProjectServiceWebService")
+public class ProjectServiceBean implements ProjectService,
+                                           ProjectServiceWebService {
+    @PersistenceContext
+    private EntityManager em;
+
+    public ProjectServiceBean() {
+    }
+}

Added: labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceWebService.java
===================================================================
--- labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceWebService.java	                        (rev 0)
+++ labs/jbosslabs/trunk/ng/architecture/model/ProjectModel/src/org/jboss/labs/ng/service/ProjectServiceWebService.java	2008-01-08 12:53:41 UTC (rev 17621)
@@ -0,0 +1,9 @@
+package org.jboss.labs.ng.service;
+
+import java.rmi.Remote;
+
+import javax.jws.WebService;
+
+ at WebService
+public interface ProjectServiceWebService extends Remote {
+}




More information about the jboss-svn-commits mailing list