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 2012/10/04 12:11:05 UTC
svn commit: r1393975 [2/2] - in /incubator/isis/trunk/examples: claims/
claims/dom/
claims/dom/src/main/java/org/apache/isis/example/claims/dom/claim/
claims/fixture/ claims/objstore-default/ claims/objstore-jdo/
claims/objstore-jdo/src/ claims/objstor...
Copied: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java-ARCHIVED/claimwizard/ClaimWizardPanel.html (from r1393105, incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/claimwizard/ClaimWizardPanel.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java-ARCHIVED/claimwizard/ClaimWizardPanel.html?p2=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java-ARCHIVED/claimwizard/ClaimWizardPanel.html&p1=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/claimwizard/ClaimWizardPanel.html&r1=1393105&r2=1393975&rev=1393975&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java-ARCHIVED/claimwizard/ClaimWizardPanel.java (from r1393105, incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/claimwizard/ClaimWizardPanel.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java-ARCHIVED/claimwizard/ClaimWizardPanel.java?p2=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java-ARCHIVED/claimwizard/ClaimWizardPanel.java&p1=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/claimwizard/ClaimWizardPanel.java&r1=1393105&r2=1393975&rev=1393975&view=diff
==============================================================================
(empty)
Modified: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/app/ClaimsApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/app/ClaimsApplication.java?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/app/ClaimsApplication.java (original)
+++ incubator/isis/trunk/examples/claims/viewer-wicket/src/main/java/org/apache/isis/example/claims/viewer/wicket/app/ClaimsApplication.java Thu Oct 4 10:11:03 2012
@@ -38,7 +38,6 @@ public class ClaimsApplication extends I
new AbstractModule() {
@Override
protected void configure() {
- //bindConstant().annotatedWith(ApplicationCssUrl.class).to("myapp.css");
}
});
}
Modified: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-wicket/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory (original)
+++ incubator/isis/trunk/examples/claims/viewer-wicket/src/main/resources/META-INF/services/org.apache.isis.viewer.wicket.ui.ComponentFactory Thu Oct 4 10:11:03 2012
@@ -1 +0,0 @@
-org.apache.isis.example.claims.viewer.wicket.claimwizard.ClaimWizardComponentFactory
\ No newline at end of file
Copied: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords (from r1393105, incubator/isis/trunk/examples/claims/viewer-json/src/main/webapp/WEB-INF/security_file.passwords)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords?p2=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords&p1=incubator/isis/trunk/examples/claims/viewer-json/src/main/webapp/WEB-INF/security_file.passwords&r1=1393105&r2=1393975&rev=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-json/src/main/webapp/WEB-INF/security_file.passwords (original)
+++ incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords Thu Oct 4 10:11:03 2012
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-sven:pass
-dick:pass
-bob:pass
-joe:pass
+sven:pass
+dick:pass
+bob:pass
+joe:pass
Copied: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow (from r1393105, incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/security_file.allow)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow?p2=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow&p1=incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/security_file.allow&r1=1393105&r2=1393975&rev=1393975&view=diff
==============================================================================
(empty)
Modified: incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/isis.properties?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/examples/claims/viewer-wicket/src/main/webapp/WEB-INF/isis.properties Thu Oct 4 10:11:03 2012
@@ -14,38 +14,219 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-isis.services.prefix = org.apache.isis.example.claims.objstore.dflt
-isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
+
+
+#################################################################################
+#
+# specify system components.
+#
+# The values correspond to the named components in the installer-registry.properties file
+# in the org.apache.isis.runtimes.dflt:runtime JAR (in the org.apache.isis.runtimes.dflt.runtime package)
+#
+# Although all configuration could reside in isis.properties, the recommendation is
+# to split out into component specific files:
+#
+# xxx_yyy.properties files
+#
+# where
+# * xxx is the component type, and
+# * yyy is the component name.
+#
+# For example, persistor_sql.properties holds configuration information specific to the
+#
+#
+# If the components are changed, also remember to edit pom.xml (further comments can be
+# found in the persistor_xxx.properties files)
+#
+#################################################################################
+
+#
+# configure the persistor (object store) to use
+#
+# * in-memory requires no additional configuration, but stores object in-memory.
+# Only suitable for prototyping
+# * datanucleus uses JDO DataNucleus to persist objects to relational database.
+# for objectstore-specific properties, see persistor_datanucleus.properties
+# * fileserver uses a simple FileServer to persist objects as JSON documents. It requires the fileserver component to be running
+# for objectstore-specific properties, see persistor_fileserver.properties
+# * mongodb uses MongoDB to be persist objects as JSON documents. It requires MongoDB to be installed and running
+# for objectstore-specific properties, see persistor_fileserver.properties
+# * sql uses an RDBMS to persist objects as table rows.
+# for objectstore-specific properties, see persistor_sql.properties
+# * xml uses the XML ObjectStore to be persist objects to a set of XML files. Only suitable for prototyping.
+# for objectstore-specific properties, see persistor_xml.properties
+#
+# NOTE:
+# * edit isis.services (below) and pom.xml to reference appropriate objstore-xxx module
+# * for datanucleus objectstore, also edit isis.reflector.facets and isis.reflector.class-substitutor (below)
+# * for sql and datanucleus objectstores, also edit pom.xml to reference appropriate JDBC driver
+#
+
+isis.persistor=in-memory
+#isis.persistor=datanucleus
+#isis.persistor=fileserver
+#isis.persistor=mongodb
+#isis.persistor=sql
+#isis.persistor=xml
+
+
+
+
+
+#
+# configure authentication mechanis to use (to logon to the system)
+# note that the Scimpi view allows access to anonymous users
+#
+isis.authentication=file
+
+
+#
+# configure authorization mechanism to use
+
+# The authorization mechanism define each users' permissions to view/edit object properties
+# or collections, and to view/invoke object actions
+#
+# >>>
+# >>> NB: authorization also requires a "facet decorator" to be installed,
+# >>>
+#
+isis.authorization=file
+
+
+
+
+#
+# configure the user profile store to use.
+#
+# the user profile store is supported by some viewers as a way to store
+# user-specific settings (eg colours, themes etc)
+#
+isis.user-profile-store=in-memory
+
+
+
+isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
+#isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
+
+
+#################################################################################
+#
+# System MetaModel and Runtime Components
+#
+#################################################################################
+
+#
+# programming model facets
+#
+# Some components require an additional set of facets to be defined.
+#
+
+# for datanucleus object store
+#isis.reflector.facets=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.metamodel.specloader.progmodelfacets.DataNucleusProgrammingModelFacets
+
+
+#
+# enable authorization
+#
+# authorization requires that a "facet decorator" be installed; this intercepts every
+# request and delegates to the configured authorization mechanism.
+#
+
+#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+
+
+#
+# enable Isis' built-in support for lazy loading/object dirtying.
+#
+# This configuration causes every domain entity to be "enhanced" so that objects graphs
+# can be traversed transparent, and modified objects are automatically saved back to the
+# object store.
+#
+# This setting is required by most persistors (in-memory, xml, mongodb, fileserver and sql)
+# For the datanucleus objectstore, it does not matter whether it is enabled or not.
+#
+isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
+#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
+#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
+
+
+#
+# enable class substitution in the meta model
+#
+# The reflector (Isis metamodel) must be instructed to ignore the side-effects of enabling lazy-loading;
+# specifically it ignores any cglib-generated subclasses.
+#
+# This setting is required whenever the isis.persistor.object-factory property has been set.
+# For the datanucleus objectstore, it must be set to a specific implementation.
+#
+isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
+#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
+#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
+#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.bytecode.DataNucleusTypesClassSubstitutor
+
+
+
+
+################################################################################
+#
+# Viewer defaults
+#
+#################################################################################
+
+#
+# Specify viewer defaults
+#
+
+isis.viewers.paged.standalone=30
+isis.viewers.paged.parented=10
+
+
+
+#################################################################################
+#
+# Application Services and fixtures
+#
+#################################################################################
+
+#
+# Specify the domain services.
+#
+# These are the most important configuration properties in the system, as they define
+# the set of the classes for Isis to instantiate as domain service singletons.
+# From these domain service instances the rest of the metamodel is discovered, while the
+# end-user gains access to other domain objects by invoking the actions of the domain services.
+#
+# The implementations depend on the configured (see isis.persistor above)
+#
+
+# if using the in-memory or XML object stores:
+isis.services.prefix = org.apache.isis.example.claims.objstore.dflt
+isis.services = employee.EmployeeRepositoryDefault, claim.ClaimRepositoryDefault
+
+
+
+#
+# Specify the (optional) test fixtures
+#
+# Fixtures are used to seed the object store with an initial set of data. For the
+# in-memory object store, the fixtures are installed on every run. For other
+# object stores, they are used only when the object store is first initialized.
+#
+isis.fixtures.prefix= org.apache.isis.example.claims.fixture
+isis.fixtures= ClaimsFixture
+
+
+
+
+isis.exploration.users=sven, dick, bob
+
+
+
+
-isis.fixtures.prefix= org.apache.isis.example.claims.fixture
-isis.fixtures= ClaimsFixture
-
-isis.exploration.users=sven, dick, bob
-
-
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
-
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
-#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
-#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
-
-
-isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
-#isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
-
-
-#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
-#isis.authorization.learn=true
-
-
-
-isis.persistor=in-memory
-#isis.xmlos.dir=/tmp/xml
###############################
-# wicket-viewer specific
+# archived
###############################
-isis.reflector.facets.include=org.apache.isis.viewer.wicket.metamodel.wizardpagedesc.WizardPageDescriptionAnnotationFacetFactory
+#isis.reflector.facets.include=org.apache.isis.viewer.wicket.metamodel.wizardpagedesc.WizardPageDescriptionAnnotationFacetFactory
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/pom.xml?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/pom.xml (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/pom.xml Thu Oct 4 10:11:03 2012
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>isis</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.examples.progmodel</groupId>
@@ -35,13 +35,13 @@
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java Thu Oct 4 10:11:03 2012
@@ -33,7 +33,7 @@ public class NameFileFacet extends Facet
private final String name;
public NameFileFacet(final FacetHolder holder, final String name) {
- super(type(), holder, false);
+ super(type(), holder, Derivation.NOT_DERIVED);
this.name = name;
}
Modified: incubator/isis/trunk/examples/onlinedemo/dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/dom/pom.xml?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/dom/pom.xml (original)
+++ incubator/isis/trunk/examples/onlinedemo/dom/pom.xml Thu Oct 4 10:11:03 2012
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.isis.examples</groupId>
<artifactId>onlinedemo</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>onlinedemo-dom</artifactId>
Modified: incubator/isis/trunk/examples/onlinedemo/fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/fixture/pom.xml?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/fixture/pom.xml (original)
+++ incubator/isis/trunk/examples/onlinedemo/fixture/pom.xml Thu Oct 4 10:11:03 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.examples</groupId>
<artifactId>onlinedemo</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>onlinedemo-fixture</artifactId>
Modified: incubator/isis/trunk/examples/onlinedemo/objstore-default/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/objstore-default/pom.xml?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/objstore-default/pom.xml (original)
+++ incubator/isis/trunk/examples/onlinedemo/objstore-default/pom.xml Thu Oct 4 10:11:03 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.isis.examples</groupId>
<artifactId>onlinedemo</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>onlinedemo-objstore-dflt</artifactId>
Modified: incubator/isis/trunk/examples/onlinedemo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/pom.xml?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/pom.xml (original)
+++ incubator/isis/trunk/examples/onlinedemo/pom.xml Thu Oct 4 10:11:03 2012
@@ -21,14 +21,14 @@
<groupId>org.apache.isis.examples</groupId>
<artifactId>onlinedemo</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
<name>Online Demo</name>
<packaging>pom</packaging>
<properties>
- <isis.version>0.3.0-incubating-SNAPSHOT</isis.version>
+ <isis.version>0.3.1-incubating-SNAPSHOT</isis.version>
</properties>
<repositories>
@@ -149,25 +149,25 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>onlinedemo-dom</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>onlinedemo-fixture</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>onlinedemo-objstore-dflt</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>onlinedemo-webapp</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
@@ -360,20 +360,20 @@
<version>${isis.version}</version>
</dependency>
- <!-- isis: viewer: json -->
+ <!-- isis: viewer: restfulobjects -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>json</artifactId>
+ <artifactId>restfulobjects</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>json-applib</artifactId>
+ <artifactId>restfulobjects-applib</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>json-viewer</artifactId>
+ <artifactId>restfulobjects-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
Modified: incubator/isis/trunk/examples/onlinedemo/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/pom.xml?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/pom.xml Thu Oct 4 10:11:03 2012
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.isis.examples</groupId>
<artifactId>onlinedemo</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
+ <version>0.3.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>onlinedemo-webapp</artifactId>
- <name>Online Demo Webapp with HTML+JSON Viewers</name>
+ <name>Online Demo Webapp with HTML+RestfulObjects Viewers</name>
<packaging>war</packaging>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>json-viewer</artifactId>
+ <artifactId>restfulobjects-viewer</artifactId>
</dependency>
<!-- isis runtime -->
Modified: incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java?rev=1393975&r1=1393974&r2=1393975&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java (original)
+++ incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java Thu Oct 4 10:11:03 2012
@@ -21,15 +21,11 @@ package objstore.jdo.todo;
import java.util.List;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableMap;
-
import dom.todo.ToDoItem;
import dom.todo.ToDoItem.Category;
import dom.todo.ToDoItems;
import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.query.QueryDefault;
public class ToDoItemsJdo extends AbstractFactoryAndRepository implements ToDoItems {