incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234516 [5/9] - in /incubator/isis/trunk/framework: ./ quickstart-archetype/ quickstart-archetype/src/main/appended-resources/ quickstart-archetype/src/main/resources/META-INF/maven/ quickstart-archetype/src/main/resources/archetype-resour...
Date Sun, 22 Jan 2012 14:30:12 GMT
Modified: incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/isis-templates.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/isis-templates.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/isis-templates.xml (original)
+++ incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/isis-templates.xml Sun Jan 22 14:30:07 2012
@@ -18,359 +18,359 @@
   under the License.
 -->
 <templates><template autoinsert="true" context="java-members" deleted="false" description="Action" enabled="true" name="isa">// {{ ${actionName} (action)&#13;
-${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
-public ${ReturnType} ${actionName}(final ${ParameterType} ${parameterType}) {&#13;
-	return ${cursor}null; // TODO: business logic here&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument N choices" enabled="true" name="isacho">${:import(java.util.Collections,java.util.List)}public List&lt;${ParameterType}&gt; choices${ParameterNumThenCapitalizedActionName}() {&#13;
-	return ${cursor}Collections.emptyList(); // TODO: return list of choices for argument N&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument defaults" enabled="true" name="isadef">public ${ParameterType} default${ParameterNumThenCapitalizedActionName}() {&#13;
-	return ${cursor}null; // TODO: return default for argument N&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action disabling" enabled="true" name="isadis">public String disable${ActionName}() {&#13;
-	return ${cursor}null; // TODO: return reason why action disabled, null if enabled&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action hiding" enabled="true" name="isahid">public boolean hide${ActionName}() {&#13;
-	return ${cursor}false; // TODO: return true if action is hidden, false if visible&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Action validation" enabled="true" name="isaval">public String validate${ActionName}(final ${ParameterType} ${parameterType}) {&#13;
-	return ${cursor}null; // TODO: return reason why action arguments are invalid, null if ok&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (1:m bidir parent)" enabled="true" name="isc-1m">public void addTo${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg from its current parent (if any).&#13;
-	${childElementName}.clear${ParentPropertyNameInChild}();&#13;
-	// associate arg&#13;
-	${childElementName}.set${ParentPropertyNameInChild}(this);&#13;
-	get${ChildCollectionName}().add(${childElementName});&#13;
-	// additional business logic&#13;
-	onAddTo${ChildCollectionName}(${childElementName});&#13;
-}&#13;
-public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		!get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg&#13;
-	${childElementName}.set${ParentPropertyNameInChild}(null);&#13;
-	get${ChildCollectionName}().remove(${childElementName});&#13;
-	// additional business logic&#13;
-	onRemoveFrom${ChildCollectionName}(${childElementName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (m:m bidir child)" enabled="true" name="isc-mmc">public void addTo${ParentCollectionName}(final ${ParentElementType} ${parentElementName}) {&#13;
-	// check for no-op&#13;
-	if (${parentElementName} == null || &#13;
-		get${ParentCollectionName}().contains(${parentElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to add&#13;
-	${parentElementName}.addTo${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onAddTo${ParentCollectionName}(${parentElementName});&#13;
-}&#13;
-public void removeFrom${ParentCollectionName}(final ${ParentElementType} ${parentElementName}) {&#13;
-	// check for no-op&#13;
-	if (${parentElementName} == null || &#13;
-		!get${ParentCollectionName}().contains(${parentElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to remove&#13;
-	${parentElementName}.removeFrom${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onRemoveFrom${ParentCollectionName}(${parentElementName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (m:m bidir parent)" enabled="true" name="isc-mmp">public void addTo${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg from its current parent (if any).&#13;
-	${childElementName}.removeFrom${ParentCollectionNameInChild}(this);&#13;
-	// associate arg&#13;
-	${childElementName}.get${ParentCollectionNameInChild}().add(this);&#13;
-	get${ChildCollectionName}().add(${childElementName});&#13;
-	// additional business logic&#13;
-	onAddTo${ChildCollectionName}(${childElementName});&#13;
-}&#13;
-public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
-	// check for no-op&#13;
-	if (${childElementName} == null || &#13;
-		!get${ChildCollectionName}().contains(${childElementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate arg&#13;
-	${childElementName}.get${ParentCollectionNameInChild}().remove(this);&#13;
-	get${ChildCollectionName}().remove(${childElementName});&#13;
-	// additional business logic&#13;
-	onRemoveFrom${ChildCollectionName}(${childElementName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection disabling" enabled="true" name="iscdis">public String disable${CollectionName}() {&#13;
-	return ${cursor}null; // TODO: return reason why collection read-only, null if editable&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection hiding" enabled="true" name="ischid">public boolean hide${CollectionName}() {&#13;
-	return ${cursor}false; // TODO: return true if hidden, false otherwise&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (list)" enabled="true" name="iscl">// {{ ${CollectionName} (Collection)&#13;
-${:import(java.util.List,java.util.ArrayList,org.apache.isis.applib.annotation.MemberOrder)}private List&lt;${ElementType}&gt; ${collectionName} = new ArrayList&lt;${ElementType}&gt;();&#13;
-@MemberOrder(sequence="1")&#13;
-public List&lt;${ElementType}&gt; get${CollectionName}() {&#13;
-	return ${collectionName};&#13;
-}&#13;
-public void set${CollectionName}(final List&lt;${ElementType}&gt; ${collectionName}) {&#13;
-	this.${collectionName} = ${collectionName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Collection modify" enabled="true" name="iscmod">public void addTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	// check for no-op&#13;
-	if (${elementName} == null || &#13;
-		get${CollectionName}().contains(${elementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// associate new&#13;
-	get${CollectionName}().add(${elementName});&#13;
-    // additional business logic&#13;
-    onAddTo${CollectionName}(${elementName});&#13;
-}&#13;
-public void removeFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	// check for no-op&#13;
-	if (${elementName} == null || &#13;
-		!get${CollectionName}().contains(${elementName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	get${CollectionName}().remove(${elementName});&#13;
-    // additional business logic&#13;
-    onRemoveFrom${CollectionName}(${elementName});&#13;
-}&#13;
-protected void onAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-}&#13;
-protected void onRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (set)" enabled="true" name="iscs">// {{ ${CollectionName} (Collection)&#13;
-${:import(java.util.Set,java.util.LinkedHashSet,org.apache.isis.applib.annotation.MemberOrder)}private Set&lt;${ElementType}&gt; ${collectionName} = new LinkedHashSet&lt;${ElementType}&gt;();&#13;
-@MemberOrder(sequence="1")&#13;
-public Set&lt;${ElementType}&gt; get${CollectionName}() {&#13;
-	return ${collectionName};&#13;
-}&#13;
-public void set${CollectionName}(final Set&lt;${ElementType}&gt; ${collectionName}) {&#13;
-	this.${collectionName} = ${collectionName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Collection validation" enabled="true" name="iscval">public String validateAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	return ${cursor}null; // TODO: return reason why argument cannot be added, null if ok to add&#13;
-}&#13;
-public String validateRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
-	return null; // TODO: return reason why argument cannot be removed, null if ok to remove&#13;
-}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Dependencies region" enabled="true" name="isd">// {{ injected dependencies&#13;
-${cursor}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Dependencies - injected service" enabled="true" name="isds">// {{ injected: ${ServiceType}&#13;
-private ${ServiceType} ${serviceType};&#13;
-public void set${ServiceType}(final ${ServiceType} ${serviceType}) {&#13;
-	this.${serviceType} = ${serviceType};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Factory - new instance (persistent)" enabled="true" name="isfp">// {{ Create new (already persisted) ${Type}&#13;
-public ${Type} new${Type}() {&#13;
-	${Type} ${type} = newTransientInstance(${Type}.class);&#13;
-	${cursor}// TODO: set up any properties&#13;
-&#13;
-	persist(${type});&#13;
-	return ${type};&#13;
-}&#13;
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Factory - new instance (transient)" enabled="true" name="isft">// {{ Create new (still transient) ${Type}&#13;
-public ${Type} new${InstanceOfType}() {&#13;
-	${Type} ${type} = newTransientInstance(${Type}.class);&#13;
-	${cursor}// TODO: set up any properties&#13;
-&#13;
-	return ${type};&#13;
-}&#13;
-// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Identification region" enabled="true" name="isid">// {{ Identification&#13;
-${cursor}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Identification - icon" enabled="true" name="isidicon">public String iconName() {&#13;
-	return ${cursor}null; // TODO: return name of image file (without suffix)&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Identification - title" enabled="true" name="isidtitle">public String title() {&#13;
-    ${:import(org.apache.isis.applib.util.TitleBuffer)}final TitleBuffer buf = new TitleBuffer();&#13;
-    ${cursor}// TODO: append to TitleBuffer, typically value properties&#13;
-	return buf.toString();&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle region" enabled="true" name="isl">// {{ Lifecycle methods&#13;
-${cursor}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - create" enabled="true" name="islc">public void created() {&#13;
-    ${cursor}// TODO: post-create&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - load" enabled="true" name="isll">public void loading() {&#13;
-    ${cursor}// TODO: pre-load&#13;
-}&#13;
-public void loaded() {&#13;
-    // TODO: post-load&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - persist" enabled="true" name="islp">public void persisting() {&#13;
-    ${cursor}// TODO: pre-persist&#13;
-}&#13;
-public void persisted() {&#13;
-    // TODO: post-persist&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - remove" enabled="true" name="islr">public void removing() {&#13;
-    ${cursor}// TODO: pre-remove&#13;
-}&#13;
-public void removed() {&#13;
-    // TODO: post-remove&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - update" enabled="true" name="islu">public void updating() {&#13;
-    ${cursor}// TODO: pre-update&#13;
-}&#13;
-public void updated() {&#13;
-    // TODO: post-update&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property" enabled="true" name="isp">// {{ ${PropertyName} (property)&#13;
-private ${PropertyType} ${propertyName};&#13;
-${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
-public ${PropertyType} get${PropertyName}() {&#13;
-	return ${propertyName};&#13;
-}&#13;
-public void set${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-	this.${propertyName} = ${propertyName};&#13;
-}&#13;
-// }}&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Property (1:1 bidir child)" enabled="true" name="isp-11c">public void modify${ParentPropertyName}(final ${ParentPropertyType} ${parentPropertyName}) {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (${parentPropertyName} == null || &#13;
-		${parentPropertyName}.equals(current${ParentPropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to associate&#13;
-	${parentPropertyName}.modify${ChildPropertyNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onModify${ParentPropertyName}(current${ParentPropertyName}, ${parentPropertyName});&#13;
-}&#13;
-public void clear${PropertyName}() {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${ParentPropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to dissociate&#13;
-	current${ParentPropertyName}.clear${ChildPropertyNameInParent}();&#13;
-	// additional business logic&#13;
-	onClear${ParentPropertyName}(current${ParentPropertyName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property (1:1 bidir parent)" enabled="true" name="isp-11p">public void modify${ChildPropertyName}(final ${ChildPropertyType} ${childPropertyName}) {&#13;
-    ${ChildPropertyType} current${ChildPropertyName} = get${ChildPropertyName}();&#13;
-	// check for no-op&#13;
-	if (${childPropertyName} == null || &#13;
-		${childPropertyName}.equals(current${ChildPropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	clear${ChildPropertyName}();&#13;
-	// associate new&#13;
-	${childPropertyName}.set${ParentPropertyNameInChild}(this);&#13;
-	set${ChildPropertyName}(${childPropertyName});&#13;
-	// additional business logic&#13;
-	onModify${ChildPropertyName}(current${ChildPropertyName}, ${childPropertyName});&#13;
-}&#13;
-public void clear${ChildPropertyName}() {&#13;
-    ${ChildPropertyType} current${ChildPropertyName} = get${ChildPropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${ChildPropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	current${ChildPropertyName}.set${ParentPropertyNameInChild}(null);&#13;
-	set${ChildPropertyName}(null);&#13;
-	// additional business logic&#13;
-	onClear${ChildPropertyName}(current${ChildPropertyName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property (m:1 bidir child)" enabled="true" name="isp-m1">public void modify${ParentPropertyName}(final ${ParentPropertyType} ${parentPropertyName}) {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (${parentPropertyName} == null || &#13;
-		${parentPropertyName}.equals(current${ParentPropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to associate&#13;
-	${parentPropertyName}.addTo${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onModify${ParentPropertyName}(current${ParentPropertyName}, ${parentPropertyName});&#13;
-}&#13;
-public void clear${ParentPropertyName}() {&#13;
-    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${ParentPropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// delegate to parent to dissociate&#13;
-	current${ParentPropertyName}.removeFrom${ChildCollectionNameInParent}(this);&#13;
-	// additional business logic&#13;
-	onClear${ParentPropertyName}(current${ParentPropertyName});&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property choices" enabled="true" name="ispcho">${:import(java.util.List)}public List&lt;${PropertyType}&gt; choices${PropertyName}() {&#13;
-	return ${cursor}null; // TODO: return list of choices for property&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property defaults" enabled="true" name="ispdef">public ${PropertyType} default${PropertyName}() {&#13;
-	return ${cursor}null; // TODO: return default for property when first created&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property disabling" enabled="true" name="ispdis">public String disable${PropertyName}() {&#13;
-	return ${cursor}null; // TODO: return reason why property is disabled, null if editable&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property hiding" enabled="true" name="isphid">public boolean hide${PropertyName}() {&#13;
-	return ${cursor}false; // TODO: return true if hidden, false if visible&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property modify" enabled="true" name="ispmod">public void modify${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-    ${PropertyType} current${PropertyName} = get${PropertyName}();&#13;
-	// check for no-op&#13;
-	if (${propertyName} == null || &#13;
-		${propertyName}.equals(current${PropertyName})) {&#13;
-		return;&#13;
-	}&#13;
-	// associate new&#13;
-	set${PropertyName}(${propertyName});&#13;
-	// additional business logic&#13;
-	onModify${PropertyName}(current${PropertyName}, ${propertyName});&#13;
-}&#13;
-public void clear${PropertyName}() {&#13;
-    ${PropertyType} current${PropertyName} = get${PropertyName}();&#13;
-	// check for no-op&#13;
-	if (current${PropertyName} == null) {&#13;
-		return;&#13;
-	}&#13;
-	// dissociate existing&#13;
-	set${PropertyName}(null);&#13;
-	// additional business logic&#13;
-	onClear${PropertyName}(current${PropertyName});&#13;
-}&#13;
-protected void onModify${PropertyName}(final ${PropertyType} old${PropertyName}, final ${PropertyType} new${PropertyName}) {&#13;
-}&#13;
-protected void onClear${PropertyName}(final ${PropertyType} old${PropertyName}) {&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Property validation" enabled="true" name="ispval">public String validate${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
-	if (${propertyName} == null) return null;&#13;
-	return ${cursor}null; // TODO: return reason why proposed value is invalid, null if valid&#13;
-}</template><template autoinsert="true" context="java-members" deleted="false" description="Search for all" enabled="true" name="issa">// {{ all ${TypePlural}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,java.util.List)}@Exploration&#13;
-public List&lt;${Type}&gt; all${TypePlural}() {&#13;
-	return allInstances(${Type}.class);&#13;
-}&#13;
-// }}&#13;
-&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Search for all matching" enabled="true" name="issafil">// {{ all ${TypePlural} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
-public List&lt;${Type}&gt; all${TypePlural}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
-	return allMatches(${Type}.class, filter);&#13;
-}&#13;
-// }}&#13;
-&#13;
-&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Search for first matching" enabled="true" name="issffil">// {{ first ${Type} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
-public ${Type} first${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
-	return firstMatch(${Type}.class, filter);&#13;
-}&#13;
-// }}&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Search for unique matching" enabled="true" name="issufil">// {{ unique ${Type} that ${filterDescription}&#13;
-${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
-public ${Type} unique${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
-	return uniqueMatch(${Type}.class, filter);&#13;
-}&#13;
-// }}&#13;
-</template><template autoinsert="true" context="java-members" deleted="false" description="Object-level validation" enabled="true" name="isval">public String validate() {&#13;
-    ${cursor}// TODO: return reason why object is in invalid state (and so cannot be saved/updated), or null if ok&#13;
-}</template></templates>
+${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
+public ${ReturnType} ${actionName}(final ${ParameterType} ${parameterType}) {&#13;
+	return ${cursor}null; // TODO: business logic here&#13;
+}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument N choices" enabled="true" name="isacho">${:import(java.util.Collections,java.util.List)}public List&lt;${ParameterType}&gt; choices${ParameterNumThenCapitalizedActionName}() {&#13;
+	return ${cursor}Collections.emptyList(); // TODO: return list of choices for argument N&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument defaults" enabled="true" name="isadef">public ${ParameterType} default${ParameterNumThenCapitalizedActionName}() {&#13;
+	return ${cursor}null; // TODO: return default for argument N&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Action disabling" enabled="true" name="isadis">public String disable${ActionName}() {&#13;
+	return ${cursor}null; // TODO: return reason why action disabled, null if enabled&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Action hiding" enabled="true" name="isahid">public boolean hide${ActionName}() {&#13;
+	return ${cursor}false; // TODO: return true if action is hidden, false if visible&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Action validation" enabled="true" name="isaval">public String validate${ActionName}(final ${ParameterType} ${parameterType}) {&#13;
+	return ${cursor}null; // TODO: return reason why action arguments are invalid, null if ok&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (1:m bidir parent)" enabled="true" name="isc-1m">public void addTo${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
+	// check for no-op&#13;
+	if (${childElementName} == null || &#13;
+		get${ChildCollectionName}().contains(${childElementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate arg from its current parent (if any).&#13;
+	${childElementName}.clear${ParentPropertyNameInChild}();&#13;
+	// associate arg&#13;
+	${childElementName}.set${ParentPropertyNameInChild}(this);&#13;
+	get${ChildCollectionName}().add(${childElementName});&#13;
+	// additional business logic&#13;
+	onAddTo${ChildCollectionName}(${childElementName});&#13;
+}&#13;
+public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
+	// check for no-op&#13;
+	if (${childElementName} == null || &#13;
+		!get${ChildCollectionName}().contains(${childElementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate arg&#13;
+	${childElementName}.set${ParentPropertyNameInChild}(null);&#13;
+	get${ChildCollectionName}().remove(${childElementName});&#13;
+	// additional business logic&#13;
+	onRemoveFrom${ChildCollectionName}(${childElementName});&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (m:m bidir child)" enabled="true" name="isc-mmc">public void addTo${ParentCollectionName}(final ${ParentElementType} ${parentElementName}) {&#13;
+	// check for no-op&#13;
+	if (${parentElementName} == null || &#13;
+		get${ParentCollectionName}().contains(${parentElementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// delegate to parent to add&#13;
+	${parentElementName}.addTo${ChildCollectionNameInParent}(this);&#13;
+	// additional business logic&#13;
+	onAddTo${ParentCollectionName}(${parentElementName});&#13;
+}&#13;
+public void removeFrom${ParentCollectionName}(final ${ParentElementType} ${parentElementName}) {&#13;
+	// check for no-op&#13;
+	if (${parentElementName} == null || &#13;
+		!get${ParentCollectionName}().contains(${parentElementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// delegate to parent to remove&#13;
+	${parentElementName}.removeFrom${ChildCollectionNameInParent}(this);&#13;
+	// additional business logic&#13;
+	onRemoveFrom${ParentCollectionName}(${parentElementName});&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (m:m bidir parent)" enabled="true" name="isc-mmp">public void addTo${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
+	// check for no-op&#13;
+	if (${childElementName} == null || &#13;
+		get${ChildCollectionName}().contains(${childElementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate arg from its current parent (if any).&#13;
+	${childElementName}.removeFrom${ParentCollectionNameInChild}(this);&#13;
+	// associate arg&#13;
+	${childElementName}.get${ParentCollectionNameInChild}().add(this);&#13;
+	get${ChildCollectionName}().add(${childElementName});&#13;
+	// additional business logic&#13;
+	onAddTo${ChildCollectionName}(${childElementName});&#13;
+}&#13;
+public void removeFrom${ChildCollectionName}(final ${ChildElementType} ${childElementName}) {&#13;
+	// check for no-op&#13;
+	if (${childElementName} == null || &#13;
+		!get${ChildCollectionName}().contains(${childElementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate arg&#13;
+	${childElementName}.get${ParentCollectionNameInChild}().remove(this);&#13;
+	get${ChildCollectionName}().remove(${childElementName});&#13;
+	// additional business logic&#13;
+	onRemoveFrom${ChildCollectionName}(${childElementName});&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection disabling" enabled="true" name="iscdis">public String disable${CollectionName}() {&#13;
+	return ${cursor}null; // TODO: return reason why collection read-only, null if editable&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection hiding" enabled="true" name="ischid">public boolean hide${CollectionName}() {&#13;
+	return ${cursor}false; // TODO: return true if hidden, false otherwise&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (list)" enabled="true" name="iscl">// {{ ${CollectionName} (Collection)&#13;
+${:import(java.util.List,java.util.ArrayList,org.apache.isis.applib.annotation.MemberOrder)}private List&lt;${ElementType}&gt; ${collectionName} = new ArrayList&lt;${ElementType}&gt;();&#13;
+@MemberOrder(sequence="1")&#13;
+public List&lt;${ElementType}&gt; get${CollectionName}() {&#13;
+	return ${collectionName};&#13;
+}&#13;
+public void set${CollectionName}(final List&lt;${ElementType}&gt; ${collectionName}) {&#13;
+	this.${collectionName} = ${collectionName};&#13;
+}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Collection modify" enabled="true" name="iscmod">public void addTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
+	// check for no-op&#13;
+	if (${elementName} == null || &#13;
+		get${CollectionName}().contains(${elementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// associate new&#13;
+	get${CollectionName}().add(${elementName});&#13;
+    // additional business logic&#13;
+    onAddTo${CollectionName}(${elementName});&#13;
+}&#13;
+public void removeFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
+	// check for no-op&#13;
+	if (${elementName} == null || &#13;
+		!get${CollectionName}().contains(${elementName})) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate existing&#13;
+	get${CollectionName}().remove(${elementName});&#13;
+    // additional business logic&#13;
+    onRemoveFrom${CollectionName}(${elementName});&#13;
+}&#13;
+protected void onAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
+}&#13;
+protected void onRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (set)" enabled="true" name="iscs">// {{ ${CollectionName} (Collection)&#13;
+${:import(java.util.Set,java.util.LinkedHashSet,org.apache.isis.applib.annotation.MemberOrder)}private Set&lt;${ElementType}&gt; ${collectionName} = new LinkedHashSet&lt;${ElementType}&gt;();&#13;
+@MemberOrder(sequence="1")&#13;
+public Set&lt;${ElementType}&gt; get${CollectionName}() {&#13;
+	return ${collectionName};&#13;
+}&#13;
+public void set${CollectionName}(final Set&lt;${ElementType}&gt; ${collectionName}) {&#13;
+	this.${collectionName} = ${collectionName};&#13;
+}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Collection validation" enabled="true" name="iscval">public String validateAddTo${CollectionName}(final ${ElementType} ${elementName}) {&#13;
+	return ${cursor}null; // TODO: return reason why argument cannot be added, null if ok to add&#13;
+}&#13;
+public String validateRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {&#13;
+	return null; // TODO: return reason why argument cannot be removed, null if ok to remove&#13;
+}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Dependencies region" enabled="true" name="isd">// {{ injected dependencies&#13;
+${cursor}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Dependencies - injected service" enabled="true" name="isds">// {{ injected: ${ServiceType}&#13;
+private ${ServiceType} ${serviceType};&#13;
+public void set${ServiceType}(final ${ServiceType} ${serviceType}) {&#13;
+	this.${serviceType} = ${serviceType};&#13;
+}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Factory - new instance (persistent)" enabled="true" name="isfp">// {{ Create new (already persisted) ${Type}&#13;
+public ${Type} new${Type}() {&#13;
+	${Type} ${type} = newTransientInstance(${Type}.class);&#13;
+	${cursor}// TODO: set up any properties&#13;
+&#13;
+	persist(${type});&#13;
+	return ${type};&#13;
+}&#13;
+// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Factory - new instance (transient)" enabled="true" name="isft">// {{ Create new (still transient) ${Type}&#13;
+public ${Type} new${InstanceOfType}() {&#13;
+	${Type} ${type} = newTransientInstance(${Type}.class);&#13;
+	${cursor}// TODO: set up any properties&#13;
+&#13;
+	return ${type};&#13;
+}&#13;
+// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Identification region" enabled="true" name="isid">// {{ Identification&#13;
+${cursor}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Identification - icon" enabled="true" name="isidicon">public String iconName() {&#13;
+	return ${cursor}null; // TODO: return name of image file (without suffix)&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Identification - title" enabled="true" name="isidtitle">public String title() {&#13;
+    ${:import(org.apache.isis.applib.util.TitleBuffer)}final TitleBuffer buf = new TitleBuffer();&#13;
+    ${cursor}// TODO: append to TitleBuffer, typically value properties&#13;
+	return buf.toString();&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle region" enabled="true" name="isl">// {{ Lifecycle methods&#13;
+${cursor}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - create" enabled="true" name="islc">public void created() {&#13;
+    ${cursor}// TODO: post-create&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - load" enabled="true" name="isll">public void loading() {&#13;
+    ${cursor}// TODO: pre-load&#13;
+}&#13;
+public void loaded() {&#13;
+    // TODO: post-load&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - persist" enabled="true" name="islp">public void persisting() {&#13;
+    ${cursor}// TODO: pre-persist&#13;
+}&#13;
+public void persisted() {&#13;
+    // TODO: post-persist&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - remove" enabled="true" name="islr">public void removing() {&#13;
+    ${cursor}// TODO: pre-remove&#13;
+}&#13;
+public void removed() {&#13;
+    // TODO: post-remove&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Lifecycle - update" enabled="true" name="islu">public void updating() {&#13;
+    ${cursor}// TODO: pre-update&#13;
+}&#13;
+public void updated() {&#13;
+    // TODO: post-update&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property" enabled="true" name="isp">// {{ ${PropertyName} (property)&#13;
+private ${PropertyType} ${propertyName};&#13;
+${:import(org.apache.isis.applib.annotation.MemberOrder)}@MemberOrder(sequence="1")&#13;
+public ${PropertyType} get${PropertyName}() {&#13;
+	return ${propertyName};&#13;
+}&#13;
+public void set${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
+	this.${propertyName} = ${propertyName};&#13;
+}&#13;
+// }}&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Property (1:1 bidir child)" enabled="true" name="isp-11c">public void modify${ParentPropertyName}(final ${ParentPropertyType} ${parentPropertyName}) {&#13;
+    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
+	// check for no-op&#13;
+	if (${parentPropertyName} == null || &#13;
+		${parentPropertyName}.equals(current${ParentPropertyName})) {&#13;
+		return;&#13;
+	}&#13;
+	// delegate to parent to associate&#13;
+	${parentPropertyName}.modify${ChildPropertyNameInParent}(this);&#13;
+	// additional business logic&#13;
+	onModify${ParentPropertyName}(current${ParentPropertyName}, ${parentPropertyName});&#13;
+}&#13;
+public void clear${PropertyName}() {&#13;
+    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
+	// check for no-op&#13;
+	if (current${ParentPropertyName} == null) {&#13;
+		return;&#13;
+	}&#13;
+	// delegate to parent to dissociate&#13;
+	current${ParentPropertyName}.clear${ChildPropertyNameInParent}();&#13;
+	// additional business logic&#13;
+	onClear${ParentPropertyName}(current${ParentPropertyName});&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property (1:1 bidir parent)" enabled="true" name="isp-11p">public void modify${ChildPropertyName}(final ${ChildPropertyType} ${childPropertyName}) {&#13;
+    ${ChildPropertyType} current${ChildPropertyName} = get${ChildPropertyName}();&#13;
+	// check for no-op&#13;
+	if (${childPropertyName} == null || &#13;
+		${childPropertyName}.equals(current${ChildPropertyName})) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate existing&#13;
+	clear${ChildPropertyName}();&#13;
+	// associate new&#13;
+	${childPropertyName}.set${ParentPropertyNameInChild}(this);&#13;
+	set${ChildPropertyName}(${childPropertyName});&#13;
+	// additional business logic&#13;
+	onModify${ChildPropertyName}(current${ChildPropertyName}, ${childPropertyName});&#13;
+}&#13;
+public void clear${ChildPropertyName}() {&#13;
+    ${ChildPropertyType} current${ChildPropertyName} = get${ChildPropertyName}();&#13;
+	// check for no-op&#13;
+	if (current${ChildPropertyName} == null) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate existing&#13;
+	current${ChildPropertyName}.set${ParentPropertyNameInChild}(null);&#13;
+	set${ChildPropertyName}(null);&#13;
+	// additional business logic&#13;
+	onClear${ChildPropertyName}(current${ChildPropertyName});&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property (m:1 bidir child)" enabled="true" name="isp-m1">public void modify${ParentPropertyName}(final ${ParentPropertyType} ${parentPropertyName}) {&#13;
+    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
+	// check for no-op&#13;
+	if (${parentPropertyName} == null || &#13;
+		${parentPropertyName}.equals(current${ParentPropertyName})) {&#13;
+		return;&#13;
+	}&#13;
+	// delegate to parent to associate&#13;
+	${parentPropertyName}.addTo${ChildCollectionNameInParent}(this);&#13;
+	// additional business logic&#13;
+	onModify${ParentPropertyName}(current${ParentPropertyName}, ${parentPropertyName});&#13;
+}&#13;
+public void clear${ParentPropertyName}() {&#13;
+    ${ParentPropertyType} current${ParentPropertyName} = get${ParentPropertyName}();&#13;
+	// check for no-op&#13;
+	if (current${ParentPropertyName} == null) {&#13;
+		return;&#13;
+	}&#13;
+	// delegate to parent to dissociate&#13;
+	current${ParentPropertyName}.removeFrom${ChildCollectionNameInParent}(this);&#13;
+	// additional business logic&#13;
+	onClear${ParentPropertyName}(current${ParentPropertyName});&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property choices" enabled="true" name="ispcho">${:import(java.util.List)}public List&lt;${PropertyType}&gt; choices${PropertyName}() {&#13;
+	return ${cursor}null; // TODO: return list of choices for property&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property defaults" enabled="true" name="ispdef">public ${PropertyType} default${PropertyName}() {&#13;
+	return ${cursor}null; // TODO: return default for property when first created&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property disabling" enabled="true" name="ispdis">public String disable${PropertyName}() {&#13;
+	return ${cursor}null; // TODO: return reason why property is disabled, null if editable&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property hiding" enabled="true" name="isphid">public boolean hide${PropertyName}() {&#13;
+	return ${cursor}false; // TODO: return true if hidden, false if visible&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property modify" enabled="true" name="ispmod">public void modify${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
+    ${PropertyType} current${PropertyName} = get${PropertyName}();&#13;
+	// check for no-op&#13;
+	if (${propertyName} == null || &#13;
+		${propertyName}.equals(current${PropertyName})) {&#13;
+		return;&#13;
+	}&#13;
+	// associate new&#13;
+	set${PropertyName}(${propertyName});&#13;
+	// additional business logic&#13;
+	onModify${PropertyName}(current${PropertyName}, ${propertyName});&#13;
+}&#13;
+public void clear${PropertyName}() {&#13;
+    ${PropertyType} current${PropertyName} = get${PropertyName}();&#13;
+	// check for no-op&#13;
+	if (current${PropertyName} == null) {&#13;
+		return;&#13;
+	}&#13;
+	// dissociate existing&#13;
+	set${PropertyName}(null);&#13;
+	// additional business logic&#13;
+	onClear${PropertyName}(current${PropertyName});&#13;
+}&#13;
+protected void onModify${PropertyName}(final ${PropertyType} old${PropertyName}, final ${PropertyType} new${PropertyName}) {&#13;
+}&#13;
+protected void onClear${PropertyName}(final ${PropertyType} old${PropertyName}) {&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property validation" enabled="true" name="ispval">public String validate${PropertyName}(final ${PropertyType} ${propertyName}) {&#13;
+	if (${propertyName} == null) return null;&#13;
+	return ${cursor}null; // TODO: return reason why proposed value is invalid, null if valid&#13;
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Search for all" enabled="true" name="issa">// {{ all ${TypePlural}&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,java.util.List)}@Exploration&#13;
+public List&lt;${Type}&gt; all${TypePlural}() {&#13;
+	return allInstances(${Type}.class);&#13;
+}&#13;
+// }}&#13;
+&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Search for all matching" enabled="true" name="issafil">// {{ all ${TypePlural} that ${filterDescription}&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
+public List&lt;${Type}&gt; all${TypePlural}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
+	return allMatches(${Type}.class, filter);&#13;
+}&#13;
+// }}&#13;
+&#13;
+&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Search for first matching" enabled="true" name="issffil">// {{ first ${Type} that ${filterDescription}&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
+public ${Type} first${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
+	return firstMatch(${Type}.class, filter);&#13;
+}&#13;
+// }}&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Search for unique matching" enabled="true" name="issufil">// {{ unique ${Type} that ${filterDescription}&#13;
+${:import(org.apache.isis.applib.annotation.Exploration,org.apache.isis.applib.Filter,java.util.List)}@Exploration&#13;
+public ${Type} unique${Type}Matching(final Filter&lt;${Type}&gt; filter) {&#13;
+	return uniqueMatch(${Type}.class, filter);&#13;
+}&#13;
+// }}&#13;
+</template><template autoinsert="true" context="java-members" deleted="false" description="Object-level validation" enabled="true" name="isval">public String validate() {&#13;
+    ${cursor}// TODO: return reason why object is in invalid state (and so cannot be saved/updated), or null if ok&#13;
+}</template></templates>

Propchange: incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/isis-templates.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/jmock2-templates.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/jmock2-templates.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/jmock2-templates.xml (original)
+++ incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/jmock2-templates.xml Sun Jan 22 14:30:07 2012
@@ -17,7 +17,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<templates><template autoinsert="true" context="java" deleted="false" description="JMock2 Context field" enabled="true" name="jmcontext">${:import(org.jmock.Mockery,org.jmock.integration.junit4.JUnit4Mockery)}private Mockery context = new JUnit4Mockery();&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Expectations" enabled="true" name="jmexpectations">${:import(org.jmock.Expectations)}context.checking(new Expectations() {{&#13;
-    ${cursor}&#13;
-}});</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Mock Definition" enabled="true" name="jmmock">${MockClass} ${mockObject} = context.mock(${MockClass}.class);</template><template autoinsert="true" context="java" deleted="false" description="JMock2 RunWith" enabled="true" name="jmrunwith">${:import(org.junit.runner.RunWith,org.jmock.integration.junit4.JMock)}@RunWith(JMock.class)</template></templates>
+<templates><template autoinsert="true" context="java" deleted="false" description="JMock2 Context field" enabled="true" name="jmcontext">${:import(org.jmock.Mockery,org.jmock.integration.junit4.JUnit4Mockery)}private Mockery context = new JUnit4Mockery();&#13;
+</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Expectations" enabled="true" name="jmexpectations">${:import(org.jmock.Expectations)}context.checking(new Expectations() {{&#13;
+    ${cursor}&#13;
+}});</template><template autoinsert="true" context="java" deleted="false" description="JMock2 Mock Definition" enabled="true" name="jmmock">${MockClass} ${mockObject} = context.mock(${MockClass}.class);</template><template autoinsert="true" context="java" deleted="false" description="JMock2 RunWith" enabled="true" name="jmrunwith">${:import(org.junit.runner.RunWith,org.jmock.integration.junit4.JMock)}@RunWith(JMock.class)</template></templates>

Propchange: incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/jmock2-templates.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/junit4-templates.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/junit4-templates.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/junit4-templates.xml (original)
+++ incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/junit4-templates.xml Sun Jan 22 14:30:07 2012
@@ -17,16 +17,16 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<templates><template autoinsert="true" context="java" deleted="false" description="JUnit4 After Method" enabled="true" name="juafter">${:import(org.junit.After)}@After&#13;
-public void tearDown() throws Exception {&#13;
-	${cursor}&#13;
-}&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 AssertThat" enabled="true" name="juassertThat">${:importStatic(org.junit.Assert.assertThat,'org.hamcrest.CoreMatchers.*')}assertThat(${object}, ${matcher});</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 Before Method" enabled="true" name="jubefore">${:import(org.junit.Before)}@Before&#13;
-public void setUp() throws Exception {&#13;
-	${cursor}&#13;
-}&#13;
-</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 Test Method" enabled="true" name="jutest">${:import(org.junit.Test)}@Test&#13;
-public void when${SomethingOccurs}Then${SomePostcondition}() throws Exception {&#13;
-	${cursor}&#13;
-}&#13;
-</template></templates>
+<templates><template autoinsert="true" context="java" deleted="false" description="JUnit4 After Method" enabled="true" name="juafter">${:import(org.junit.After)}@After&#13;
+public void tearDown() throws Exception {&#13;
+	${cursor}&#13;
+}&#13;
+</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 AssertThat" enabled="true" name="juassertThat">${:importStatic(org.junit.Assert.assertThat,'org.hamcrest.CoreMatchers.*')}assertThat(${object}, ${matcher});</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 Before Method" enabled="true" name="jubefore">${:import(org.junit.Before)}@Before&#13;
+public void setUp() throws Exception {&#13;
+	${cursor}&#13;
+}&#13;
+</template><template autoinsert="true" context="java" deleted="false" description="JUnit4 Test Method" enabled="true" name="jutest">${:import(org.junit.Test)}@Test&#13;
+public void when${SomethingOccurs}Then${SomePostcondition}() throws Exception {&#13;
+	${cursor}&#13;
+}&#13;
+</template></templates>

Propchange: incubator/isis/trunk/framework/src/site/resources/ide/eclipse/templates/junit4-templates.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/images/icons/haywood/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/images/icons/haywood/LICENSE.txt?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/images/icons/haywood/LICENSE.txt (original)
+++ incubator/isis/trunk/framework/src/site/resources/images/icons/haywood/LICENSE.txt Sun Jan 22 14:30:07 2012
@@ -1,4 +1,4 @@
-These icons have been donated by Dan Haywood, as part
-of his contributions to the Apache Software Foundation.
-
-They may be used freely and without restriction.
+These icons have been donated by Dan Haywood, as part
+of his contributions to the Apache Software Foundation.
+
+They may be used freely and without restriction.

Propchange: incubator/isis/trunk/framework/src/site/resources/images/icons/haywood/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/images/icons/nogl/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/images/icons/nogl/LICENSE.txt?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/images/icons/nogl/LICENSE.txt (original)
+++ incubator/isis/trunk/framework/src/site/resources/images/icons/nogl/LICENSE.txt Sun Jan 22 14:30:07 2012
@@ -1,10 +1,10 @@
-These icons have been donated by Naked Objects Group Ltd, as part
-of their contribution of Naked Objects Framework to the
-Apache Software Foundation.
-
-They may be used freely and without restriction.
-
-created by:
-
-Ian Head
-Richard Pawson
+These icons have been donated by Naked Objects Group Ltd, as part
+of their contribution of Naked Objects Framework to the
+Apache Software Foundation.
+
+They may be used freely and without restriction.
+
+created by:
+
+Ian Head
+Richard Pawson

Propchange: incubator/isis/trunk/framework/src/site/resources/images/icons/nogl/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/images/icons/tango/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/images/icons/tango/LICENSE.txt?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/images/icons/tango/LICENSE.txt (original)
+++ incubator/isis/trunk/framework/src/site/resources/images/icons/tango/LICENSE.txt Sun Jan 22 14:30:07 2012
@@ -1,13 +1,13 @@
-These icons are taken from the Tango project (tango.freedesktop.org), released into the public domain, and therefore available to use freely.
-
-created by:
-
-Ulisse Perusin <uli.peru@gmail.com>
-Steven Garrity <sgarrity@silverorange.com>
-Lapo Calamandrei <calamandrei@gmail.com>
-Ryan Collier <rcollier@novell.com>
-Rodney Dawes <dobey@novell.com>
-Andreas Nilsson <nisses.mail@home.se>
-Tuomas Kuosmanen <tigert@tigert.com>
-Garrett LeSage <garrett@novell.com>
+These icons are taken from the Tango project (tango.freedesktop.org), released into the public domain, and therefore available to use freely.
+
+created by:
+
+Ulisse Perusin <uli.peru@gmail.com>
+Steven Garrity <sgarrity@silverorange.com>
+Lapo Calamandrei <calamandrei@gmail.com>
+Ryan Collier <rcollier@novell.com>
+Rodney Dawes <dobey@novell.com>
+Andreas Nilsson <nisses.mail@home.se>
+Tuomas Kuosmanen <tigert@tigert.com>
+Garrett LeSage <garrett@novell.com>
 Jakub Steiner <jimmac@novell.com>
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/src/site/resources/images/icons/tango/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/release-notes-0.1.2-incubating.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/release-notes-0.1.2-incubating.html?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/release-notes-0.1.2-incubating.html (original)
+++ incubator/isis/trunk/framework/src/site/resources/release-notes-0.1.2-incubating.html Sun Jan 22 14:30:07 2012
@@ -1,136 +1,136 @@
-<!-- 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. -->
-<H3>Release Notes - Isis - Version 0.1.2-incubating</h3>
-
-<h2>        Task
-</h2>
-<ul>
-</ul>
-    
-<h2>        Tasks/subtasks
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-1'>ISIS-1</a>] -         Check and make sure that the files that have been donated have been updated to reflect the new ASF copyright
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-2'>ISIS-2</a>] -         Add all active committers in the STATUS file
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-3'>ISIS-3</a>] -         Import Naked Objects and Sister Projects code into the Apache repo
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-8'>ISIS-8</a>] -         Update the DOCBOOK URLs to reference local files instead of online DTDs
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-15'>ISIS-15</a>] -         our release numbers need to reflect the &#39;incubating&#39; status
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-20'>ISIS-20</a>] -         Get all components ready for a 0.1 release
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-21'>ISIS-21</a>] -         prepare applib for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-22'>ISIS-22</a>] -         prepare core for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-23'>ISIS-23</a>] -         prepare progmodels:dflt for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-24'>ISIS-24</a>] -         prepare runtimes.dflt:bytecode for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-27'>ISIS-27</a>] -         prepare objectstore:sql for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-30'>ISIS-30</a>] -         prepare profilestores for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-31'>ISIS-31</a>] -         prepare progmodels:groovy for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-32'>ISIS-32</a>] -         prepare progmodels:wrapper for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-33'>ISIS-33</a>] -         prepare security:file for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-34'>ISIS-34</a>] -         prepare security:ldap for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-35'>ISIS-35</a>] -         prepare viewer:bdd for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-39'>ISIS-39</a>] -         prepare viewer:restful for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-41'>ISIS-41</a>] -         prepare viewer:wicket for 0.1 release
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-42'>ISIS-42</a>] -         rebuild archetypes from support/quickstart
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-43'>ISIS-43</a>] -         contributors guide (in isis-parent)
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-44'>ISIS-44</a>] -         screencasts (linked from top-level site in isis-parent)
-    </li>
-</ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-46'>ISIS-46</a>] -         Create page on site to list all the DocBooks PDFs we have available.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-57'>ISIS-57</a>] -         Remove arrays from all public APIs, replace with (immutable) lists of elements
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-58'>ISIS-58</a>] -         Change FacetFactory#getFeatureTypes to return List&lt;ObjectFeatureType&gt; instead of ObjectFeatureType[]
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-60'>ISIS-60</a>] -         ObjectSpecification&#39;s superinterfaces: ObjectActionContainer and ObjectAssociationContainer.
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-61'>ISIS-61</a>] -         ObjectSpecification&#39;s superinterface: Hierarchical
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-71'>ISIS-71</a>] -         Identifier (in the applib)
-    </li>
-</ul>
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-63'>ISIS-63</a>] -         Remove cyclic dependencies between packages (in core framework and runtimes:dflt)
-<ul>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-64'>ISIS-64</a>] -         Remove (at least some of the) cyclic dependencies within metamodel
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-76'>ISIS-76</a>] -         Remove cyclic dependencies within progmodel.
-    </li>
-    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-90'>ISIS-90</a>] -         Remove cyclic dependencies in oai.runtimes,dflt:runtime
-    </li>
-</ul>
-</li>
-</ul>
-            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-16'>ISIS-16</a>] -         Concordian test fails:  NewClaimDefaultsOkStory
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-19'>ISIS-19</a>] -         i18n issue with date parsing for BDD viewer (new CheckList, VerifyRows functionality)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-70'>ISIS-70</a>] -         ResourceBasedI18nManager - resolving the resource key name uses two dots for action addressing - should be one
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-83'>ISIS-83</a>] -         Broken Links
-</li>
-</ul>
-            
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-13'>ISIS-13</a>] -         add &quot;image map&quot; functionality to the main page image HexagonalArchitectureOverview.png
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-17'>ISIS-17</a>] -         Update to use org.apache:apache:8 as our parent.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-59'>ISIS-59</a>] -         Combine the ObjectMember and ObjectMemberPeer hierarchies.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-62'>ISIS-62</a>] -         Split out RuntimeContext into separate sub-interfaces, for testability and understanding (ie, the interface separation principle).
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-65'>ISIS-65</a>] -         Simplify code: improve the subclasses under IntrospectableSpecificationAbstract (InstancesCollection and JavaSpecification)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-67'>ISIS-67</a>] -         Move JavaReflector and JavaSpecification back from default.progmodel and core.progmodel and back into metamodel
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-68'>ISIS-68</a>] -         Combine JavaSpecification and JavaIntrospector, and make the mechanism for ordering members more explicit.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-72'>ISIS-72</a>] -         Break out {Property/Collection/Action}MethodsFacetFactory into more fine-grained FacetFactory&#39;s.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-77'>ISIS-77</a>] -         Add a downloadable &quot;cheat-sheet&quot; to the site.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-84'>ISIS-84</a>] -         Add object identifiers in links
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-97'>ISIS-97</a>] -         Replace dependency on Sergey Ilinksy's XmlHttpRequest with JQuery's ajax() method instead.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-98'>ISIS-98</a>] -         Replace dependencies on XOM (an LGPL licensed library).
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-99'>ISIS-99</a>] -         website bug - http://incubator.apache.org/isis/quickstart-app.html does not give the demo username and password
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-100'>ISIS-100</a>] -       Update RestEasy version from 1.0.2 to latest (2.2.0); the old version is LGPL but latest version is ALv2.
-</li>
+<!-- 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. -->
+<H3>Release Notes - Isis - Version 0.1.2-incubating</h3>
+
+<h2>        Task
+</h2>
+<ul>
+</ul>
+    
+<h2>        Tasks/subtasks
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-1'>ISIS-1</a>] -         Check and make sure that the files that have been donated have been updated to reflect the new ASF copyright
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-2'>ISIS-2</a>] -         Add all active committers in the STATUS file
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-3'>ISIS-3</a>] -         Import Naked Objects and Sister Projects code into the Apache repo
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-8'>ISIS-8</a>] -         Update the DOCBOOK URLs to reference local files instead of online DTDs
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-15'>ISIS-15</a>] -         our release numbers need to reflect the &#39;incubating&#39; status
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-20'>ISIS-20</a>] -         Get all components ready for a 0.1 release
+<ul>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-21'>ISIS-21</a>] -         prepare applib for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-22'>ISIS-22</a>] -         prepare core for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-23'>ISIS-23</a>] -         prepare progmodels:dflt for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-24'>ISIS-24</a>] -         prepare runtimes.dflt:bytecode for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-27'>ISIS-27</a>] -         prepare objectstore:sql for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-30'>ISIS-30</a>] -         prepare profilestores for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-31'>ISIS-31</a>] -         prepare progmodels:groovy for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-32'>ISIS-32</a>] -         prepare progmodels:wrapper for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-33'>ISIS-33</a>] -         prepare security:file for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-34'>ISIS-34</a>] -         prepare security:ldap for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-35'>ISIS-35</a>] -         prepare viewer:bdd for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-39'>ISIS-39</a>] -         prepare viewer:restful for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-41'>ISIS-41</a>] -         prepare viewer:wicket for 0.1 release
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-42'>ISIS-42</a>] -         rebuild archetypes from support/quickstart
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-43'>ISIS-43</a>] -         contributors guide (in isis-parent)
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-44'>ISIS-44</a>] -         screencasts (linked from top-level site in isis-parent)
+    </li>
+</ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-46'>ISIS-46</a>] -         Create page on site to list all the DocBooks PDFs we have available.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-57'>ISIS-57</a>] -         Remove arrays from all public APIs, replace with (immutable) lists of elements
+<ul>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-58'>ISIS-58</a>] -         Change FacetFactory#getFeatureTypes to return List&lt;ObjectFeatureType&gt; instead of ObjectFeatureType[]
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-60'>ISIS-60</a>] -         ObjectSpecification&#39;s superinterfaces: ObjectActionContainer and ObjectAssociationContainer.
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-61'>ISIS-61</a>] -         ObjectSpecification&#39;s superinterface: Hierarchical
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-71'>ISIS-71</a>] -         Identifier (in the applib)
+    </li>
+</ul>
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-63'>ISIS-63</a>] -         Remove cyclic dependencies between packages (in core framework and runtimes:dflt)
+<ul>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-64'>ISIS-64</a>] -         Remove (at least some of the) cyclic dependencies within metamodel
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-76'>ISIS-76</a>] -         Remove cyclic dependencies within progmodel.
+    </li>
+    <li>[<a href='https://issues.apache.org/jira/browse/ISIS-90'>ISIS-90</a>] -         Remove cyclic dependencies in oai.runtimes,dflt:runtime
+    </li>
+</ul>
+</li>
+</ul>
+            
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-16'>ISIS-16</a>] -         Concordian test fails:  NewClaimDefaultsOkStory
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-19'>ISIS-19</a>] -         i18n issue with date parsing for BDD viewer (new CheckList, VerifyRows functionality)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-70'>ISIS-70</a>] -         ResourceBasedI18nManager - resolving the resource key name uses two dots for action addressing - should be one
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-83'>ISIS-83</a>] -         Broken Links
+</li>
+</ul>
+            
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-13'>ISIS-13</a>] -         add &quot;image map&quot; functionality to the main page image HexagonalArchitectureOverview.png
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-17'>ISIS-17</a>] -         Update to use org.apache:apache:8 as our parent.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-59'>ISIS-59</a>] -         Combine the ObjectMember and ObjectMemberPeer hierarchies.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-62'>ISIS-62</a>] -         Split out RuntimeContext into separate sub-interfaces, for testability and understanding (ie, the interface separation principle).
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-65'>ISIS-65</a>] -         Simplify code: improve the subclasses under IntrospectableSpecificationAbstract (InstancesCollection and JavaSpecification)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-67'>ISIS-67</a>] -         Move JavaReflector and JavaSpecification back from default.progmodel and core.progmodel and back into metamodel
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-68'>ISIS-68</a>] -         Combine JavaSpecification and JavaIntrospector, and make the mechanism for ordering members more explicit.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-72'>ISIS-72</a>] -         Break out {Property/Collection/Action}MethodsFacetFactory into more fine-grained FacetFactory&#39;s.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-77'>ISIS-77</a>] -         Add a downloadable &quot;cheat-sheet&quot; to the site.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-84'>ISIS-84</a>] -         Add object identifiers in links
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-97'>ISIS-97</a>] -         Replace dependency on Sergey Ilinksy's XmlHttpRequest with JQuery's ajax() method instead.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-98'>ISIS-98</a>] -         Replace dependencies on XOM (an LGPL licensed library).
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-99'>ISIS-99</a>] -         website bug - http://incubator.apache.org/isis/quickstart-app.html does not give the demo username and password
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-100'>ISIS-100</a>] -       Update RestEasy version from 1.0.2 to latest (2.2.0); the old version is LGPL but latest version is ALv2.
+</li>
 </ul>
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/src/site/resources/release-notes-0.1.2-incubating.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/site/resources/release-notes-0.2.0-incubating.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/resources/release-notes-0.2.0-incubating.html?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/resources/release-notes-0.2.0-incubating.html (original)
+++ incubator/isis/trunk/framework/src/site/resources/release-notes-0.2.0-incubating.html Sun Jan 22 14:30:07 2012
@@ -1,117 +1,117 @@
-<!-- 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. -->
-<H3>Release Notes - Isis - Version 0.2.0-incubating</h3>
-
-
-<h2>        Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-25'>ISIS-25</a>] -         Update runtimes:embedded docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-26'>ISIS-26</a>] -         Update runtimes.dflt.objectstores:nosql docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-28'>ISIS-28</a>] -         Update objectstores:xml docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-36'>ISIS-36</a>] -         Update viewer:dnd docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-37'>ISIS-37</a>] -         Update viewer:html docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-38'>ISIS-38</a>] -         Update viewer:junit docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-40'>ISIS-40</a>] -         Update viewer:scimpi docbook guide for 0.2 release
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-91'>ISIS-91</a>] -         Update progmodels docbook guide for 0.2 release.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-92'>ISIS-92</a>] -         Update runtimes:dflt docbook guide for 0.2 release.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-93'>ISIS-93</a>] -         Update security docbook guide for 0.2 release.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-94'>ISIS-94</a>] -         Create profilestores:xml docbook guide for 0.2 release.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-95'>ISIS-95</a>] -         Create runtime.dflt:remoting docbook guide for 0.2 release.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-113'>ISIS-113</a>] -         Get acquainted with Tapestry5 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-119'>ISIS-119</a>] -         Collections were marked as &quot;resolved&quot;, even if a collection has an unresolved collection.
-</li>
-</ul>
-            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-11'>ISIS-11</a>] -         Build errors under maven 3.0
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-114'>ISIS-114</a>] -         json viewer applib could not fetch json-lib-2.4
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-117'>ISIS-117</a>] -         Infinite recursion in JDBC objectstore
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-122'>ISIS-122</a>] -         BooleanValueSemanticsProviderAbstract can not handle fields of type Boolean, when value string is &quot;TRUE&quot;/&quot;FALSE&quot; from the SQL OS
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-126'>ISIS-126</a>] -         Service contributed actions (with parameters) are not picking up the current object as parameter
-</li>
-</ul>
-            
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-5'>ISIS-5</a>] -         Reinstate DerivedFacet (to distinguish from NonPersistableFacet, which is also unmodifiable).
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-9'>ISIS-9</a>] -         Fixes to the Eclipse templates
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-18'>ISIS-18</a>] -         The validate() method should apply for updates as well as for objects being initially persisted.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-45'>ISIS-45</a>] -         Improve the look-n-feel of our generated DocBook; output also in single page HTML and in Eclipse HTML format (as well as current chunked HTML and PDF)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-47'>ISIS-47</a>] -         Refactor components to JSR-299, while maintaining backwards compatibility for bootstrapping.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-89'>ISIS-89</a>] -         Finish off updating documentation post the first (pre 1.0) release of Isis.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-104'>ISIS-104</a>] -         Implement logout for Wicket
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-108'>ISIS-108</a>] -         Develop a &quot;TCK&quot; example application that exhibits/uses most Isis features in order to facilitate automated integration testing of viewers/objectstores etc.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-123'>ISIS-123</a>] -         Metamodel specload specimpl could not handle only some parameters having @Named
-</li>
-</ul>
-    
-<h2>        New Feature
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-109'>ISIS-109</a>] -         JSON viewer
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-111'>ISIS-111</a>] -         Title Facet Via Method Annotation
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-112'>ISIS-112</a>] -         Tapestry Viewer Support
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-124'>ISIS-124</a>] -         Add a @Stable annotation in the applib (along with StableFacet and StableAnnotationFacetFactory in the metamodel)
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-128'>ISIS-128</a>] -         Add DomainObjectContainer#titleOf(pojo) to allow domain objects to programmatically obtain the title of other domain objects.
-</li>
-</ul>
-                        
-<h2>        Task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-120'>ISIS-120</a>] -         Document about Title Facet Via Method Annotation
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-125'>ISIS-125</a>] -         Prepare for 0.2.0 release
-</li>
-</ul>
-            
-<h2>        Umbrella
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-107'>ISIS-107</a>] -         For Isis 0.2.0 release: Miscellaneous minor changes (eg fix spelling typos in code, minor site/documentation updates) 
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/ISIS-121'>ISIS-121</a>] -         General updates to the SQL ObjectStore, not related to any specific issue
-</li>
-</ul>
- 
+<!-- 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. -->
+<H3>Release Notes - Isis - Version 0.2.0-incubating</h3>
+
+
+<h2>        Sub-task
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-25'>ISIS-25</a>] -         Update runtimes:embedded docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-26'>ISIS-26</a>] -         Update runtimes.dflt.objectstores:nosql docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-28'>ISIS-28</a>] -         Update objectstores:xml docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-36'>ISIS-36</a>] -         Update viewer:dnd docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-37'>ISIS-37</a>] -         Update viewer:html docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-38'>ISIS-38</a>] -         Update viewer:junit docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-40'>ISIS-40</a>] -         Update viewer:scimpi docbook guide for 0.2 release
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-91'>ISIS-91</a>] -         Update progmodels docbook guide for 0.2 release.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-92'>ISIS-92</a>] -         Update runtimes:dflt docbook guide for 0.2 release.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-93'>ISIS-93</a>] -         Update security docbook guide for 0.2 release.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-94'>ISIS-94</a>] -         Create profilestores:xml docbook guide for 0.2 release.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-95'>ISIS-95</a>] -         Create runtime.dflt:remoting docbook guide for 0.2 release.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-113'>ISIS-113</a>] -         Get acquainted with Tapestry5 
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-119'>ISIS-119</a>] -         Collections were marked as &quot;resolved&quot;, even if a collection has an unresolved collection.
+</li>
+</ul>
+            
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-11'>ISIS-11</a>] -         Build errors under maven 3.0
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-114'>ISIS-114</a>] -         json viewer applib could not fetch json-lib-2.4
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-117'>ISIS-117</a>] -         Infinite recursion in JDBC objectstore
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-122'>ISIS-122</a>] -         BooleanValueSemanticsProviderAbstract can not handle fields of type Boolean, when value string is &quot;TRUE&quot;/&quot;FALSE&quot; from the SQL OS
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-126'>ISIS-126</a>] -         Service contributed actions (with parameters) are not picking up the current object as parameter
+</li>
+</ul>
+            
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-5'>ISIS-5</a>] -         Reinstate DerivedFacet (to distinguish from NonPersistableFacet, which is also unmodifiable).
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-9'>ISIS-9</a>] -         Fixes to the Eclipse templates
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-18'>ISIS-18</a>] -         The validate() method should apply for updates as well as for objects being initially persisted.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-45'>ISIS-45</a>] -         Improve the look-n-feel of our generated DocBook; output also in single page HTML and in Eclipse HTML format (as well as current chunked HTML and PDF)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-47'>ISIS-47</a>] -         Refactor components to JSR-299, while maintaining backwards compatibility for bootstrapping.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-89'>ISIS-89</a>] -         Finish off updating documentation post the first (pre 1.0) release of Isis.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-104'>ISIS-104</a>] -         Implement logout for Wicket
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-108'>ISIS-108</a>] -         Develop a &quot;TCK&quot; example application that exhibits/uses most Isis features in order to facilitate automated integration testing of viewers/objectstores etc.
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-123'>ISIS-123</a>] -         Metamodel specload specimpl could not handle only some parameters having @Named
+</li>
+</ul>
+    
+<h2>        New Feature
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-109'>ISIS-109</a>] -         JSON viewer
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-111'>ISIS-111</a>] -         Title Facet Via Method Annotation
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-112'>ISIS-112</a>] -         Tapestry Viewer Support
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-124'>ISIS-124</a>] -         Add a @Stable annotation in the applib (along with StableFacet and StableAnnotationFacetFactory in the metamodel)
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-128'>ISIS-128</a>] -         Add DomainObjectContainer#titleOf(pojo) to allow domain objects to programmatically obtain the title of other domain objects.
+</li>
+</ul>
+                        
+<h2>        Task
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-120'>ISIS-120</a>] -         Document about Title Facet Via Method Annotation
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-125'>ISIS-125</a>] -         Prepare for 0.2.0 release
+</li>
+</ul>
+            
+<h2>        Umbrella
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-107'>ISIS-107</a>] -         For Isis 0.2.0 release: Miscellaneous minor changes (eg fix spelling typos in code, minor site/documentation updates) 
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/ISIS-121'>ISIS-121</a>] -         General updates to the SQL ObjectStore, not related to any specific issue
+</li>
+</ul>
+ 

Propchange: incubator/isis/trunk/framework/src/site/resources/release-notes-0.2.0-incubating.html
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message