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 2013/06/13 18:19:45 UTC
svn commit: r1492737 - in /isis/site/trunk/content:
components/objectstores/jdo/datanucleus-and-maven.md
getting-started/resources/isis-templates.xml
Author: danhaywood
Date: Thu Jun 13 16:19:44 2013
New Revision: 1492737
URL: http://svn.apache.org/r1492737
Log:
update to template, and minor jdo edit also
Modified:
isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md
isis/site/trunk/content/getting-started/resources/isis-templates.xml
Modified: isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md?rev=1492737&r1=1492736&r2=1492737&view=diff
==============================================================================
--- isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md (original)
+++ isis/site/trunk/content/components/objectstores/jdo/datanucleus-and-maven.md Thu Jun 13 16:19:44 2013
@@ -58,7 +58,7 @@ istered, and you are trying to register
ch.
</pre>
-The fix is to use a Maven profile:
+The fix is to use a Maven profile. The following is correct as of the JDO ObjectStore v1.1.0:
<pre>
<profiles>
@@ -73,13 +73,7 @@ The fix is to use a Maven profile:
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId>
- <version>(3.0.99, 3.1.99)</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-enhancer</artifactId>
- <version>(3.0.99, 3.1.99)</version>
+ <version>(3.2.0-m1, 3.2.99)</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: isis/site/trunk/content/getting-started/resources/isis-templates.xml
URL: http://svn.apache.org/viewvc/isis/site/trunk/content/getting-started/resources/isis-templates.xml?rev=1492737&r1=1492736&r2=1492737&view=diff
==============================================================================
--- isis/site/trunk/content/getting-started/resources/isis-templates.xml (original)
+++ isis/site/trunk/content/getting-started/resources/isis-templates.xml Thu Jun 13 16:19:44 2013
@@ -5,7 +5,9 @@ public ${ReturnType} ${actionName}(final
}
// }}
-</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<${ParameterType}> choices${ParameterNumThenCapitalizedActionName}() {
+</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument N autoComplete" enabled="true" name="isaauto">${:import(java.util.Collections,java.util.List)}public List<${ParameterType}> autoComplete${ParameterNumThenCapitalizedActionName}(final String searchArg) {
+ return ${cursor}Collections.emptyList(); // TODO: return list of choices for argument N, based on the provided search argument
+}</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<${ParameterType}> choices${ParameterNumThenCapitalizedActionName}() {
return ${cursor}Collections.emptyList(); // TODO: return list of choices for argument N
}</template><template autoinsert="true" context="java-members" deleted="false" description="Action argument defaults" enabled="true" name="isadef">public ${ParameterType} default${ParameterNumThenCapitalizedActionName}() {
return ${cursor}null; // TODO: return default for argument N
@@ -137,7 +139,16 @@ public void set${CollectionName}(final S
}
// }}
-</template><template autoinsert="true" context="java-members" deleted="false" description="Collection validation" enabled="true" name="iscval">public String validateAddTo${CollectionName}(final ${ElementType} ${elementName}) {
+</template><template autoinsert="true" context="java-members" deleted="false" description="Collection (set-sorted)" enabled="true" name="iscss">// {{ ${CollectionName} (Collection)
+${:import(java.util.SortedSet,java.util.TreeSet,org.apache.isis.applib.annotation.MemberOrder)}private SortedSet<${ElementType}> ${collectionName} = new TreeSet<${ElementType}>();
+@MemberOrder(sequence="1")
+public SortedSet<${ElementType}> get${CollectionName}() {
+ return ${collectionName};
+}
+public void set${CollectionName}(final SortedSet<${ElementType}> ${collectionName}) {
+ this.${collectionName} = ${collectionName};
+}
+// }}</template><template autoinsert="true" context="java-members" deleted="false" description="Collection validation" enabled="true" name="iscval">public String validateAddTo${CollectionName}(final ${ElementType} ${elementName}) {
return ${cursor}null; // TODO: return reason why argument cannot be added, null if ok to add
}
public String validateRemoveFrom${CollectionName}(final ${ElementType} ${elementName}) {
@@ -290,6 +301,8 @@ public void clear${ParentPropertyName}()
current${ParentPropertyName}.removeFrom${ChildCollectionNameInParent}(this);
// additional business logic
onClear${ParentPropertyName}(current${ParentPropertyName});
+}</template><template autoinsert="true" context="java-members" deleted="false" description="Property autocomplete" enabled="true" name="ispauto">${:import(java.util.List)}public List<${PropertyType}> autoComplete${PropertyName}(final String searchArg) {
+ return ${cursor}null; // TODO: return list of choices for property based on the provided search argument
}</template><template autoinsert="true" context="java-members" deleted="false" description="Property choices" enabled="true" name="ispcho">${:import(java.util.List)}public List<${PropertyType}> choices${PropertyName}() {
return ${cursor}null; // TODO: return list of choices for property
}</template><template autoinsert="true" context="java-members" deleted="false" description="Property defaults" enabled="true" name="ispdef">public ${PropertyType} default${PropertyName}() {