isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234708 - in /incubator/isis/trunk/examples: claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/ embeddedinspring/src/main/java/org/apac...
Date Mon, 23 Jan 2012 09:03:57 GMT
Author: danhaywood
Date: Mon Jan 23 09:03:56 2012
New Revision: 1234708

URL: http://svn.apache.org/viewvc?rev=1234708&view=rev
Log:
ISIS-165: code cleanup etc

Modified:
    incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
    incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java
    incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java
    incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java
    incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java
    incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java
    incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java
    incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java
    incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java
    incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java
    incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
    incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
    incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java
    incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java
    incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Category.java
    incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItem.java
    incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticationManagerSupportingInMemoryRegistrationInstaller.java
    incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticatorInMemory.java
    incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
    incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
    incubator/isis/trunk/examples/quickstart/pom.xml
    incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
    incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
    incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java

Modified: incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
(original)
+++ incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
Mon Jan 23 09:03:56 2012
@@ -19,6 +19,10 @@
 
 package org.apache.isis.example.claims.junit;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.example.claims.dom.claim.ClaimRepository;
 import org.apache.isis.example.claims.dom.employee.Employee;
@@ -30,9 +34,6 @@ import org.apache.isis.progmodel.wrapper
 import org.apache.isis.viewer.junit.IsisTestRunner;
 import org.apache.isis.viewer.junit.Service;
 import org.apache.isis.viewer.junit.Services;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
 
 @RunWith(IsisTestRunner.class)
 @Services({ @Service(ClaimRepositoryDefault.class), @Service(EmployeeRepositoryDefault.class)
})

Modified: incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java
(original)
+++ incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/ClaimSubmitTest.java
Mon Jan 23 09:03:56 2012
@@ -25,13 +25,14 @@ import static org.junit.Assert.fail;
 
 import java.util.List;
 
+import org.junit.Test;
+
 import org.apache.isis.example.claims.dom.claim.Approver;
 import org.apache.isis.example.claims.dom.claim.Claim;
 import org.apache.isis.example.claims.fixture.ClaimsFixture;
 import org.apache.isis.progmodel.wrapper.applib.DisabledException;
 import org.apache.isis.viewer.junit.Fixture;
 import org.apache.isis.viewer.junit.Fixtures;
