switched to version 1.2

code/Choice/type.properties

@@ -1,11 +1,16 @@
-_datasource = antville
-_tablename = CHOICE
-_subnodes =< vote.CHOICE_ID
+_version = 1.2
+_db = antville
+_table = CHOICE
+_children = collection (vote)
+_children.local = ID
+_children.foreign = CHOICE_ID
 
 _id = ID
 _parent = poll
 
-poll = POLL_ID > poll.ID
+poll = object (poll)
+poll.local = POLL_ID
+poll.foreign = ID
 title = TITLE
 createtime = CREATETIME
 modifytime = MODIFYTIME

code/Comment/type.properties

@@ -1,6 +1,9 @@
-_extends=story
+_version = 1.2
+_extends = story
 
-_subnodes=<comment.PARENT_ID
-_subnodes.order=CREATETIME ASC
+_children = collection (comment)
+_children.local = ID
+_children.foreign = PARENT_ID
+_children.order = CREATETIME ASC
 
-_parent=parent,story
+_parent = parent,story

code/File/type.properties

@@ -1,17 +1,27 @@
-_datasource=antville
-_tablename=GOODIE
+_version = 1.2
+_db = antville
+_table = GOODIE
 
-_id=ID
-_parent=weblog.goodies
+_id = ID
+_parent = weblog.goodies
 
-weblog=WEBLOG_ID>weblog.ID
-alias=ALIAS
-mimetype=MIMETYPE
-file=FILE
-filesize=FILESIZE
-description=DESCRIPTION
-requestcnt=REQUESTCNT
-createtime=CREATETIME
-creator=CREATOR>user.ID
-modifytime=MODIFYTIME
-modifier=MODIFIER>user.ID
+# object references
+weblog = object (weblog)
+weblog.local = WEBLOG_ID
+weblog.foreign = ID
+creator = object (user)
+creator.local = CREATOR
+creator.foreign = ID
+modifier = object (user)
+modifier.local = MODIFIER
+modifier.foreign = ID
+
+# primitive properties
+alias = ALIAS
+mimetype = MIMETYPE
+file = FILE
+filesize = FILESIZE
+description = DESCRIPTION
+requestcnt = REQUESTCNT
+createtime = CREATETIME
+modifytime = MODIFYTIME

code/FileMgr/type.properties

@@ -1,7 +1,7 @@
-_subnodes=<goodie.WEBLOG_ID
-_subnodes.order=CREATETIME desc
-_subnodes.loadmode=aggressive
-
-_properties=goodie.ALIAS
-_properties.aresubnodes=true
-
+_version = 1.2
+_children = collection (goodie)
+_children.local = ID
+_children.foreign = WEBLOG_ID
+_children.order = CREATETIME desc
+_children.loadmode = aggressive
+_children.accessname = ALIAS

code/Image/type.properties

@@ -1,19 +1,33 @@
-_datasource=antville
-_tablename=IMAGE
+_version = 1.2
+_db = antville
+_table = IMAGE
 
-_id=ID
-_parent=parent, weblog.images[named]
+_id = ID
+_parent = parent, weblog.images[named]
 
-weblog=WEBLOG_ID>weblog.ID
-parent=PARENT_ID>image.ID
-thumbnail=THUMBNAIL_ID>image.ID
-alias=ALIAS
-filename=FILENAME
-fileext=FILEEXT
-width=WIDTH
-height=HEIGHT
-alttext=ALTTEXT
-createtime=CREATETIME
-creator=CREATOR>user.ID
-modifytime=MODIFYTIME
-modifier=MODIFIER>user.ID
+# object references
+weblog = object (weblog)
+weblog.local = WEBLOG_ID
+weblog.foreign = ID
+parent = object (image)
+parent.local = PARENT_ID
+parent.foreign = ID
+thumbnail = object (image)
+thumbnail.local = THUMBNAIL_ID
+thumbnail.foreign = ID
+creator = object (user)
+creator.local = CREATOR
+creator.foreign = ID
+modifier = object (user)
+modifier.local = MODIFIER
+modifier.foreign = ID
+
+# primitive properties
+alias = ALIAS
+filename = FILENAME
+fileext = FILEEXT
+width = WIDTH
+height = HEIGHT
+alttext = ALTTEXT
+createtime = CREATETIME
+modifytime = MODIFYTIME

code/ImageMgr/type.properties

