Repository: isis Updated Branches: refs/heads/master f19cbe239 -> 46e8aef81
http://git-wip-us.apache.org/repos/asf/isis/blob/46e8aef8/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java index b98fac6..ffd48f9 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java @@ -27,6 +27,8 @@ import static org.hamcrest.CoreMatchers.nullValue; import java.util.Iterator; +import org.apache.isis.core.runtime.persistence.ObjectNotFoundException; +import org.apache.isis.core.runtime.persistence.PojoRecreationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,7 +64,6 @@ import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.metamodel.spec.feature.Contributed; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; -import org.apache.isis.core.runtime.persistence.ObjectNotFoundException; import org.apache.isis.core.runtime.system.context.IsisContext; import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.core.runtime.system.persistence.OidGenerator; @@ -308,7 +309,7 @@ public class AdapterManagerDefault implements AdapterManagerSpi { final Object pojo = pojoRecreator.recreatePojo(typedOid); adapter = mapRecreatedPojo(typedOid, pojo); } catch(RuntimeException ex) { - throw new ObjectNotFoundException(typedOid, ex); + throw new PojoRecreationException(typedOid, ex); } } http://git-wip-us.apache.org/repos/asf/isis/blob/46e8aef8/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java index 8b97b41..e104454 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/ObjectStore.java @@ -32,7 +32,6 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid; import org.apache.isis.core.metamodel.adapter.oid.TypedOid; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; -import org.apache.isis.core.runtime.persistence.ObjectNotFoundException; import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand; import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand; import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand; @@ -147,7 +146,7 @@ public interface ObjectStore extends DebuggableWithTitle, SessionScopedComponent * * <p> * If the persistence mechanism does not known of an object with the - * specified {@link TypedOid} then a {@link ObjectNotFoundException} should be + * specified {@link TypedOid} then a {@link org.apache.isis.core.runtime.persistence.ObjectNotFoundException} should be * thrown. * * <p> @@ -164,7 +163,7 @@ public interface ObjectStore extends DebuggableWithTitle, SessionScopedComponent * @return the requested {@link ObjectAdapter} that has the specified * {@link TypedOid}. * - * @throws ObjectNotFoundException + * @throws org.apache.isis.core.runtime.persistence.ObjectNotFoundException * when no object corresponding to the oid can be found */ ObjectAdapter loadInstanceAndAdapt(TypedOid oid); http://git-wip-us.apache.org/repos/asf/isis/blob/46e8aef8/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java index eb9fe0f..02b5123 100644 --- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java +++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/actions/ToDoItemContributionsTest_updateCategory.java @@ -76,7 +76,7 @@ public class ToDoItemContributionsTest_updateCategory extends ToDoIntegTest { public void categoryCannotBeNull() throws Exception { // when, then - expectedExceptions.expectMessage("Category is mandatory"); + expectedExceptions.expectMessage("'Category' is mandatory"); toDoItemContributions.updateCategory(toDoItem, null, Subcategory.Chores); } http://git-wip-us.apache.org/repos/asf/isis/blob/46e8aef8/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml index a1859ba..e415798 100644 --- a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml @@ -204,7 +204,11 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_2.5_spec</artifactId> + <!-- + removed so can run o.a.i.WebServer from within IntelliJ; + can rely on servlet container to ignore this in war file <scope>provided</scope> + --> </dependency> <!-- http://git-wip-us.apache.org/repos/asf/isis/blob/46e8aef8/example/application/simple_wicket_restful_jdo/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simple_wicket_restful_jdo/webapp/pom.xml b/example/application/simple_wicket_restful_jdo/webapp/pom.xml index 3279711..374e1d7 100644 --- a/example/application/simple_wicket_restful_jdo/webapp/pom.xml +++ b/example/application/simple_wicket_restful_jdo/webapp/pom.xml @@ -204,7 +204,9 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_2.5_spec</artifactId> - <!-- + <!-- + removed so can run o.a.i.WebServer from within IntelliJ; + can rely on servlet container to ignore this in war file <scope>provided</scope> --> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/46e8aef8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ecc2529..5d03255 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,20 @@ </profile> <profile> + <id>security-file</id> + <modules> + <module>component/security/file</module> + </modules> + </profile> + + <profile> + <id>security-shiro</id> + <modules> + <module>component/security/shiro</module> + </modules> + </profile> + + <profile> <id>objectstore-jdo</id> <modules> <module>component/objectstore/jdo</module>
