You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/07/03 17:01:12 UTC
[06/63] [abbrv] [partial] ISIS-832: mothballing components
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/dtd/xhtml1-strict.dtd
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/dtd/xhtml1-strict.dtd b/mothballed/bdd/tck/src/test/resources/dtd/xhtml1-strict.dtd
deleted file mode 100644
index abced1d..0000000
--- a/mothballed/bdd/tck/src/test/resources/dtd/xhtml1-strict.dtd
+++ /dev/null
@@ -1,980 +0,0 @@
-<!--
- Extensible HTML version 1.0 Strict DTD
-
- This is the same as HTML 4 Strict except for
- changes due to the differences between XML and SGML.
-
- Namespace = http://www.w3.org/1999/xhtml
-
- For further information, see: http://www.w3.org/TR/xhtml1
-
- Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
- All Rights Reserved.
-
- This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
- PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-
- $Revision: 1.1 $
- $Date: 2002/08/01 13:56:03 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
- "-//W3C//ENTITIES Latin 1 for XHTML//EN"
- "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
- "-//W3C//ENTITIES Symbols for XHTML//EN"
- "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
- "-//W3C//ENTITIES Special for XHTML//EN"
- "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
- <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
- <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
- <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
- <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
- <!-- a language code, as per [RFC3066] -->
-
-<!ENTITY % Character "CDATA">
- <!-- a single character, as per section 2.2 of [XML] -->
-
-<!ENTITY % Number "CDATA">
- <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
- <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
- <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
- <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
- <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
- <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
- <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
- <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
- <!-- used for titles etc. -->
-
-<!ENTITY % Length "CDATA">
- <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
- <!-- pixel, percentage, or relative -->
-
-<!ENTITY % Pixels "CDATA">
- <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
- <!-- comma separated list of lengths -->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
- id document-wide unique id
- class space separated list of classes
- style associated style info
- title advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id ID #IMPLIED
- class CDATA #IMPLIED
- style %StyleSheet; #IMPLIED
- title %Text; #IMPLIED"
- >
-
-<!-- internationalization attributes
- lang language code (backwards compatible)
- xml:lang language code (as per XML 1.0 spec)
- dir direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang %LanguageCode; #IMPLIED
- xml:lang %LanguageCode; #IMPLIED
- dir (ltr|rtl) #IMPLIED"
- >
-
-<!-- attributes for common UI events
- onclick a pointer button was clicked
- ondblclick a pointer button was double clicked
- onmousedown a pointer button was pressed down
- onmouseup a pointer button was released
- onmousemove a pointer was moved onto the element
- onmouseout a pointer was moved away from the element
- onkeypress a key was pressed and released
- onkeydown a key was pressed down
- onkeyup a key was released
--->
-<!ENTITY % events
- "onclick %Script; #IMPLIED
- ondblclick %Script; #IMPLIED
- onmousedown %Script; #IMPLIED
- onmouseup %Script; #IMPLIED
- onmouseover %Script; #IMPLIED
- onmousemove %Script; #IMPLIED
- onmouseout %Script; #IMPLIED
- onkeypress %Script; #IMPLIED
- onkeydown %Script; #IMPLIED
- onkeyup %Script; #IMPLIED"
- >
-
-<!-- attributes for elements that can get the focus
- accesskey accessibility key character
- tabindex position in tabbing order
- onfocus the element got the focus
- onblur the element lost the focus
--->
-<!ENTITY % focus
- "accesskey %Character; #IMPLIED
- tabindex %Number; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED"
- >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special.pre
- "br | span | bdo | map">
-
-
-<!ENTITY % special
- "%special.pre; | object | img ">
-
-<!ENTITY % fontstyle "tt | i | b | big | small ">
-
-<!ENTITY % phrase "em | strong | dfn | code | q |
- samp | kbd | var | cite | abbr | acronym | sub | sup ">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc.inline "ins | del | script">
-
-<!-- these can only occur at block level -->
-<!ENTITY % misc "noscript | %misc.inline;">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl">
-<!ENTITY % blocktext "pre | hr | blockquote | address">
-
-<!ENTITY % block
- "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes block and inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
- "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*">
-
-<!-- pre uses %Inline excluding big, small, sup or sup -->
-
-<!ENTITY % pre.content
- "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline;
- | %inline.forms;)*">
-
-<!-- form uses %Block; excluding form -->
-
-<!ENTITY % form.content "(%block; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form and form controls -->
-
-<!ENTITY % button.content
- "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
- table | %special; | %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
- %i18n;
- id ID #IMPLIED
- xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml'
- xmlns:concordion %URI; #FIXED 'http://www.concordion.org/2007/concordion'
- xmlns:isis %URI; #FIXED 'http://isis.apache.org/2010/concordion'
- >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object)*">
-
-<!-- content model is %head.misc; combined with a single
- title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
- ((title, %head.misc;, (base, %head.misc;)?) |
- (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
- %i18n;
- id ID #IMPLIED
- profile %URI; #IMPLIED
- >
-
-<!-- The title element is not considered part of the flow of text.
- It should be displayed, for example as the page header or
- window title. Exactly one title is required per document.
- -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title
- %i18n;
- id ID #IMPLIED
- >
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
- href %URI; #REQUIRED
- id ID #IMPLIED
- >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
- %i18n;
- id ID #IMPLIED
- http-equiv CDATA #IMPLIED
- name CDATA #IMPLIED
- content CDATA #REQUIRED
- scheme CDATA #IMPLIED
- >
-
-<!--
- Relationship values can be used in principle:
-
- a) for document specific toolbars/menus when used
- with the link element in document head e.g.
- start, contents, previous, next, index, end, help
- b) to link to a separate style sheet (rel="stylesheet")
- c) to make a link to a script (rel="script")
- d) by stylesheets to control how collections of
- html nodes are rendered into printed documents
- e) to make a link to a printable version of this document
- e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
- %attrs;
- charset %Charset; #IMPLIED
- href %URI; #IMPLIED
- hreflang %LanguageCode; #IMPLIED
- type %ContentType; #IMPLIED
- rel %LinkTypes; #IMPLIED
- rev %LinkTypes; #IMPLIED
- media %MediaDesc; #IMPLIED
- >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
- %i18n;
- id ID #IMPLIED
- type %ContentType; #REQUIRED
- media %MediaDesc; #IMPLIED
- title %Text; #IMPLIED
- xml:space (preserve) #FIXED 'preserve'
- >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
- id ID #IMPLIED
- charset %Charset; #IMPLIED
- type %ContentType; #REQUIRED
- src %URI; #IMPLIED
- defer (defer) #IMPLIED
- xml:space (preserve) #FIXED 'preserve'
- >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Block;>
-<!ATTLIST noscript
- %attrs;
- >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Block;>
-<!ATTLIST body
- %attrs;
- onload %Script; #IMPLIED
- onunload %Script; #IMPLIED
- >
-
-<!ELEMENT div %Flow;> <!-- generic language/style container -->
-<!ATTLIST div
- %attrs;
- >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
- %attrs;
- >
-
-<!--=================== Headings =========================================-->
-
-<!--
- There are six levels of headings from h1 (the most important)
- to h6 (the least important).
--->
-
-<!ELEMENT h1 %Inline;>
-<!ATTLIST h1
- %attrs;
- >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
- %attrs;
- >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
- %attrs;
- >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
- %attrs;
- >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
- %attrs;
- >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
- %attrs;
- >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
- %attrs;
- >
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
- %attrs;
- >
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
- %attrs;
- >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
- %attrs;
- >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
- %attrs;
- >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
- %attrs;
- >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
- %attrs;
- >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
- %attrs;
- >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
- %attrs;
- xml:space (preserve) #FIXED 'preserve'
- >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Block;>
-<!ATTLIST blockquote
- %attrs;
- cite %URI; #IMPLIED
- >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
- ins/del are allowed in block and inline content, but its
- inappropriate to include block content within an ins element
- occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
- %attrs;
- cite %URI; #IMPLIED
- datetime %Datetime; #IMPLIED
- >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
- %attrs;
- cite %URI; #IMPLIED
- datetime %Datetime; #IMPLIED
- >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
- %attrs;
- %focus;
- charset %Charset; #IMPLIED
- type %ContentType; #IMPLIED
- name NMTOKEN #IMPLIED
- href %URI; #IMPLIED
- hreflang %LanguageCode; #IMPLIED
- rel %LinkTypes; #IMPLIED
- rev %LinkTypes; #IMPLIED
- shape %Shape; "rect"
- coords %Coords; #IMPLIED
- >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
- %attrs;
- >
-
-<!ELEMENT bdo %Inline;> <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
- %coreattrs;
- %events;
- lang %LanguageCode; #IMPLIED
- xml:lang %LanguageCode; #IMPLIED
- dir (ltr|rtl) #REQUIRED
- >
-
-<!ELEMENT br EMPTY> <!-- forced line break -->
-<!ATTLIST br
- %coreattrs;
- >
-
-<!ELEMENT em %Inline;> <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;> <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;> <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;> <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;> <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;> <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;> <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;> <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;> <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;> <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;> <!-- inlined quote -->
-<!ATTLIST q
- %attrs;
- cite %URI; #IMPLIED
- >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;> <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;> <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;> <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;> <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;> <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!--==================== Object ======================================-->
-<!--
- object is used to embed objects as part of HTML pages.
- param elements should precede other content. Parameters
- can also be expressed as attribute/value pairs on the
- object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
- %attrs;
- declare (declare) #IMPLIED
- classid %URI; #IMPLIED
- codebase %URI; #IMPLIED
- data %URI; #IMPLIED
- type %ContentType; #IMPLIED
- codetype %ContentType; #IMPLIED
- archive %UriList; #IMPLIED
- standby %Text; #IMPLIED
- height %Length; #IMPLIED
- width %Length; #IMPLIED
- usemap %URI; #IMPLIED
- name NMTOKEN #IMPLIED
- tabindex %Number; #IMPLIED
- >
-
-<!--
- param is used to supply a named property value.
- In XML it would seem natural to follow RDF and support an
- abbreviated syntax where the param elements are replaced
- by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
- id ID #IMPLIED
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- valuetype (data|ref|object) "data"
- type %ContentType; #IMPLIED
- >
-
-<!--=================== Images ===========================================-->
-
-<!--
- To avoid accessibility problems for people who aren't
- able to see the image, you should provide a text
- description using the alt and longdesc attributes.
- In addition, avoid the use of server-side image maps.
- Note that in this DTD there is no name attribute. That
- is only available in the transitional and frameset DTD.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
- %attrs;
- src %URI; #REQUIRED
- alt %Text; #REQUIRED
- longdesc %URI; #IMPLIED
- height %Length; #IMPLIED
- width %Length; #IMPLIED
- usemap %URI; #IMPLIED
- ismap (ismap) #IMPLIED
- >
-
-<!-- usemap points to a map element which may be in this document
- or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
- separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
- %i18n;
- %events;
- id ID #REQUIRED
- class CDATA #IMPLIED
- style %StyleSheet; #IMPLIED
- title %Text; #IMPLIED
- name NMTOKEN #IMPLIED
- >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
- %attrs;
- %focus;
- shape %Shape; "rect"
- coords %Coords; #IMPLIED
- href %URI; #IMPLIED
- nohref (nohref) #IMPLIED
- alt %Text; #REQUIRED
- >
-
-<!--================ Forms ===============================================-->
-<!ELEMENT form %form.content;> <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
- %attrs;
- action %URI; #REQUIRED
- method (get|post) "get"
- enctype %ContentType; "application/x-www-form-urlencoded"
- onsubmit %Script; #IMPLIED
- onreset %Script; #IMPLIED
- accept %ContentTypes; #IMPLIED
- accept-charset %Charsets; #IMPLIED
- >
-
-<!--
- Each label must not contain more than ONE field
- Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
- %attrs;
- for IDREF #IMPLIED
- accesskey %Character; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- >
-
-<!ENTITY % InputType
- "(text | password | checkbox |
- radio | submit | reset |
- file | hidden | image | button)"
- >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY> <!-- form control -->
-<!ATTLIST input
- %attrs;
- %focus;
- type %InputType; "text"
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- checked (checked) #IMPLIED
- disabled (disabled) #IMPLIED
- readonly (readonly) #IMPLIED
- size CDATA #IMPLIED
- maxlength %Number; #IMPLIED
- src %URI; #IMPLIED
- alt CDATA #IMPLIED
- usemap %URI; #IMPLIED
- onselect %Script; #IMPLIED
- onchange %Script; #IMPLIED
- accept %ContentTypes; #IMPLIED
- >
-
-<!ELEMENT select (optgroup|option)+> <!-- option selector -->
-<!ATTLIST select
- %attrs;
- name CDATA #IMPLIED
- size %Number; #IMPLIED
- multiple (multiple) #IMPLIED
- disabled (disabled) #IMPLIED
- tabindex %Number; #IMPLIED
- onfocus %Script; #IMPLIED
- onblur %Script; #IMPLIED
- onchange %Script; #IMPLIED
- >
-
-<!ELEMENT optgroup (option)+> <!-- option group -->
-<!ATTLIST optgroup
- %attrs;
- disabled (disabled) #IMPLIED
- label %Text; #REQUIRED
- >
-
-<!ELEMENT option (#PCDATA)> <!-- selectable choice -->
-<!ATTLIST option
- %attrs;
- selected (selected) #IMPLIED
- disabled (disabled) #IMPLIED
- label %Text; #IMPLIED
- value CDATA #IMPLIED
- >
-
-<!ELEMENT textarea (#PCDATA)> <!-- multi-line text field -->
-<!ATTLIST textarea
- %attrs;
- %focus;
- name CDATA #IMPLIED
- rows %Number; #REQUIRED
- cols %Number; #REQUIRED
- disabled (disabled) #IMPLIED
- readonly (readonly) #IMPLIED
- onselect %Script; #IMPLIED
- onchange %Script; #IMPLIED
- >
-
-<!--
- The fieldset element is used to group form fields.
- Only one legend element should occur in the content
- and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
- %attrs;
- >
-
-<!ELEMENT legend %Inline;> <!-- fieldset label -->
-<!ATTLIST legend
- %attrs;
- accesskey %Character; #IMPLIED
- >
-
-<!--
- Content is %Flow; excluding a, form and form controls
--->
-<!ELEMENT button %button.content;> <!-- push button -->
-<!ATTLIST button
- %attrs;
- %focus;
- name CDATA #IMPLIED
- value CDATA #IMPLIED
- type (button|submit|reset) "submit"
- disabled (disabled) #IMPLIED
- >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
- "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-
-<!-- horizontal alignment attributes for cell contents
-
- char alignment char, e.g. char=':'
- charoff offset for alignment char
--->
-<!ENTITY % cellhalign
- "align (left|center|right|justify|char) #IMPLIED
- char %Character; #IMPLIED
- charoff %Length; #IMPLIED"
- >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
- "valign (top|middle|bottom|baseline) #IMPLIED"
- >
-
-<!ELEMENT table
- (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption %Inline;>
-<!ELEMENT thead (tr)+>
-<!ELEMENT tfoot (tr)+>
-<!ELEMENT tbody (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col EMPTY>
-<!ELEMENT tr (th|td)+>
-<!ELEMENT th %Flow;>
-<!ELEMENT td %Flow;>
-
-<!ATTLIST table
- %attrs;
- summary %Text; #IMPLIED
- width %Length; #IMPLIED
- border %Pixels; #IMPLIED
- frame %TFrame; #IMPLIED
- rules %TRules; #IMPLIED
- cellspacing %Length; #IMPLIED
- cellpadding %Length; #IMPLIED
- >
-
-<!ATTLIST caption
- %attrs;
- >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
- %attrs;
- span %Number; "1"
- width %MultiLength; #IMPLIED
- %cellhalign;
- %cellvalign;
- >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
- width=64 width in screen pixels
- width=0.5* relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
- %attrs;
- span %Number; "1"
- width %MultiLength; #IMPLIED
- %cellhalign;
- %cellvalign;
- >
-
-<!--
- Use thead to duplicate headers when breaking table
- across page boundaries, or for static headers when
- tbody sections are rendered in scrolling panel.
-
- Use tfoot to duplicate footers when breaking table
- across page boundaries, or for static footers when
- tbody sections are rendered in scrolling panel.
-
- Use multiple tbody sections when rules are needed
- between groups of table rows.
--->
-<!ATTLIST thead
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST tfoot
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST tbody
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST tr
- %attrs;
- %cellhalign;
- %cellvalign;
- >
-
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
- %attrs;
- abbr %Text; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- scope %Scope; #IMPLIED
- rowspan %Number; "1"
- colspan %Number; "1"
- %cellhalign;
- %cellvalign;
- >
-
-<!ATTLIST td
- %attrs;
- abbr %Text; #IMPLIED
- axis CDATA #IMPLIED
- headers IDREFS #IMPLIED
- scope %Scope; #IMPLIED
- rowspan %Number; "1"
- colspan %Number; "1"
- %cellhalign;
- %cellvalign;
- >
-
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html b/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
deleted file mode 100644
index 0bf58a3..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html xmlns:concordion="http://www.concordion.org/2007/concordion"
- xmlns:isis="http://isis.apache.org/2010/concordion">
-<link href="../concordion.css" rel="stylesheet" type="text/css" />
-<body>
-
-<p>
-The system:
-</p>
-<ul>
-<li>
-<p concordion:execute="#result=bootstrapIsis(#configDir,#deploymentType)">
-<span concordion:assertTrue="#result">bootstrapped</span> from
-config directory <span concordion:set="#configDir">../quickrun/src/main/resources</span>
-and running in <span concordion:set="#deploymentType">exploration</span>
-mode,
-</p>
-</li>
-<li>
-<p>with services: </p>
-<table concordion:execute="#result=aliasService(#aliasAs, #className)">
- <tr>
- <th concordion:set="#className">Class Name</th>
- <th concordion:set="#aliasAs">aliasAs</th>
- <th concordion:assertTrue="#result"/>
- </tr>
- <tr>
- <td>objstore.dflt.todo.ToDoItemRepositoryDefault</td>
- <td>toDoItems</td>
- <td>ok</td>
- </tr>
-</table>
-</li>
-</ul>
-
-</body>
-
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/ToDoItems.html
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/ToDoItems.html b/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/ToDoItems.html
deleted file mode 100644
index 33bc742..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/common/ToDoItems.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<html xmlns:concordion="http://www.concordion.org/2007/concordion"
- xmlns:isis="http://isis.apache.org/2010/concordion">
-<link href="../concordion.css" rel="stylesheet" type="text/css" />
-<body>
-
-<h3>Operational Data</h3>
-<p>With to do items (<span concordion:set="#className">dom.todo.ToDoItem</span>):
-</p>
-<table isis:execute="#result=setUpObject(#className, #alias, #description, #done)">
- <tr>
- <th concordion:set="#alias">Alias</th>
- <th concordion:set="#description">Description</th>
- <th concordion:set="#done">Done</th>
- <th concordion:assertEquals="#result"/>
- </tr>
- <tr>
- <td>item1</td>
- <td>Buy milk</td>
- <td>false</td>
- <td>ok</td>
- </tr>
- <tr>
- <td>item2</td>
- <td>Pick up laundry</td>
- <td>false</td>
- <td>ok</td>
- </tr>
- <tr>
- <td>item3</td>
- <td>Buy stamps</td>
- <td>false</td>
- <td>ok</td>
- </tr>
- <tr>
- <td>item4</td>
- <td>Write blog post</td>
- <td>false</td>
- <td>ok</td>
- </tr>
- <tr>
- <td>item5</td>
- <td>Organize brown bag</td>
- <td>false</td>
- <td>ok</td>
- </tr>
-</table>
-
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/concordion.css
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/concordion.css b/mothballed/bdd/tck/src/test/resources/viewer/bdd/concordion.css
deleted file mode 100644
index f849431..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/concordion.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-* {
- font-family: Arial;
-}
-body {
- padding: 32px;
-}
-pre {
- padding: 6px 28px 6px 28px;
- background-color: #E8EEF7;
-}
-pre, pre *, code, code *, kbd {
- font-family: Courier New, Courier;
- font-size: 10pt;
-}
-h1, h1 * {
- font-size: 24pt;
-}
-p, td, th, li, .breadcrumbs {
- font-size: 10pt;
-}
-p, li {
- line-height: 140%;
-}
-table {
- border-collapse: collapse;
- empty-cells: show;
- margin: 8px 0px 8px 0px;
-}
-th, td {
- border: 1px solid black;
- padding: 3px;
-}
-td {
- background-color: white;
- vertical-align: top;
-}
-th {
- background-color: #C3D9FF;
-}
-li {
- margin-top: 6px;
- margin-bottom: 6px;
-}
-
-
-.example {
- padding: 2px 12px 6px 12px;
- border: 1px solid #C3D9FF;
- margin: 6px 0px 28px 0px;
- background-color: #F5F9FD;
-}
-.example h3 {
- margin-top: 8px;
- margin-bottom: 8px;
- font-size: 12pt;
-}
-
-.special {
- font-style: italic;
-}
-
-.idea {
- font-size: 9pt;
- color: #888;
- font-style: italic;
-}
-.tight li {
- margin-top: 1px;
- margin-bottom: 1px;
-}
-.commentary {
- float: right;
- width: 200px;
- background-color: #ffffd0;
- padding:8px;
- border: 3px solid #eeeeb0;
- margin: 10px 0px 10px 10px;
-}
-.commentary, .commentary * {
- font-size: 8pt;
-}
-span {
- font-style: italic;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/AllStories.html
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/AllStories.html b/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/AllStories.html
deleted file mode 100644
index 39b3793..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/AllStories.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "file:src/test/resources/dtd/xhtml1-strict.dtd">
-<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"
- xmlns:concordion="http://www.concordion.org/2007/concordion"
- xmlns:isis="http://isis.apache.org/2010/concordion">
-<link href="../concordion.css" rel="stylesheet" type="text/css" />
-<body>
-
-<h1>Stories</h1>
-
-<ul>
- <li>
- <p><a concordion:run="concordion"
- href="todo/Index.html">ToDo Item Stories</a></p>
- </li>
-</ul>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Fixtures.html
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Fixtures.html b/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Fixtures.html
deleted file mode 100644
index b2044e8..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Fixtures.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "file:src/test/resources/dtd/xhtml1-strict.dtd">
-<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"
- xmlns:concordion="http://www.concordion.org/2007/concordion"
- xmlns:isis="http://isis.apache.org/2010/concordion">
-<link href="../../concordion.css" rel="stylesheet" type="text/css" />
-<body>
-
-<h2>Given</h2>
-<ul>
- <li>
- <p>bootstrapped in <a concordion:run="concordion"
- href="../../common/BootstrapInExplorationMode.html">exploration</a> mode</p>
- </li>
- <li>
- <p concordion:execute="#result=usingDateFormat(#format)"><span
- concordion:assertTrue="#result">using a date format</span> of <span
- concordion:set="#format">dd-MM-yyyy</span>, and</p>
- </li>
- <li>
- <p concordion:execute="#result=timeIs(#dateTime)"><span
- concordion:assertTrue="#result">date/time</span> being <span
- concordion:set="#dateTime">02-03-2007 09:20</span>, and</p>
- </li>
- <li>
- <p concordion:execute="#result=logonAs(#userName)"><span
- concordion:assertTrue="#result">logged on</span> as <span
- concordion:set="#userName">fsmith</span></p>
- </li>
- <li>
- <p>with <a concordion:run="concordion"
- href="../../common/ToDoItems.html">To Do Items</a>.</p>
- </li>
-</ul>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Index.html
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Index.html b/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Index.html
deleted file mode 100644
index 0a43ec4..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/Index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "file:src/test/resources/dtd/xhtml1-strict.dtd">
-<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"
- xmlns:concordion="http://www.concordion.org/2007/concordion"
- xmlns:isis="http://isis.apache.org/2010/concordion">
-<link href="../../concordion.css" rel="stylesheet" type="text/css" />
-<body>
-
-<h1>ToDo Item Stories</h1>
-
-<ul>
- <li>
- <p><a concordion:run="concordion"
- href="ScenarioMarkItemAsDone.html">mark item as done</a></p>
- </li>
-</ul>
-
-
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html
----------------------------------------------------------------------
diff --git a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html b/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html
deleted file mode 100644
index beff4b2..0000000
--- a/mothballed/bdd/tck/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "file:src/test/resources/dtd/xhtml1-strict.dtd">
-<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"
- xmlns:concordion="http://www.concordion.org/2007/concordion"
- xmlns:isis="http://isis.apache.org/2010/concordion">
-<link href="../../concordion.css" rel="stylesheet" type="text/css" />
-<body>
-
-<h1>Mark Item As Done</h1>
-
-<div class="example">
-
-<h2>Given</h2>
-<p>
-Given <a concordion:run="concordion"
- href="Fixtures.html">this fixture</a></p>
-
-<p>Locate to-do item:</p>
-<table
- isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #thatIt, #value)">
- <tr>
- <th concordion:set="#onObject">on object</th>
- <th concordion:set="#aliasResultAs">alias result as</th>
- <th concordion:set="#perform">perform</th>
- <th concordion:set="#onMember">on member</th>
- <th concordion:assertEquals="#result" />
- </tr>
- <tr>
- <td>toDoItems</td>
- <td>listOfItemsBefore</td>
- <td>invoke action</td>
- <td>not yet done</td>
- <td>ok</td>
- </tr>
-</table>
-
-<p
- concordion:execute="#result=aliasItemsInList(#listAlias, #title, #aliasAs)">
-... and then alias the '<span concordion:set="#title">Buy milk</span>' item in the returned <span
- concordion:set="#listAlias">listOfItemsBefore</span> as <span
- concordion:set="#aliasAs">buyMilkItem</span>; <span
- concordion:assertEquals="#result">ok</span>.</p>
-
-<p>Confirm to-do item is not done:</p>
-<table
- isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #thatIt, #value)">
- <tr>
- <th concordion:set="#onObject">on object</th>
- <th concordion:set="#aliasResultAs">alias result as</th>
- <th concordion:set="#perform">perform</th>
- <th concordion:set="#onMember">on member</th>
- <th concordion:set="#thatIt">that it</th>
- <th concordion:set="#value">value</th>
- <th concordion:assertEquals="#result" />
- </tr>
- <tr>
- <td>buyMilkItem</td>
- <td></td>
- <td>check property</td>
- <td>Done</td>
- <td>is</td>
- <td>False</td>
- <td>ok</td>
- </tr>
-</table>
-
-
-
-<h2>When</h2>
-
-<p>Mark as done</p>
-<table
- isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #thatIt, #value)">
- <tr>
- <th concordion:set="#onObject">on object</th>
- <th concordion:set="#aliasResultAs">alias result as</th>
- <th concordion:set="#perform">perform</th>
- <th concordion:set="#onMember">on member</th>
- <th concordion:assertEquals="#result" />
- </tr>
- <tr>
- <td>buyMilkItem</td>
- <td></td>
- <td>invoke action</td>
- <td>mark as done</td>
- <td>ok</td>
- </tr>
-</table>
-
-<h2>Then</h2>
-<p>Confirm item is done...</p>
-<table
- isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #thatIt, #value)">
- <tr>
- <th concordion:set="#onObject">on object</th>
- <th concordion:set="#aliasResultAs">alias result as</th>
- <th concordion:set="#perform">perform</th>
- <th concordion:set="#onMember">on member</th>
- <th concordion:set="#thatIt">that it</th>
- <th concordion:set="#value">value</th>
- <th concordion:assertEquals="#result" />
- </tr>
- <tr>
- <td>buyMilkItem</td>
- <td></td>
- <td>check property</td>
- <td>Done</td>
- <td>is</td>
- <td>True</td>
- <td>ok</td>
- </tr>
-</table>
-
-<p>... and that when the list of items is obtained again...</p>
-<table
- isis:execute="#result=usingIsisViewerThatArgs(#onObject, #aliasResultAs, #perform, #onMember, #thatIt, #value)">
- <tr>
- <th concordion:set="#onObject">on object</th>
- <th concordion:set="#aliasResultAs">alias result as</th>
- <th concordion:set="#perform">perform</th>
- <th concordion:set="#onMember">on member</th>
- <th concordion:assertEquals="#result" />
- </tr>
- <tr>
- <td>toDoItems</td>
- <td>listOfItemsAfter</td>
- <td>invoke action</td>
- <td>not yet done</td>
- <td>ok</td>
- </tr>
-</table>
-
-<p concordion:execute="#result=checkCollectionDoesNotContain(#listAlias,#alias)">
-... then the <span concordion:set="#alias">buyMilkItem</span> is no
-longer in that list (<span concordion:set="#listAlias">listOfItemsAfter</span>);
- <span concordion:assertEquals="#result">ok</span>.
-</p>
-
-<!-- uncomment the line below to run up the DnD viewer -->
-<!--
-<p concordion:execute="runViewer()">run viewer</p>
---></div>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/NOTICE
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/NOTICE b/mothballed/component/objectstore/nosql/NOTICE
new file mode 100644
index 0000000..ba21d0c
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/NOTICE
@@ -0,0 +1,7 @@
+Apache Isis
+Copyright 2010-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/config/logging.properties
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/config/logging.properties b/mothballed/component/objectstore/nosql/config/logging.properties
new file mode 100644
index 0000000..323bf75
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/config/logging.properties
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# apache's log4j is used to provide system logging.
+log4j.rootCategory=ALL, Console, File
+
+# The console appender
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+#log4j.appender.Console.threshold=INFO
+log4j.appender.Console.target=System.out
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
+
+
+# The rolling file appender
+log4j.appender.File=org.apache.log4j.RollingFileAppender
+log4j.appender.File.file=fileserver.log
+log4j.appender.File.append=false
+#log4j.appender.File.maxFileSize=500KB
+#log4j.appender.File.maxBackupIndex=1
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
+
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/config/server.properties
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/config/server.properties b/mothballed/component/objectstore/nosql/config/server.properties
new file mode 100644
index 0000000..575d8ed
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/config/server.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+fileserver.host = localhost
+fileserver.port = 9100
+fileserver.control-host=localhost
+fileserver.control-port = 9101
+fileserver.sync-host=localhost
+fileserver.sync-port = 9102
+
+#fileserver.data = data
+#fileserver.services = services
+#fileserver.logs = logs
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/pom.xml b/mothballed/component/objectstore/nosql/pom.xml
new file mode 100644
index 0000000..29ca0a3
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/pom.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <relativePath>../../../core/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-objectstore-nosql</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <name>Isis NOSQL ObjectStore</name>
+
+ <description>
+ Provides file-based or MongoDB-based persistence for a standalone application using a NOSQL database.
+ </description>
+
+ <properties>
+ <siteBaseDir>.</siteBaseDir>
+ <relativeUrl/>
+ </properties>
+
+ <!-- used in Site generation for relative references. -->
+ <url>http://isis.apache.org/${relativeUrl}</url>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- Apache Release Audit Tool -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.10</version>
+ <configuration>
+ <excludes>
+ <!--
+ overriding inherited excludes from oia.core:isis
+ with a more specific set for this component
+ -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/target-ide/**</exclude>
+
+ <exclude>**/*.project</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.settings/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <inherited>false</inherited>
+ <reports>
+ <report>dependency-management</report>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>plugins</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencyManagement>
+
+ <!-- for benefit of application developers, using scope=import -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-objectstore-nosql</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ <version>2.11.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ <!--
+ upgrading the dependency caused tests to fail...
+ <version>20140107</version>
+ -->
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.9</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+
+ <!-- compile dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ </dependency>
+
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-runtime</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-integtestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-bytecode-cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-objectstore</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-objectstore</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/appended-resources/supplemental-models.xml b/mothballed/component/objectstore/nosql/src/main/appended-resources/supplemental-models.xml
new file mode 100644
index 0000000..837b4e9
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/src/main/appended-resources/supplemental-models.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<supplementalDataModels
+ xmlns="http://maven.apache.org/supplemental-model/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0
+ http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
+
+</supplementalDataModels>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCommandContext.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCommandContext.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCommandContext.java
new file mode 100644
index 0000000..f95de8b
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCommandContext.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.objectstore.nosql;
+
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.objectstore.nosql.db.StateWriter;
+
+public interface NoSqlCommandContext extends PersistenceCommandContext {
+
+ StateWriter createStateWriter(ObjectSpecId objectSpecId);
+
+ void insert(StateWriter writer);
+ void update(StateWriter writer);
+
+ void delete(ObjectSpecId objectSpecId, String key, String version, Oid oid);
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCreateObjectCommand.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCreateObjectCommand.java
new file mode 100644
index 0000000..2be121b
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlCreateObjectCommand.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.objectstore.nosql;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
+import org.apache.isis.objectstore.nosql.versions.VersionCreator;
+
+final class NoSqlCreateObjectCommand extends WriteObjectCommand implements CreateObjectCommand {
+
+ public NoSqlCreateObjectCommand(final VersionCreator versionCreator, final DataEncryption dataEncrypter, final ObjectAdapter object) {
+ super(Mode.NON_UPDATE, versionCreator, dataEncrypter, object);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlDestroyObjectCommand.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlDestroyObjectCommand.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlDestroyObjectCommand.java
new file mode 100644
index 0000000..dee418c
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlDestroyObjectCommand.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.objectstore.nosql;
+
+import org.apache.isis.core.commons.util.ToString;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
+import org.apache.isis.objectstore.nosql.versions.VersionCreator;
+
+final class NoSqlDestroyObjectCommand implements DestroyObjectCommand {
+
+ private final KeyCreatorDefault keyCreator = new KeyCreatorDefault();
+
+ private final ObjectAdapter adapter;
+ private final VersionCreator versionCreator;
+
+ public NoSqlDestroyObjectCommand(final VersionCreator versionCreator, final ObjectAdapter adapter) {
+ this.versionCreator = versionCreator;
+ this.adapter = adapter;
+ }
+
+ @Override
+ public void execute(final PersistenceCommandContext context) {
+ final String key = keyCreator.getIdentifierForPersistentRoot(adapter.getOid());
+ final String version = versionCreator.versionString(adapter.getVersion());
+ final ObjectSpecification objectSpec = adapter.getSpecification();
+
+ final NoSqlCommandContext noSqlCommandContext = (NoSqlCommandContext) context;
+ noSqlCommandContext.delete(objectSpec.getSpecId(), key, version, adapter.getOid());
+ }
+
+ @Override
+ public ObjectAdapter onAdapter() {
+ return adapter;
+ }
+
+ @Override
+ public String toString() {
+ final ToString toString = new ToString(this);
+ toString.append("spec", adapter.getSpecification().getFullIdentifier());
+ toString.append("oid", adapter.getOid());
+ return toString.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
new file mode 100644
index 0000000..552a2aa
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.objectstore.nosql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.ensure.Assert;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.runtime.system.persistence.IdentifierGenerator;
+import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
+
+public class NoSqlIdentifierGenerator implements IdentifierGenerator {
+
+ private static int INITIAL_TRANSIENT_ID = -9999999;
+ private static int DEFAULT_BATCH_SIZE = 50;
+
+ private final NoSqlDataDatabase database;
+ private final IdNumbers ids;
+
+
+ //////////////////////////////////////////////////////////////////
+ // constructor
+ //////////////////////////////////////////////////////////////////
+
+ public NoSqlIdentifierGenerator(final NoSqlDataDatabase database) {
+ this(database, INITIAL_TRANSIENT_ID, DEFAULT_BATCH_SIZE);
+ }
+
+ public NoSqlIdentifierGenerator(final NoSqlDataDatabase database, final int initialTransientId, final int batchSize) {
+ this.database = database;
+ ids = new IdNumbers(initialTransientId, batchSize);
+ }
+
+
+ //////////////////////////////////////////////////////////////////
+ // API
+ //////////////////////////////////////////////////////////////////
+
+ @Override
+ public String createTransientIdentifierFor(ObjectSpecId objectSpecId, Object pojo) {
+ final String identifier = "" + ids.nextTransientId();
+ return identifier;
+ }
+
+ @Override
+ public String createAggregateLocalId(ObjectSpecId objectSpecId, final Object pojo, final ObjectAdapter parentAdapter) {
+ Assert.assertNotNull("No connection set up", database);
+ return Long.toHexString(ids.nextSubId(database));
+ }
+
+ @Override
+ public String createPersistentIdentifierFor(ObjectSpecId objectSpecId, Object pojo, RootOid transientRootOid) {
+ return "" + ids.nextPersistentId(database);
+ }
+
+
+ //////////////////////////////////////////////////////////////////
+ // debug
+ //////////////////////////////////////////////////////////////////
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
+ debug.appendln(this.toString());
+ debug.indent();
+ ids.debugData(debug);
+ debug.unindent();
+ }
+
+ @Override
+ public String debugTitle() {
+ return "NoSql OID Generator";
+ }
+}
+
+class IdNumbers {
+
+ private static final Logger LOG = LoggerFactory.getLogger(IdNumbers.class);
+
+ private final int batchSize;
+
+ private long transientNumber;
+ private long nextId = 0;
+ private long newIdBatchAt = 0;
+ private long nextSubId = 0;
+ private long newSubIdBatchAt = 0;
+
+ public IdNumbers(final int initialTransientId, final int batchSize) {
+ transientNumber = initialTransientId;
+ this.batchSize = batchSize;
+ }
+
+ public synchronized long nextTransientId() {
+ return transientNumber++;
+ }
+
+ public synchronized long nextSubId(final NoSqlDataDatabase connectionPool) {
+ if (nextSubId > newSubIdBatchAt) {
+ final String message = "ID exception, last id (" + nextSubId + ") past new batch boundary (" + newSubIdBatchAt + ")";
+ throw new NoSqlStoreException(message);
+ }
+ if (nextSubId == newSubIdBatchAt) {
+ nextSubId = connectionPool.nextSerialNumberBatch(ObjectSpecId.of("_sub-id"), batchSize);
+ newSubIdBatchAt = nextSubId + batchSize;
+ LOG.debug("New Sub-ID batch created, from " + nextSubId + " to " + newSubIdBatchAt);
+ }
+ return nextSubId++;
+ }
+
+ public synchronized long nextPersistentId(final NoSqlDataDatabase connectionPool) {
+ if (nextId > newIdBatchAt) {
+ final String message = "ID exception, last id (" + nextId + ") past new batch boundary (" + newIdBatchAt + ")";
+ throw new NoSqlStoreException(message);
+ }
+ if (nextId == newIdBatchAt) {
+ nextId = connectionPool.nextSerialNumberBatch(ObjectSpecId.of("_id"), batchSize);
+ newIdBatchAt = nextId + batchSize;
+ LOG.debug("New ID batch created, from " + nextId + " to " + newIdBatchAt);
+ }
+ return nextId++;
+ }
+
+ public void debugData(final DebugBuilder debug) {
+ debug.appendln("id", nextId);
+ debug.appendln("sub-id", nextSubId);
+ debug.appendln("transient id", transientNumber);
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/isis/blob/680f0c8d/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlObjectStore.java
----------------------------------------------------------------------
diff --git a/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlObjectStore.java b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlObjectStore.java
new file mode 100644
index 0000000..062fcbc
--- /dev/null
+++ b/mothballed/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlObjectStore.java
@@ -0,0 +1,338 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.objectstore.nosql;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStoreSpi;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindAllInstances;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByPattern;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindByTitle;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.persistence.IdentifierGenerator;
+import org.apache.isis.core.runtime.system.persistence.OidGenerator;
+import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.objectstore.nosql.db.NoSqlDataDatabase;
+import org.apache.isis.objectstore.nosql.db.StateReader;
+import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
+import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
+import org.apache.isis.objectstore.nosql.versions.VersionCreator;
+
+public class NoSqlObjectStore implements ObjectStoreSpi {
+
+ private final KeyCreatorDefault keyCreator = new KeyCreatorDefault();
+ private final Map<ObjectSpecId, RootOid> servicesByObjectSpecId = Maps.newHashMap();
+
+ private final NoSqlDataDatabase database;
+ private final VersionCreator versionCreator;
+ private final ObjectReader objectReader = new ObjectReader();
+ private final OidGenerator oidGenerator;
+ private final DataEncryption wrtingDataEncrypter;
+ private final Map<String, DataEncryption> availableDataEncrypters;
+ private final boolean isDataLoaded;
+
+ public NoSqlObjectStore(final NoSqlDataDatabase db, final OidGenerator oidGenerator, final VersionCreator versionCreator, final DataEncryption writingDataEncrypter, final Map<String, DataEncryption> availableDataEncrypters) {
+ this.database = db;
+ this.oidGenerator = oidGenerator;
+ this.versionCreator = versionCreator;
+ this.wrtingDataEncrypter = writingDataEncrypter;
+ this.availableDataEncrypters = availableDataEncrypters;
+
+ db.open();
+ isDataLoaded = db.containsData();
+ db.close();
+ }
+
+ public IdentifierGenerator getIdentifierGenerator() {
+ return oidGenerator.getIdentifierGenerator();
+ }
+
+ @Override
+ public CreateObjectCommand createCreateObjectCommand(final ObjectAdapter object) {
+ // TODO should this be done at a higher level so it is applicable for
+ // all OSes
+ if (object.getSpecification().isParented()) {
+ // throw new
+ // UnexpectedCallException("Aggregated objects should not be created outside of their owner");
+ return null;
+ } else {
+ return new NoSqlCreateObjectCommand(versionCreator, wrtingDataEncrypter, object);
+ }
+ }
+
+ @Override
+ public DestroyObjectCommand createDestroyObjectCommand(final ObjectAdapter adapter) {
+ if (adapter.getSpecification().isParented()) {
+ throw new NoSqlStoreException("Can't delete an aggregated object");
+ } else {
+ return new NoSqlDestroyObjectCommand(versionCreator, adapter);
+ }
+ }
+
+ @Override
+ public SaveObjectCommand createSaveObjectCommand(final ObjectAdapter adapter) {
+
+ // TODO should this be done at a higher level
+ // so it is applicable for all object stores?
+
+ final ObjectAdapter rootAdapter = adapter.getAggregateRoot();
+ if (!(rootAdapter.getOid() instanceof RootOid)) {
+ throw new NoSqlStoreException("Unexpected aggregated object to save: " + rootAdapter + " (" + adapter + ")");
+ }
+ return new NoSqlSaveObjectCommand(versionCreator, wrtingDataEncrypter, rootAdapter);
+ }
+
+ @Override
+ public void execute(final List<PersistenceCommand> commands) {
+ database.write(commands);
+ }
+
+ @Override
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery persistenceQuery) {
+ if (persistenceQuery instanceof PersistenceQueryFindByTitle) {
+ return getAllInstances((PersistenceQueryFindByTitle) persistenceQuery);
+ } else if (persistenceQuery instanceof PersistenceQueryFindAllInstances) {
+ return getAllInstances((PersistenceQueryFindAllInstances) persistenceQuery);
+ } else if (persistenceQuery instanceof PersistenceQueryFindByPattern) {
+ return findByPattern((PersistenceQueryFindByPattern) persistenceQuery);
+ } else {
+ return findDefaultr(persistenceQuery);
+ }
+ }
+
+ private List<ObjectAdapter> findDefaultr(PersistenceQuery persistenceQuery) {
+ final List<ObjectAdapter> instances = Lists.newArrayList();
+ final ObjectSpecification specification = persistenceQuery.getSpecification();
+ final Iterator<StateReader> instanceData = database.instancesOf(specification.getSpecId());
+ while (instanceData.hasNext()) {
+ final StateReader reader = instanceData.next();
+ final ObjectAdapter instance = objectReader.load(reader, versionCreator, availableDataEncrypters);
+ instances.add(instance);
+ }
+ return instances;
+ }
+
+ private List<ObjectAdapter> findByPattern(PersistenceQueryFindByPattern query) {
+ final ObjectSpecification specification = query.getSpecification();
+ final List<ObjectAdapter> instances = Lists.newArrayList();
+ appendPatternInstances(query, specification, instances);
+ return instances;
+ }
+
+ private void appendPatternInstances(final PersistenceQueryFindByPattern persistenceQuery, final ObjectSpecification specification, final List<ObjectAdapter> instances) {
+ final Iterator<StateReader> instanceData = database.instancesOf(specification.getSpecId(), persistenceQuery.getPattern());
+ while (instanceData.hasNext()) {
+ final StateReader reader = instanceData.next();
+ final ObjectAdapter instance = objectReader.load(reader, versionCreator, availableDataEncrypters);
+ instances.add(instance);
+ }
+ for (final ObjectSpecification spec : specification.subclasses()) {
+ appendPatternInstances(persistenceQuery, spec, instances);
+ }
+ }
+
+
+ private List<ObjectAdapter> getAllInstances(PersistenceQuery query) {
+ final ObjectSpecification specification = query.getSpecification();
+ final List<ObjectAdapter> instances = Lists.newArrayList();
+ appendInstances(query, specification, instances);
+ return instances;
+ }
+
+ private void appendInstances(final PersistenceQuery persistenceQuery, final ObjectSpecification specification, final List<ObjectAdapter> instances) {
+ final Iterator<StateReader> instanceData = database.instancesOf(specification.getSpecId());
+ while (instanceData.hasNext()) {
+ final StateReader reader = instanceData.next();
+ final ObjectAdapter instance = objectReader.load(reader, versionCreator, availableDataEncrypters);
+
+ // TODO deal with this natively
+ if (persistenceQuery instanceof PersistenceQueryBuiltIn) {
+ if (!((PersistenceQueryBuiltIn) persistenceQuery).matches(instance)) {
+ continue;
+ }
+ }
+ instances.add(instance);
+ }
+ for (final ObjectSpecification spec : specification.subclasses()) {
+ appendInstances(persistenceQuery, spec, instances);
+ }
+ }
+
+
+
+ @Override
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) {
+ final String key = keyCreator.getIdentifierForPersistentRoot(oid);
+ final ObjectSpecification objectSpec = getSpecificationLookup().lookupBySpecId(oid.getObjectSpecId());
+ final StateReader reader = database.getInstance(key, objectSpec.getSpecId());
+ return objectReader.load(reader, versionCreator, availableDataEncrypters);
+ }
+
+ @Override
+ public boolean hasInstances(final ObjectSpecification specification) {
+ return database.hasInstances(specification.getSpecId());
+ }
+
+ @Override
+ public boolean isFixturesInstalled() {
+ return isDataLoaded;
+ }
+
+ @Override
+ public void reset() {
+ }
+
+ @Override
+ public void resolveField(final ObjectAdapter object, final ObjectAssociation field) {
+ final ObjectAdapter fieldValue = field.get(object);
+ if (fieldValue != null && !fieldValue.isResolved() && !fieldValue.getSpecification().isParented()) {
+ resolveImmediately(fieldValue);
+ }
+ }
+
+ @Override
+ public void resolveImmediately(final ObjectAdapter adapter) {
+ final Oid oid = adapter.getOid();
+ if (!(oid instanceof AggregatedOid)) {
+ final ObjectSpecification objectSpec = adapter.getSpecification();
+ final String key = keyCreator.getIdentifierForPersistentRoot(oid);
+ final StateReader reader = database.getInstance(key, objectSpec.getSpecId());
+ objectReader.update(reader, versionCreator, availableDataEncrypters, adapter);
+ }
+ }
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
+ // TODO show details
+ }
+
+ // ////////////////////////////////////////////////////////////////
+ // open, close
+ // ////////////////////////////////////////////////////////////////
+
+ @Override
+ public void close() {
+ database.close();
+ }
+
+ @Override
+ public void open() {
+ database.open();
+ }
+
+ @Override
+ public String name() {
+ return "nosql";
+ }
+
+
+ // ////////////////////////////////////////////////////////////////
+ // Services
+ // ////////////////////////////////////////////////////////////////
+
+ @Override
+ public void registerService(final RootOid rootOid) {
+ final String key = keyCreator.getIdentifierForPersistentRoot(rootOid);
+ database.addService(rootOid.getObjectSpecId(), key);
+ }
+
+ @Override
+ public RootOid getOidForService(ObjectSpecification serviceSpec) {
+ final ObjectSpecId objectSpecId = serviceSpec.getSpecId();
+ RootOid oid = servicesByObjectSpecId.get(objectSpecId);
+ if (oid == null) {
+ final String id = database.getService(objectSpecId);
+ if (id == null) {
+ oid = null;
+ } else {
+ oid = keyCreator.createRootOid(serviceSpec, id);
+ }
+ servicesByObjectSpecId.put(objectSpecId, oid);
+ }
+ return oid;
+ }
+
+
+ // ////////////////////////////////////////////////////////////////
+ // Transaction Mgmt
+ // ////////////////////////////////////////////////////////////////
+
+ @Override
+ public void abortTransaction() {
+ }
+
+ @Override
+ public void endTransaction() {
+ }
+
+ @Override
+ public void startTransaction() {
+ }
+
+
+ // ////////////////////////////////////////////////////////////////
+ // debugging
+ // ////////////////////////////////////////////////////////////////
+
+ @Override
+ public String debugTitle() {
+ return "NoSql Object Store";
+ }
+
+
+ // ////////////////////////////////////////////////////////////////
+ // Dependencies (from context)
+ // ////////////////////////////////////////////////////////////////
+
+ protected AdapterManager getAdapterManager() {
+ return getPersistenceSession().getAdapterManager();
+ }
+
+ protected PersistenceSession getPersistenceSession() {
+ return IsisContext.getPersistenceSession();
+ }
+
+ protected SpecificationLoader getSpecificationLookup() {
+ return IsisContext.getSpecificationLoader();
+ }
+
+}