[GME-commit] GMESRC/Paradigms/SF SFDemo.xme,1.3,1.4 SFMeta.xme,1.3,1.4

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/SF
In directory braindrain:/tmp/cvs-serv31291

Modified Files:
	SFDemo.xme SFMeta.xme 
Log Message:
Modified Files:
Though conflicts have been notified...a new version is reinterpreted with MetaGME2004 and exported.
SF.xmp SFDemo.xme SFMeta.xme 


CVS User: zolmol

Index: SFDemo.xme
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/SF/SFDemo.xme,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SFDemo.xme	3 Feb 2004 03:29:30 -0000	1.3
--- SFDemo.xme	4 Mar 2004 23:09:26 -0000	1.4
***************
*** 2,6 ****
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{00000000-0000-0000-0000-000000000000}" cdate="Mon Feb 02 21:24:53 2004" mdate="Mon Feb 02 21:31:10 2004" metaguid="{A5D49042-DEAD-BEEF-FEED-DAD000000001}" metaname="SF">
  	<name>SFDemo</name>
  	<comment></comment>
--- 2,6 ----
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{00000000-0000-0000-0000-000000000000}" cdate="Thu Mar 04 15:59:10 2004" mdate="Thu Mar 04 15:59:11 2004" metaguid="{9F1A1595-DEAD-BEEF-FEED-DAD000000001}" metaname="SF">
  	<name>SFDemo</name>
[...2326 lines suppressed...]
  				<name>PC</name>
! 				<connpoint role="dst" target="id-0066-0000004c"/>
! 				<connpoint role="src" target="id-0066-00000074"/>
  			</connection>
  			<connection id="id-0068-0000004e" kind="DataflowConn" role="DFC" relid="0x2d">
  				<name>DFC</name>
! 				<connpoint role="src" target="id-0066-00000006"/>
! 				<connpoint role="dst" target="id-0066-0000000e"/>
  			</connection>
  			<connection id="id-0068-0000004f" kind="DataflowConn" role="DFC" relid="0x1a">
  				<name>DFC</name>
! 				<connpoint role="dst" target="id-0066-00000023"/>
! 				<connpoint role="src" target="id-0066-00000066"/>
  			</connection>
  			<connection id="id-0068-00000050" kind="ParameterConn" role="PC" relid="0x1b">
  				<name>PC</name>
! 				<connpoint role="dst" target="id-0066-00000038"/>
! 				<connpoint role="src" target="id-0066-00000073"/>
  			</connection>
  		</model>

Index: SFMeta.xme
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/SF/SFMeta.xme,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SFMeta.xme	3 Feb 2004 03:29:30 -0000	1.3
--- SFMeta.xme	4 Mar 2004 23:09:26 -0000	1.4
***************
*** 2,6 ****
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{00000000-0000-0000-0000-000000000000}" cdate="Fri Jan 30 19:59:21 2004" mdate="Mon Feb 02 14:11:05 2004" metaguid="{34B83F2E-DEAD-BEEF-FEED-DAD000000001}" metaname="MetaGME">
  	<name>SF</name>
  	<comment></comment>
--- 2,6 ----
  <!DOCTYPE project SYSTEM "mga.dtd">
  
! <project guid="{00000000-0000-0000-0000-000000000000}" cdate="Thu Mar 04 15:54:49 2004" mdate="Thu Mar 04 15:55:41 2004" metaguid="{34B83F2E-DEAD-BEEF-FEED-DAD000000001}" metaname="MetaGME">
  	<name>SF</name>
[...1326 lines suppressed...]
  				<name>HasAttribute</name>
  				<connpoint role="src" target="id-0066-00000005"/>
  				<connpoint role="dst" target="id-0066-0000000d"/>
  			</connection>
! 			<connection id="id-0068-00000021" kind="HasAttribute" role="HasAttribute" relid="0x43">
  				<name>HasAttribute</name>
  				<connpoint role="src" target="id-0066-00000007"/>
***************
*** 2552,2556 ****
  				</attribute>
  			</set>
! 			<set id="id-0069-00000002" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-00000001 id-0066-0000000d id-0066-00000015">
  				<name>ParameterAspect</name>
  				<regnode name="MetaRef" isopaque="yes">
--- 2537,2541 ----
  				</attribute>
  			</set>
! 			<set id="id-0069-00000002" kind="Aspect" role="Aspect" relid="0x0" members="id-0066-0000000d id-0066-00000015 id-0066-00000001">
  				<name>ParameterAspect</name>
  				<regnode name="MetaRef" isopaque="yes">