@@ -1,8 +1,8 @@
-_subnodes=<image.WEBLOG_ID
-_subnodes.order=CREATETIME desc
-_subnodes.loadmode=aggressive
-_subnodes.filter=PARENT_ID is null
-
-_properties=image.ALIAS
-_properties.aresubnodes=true
-
+_version = 1.2
+_children = collection (image)
+_children.local = ID
+_children.foreign = WEBLOG_ID
+_children.order = CREATETIME desc
+_children.loadmode = aggressive
+_children.filter = PARENT_ID is null
+_children.accessname = ALIAS

code/MemberMgr/type.properties

@@ -1,4 +1,6 @@
-_subnodes=<member.WEBLOG_ID
-_properties=member.USERNAME
-_properties.aresubnodes=true
-_subnodes.order=LEVEL desc, USERNAME asc
+_version = 1.2
+_children = collection (member)
+_children.local = ID
+_children.foreign = WEBLOG_ID
+_children.accessname = USERNAME
+_children.order = LEVEL desc, USERNAME asc

code/Membership/type.properties

@@ -1,13 +1,23 @@
-_datasource=antville
-_tablename=MEMBER
+_version = 1.2
+_db = antville
+_table = MEMBER
 
-_parent=weblog.members
+_parent = weblog.members
+_id = ID
 
-_id=ID
-weblog=WEBLOG_ID>weblog.ID
-user=USER_ID>user.ID
-username=USERNAME
-level=LEVEL
-createtime=CREATETIME
-modifier=MODIFIER>user.ID
-modifytime=MODIFYTIME
+# object references
+weblog = object (weblog)
+weblog.local = WEBLOG_ID
+weblog.foreign = ID
+user = object (user)
+user.local = USER_ID
+user.foreign = ID
+modifier = object (user)
+modifier.local = MODIFIER
+modifier.foreign = ID
+
+# primitive properties
+username = USERNAME
+level = LEVEL
+createtime = CREATETIME
+modifytime = MODIFYTIME

code/Poll/type.properties

@@ -1,19 +1,32 @@
-_datasource = antville
-_tablename = POLL
-_subnodes =< choice.POLL_ID
-_subnodes.order = ID asc
+_version = 1.2
+_db = antville
+_table = POLL
+
+_children = collection (choice)
+_children.local = ID
+_children.foreign = POLL_ID
+_children.order = ID asc
 
 _id = ID
 _parent = weblog.polls
 
-weblog = WEBLOG_ID > weblog.ID
-creator = USER_ID > user.ID
+# object references
+weblog = object (weblog)
+weblog.local = WEBLOG_ID
+weblog.foreign = ID
+creator = object (user)
+creator.local = USER_ID
+creator.foreign = ID
+
+# primitive properties
 title = TITLE
 question = QUESTION
 closed = CLOSED
 createtime = CREATETIME
 modifytime = MODIFYTIME
 
-votes = [virtual] vote.USERNAME
-votes.subnodeRelation =< vote.POLL_ID
-votes.areSubnodes = true
+# collections
+votes = collection (vote)
+votes.accessname = USERNAME
+votes.local = ID
+votes.foreign = vote.POLL_ID

code/PollMgr/type.properties

@@ -1,2 +1,5 @@
-_subnodes =< poll.WEBLOG_ID
-_subnodes.order = CREATETIME desc
+_version = 1.2
+_children = collection (poll)
+_children.local = ID
+_children.foreign = WEBLOG_ID
+_children.order = CREATETIME desc

code/Skin/type.properties

@@ -1,11 +1,20 @@
-_datasource=antville
-_tablename=SKIN
+_version = 1.2
+_db = antville
+_table = SKIN
 
-_id=ID
-weblog=WEBLOG_ID>weblog.ID
-proto=PROTO
-name=NAME
-skin=SOURCE
-creator=CREATOR>user.ID
-createtime=CREATETIME
-modified=MODIFYTIME
+_id = ID
+
+# object references
+weblog = object (weblog)
+weblog.local = WEBLOG_ID
+weblog.foreign = ID
+creator = object (user)
+creator.local = CREATOR
+creator.foreign = ID
+
+# primitive properties
+proto = PROTO
+name = NAME
+skin = SOURCE
+createtime = CREATETIME
+modified = MODIFYTIME

code/Story/type.properties