-import org.junit.Test;
 
 @Fixtures({ @Fixture(ClaimsFixture.class) })
 public class ClaimSubmitTest extends AbstractTest {

Modified: incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java
(original)
+++ incubator/isis/trunk/examples/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/NewClaimTest.java
Mon Jan 23 09:03:56 2012
@@ -22,11 +22,12 @@ package org.apache.isis.example.claims.j
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import org.junit.Test;
+
 import org.apache.isis.example.claims.dom.claim.Claim;
 import org.apache.isis.example.claims.fixture.ClaimsFixture;
 import org.apache.isis.viewer.junit.Fixture;
 import org.apache.isis.viewer.junit.Fixtures;
-import org.junit.Test;
 
 @Fixtures({ @Fixture(ClaimsFixture.class) })
 public class NewClaimTest extends AbstractTest {

Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java
(original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/controller/PersonController.java
Mon Jan 23 09:03:56 2012
@@ -2,9 +2,6 @@ package org.apache.isis.examples.embedde
 
 import java.util.List;
 
-import org.apache.isis.examples.embeddedinspring.dao.PersonDao;
-import org.apache.isis.examples.embeddedinspring.model.Person;
-import org.apache.isis.runtimes.embedded.IsisMetaModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +12,10 @@ import org.springframework.web.bind.anno
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
+import org.apache.isis.examples.embeddedinspring.dao.PersonDao;
+import org.apache.isis.examples.embeddedinspring.model.Person;
+import org.apache.isis.runtimes.embedded.IsisMetaModel;
+
 @Controller
 @RequestMapping("/person/")
 public class PersonController {

Modified: incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java
(original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/main/java/org/apache/isis/examples/embeddedinspring/dao/PersonDao.java
Mon Jan 23 09:03:56 2012
@@ -5,10 +5,11 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.apache.isis.examples.embeddedinspring.model.Person;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.apache.isis.examples.embeddedinspring.model.Person;
+
 @Repository("personRepo")
 public class PersonDao {
 

Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java
(original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/DataInitializer.java
Mon Jan 23 09:03:56 2012
@@ -6,10 +6,11 @@ import java.util.List;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import org.apache.isis.examples.embeddedinspring.model.Person;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
+import org.apache.isis.examples.embeddedinspring.model.Person;
+
 @Component
 @Scope("prototype")
 public class DataInitializer {

Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java
(original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/controller/PersonControllerTest.java
Mon Jan 23 09:03:56 2012
@@ -7,7 +7,6 @@ import static org.junit.Assert.assertTru
 
 import java.util.List;
 
-import org.apache.isis.examples.embeddedinspring.model.Person;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,6 +16,8 @@ import org.springframework.test.context.
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.servlet.ModelAndView;
 
+import org.apache.isis.examples.embeddedinspring.model.Person;
+
 @ContextConfiguration({ "/test-context.xml", "/test-isis.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 @Transactional

Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java
(original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/dao/PersonDaoTest.java
Mon Jan 23 09:03:56 2012
@@ -2,8 +2,6 @@ package org.apache.isis.examples.embedde
 
 import java.util.List;
 
-import org.apache.isis.examples.embeddedinspring.controller.DataInitializer;
-import org.apache.isis.examples.embeddedinspring.model.Person;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,6 +11,9 @@ import org.springframework.test.context.
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.apache.isis.examples.embeddedinspring.controller.DataInitializer;
+import org.apache.isis.examples.embeddedinspring.model.Person;
+
 @ContextConfiguration({ "/test-context.xml", "/test-isis.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 @Transactional

Modified: incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java
(original)
+++ incubator/isis/trunk/examples/embeddedinspring/src/test/java/org/apache/isis/examples/embeddedinspring/webserver/WebServerBootstrapper.java
Mon Jan 23 09:03:56 2012
@@ -19,10 +19,11 @@
 
 package org.apache.isis.examples.embeddedinspring.webserver;
 
-import org.apache.isis.core.commons.exceptions.IsisException;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.webapp.WebAppContext;
 
+import org.apache.isis.core.commons.exceptions.IsisException;
+
 /**
  * For bootstrapping the app from the command line.
  */

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java
(original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFacetHolderTest.java
Mon Jan 23 09:03:56 2012
@@ -22,7 +22,6 @@ package org.apache.isis.metamodel.exampl
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
@@ -32,6 +31,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
 @RunWith(JMock.class)
 public class NameFileFacetFacetHolderTest {
 

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
(original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
Mon Jan 23 09:03:56 2012
@@ -25,11 +25,12 @@ import static org.junit.Assert.assertTha
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+
 public class NameFileFacetFactoryFeatureTypesTest {
 
     private NameFileFacetFactory facetFactory;

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
(original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
Mon Jan 23 09:03:56 2012
@@ -23,12 +23,6 @@ import static org.apache.isis.core.commo
 
 import java.lang.reflect.Method;
 
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
@@ -39,6 +33,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.MethodRemover;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.FacetedMethod;
+
 @RunWith(JMock.class)
 public class NameFileFacetFactoryProcessTest {
 

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java
(original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetInstantiationTest.java
Mon Jan 23 09:03:56 2012
@@ -19,11 +19,12 @@
 
 package org.apache.isis.metamodel.examples.facets.namefile;
 
-import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
+
 public class NameFileFacetInstantiationTest {
 
     private FacetHolderImpl holder;

Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java
(original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetValueTest.java
Mon Jan 23 09:03:56 2012
@@ -22,7 +22,6 @@ package org.apache.isis.metamodel.exampl
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
@@ -32,6 +31,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+
 @RunWith(JMock.class)
 public class NameFileFacetValueTest {
 

Modified: incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Category.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Category.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Category.java
(original)
+++ incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/Category.java
Mon Jan 23 09:03:56 2012
@@ -19,6 +19,8 @@
 
 package org.apache.isis.examples.onlinedemo.dom.items;
 
+import com.google.common.base.Objects;
+
 import org.apache.isis.applib.AbstractDomainObject;
 import org.apache.isis.applib.annotation.Bounded;
 import org.apache.isis.applib.annotation.Immutable;
@@ -26,8 +28,6 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.Title;
 import org.apache.isis.applib.filter.Filter;
 
-import com.google.common.base.Objects;
-
 @Immutable
 // cannot be modified through the UI
 @Bounded

Modified: incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItem.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItem.java
(original)
+++ incubator/isis/trunk/examples/onlinedemo/dom/src/main/java/org/apache/isis/examples/onlinedemo/dom/items/ToDoItem.java
Mon Jan 23 09:03:56 2012
@@ -21,6 +21,8 @@ package org.apache.isis.examples.onlined
 
 import java.util.List;
 
+import com.google.common.base.Objects;
+
 import org.apache.isis.applib.annotation.Disabled;
 import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.applib.annotation.Ignore;
@@ -34,8 +36,6 @@ import org.apache.isis.applib.filter.Fil
 import org.apache.isis.applib.util.TitleBuffer;
 import org.apache.isis.applib.value.Date;
 
-import com.google.common.base.Objects;
-
 /**
  * A todo item (task) owned by a particular user.
  */

Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticationManagerSupportingInMemoryRegistrationInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticationManagerSupportingInMemoryRegistrationInstaller.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticationManagerSupportingInMemoryRegistrationInstaller.java
(original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticationManagerSupportingInMemoryRegistrationInstaller.java
Mon Jan 23 09:03:56 2012
@@ -21,12 +21,12 @@ package org.apache.isis.examples.onlined
 
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.standard.Authenticator;
 import org.apache.isis.runtimes.dflt.runtime.authentication.AuthenticationManagerStandardInstallerAbstractForDfltRuntime;
 
-import com.google.common.collect.Lists;
-
 public class AuthenticationManagerSupportingInMemoryRegistrationInstaller extends AuthenticationManagerStandardInstallerAbstractForDfltRuntime
{
 
     public AuthenticationManagerSupportingInMemoryRegistrationInstaller() {

Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticatorInMemory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticatorInMemory.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticatorInMemory.java
(original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/auth/AuthenticatorInMemory.java
Mon Jan 23 09:03:56 2012
@@ -21,6 +21,9 @@ package org.apache.isis.examples.onlined
 
 import java.util.Map;
 
+import com.google.common.base.Objects;
+import com.google.common.collect.Maps;
+
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
@@ -29,9 +32,6 @@ import org.apache.isis.core.runtime.auth
 import org.apache.isis.core.runtime.authentication.standard.Registrar;
 import org.apache.isis.core.runtime.authentication.standard.RegistrationDetailsPassword;
 
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
 public class AuthenticatorInMemory extends AuthenticatorAbstract implements Registrar {
 
     private static AuthenticatorInMemory instance;

Modified: incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
(original)
+++ incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
Mon Jan 23 09:03:56 2012
@@ -19,11 +19,11 @@
 
 package fixture.todo;
 
-import org.apache.isis.applib.fixtures.AbstractFixture;
-
 import dom.todo.ToDoItem;
 import dom.todo.ToDoItems;
 
+import org.apache.isis.applib.fixtures.AbstractFixture;
+
 public class ToDoItemsFixture extends AbstractFixture {
 
     @Override

Modified: incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
(original)
+++ incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
Mon Jan 23 09:03:56 2012
@@ -21,12 +21,12 @@ package objstore.dflt.todo;
 
 import java.util.List;
 
-import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.applib.filter.Filter;
-
 import dom.todo.ToDoItem;
 import dom.todo.ToDoItems;
 
+import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.filter.Filter;
+
 public class ToDoItemsDefault extends AbstractFactoryAndRepository implements ToDoItems {
 
     // {{ Id, iconName

Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Mon Jan 23 09:03:56 2012
@@ -189,18 +189,6 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>quickstart-viewer-html</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>quickstart-viewer-json</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
                 <artifactId>quickstart-tests-bdd</artifactId>
                 <version>${project.version}</version>
             </dependency>

Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
(original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
Mon Jan 23 09:03:56 2012
@@ -19,8 +19,13 @@
 
 package junit;
 
+import dom.todo.ToDoItems;
 import objstore.dflt.todo.ToDoItemsDefault;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
 import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
@@ -28,11 +33,6 @@ import org.apache.isis.viewer.junit.Conf
 import org.apache.isis.viewer.junit.IsisTestRunner;
 import org.apache.isis.viewer.junit.Service;
 import org.apache.isis.viewer.junit.Services;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import dom.todo.ToDoItems;
 
 @RunWith(IsisTestRunner.class)
 @ConfigDir("../webapp/src/main/webapp/WEB-INF")

Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
(original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
Mon Jan 23 09:03:56 2012
@@ -27,13 +27,13 @@ import static org.junit.Assert.assertTha
 import java.util.List;
 
 import junit.AbstractTest;
+import dom.todo.ToDoItem;
+import fixture.todo.ToDoItemsFixture;
 
-import org.apache.isis.viewer.junit.Fixture;
-import org.apache.isis.viewer.junit.Fixtures;
 import org.junit.Test;
 
-import dom.todo.ToDoItem;
-import fixture.todo.ToDoItemsFixture;
+import org.apache.isis.viewer.junit.Fixture;
+import org.apache.isis.viewer.junit.Fixtures;
 
 @Fixtures({ @Fixture(ToDoItemsFixture.class) })
 public class ToDoItemRepositoryTest extends AbstractTest {

Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java?rev=1234708&r1=1234707&r2=1234708&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
(original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
Mon Jan 23 09:03:56 2012
@@ -23,15 +23,15 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import junit.AbstractTest;
+import dom.todo.ToDoItem;
+import fixture.todo.ToDoItemsFixture;
 
-import org.apache.isis.progmodel.wrapper.applib.DisabledException;
-import org.apache.isis.viewer.junit.Fixture;
-import org.apache.isis.viewer.junit.Fixtures;
 import org.junit.Before;
 import org.junit.Test;
 
-import dom.todo.ToDoItem;
-import fixture.todo.ToDoItemsFixture;
+import org.apache.isis.progmodel.wrapper.applib.DisabledException;
+import org.apache.isis.viewer.junit.Fixture;
+import org.apache.isis.viewer.junit.Fixtures;
 
 @Fixtures({ @Fixture(ToDoItemsFixture.class) })
 public class ToDoItemTest extends AbstractTest {



Mime
View raw message