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 2010/10/27 19:00:32 UTC
svn commit: r1028037 [6/13] - in /incubator/isis/trunk: alternatives/
alternatives/embedded/ alternatives/embedded/src/docbkx/
alternatives/embedded/src/docbkx/guide/
alternatives/embedded/src/docbkx/guide/images/
alternatives/embedded/src/main/java/or...
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/FixtureInstallerAnnotatedClass.java Wed Oct 27 17:00:06 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.extensions.headless.junit.internal;
+package org.apache.isis.viewer.junit.internal;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.extensions.headless.junit.Fixture;
-import org.apache.isis.extensions.headless.junit.Fixtures;
import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerAbstract;
import org.apache.isis.runtime.fixturesinstaller.FixturesInstallerDelegate;
+import org.apache.isis.viewer.junit.Fixture;
+import org.apache.isis.viewer.junit.Fixtures;
public class FixtureInstallerAnnotatedClass extends FixturesInstallerAbstract {
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/InMemoryPersistenceMechanismInstallerWithinJunit.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.headless.junit.internal;
+package org.apache.isis.viewer.junit.internal;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.extensions.headless.viewer.DomainObjectContainerHeadlessViewer;
-import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
+import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerHeadlessWrapper;
+import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
public class InMemoryPersistenceMechanismInstallerWithinJunit extends InMemoryPersistenceMechanismInstaller {
@@ -33,7 +33,7 @@ public class InMemoryPersistenceMechanis
@Override
protected DomainObjectContainer createContainer(
final IsisConfiguration configuration) {
- return new DomainObjectContainerHeadlessViewer();
+ return new DomainObjectContainerHeadlessWrapper();
}
}
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.junit.internal;
+package org.apache.isis.viewer.junit.internal;
import org.apache.isis.commons.exceptions.IsisException;
import org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller;
Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java (original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/ServicesInstallerAnnotatedClass.java Wed Oct 27 17:00:06 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.extensions.headless.junit.internal;
+package org.apache.isis.viewer.junit.internal;
import java.util.ArrayList;
import java.util.List;
-import org.apache.isis.extensions.headless.junit.Service;
-import org.apache.isis.extensions.headless.junit.Services;
import org.apache.isis.runtime.persistence.services.ServicesInstallerAbstract;
+import org.apache.isis.viewer.junit.Service;
+import org.apache.isis.viewer.junit.Services;
public class ServicesInstallerAnnotatedClass extends ServicesInstallerAbstract {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/AbstractTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/AbstractTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/AbstractTest.java Wed Oct 27 17:00:06 2010
@@ -18,30 +18,25 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.extensions.headless.applib.HeadlessViewer;
-import org.apache.isis.extensions.headless.applib.listeners.InteractionListener;
-import org.apache.isis.extensions.headless.junit.Fixture;
-import org.apache.isis.extensions.headless.junit.Fixtures;
-import org.apache.isis.extensions.headless.junit.IsisTestRunner;
-import org.apache.isis.extensions.headless.junit.Service;
-import org.apache.isis.extensions.headless.junit.Services;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
-import org.apache.isis.extensions.headless.junit.sample.domain.Product;
-import org.apache.isis.extensions.headless.junit.sample.fixtures.CountriesFixture;
-import org.apache.isis.extensions.headless.junit.sample.fixtures.CustomerOrdersFixture;
-import org.apache.isis.extensions.headless.junit.sample.fixtures.CustomersFixture;
-import org.apache.isis.extensions.headless.junit.sample.fixtures.ProductsFixture;
-import org.apache.isis.extensions.headless.junit.sample.service.CountryRepository;
-import org.apache.isis.extensions.headless.junit.sample.service.CustomerRepository;
-import org.apache.isis.extensions.headless.junit.sample.service.OrderRepository;
-import org.apache.isis.extensions.headless.junit.sample.service.ProductRepository;
+import org.apache.isis.applib.DomainObjectContainer;
+import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
+import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.apache.isis.viewer.junit.sample.domain.Product;
+import org.apache.isis.viewer.junit.sample.fixtures.CountriesFixture;
+import org.apache.isis.viewer.junit.sample.fixtures.CustomerOrdersFixture;
+import org.apache.isis.viewer.junit.sample.fixtures.CustomersFixture;
+import org.apache.isis.viewer.junit.sample.fixtures.ProductsFixture;
+import org.apache.isis.viewer.junit.sample.service.CountryRepository;
+import org.apache.isis.viewer.junit.sample.service.CustomerRepository;
+import org.apache.isis.viewer.junit.sample.service.OrderRepository;
+import org.apache.isis.viewer.junit.sample.service.ProductRepository;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
@RunWith(IsisTestRunner.class)
@@ -58,7 +53,7 @@ import org.apache.isis.extensions.headle
@Service(OrderRepository.class)
})
public abstract class AbstractTest {
-
+
protected Customer custJsDO;
protected Customer custJsVO;
@@ -76,27 +71,27 @@ public abstract class AbstractTest {
private ProductRepository productRepository;
private CustomerRepository customerRepository;
private CountryRepository countryRepository;
-
+
private DomainObjectContainer domainObjectContainer;
- private HeadlessViewer headlessViewer;
-
+ private WrapperFactory wrapperFactory;
+
private InteractionListener interactionListener;
@Before
public void setUp() {
-
+
product355DO = productRepository.findByCode("355-40311");
- product355VO = headlessViewer.view(product355DO);
+ product355VO = wrapperFactory.wrap(product355DO);
product850DO = productRepository.findByCode("850-18003");
countryGbrDO = countryRepository.findByCode("GBR");
- countryGbrVO = headlessViewer.view(countryGbrDO);
+ countryGbrVO = wrapperFactory.wrap(countryGbrDO);
countryUsaDO = countryRepository.findByCode("USA");
countryAusDO = countryRepository.findByCode("AUS");
custJsDO = customerRepository.findByName("Pawson");
- custJsVO = headlessViewer.view(custJsDO);
+ custJsVO = wrapperFactory.wrap(custJsDO);
}
@After
@@ -107,16 +102,16 @@ public abstract class AbstractTest {
return interactionListener;
}
-
+
////////////////////////////////////////////////////////
// Injected.
////////////////////////////////////////////////////////
-
- protected HeadlessViewer getHeadlessViewer() {
- return headlessViewer;
+
+ protected WrapperFactory getWrapperFactory() {
+ return wrapperFactory;
}
- public void setHeadlessViewer(HeadlessViewer headlessViewer) {
- this.headlessViewer = headlessViewer;
+ public void setWrapperFactory(WrapperFactory headlessViewer) {
+ this.wrapperFactory = headlessViewer;
}
protected DomainObjectContainer getDomainObjectContainer() {
@@ -154,6 +149,6 @@ public abstract class AbstractTest {
-
+
}
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/DefaultAndChoicesTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/DefaultAndChoicesTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/DefaultAndChoicesTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/DefaultAndChoicesTest.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Ignore;
+import org.junit.Test;
public class DefaultAndChoicesTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/InteractionListenerTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/InteractionListenerTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/InteractionListenerTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/InteractionListenerTest.java Wed Oct 27 17:00:06 2010
@@ -18,25 +18,25 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.extensions.headless.applib.listeners.InteractionAdapter;
-import org.apache.isis.extensions.headless.applib.listeners.InteractionListener;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+import org.apache.isis.applib.events.InteractionEvent;
+import org.apache.isis.applib.events.PropertyAccessEvent;
+import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionAdapter;
+import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.junit.Test;
public class InteractionListenerTest extends AbstractTest {
@Test
public void shouldBeAbleToAddListener() {
- final Customer proxiedCustRP = getHeadlessViewer().view(custJsDO);
+ final Customer proxiedCustRP = getWrapperFactory().wrap(custJsDO);
final InteractionEvent[] events = { null };
final InteractionListener l = new InteractionAdapter() {
@Override
@@ -44,7 +44,7 @@ public class InteractionListenerTest ext
events[0] = ev;
}
};
- getHeadlessViewer().addInteractionListener(l);
+ getWrapperFactory().addInteractionListener(l);
proxiedCustRP.getFirstName();
assertThat(events[0], notNullValue());
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberDisabledTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberDisabledTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberDisabledTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java Wed Oct 27 17:00:06 2010
@@ -18,20 +18,20 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.apache.isis.metamodel.facets.disable.DisableForContextFacetViaMethod;
-import org.apache.isis.metamodel.facets.disable.DisabledFacetAnnotation;
-import org.apache.isis.extensions.headless.applib.DisabledException;
-import org.apache.isis.extensions.headless.junit.sample.domain.Order;
+import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.apache.isis.metamodel.facets.disable.DisableForContextFacetViaMethod;
+import org.apache.isis.metamodel.facets.disable.DisabledFacetAnnotation;
+import org.apache.isis.progmodel.wrapper.applib.DisabledException;
+import org.apache.isis.viewer.junit.sample.domain.Order;
+import org.junit.Test;
public class MemberDisabledTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberHiddenTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberHiddenTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberHiddenTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java Wed Oct 27 17:00:06 2010
@@ -18,19 +18,19 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
-
-import org.junit.Test;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetAnnotation;
-import org.apache.isis.metamodel.facets.hide.HideForContextFacetViaMethod;
-import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
-import org.apache.isis.extensions.headless.applib.HiddenException;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
+import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.metamodel.facets.hide.HiddenFacetAnnotation;
+import org.apache.isis.metamodel.facets.hide.HideForContextFacetViaMethod;
+import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
+import org.apache.isis.progmodel.wrapper.applib.HiddenException;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.junit.Test;
public class MemberHiddenTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberInvalidTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberInvalidTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberInvalidTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java Wed Oct 27 17:00:06 2010
@@ -18,23 +18,23 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
-
-import org.junit.Test;
-import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
-import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateFacetViaMethod;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacetDefault;
-import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthFacetAnnotation;
-import org.apache.isis.metamodel.facets.propparam.validate.regex.RegExFacetAnnotation;
-import org.apache.isis.extensions.headless.applib.InvalidException;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
+import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetViaMethod;
+import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
+import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
+import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateFacetViaMethod;
+import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacetDefault;
+import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthFacetAnnotation;
+import org.apache.isis.metamodel.facets.propparam.validate.regex.RegExFacetAnnotation;
+import org.apache.isis.progmodel.wrapper.applib.InvalidException;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.junit.Test;
public class MemberInvalidTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberModifyTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberModifyTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberModifyTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java Wed Oct 27 17:00:06 2010
@@ -18,21 +18,21 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.apache.isis.extensions.headless.applib.InvalidException;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
-import org.apache.isis.extensions.headless.junit.sample.domain.Order;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.apache.isis.progmodel.wrapper.applib.InvalidException;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.apache.isis.viewer.junit.sample.domain.Order;
+import org.junit.Test;
public class MemberModifyTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberReadTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberReadTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/MemberReadTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java Wed Oct 27 17:00:06 2010
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.junit.Test;
public class MemberReadTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/ObjectImmutableTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/ObjectImmutableTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/ObjectImmutableTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java Wed Oct 27 17:00:06 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
-
-import org.junit.Test;
-import org.apache.isis.metamodel.facets.object.immutable.DisabledFacetDerivedFromImmutable;
-import org.apache.isis.extensions.headless.applib.DisabledException;
+import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.metamodel.facets.object.immutable.DisabledFacetDerivedFromImmutable;
+import org.apache.isis.progmodel.wrapper.applib.DisabledException;
+import org.junit.Test;
public class ObjectImmutableTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/SaveObjectsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/SaveObjectsTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/SaveObjectsTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java Wed Oct 27 17:00:06 2010
@@ -18,32 +18,32 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
-
-import org.junit.Test;
-import org.apache.isis.metamodel.facets.object.validate.ValidateObjectFacetViaValidateMethod;
-import org.apache.isis.extensions.headless.applib.InvalidException;
-import org.apache.isis.extensions.headless.applib.ViewObject;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
+import static org.apache.isis.commons.matchers.NofMatchers.classEqualTo;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import org.apache.isis.metamodel.facets.object.validate.ValidateObjectFacetViaValidateMethod;
+import org.apache.isis.progmodel.wrapper.applib.InvalidException;
+import org.apache.isis.progmodel.wrapper.applib.WrappedObject;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.junit.Test;
public class SaveObjectsTest extends AbstractTest {
@SuppressWarnings("unchecked")
- private ViewObject<Customer> asViewObject(final Customer proxiedNewCustomer) {
- return (ViewObject<Customer>) proxiedNewCustomer;
+ private WrappedObject<Customer> asViewObject(final Customer proxiedNewCustomer) {
+ return (WrappedObject<Customer>) proxiedNewCustomer;
}
@Test
public void invokingSaveThroughProxyMakesTransientObjectPersistent() {
final Customer newCustomer = getDomainObjectContainer().newTransientInstance(Customer.class);
assertThat(getDomainObjectContainer().isPersistent(newCustomer),is(false));
- final Customer newCustomerViewObject = getHeadlessViewer().view(newCustomer);
+ final Customer newCustomerViewObject = getWrapperFactory().wrap(newCustomer);
newCustomerViewObject.setCustomerNumber(123);
newCustomerViewObject.setLastName("Smith");
newCustomerViewObject.setMandatoryAssociation(countryGbrDO);
@@ -51,7 +51,7 @@ public class SaveObjectsTest extends Abs
newCustomerViewObject.setMaxLengthField("abc");
newCustomerViewObject.setRegExCaseInsensitiveField("ABCd");
newCustomerViewObject.setRegExCaseSensitiveField("abcd");
- final ViewObject<Customer> proxyNewCustomer = asViewObject(newCustomerViewObject);
+ final WrappedObject<Customer> proxyNewCustomer = asViewObject(newCustomerViewObject);
proxyNewCustomer.save();
assertThat(getDomainObjectContainer().isPersistent(newCustomer),
is(true));
@@ -67,19 +67,19 @@ public class SaveObjectsTest extends Abs
custJsDO.setMaxLengthField("abc");
custJsDO.setRegExCaseInsensitiveField("ABCd");
custJsDO.setRegExCaseSensitiveField("abcd");
-
+
assertThat(getDomainObjectContainer().isPersistent(custJsDO), is(true));
-
- final ViewObject<Customer> proxyNewCustomer = asViewObject(custJsVO);
+
+ final WrappedObject<Customer> proxyNewCustomer = asViewObject(custJsVO);
proxyNewCustomer.save();
-
+
assertThat(getDomainObjectContainer().isPersistent(custJsDO), is(true));
}
@Test
public void whenValidateMethodThenCanVetoSave() {
final Customer newCustomer = getDomainObjectContainer().newTransientInstance(Customer.class);
-
+
// just to get into valid state
newCustomer.setCustomerNumber(123);
newCustomer.setLastName("Smith");
@@ -89,10 +89,10 @@ public class SaveObjectsTest extends Abs
newCustomer.setRegExCaseInsensitiveField("ABCd");
newCustomer.setRegExCaseSensitiveField("abcd");
- final Customer newCustomerViewObject = getHeadlessViewer().view(newCustomer);
+ final Customer newCustomerViewObject = getWrapperFactory().wrap(newCustomer);
newCustomer.validate = "No shakes";
-
- final ViewObject<Customer> proxyNewCustomer = asViewObject(newCustomerViewObject);
+
+ final WrappedObject<Customer> proxyNewCustomer = asViewObject(newCustomerViewObject);
try {
assertThat(getDomainObjectContainer().isPersistent(newCustomer),
is(false));
@@ -106,5 +106,5 @@ public class SaveObjectsTest extends Abs
assertThat(ex.getMessage(), equalTo("No shakes"));
}
}
-
+
}
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/TitleTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/TitleTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/TitleTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Test;
public class TitleTest extends AbstractTest {
Copied: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java (from r1026611, incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/ViewObjectTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java?p2=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java&p1=incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/ViewObjectTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/extensions/headless/junit/ViewObjectTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java Wed Oct 27 17:00:06 2010
@@ -18,37 +18,37 @@
*/
-package org.apache.isis.extensions.headless.junit;
+package org.apache.isis.viewer.junit;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.apache.isis.extensions.headless.applib.ViewObject;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.apache.isis.progmodel.wrapper.applib.WrappedObject;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.junit.Test;
public class ViewObjectTest extends AbstractTest {
@SuppressWarnings("unchecked")
- private ViewObject<Customer> asViewObject() {
- return (ViewObject<Customer>) custJsVO;
+ private WrappedObject<Customer> asViewObject() {
+ return (WrappedObject<Customer>) custJsVO;
}
@Test
public void canCastViewsToViewObject() {
@SuppressWarnings("unused")
- final ViewObject<Customer> custRpVOAsViewObject = asViewObject();
+ final WrappedObject<Customer> custRpVOAsViewObject = asViewObject();
}
@Test
public void shouldBeAbleToCreateAView() {
- final Customer custRpVO = getHeadlessViewer().view(custJsDO);
+ final Customer custRpVO = getWrapperFactory().wrap(custJsDO);
assertThat(custRpVO, instanceOf(Customer.class));
custRpVO.setFirstName("Dick");
@@ -57,7 +57,7 @@ public class ViewObjectTest extends Abst
@Test
public void viewShouldPassesThroughSetterToUnderlyingDomainObject() {
- final Customer custRpVO = getHeadlessViewer().view(custJsDO);
+ final Customer custRpVO = getWrapperFactory().wrap(custJsDO);
custRpVO.setFirstName("Dick");
assertThat("Dick", equalTo(custRpVO.getFirstName()));
@@ -65,13 +65,13 @@ public class ViewObjectTest extends Abst
@Test
public void objectIsViewShouldReturnTrueWhenDealingWithView() {
- final Customer custRpVO = getHeadlessViewer().view(custJsDO);
- assertThat(getHeadlessViewer().isView(custRpVO), is(true));
+ final Customer custRpVO = getWrapperFactory().wrap(custJsDO);
+ assertThat(getWrapperFactory().isWrapper(custRpVO), is(true));
}
@Test
public void objectIsViewShouldReturnFalseWhenDealingWithUnderlying() {
- assertThat(getHeadlessViewer().isView(custJsDO), is(false));
+ assertThat(getWrapperFactory().isWrapper(custJsDO), is(false));
}
@Test
@@ -79,7 +79,7 @@ public class ViewObjectTest extends Abst
custJsDO.addToVisitedCountries(countryGbrDO);
custJsDO.addToVisitedCountries(countryUsaDO);
final List<Country> visitedCountries = custJsVO.getVisitedCountries();
- assertThat(visitedCountries instanceof ViewObject, is(true));
+ assertThat(visitedCountries instanceof WrappedObject, is(true));
}
@Test
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Country.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Country.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Country.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Country.java Wed Oct 27 17:00:06 2010
@@ -18,18 +18,18 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.domain;
+package org.apache.isis.viewer.junit.sample.domain;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Bounded;
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.applib.util.TitleBuffer;
+import org.apache.log4j.Logger;
@Bounded
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Customer.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.domain;
+package org.apache.isis.viewer.junit.sample.domain;
import java.util.ArrayList;
import java.util.Date;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Order.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Order.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Order.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Order.java Wed Oct 27 17:00:06 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.domain;
+package org.apache.isis.viewer.junit.sample.domain;
import java.util.Date;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.util.TitleBuffer;
+import org.apache.log4j.Logger;
public class Order extends AbstractDomainObject {
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/domain/Product.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,11 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.domain;
+package org.apache.isis.viewer.junit.sample.domain;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Immutable;
@@ -32,6 +31,7 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.TypicalLength;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.util.TitleBuffer;
+import org.apache.log4j.Logger;
@Immutable
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CountriesFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CountriesFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CountriesFixture.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CountriesFixture.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.fixtures;
+package org.apache.isis.viewer.junit.sample.fixtures;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.extensions.headless.junit.sample.service.CountryRepository;
+import org.apache.isis.viewer.junit.sample.service.CountryRepository;
+import org.apache.log4j.Logger;
public class CountriesFixture extends AbstractFixture {
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomerOrdersFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomerOrdersFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomerOrdersFixture.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomerOrdersFixture.java Wed Oct 27 17:00:06 2010
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.fixtures;
+package org.apache.isis.viewer.junit.sample.fixtures;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
-import org.apache.isis.extensions.headless.junit.sample.domain.Product;
-import org.apache.isis.extensions.headless.junit.sample.service.CustomerRepository;
-import org.apache.isis.extensions.headless.junit.sample.service.ProductRepository;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.apache.isis.viewer.junit.sample.domain.Product;
+import org.apache.isis.viewer.junit.sample.service.CustomerRepository;
+import org.apache.isis.viewer.junit.sample.service.ProductRepository;
+import org.apache.log4j.Logger;
public class CustomerOrdersFixture extends AbstractFixture {
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomersFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomersFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomersFixture.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/CustomersFixture.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.fixtures;
+package org.apache.isis.viewer.junit.sample.fixtures;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
-import org.apache.isis.extensions.headless.junit.sample.service.CountryRepository;
-import org.apache.isis.extensions.headless.junit.sample.service.CustomerRepository;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.apache.isis.viewer.junit.sample.service.CountryRepository;
+import org.apache.isis.viewer.junit.sample.service.CustomerRepository;
+import org.apache.log4j.Logger;
public class CustomersFixture extends AbstractFixture {
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/JoeBloggsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/JoeBloggsFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/JoeBloggsFixture.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/JoeBloggsFixture.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.fixtures;
+package org.apache.isis.viewer.junit.sample.fixtures;
import org.apache.isis.applib.fixtures.LogonFixture;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/ProductsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/ProductsFixture.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/ProductsFixture.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/fixtures/ProductsFixture.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.fixtures;
+package org.apache.isis.viewer.junit.sample.fixtures;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.extensions.headless.junit.sample.service.ProductRepository;
+import org.apache.isis.viewer.junit.sample.service.ProductRepository;
+import org.apache.log4j.Logger;
public class ProductsFixture extends AbstractFixture {
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CountryRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CountryRepository.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CountryRepository.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CountryRepository.java Wed Oct 27 17:00:06 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.service;
+package org.apache.isis.viewer.junit.sample.service;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.Filter;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.apache.log4j.Logger;
@Named("Countries")
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CustomerRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CustomerRepository.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CustomerRepository.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/CustomerRepository.java Wed Oct 27 17:00:06 2010
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.service;
+package org.apache.isis.viewer.junit.sample.service;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.Filter;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.extensions.headless.junit.sample.domain.Country;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
+import org.apache.isis.viewer.junit.sample.domain.Country;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.apache.log4j.Logger;
@Named("Customers")
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/OrderRepository.java Wed Oct 27 17:00:06 2010
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.service;
+package org.apache.isis.viewer.junit.sample.service;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
-import org.apache.isis.extensions.headless.junit.sample.domain.Order;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.apache.isis.viewer.junit.sample.domain.Order;
+import org.apache.log4j.Logger;
@Named("Orders")
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/ProductRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/ProductRepository.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/ProductRepository.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/sample/service/ProductRepository.java Wed Oct 27 17:00:06 2010
@@ -18,17 +18,17 @@
*/
-package org.apache.isis.extensions.headless.junit.sample.service;
+package org.apache.isis.viewer.junit.sample.service;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.Filter;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.extensions.headless.junit.sample.domain.Customer;
-import org.apache.isis.extensions.headless.junit.sample.domain.Product;
+import org.apache.isis.viewer.junit.sample.domain.Customer;
+import org.apache.isis.viewer.junit.sample.domain.Product;
+import org.apache.log4j.Logger;
@Named("Products")
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/AbstractRestfulClient.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/AbstractRestfulClient.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/AbstractRestfulClient.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/AbstractRestfulClient.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/AbstractRestfulClient.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/AbstractRestfulClient.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/AbstractRestfulClient.java Wed Oct 27 17:00:06 2010
@@ -1,11 +1,11 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
-import static org.apache.isis.extensions.restful.applib.StringUtils.asString;
-import static org.apache.isis.extensions.restful.applib.UrlConnectionUtils.createGetConnection;
-import static org.apache.isis.extensions.restful.applib.UrlConnectionUtils.createPostConnection;
-import static org.apache.isis.extensions.restful.applib.UrlConnectionUtils.readDocFromConnectionInputStream;
-import static org.apache.isis.extensions.restful.applib.UrlConnectionUtils.writeMapToConnectionOutputStream;
-import static org.apache.isis.extensions.restful.applib.UrlEncodeUtils.urlEncode;
+import static org.apache.isis.viewer.restful.applib.StringUtils.asString;
+import static org.apache.isis.viewer.restful.applib.UrlConnectionUtils.createGetConnection;
+import static org.apache.isis.viewer.restful.applib.UrlConnectionUtils.createPostConnection;
+import static org.apache.isis.viewer.restful.applib.UrlConnectionUtils.readDocFromConnectionInputStream;
+import static org.apache.isis.viewer.restful.applib.UrlConnectionUtils.writeMapToConnectionOutputStream;
+import static org.apache.isis.viewer.restful.applib.UrlEncodeUtils.urlEncode;
import java.io.IOException;
import java.net.HttpURLConnection;
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/Constants.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/Constants.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/Constants.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/Constants.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/Constants.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/Constants.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/RestfulClientException.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/RestfulClientException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/RestfulClientException.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/RestfulClientException.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/RestfulClientException.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/RestfulClientException.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/RestfulClientException.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
public class RestfulClientException extends RuntimeException {
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/StringUtils.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/StringUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/StringUtils.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/StringUtils.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/StringUtils.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/StringUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/StringUtils.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
import java.io.IOException;
import java.io.StringWriter;
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlConnectionUtils.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/UrlConnectionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlConnectionUtils.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlConnectionUtils.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/UrlConnectionUtils.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/UrlConnectionUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlConnectionUtils.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
import java.io.BufferedWriter;
import java.io.IOException;
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlEncodeUtils.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/UrlEncodeUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlEncodeUtils.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlEncodeUtils.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/UrlEncodeUtils.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/UrlEncodeUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/UrlEncodeUtils.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
Copied: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/XomUtils.java (from r1026611, incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/XomUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/XomUtils.java?p2=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/XomUtils.java&p1=incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/XomUtils.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/extensions/restful/applib/XomUtils.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/XomUtils.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib;
+package org.apache.isis.viewer.restful.applib;
import java.io.IOException;
Modified: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/providers/StringApplicationXhtmlXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/providers/StringApplicationXhtmlXmlProvider.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/providers/StringApplicationXhtmlXmlProvider.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/providers/StringApplicationXhtmlXmlProvider.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib.providers;
+package org.apache.isis.viewer.restful.applib.providers;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/HomePageResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/HomePageResource.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/HomePageResource.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/HomePageResource.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib.resources;
+package org.apache.isis.viewer.restful.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
Modified: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ObjectResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ObjectResource.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ObjectResource.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ObjectResource.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib.resources;
+package org.apache.isis.viewer.restful.applib.resources;
import java.io.InputStream;
Modified: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ServicesResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ServicesResource.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ServicesResource.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/ServicesResource.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib.resources;
+package org.apache.isis.viewer.restful.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Modified: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/SpecsResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/SpecsResource.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/SpecsResource.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/SpecsResource.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib.resources;
+package org.apache.isis.viewer.restful.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Modified: incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/UserResource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/UserResource.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/UserResource.java (original)
+++ incubator/isis/trunk/viewer/restful/applib/src/main/java/org/apache/isis/viewer/restful/applib/resources/UserResource.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.applib.resources;
+package org.apache.isis.viewer.restful.applib.resources;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
Copied: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/AbstractJaxRsApplication.java (from r1026611, incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/AbstractJaxRsApplication.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/AbstractJaxRsApplication.java?p2=incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/AbstractJaxRsApplication.java&p1=incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/AbstractJaxRsApplication.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/AbstractJaxRsApplication.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/AbstractJaxRsApplication.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.viewer;
+package org.apache.isis.viewer.restful.viewer;
import java.util.Collections;
import java.util.LinkedHashSet;
Copied: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/Constants.java (from r1026611, incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/Constants.java?p2=incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/Constants.java&p1=incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/Constants.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/Constants.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/Constants.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.viewer;
+package org.apache.isis.viewer.restful.viewer;
import org.apache.isis.runtime.system.SystemConstants;
@@ -11,7 +11,7 @@ public final class Constants {
public static final String NOF_REST_SUPPORT_JS = "nof-rest-support.js";
public static final String XMLHTTP_REQUEST_SRC_JS = "XMLHttpRequest.src.js";
public static final String XMLHTTP_REQUEST_JS = "XMLHttpRequest.js";
- public static final String URL_ENCODING_CHAR_SET = org.apache.isis.extensions.restful.applib.Constants.URL_ENCODING_CHAR_SET;
+ public static final String URL_ENCODING_CHAR_SET = org.apache.isis.viewer.restful.applib.Constants.URL_ENCODING_CHAR_SET;
private Constants() {}
Copied: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/RestfulApplication.java (from r1026611, incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/RestfulApplication.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/RestfulApplication.java?p2=incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/RestfulApplication.java&p1=incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/RestfulApplication.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/extensions/restful/viewer/RestfulApplication.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/RestfulApplication.java Wed Oct 27 17:00:06 2010
@@ -1,12 +1,12 @@
-package org.apache.isis.extensions.restful.viewer;
+package org.apache.isis.viewer.restful.viewer;
-import org.apache.isis.extensions.restful.applib.providers.StringApplicationXhtmlXmlProvider;
-import org.apache.isis.extensions.restful.viewer.resources.HomePageResourceImpl;
-import org.apache.isis.extensions.restful.viewer.resources.objects.ObjectResourceImpl;
-import org.apache.isis.extensions.restful.viewer.resources.services.ServicesResourceImpl;
-import org.apache.isis.extensions.restful.viewer.resources.specs.SpecsResourceImpl;
-import org.apache.isis.extensions.restful.viewer.resources.user.UserResourceImpl;
+import org.apache.isis.viewer.restful.applib.providers.StringApplicationXhtmlXmlProvider;
+import org.apache.isis.viewer.restful.viewer.resources.HomePageResourceImpl;
+import org.apache.isis.viewer.restful.viewer.resources.objects.ObjectResourceImpl;
+import org.apache.isis.viewer.restful.viewer.resources.services.ServicesResourceImpl;
+import org.apache.isis.viewer.restful.viewer.resources.specs.SpecsResourceImpl;
+import org.apache.isis.viewer.restful.viewer.resources.user.UserResourceImpl;
public class RestfulApplication extends AbstractJaxRsApplication {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyExtended.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyExtended.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyExtended.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.viewer.authentication;
+package org.apache.isis.viewer.restful.viewer.authentication;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java Wed Oct 27 17:00:06 2010
@@ -1,10 +1,10 @@
-package org.apache.isis.extensions.restful.viewer.embedded;
+package org.apache.isis.viewer.restful.viewer.embedded;
import org.apache.isis.commons.lang.MapUtils;
-import org.apache.isis.extensions.restful.viewer.RestfulApplication;
-import org.apache.isis.extensions.restful.viewer.authentication.AuthenticationSessionLookupStrategyExtended;
import org.apache.isis.runtime.web.EmbeddedWebViewer;
import org.apache.isis.runtime.web.WebAppSpecification;
+import org.apache.isis.viewer.restful.viewer.RestfulApplication;
+import org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyExtended;
import org.apache.isis.webapp.IsisSessionFilter;
import org.apache.isis.webapp.StaticContentFilter;
import org.apache.isis.webapp.servlets.ResourceServlet;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java Wed Oct 27 17:00:06 2010
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.restful.viewer.embedded;
+package org.apache.isis.viewer.restful.viewer.embedded;
import org.apache.isis.runtime.viewer.IsisViewer;
import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacet.java Wed Oct 27 17:00:06 2010
@@ -1,12 +1,12 @@
/**
*
*/
-package org.apache.isis.extensions.restful.viewer.facets;
+package org.apache.isis.viewer.restful.viewer.facets;
-import org.apache.isis.extensions.restful.viewer.xom.ResourceContext;
-import org.apache.isis.extensions.restful.viewer.xom.TableColumnAbstract;
import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.restful.viewer.xom.TableColumnAbstract;
public abstract class TableColumnFacet extends TableColumnAbstract<Facet> {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetDisabling.java Wed Oct 27 17:00:06 2010
@@ -1,10 +1,10 @@
-package org.apache.isis.extensions.restful.viewer.facets;
+package org.apache.isis.viewer.restful.viewer.facets;
import nu.xom.Element;
-import org.apache.isis.extensions.restful.viewer.xom.ResourceContext;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.interactions.DisablingInteractionAdvisor;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
public final class TableColumnFacetDisabling extends TableColumnFacet {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetFacetType.java Wed Oct 27 17:00:06 2010
@@ -1,12 +1,12 @@
-package org.apache.isis.extensions.restful.viewer.facets;
+package org.apache.isis.viewer.restful.viewer.facets;
import java.text.MessageFormat;
import nu.xom.Element;
-import org.apache.isis.extensions.restful.viewer.html.HtmlClass;
-import org.apache.isis.extensions.restful.viewer.xom.ResourceContext;
import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
public final class TableColumnFacetFacetType extends TableColumnFacet {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetHiding.java Wed Oct 27 17:00:06 2010
@@ -1,10 +1,10 @@
-package org.apache.isis.extensions.restful.viewer.facets;
+package org.apache.isis.viewer.restful.viewer.facets;
import nu.xom.Element;
-import org.apache.isis.extensions.restful.viewer.xom.ResourceContext;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.interactions.HidingInteractionAdvisor;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
public final class TableColumnFacetHiding extends TableColumnFacet {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetImplementation.java Wed Oct 27 17:00:06 2010
@@ -1,9 +1,9 @@
-package org.apache.isis.extensions.restful.viewer.facets;
+package org.apache.isis.viewer.restful.viewer.facets;
import nu.xom.Element;
-import org.apache.isis.extensions.restful.viewer.xom.ResourceContext;
import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
public final class TableColumnFacetImplementation extends TableColumnFacet {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/facets/TableColumnFacetIsImperative.java Wed Oct 27 17:00:06 2010
@@ -1,10 +1,10 @@
-package org.apache.isis.extensions.restful.viewer.facets;
+package org.apache.isis.viewer.restful.viewer.facets;
import nu.xom.Element;
-import org.apache.isis.extensions.restful.viewer.xom.ResourceContext;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.java5.ImperativeFacetUtils;
+import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
public final class TableColumnFacetIsImperative extends TableColumnFacet {