@@ -1,29 +1,49 @@
-_datasource=antville
-_tablename=TEXT
-_subnodes=<comment.STORY_ID
-_subnodes.order=CREATETIME ASC
-_subnodes.filter=PARENT_ID IS NULL
+_version = 1.2
+_db = antville
+_table = TEXT
 
-_parent=weblog.topics,weblog
+_children = collection (comment)
+_children.local = ID
+_children.foreign = STORY_ID
+_children.order = CREATETIME ASC
+_children.filter = PARENT_ID IS NULL
 
-_id=ID
-_prototype=PROTOTYPE
-weblog=WEBLOG_ID>weblog.ID
-day=DAY
-topic=TOPIC
-story=STORY_ID>story.ID
-parent=PARENT_ID>comment.ID
-title=TITLE
-text=TEXT
-online=ISONLINE
-editableby=EDITABLEBY
-author=AUTHOR>user.ID
-createtime=CREATETIME
-modifytime=MODIFYTIME
-modifier=MODIFIER>user.ID
-ipaddress=IPADDRESS
-reads=READS
+_parent = weblog.topics,weblog
+_id = ID
+_prototype = PROTOTYPE
 
-allcomments=[virtual]<comment.STORY_ID
-allcomments.filter=ISONLINE > 0
-allcomments.order=MODIFYTIME DESC
+# object references
+weblog = object (weblog)
+weblog.local = WEBLOG_ID
+weblog.foreign = ID
+story = object (story)
+story.local = STORY_ID
+story.foreign = ID
+parent = object (comment)
+parent.local = PARENT_ID
+parent.foreign = ID
+author = object (user)
+author.local = AUTHOR
+author.foreign = ID
+modifier = object (user)
+modifier.local = MODIFIER
+modifier.foreign = ID
+
+# primitive properties
+day = DAY
+topic = TOPIC
+title = TITLE
+text = TEXT
+online = ISONLINE
+editableby = EDITABLEBY
+createtime = CREATETIME
+modifytime = MODIFYTIME
+ipaddress = IPADDRESS
+reads = READS
+
+# collections
+allcomments = collection (comment)
+allcomments.local = ID
+allcomments.foreign = STORY_ID
+allcomments.filter = ISONLINE > 0
+allcomments.order = MODIFYTIME DESC

code/StoryMgr/type.properties

@@ -1,4 +1,6 @@
-_subnodes=<story.WEBLOG_ID
-_subnodes.filter=PROTOTYPE = 'story'
-_subnodes.order=CREATETIME desc
-_subnodes.loadmode=aggressive
+_version = 1.2
+_children = collection (story)
+_children.local = ID
+_children.foreign = WEBLOG_ID
+_children.filter = PROTOTYPE = 'story'
+_children.order = CREATETIME desc

code/Topic/type.properties

@@ -1,4 +1,4 @@
-_extends=day
-
-related=[virtual]story.ID
+_version = 1.2
+_extends = day
 
+related = collection (story)

code/TopicMgr/type.properties

@@ -1,6 +1,9 @@
-_subnodes=<story.WEBLOG_ID
-_subnodes.filter=PROTOTYPE = 'story'
-_subnodes.groupby=TOPIC
-_subnodes.order=CREATETIME DESC
-_subnodes.groupby.prototype=topic
-_subnodes.groupby.order=TOPIC
+_version = 1.2
+_children = collection (story)
+_children.local = ID
+_children.foreign = WEBLOG_ID
+_children.filter = PROTOTYPE = 'story'
+_children.order = CREATETIME DESC
+_children.groupby = TOPIC
+_children.groupby.prototype = topic
+_children.groupby.order = TOPIC

code/Vote/type.properties

@@ -1,12 +1,20 @@
-_datasource = antville
-_tablename = VOTE
+_version = 1.2
+_db = antville
+_table = VOTE
 
 _id = ID
 _parent = choice, poll.votes
 
-poll = POLL_ID > poll.ID
-user = USER_ID > user.ID
-choice = CHOICE_ID > choice.ID
+poll = object (poll)
+poll.local = POLL_ID
+poll.foreign = ID
+user = object (user)
+user.local = USER_ID
+user.foreign = ID
+choice = object (choice)
+choice.local = CHOICE_ID
+choice.foreign = ID
+
 username = USERNAME
 createtime = CREATETIME
 modifytime = MODIFYTIME