incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1074240 [2/2] - in /incubator/isis/trunk: ./ alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/ alternatives/progmodel/wrapper/applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/ alternatives/pro...
Date Thu, 24 Feb 2011 18:03:36 GMT
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java Thu Feb 24 18:03:34 2011
@@ -39,7 +39,7 @@ public class MemberHiddenTest extends Ab
     public void whenValueHiddenImperativelyForValueThenModifyThrowsException() {
         custJsDO.hideFirstName = true;
         try {
-            custJsVO.setFirstName("Dick");
+            custJsWO.setFirstName("Dick");
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -51,7 +51,7 @@ public class MemberHiddenTest extends Ab
     public void whenValueHiddenImperativelyForNullThenModifyThrowsException() {
         custJsDO.hideFirstName = true;
         try {
-            custJsVO.setFirstName("Dick");
+            custJsWO.setFirstName("Dick");
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -63,7 +63,7 @@ public class MemberHiddenTest extends Ab
     public void whenValueHiddenImperativelyThenReadThrowsException() {
         custJsDO.hideFirstName = true;
         try {
-            custJsVO.getFirstName();
+            custJsWO.getFirstName();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -75,7 +75,7 @@ public class MemberHiddenTest extends Ab
     public void whenAssociationHiddenImperativelyForValueThenModifyThrowsException() {
         custJsDO.hideCountryOfBirth = true;
         try {
-            custJsVO.setCountryOfBirth(countryUsaDO);
+            custJsWO.setCountryOfBirth(countryUsaDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -88,7 +88,7 @@ public class MemberHiddenTest extends Ab
     public void whenAssociationHiddenImperativelyForNullThenModifyThrowsException() {
         custJsDO.hideCountryOfBirth = true;
         try {
-            custJsVO.setCountryOfBirth(null);
+            custJsWO.setCountryOfBirth(null);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -100,7 +100,7 @@ public class MemberHiddenTest extends Ab
     public void whenAssociationHiddenImperativelyThenReadThrowsException() {
         custJsDO.hideCountryOfBirth = true;
         try {
-            custJsVO.getCountryOfBirth();
+            custJsWO.getCountryOfBirth();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -112,7 +112,7 @@ public class MemberHiddenTest extends Ab
     public void whenIfCollectionHiddenImperativelyThenAddToThrowsException() {
         custJsDO.hideVisitedCountries = true;
         try {
-            custJsVO.addToVisitedCountries(countryGbrDO);
+            custJsWO.addToVisitedCountries(countryGbrDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -125,7 +125,7 @@ public class MemberHiddenTest extends Ab
         custJsDO.hideVisitedCountries = true;
         custJsDO.addToVisitedCountries(countryGbrDO);
         try {
-            custJsVO.removeFromVisitedCountries(countryGbrDO);
+            custJsWO.removeFromVisitedCountries(countryGbrDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -138,7 +138,7 @@ public class MemberHiddenTest extends Ab
         custJsDO.hideVisitedCountries = true;
         custJsDO.addToVisitedCountries(countryGbrDO);
         try {
-            custJsVO.getVisitedCountries();
+            custJsWO.getVisitedCountries();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -150,7 +150,7 @@ public class MemberHiddenTest extends Ab
     public void whenActionHiddenImperativelyThenThrowsException() {
         custJsDO.hidePlaceOrder = true;
         try {
-            custJsVO.placeOrder(product355DO, 3);
+            custJsWO.placeOrder(product355DO, 3);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForContextFacetViaMethod.class));
@@ -161,7 +161,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenValueHiddenDeclarativelyForValueThenModifyThrowsException() {
         try {
-            custJsVO.setAlwaysHiddenValue("Dick");
+            custJsWO.setAlwaysHiddenValue("Dick");
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -172,7 +172,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenValueHiddenDeclarativelyForNullThenModifyThrowsException() {
         try {
-            custJsVO.setAlwaysHiddenValue(null);
+            custJsWO.setAlwaysHiddenValue(null);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -183,7 +183,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenValueHiddenDeclarativelyThenReadThrowsException() {
         try {
-            custJsVO.getAlwaysHiddenValue();
+            custJsWO.getAlwaysHiddenValue();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -196,7 +196,7 @@ public class MemberHiddenTest extends Ab
         final Country[] values = new Country[] { countryUsaDO, null };
         for (final Country value : values) {
             try {
-                custJsVO.setAlwaysHiddenAssociation(value);
+                custJsWO.setAlwaysHiddenAssociation(value);
                 fail("Should have thrown exception");
             } catch (final HiddenException ex) {
                 assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -208,7 +208,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenAssociationHiddenDeclarativelyThenReadThrowsException() {
         try {
-            custJsVO.getAlwaysHiddenAssociation();
+            custJsWO.getAlwaysHiddenAssociation();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -219,7 +219,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenCollectionHiddenDeclarativelyThenAddToThrowsException() {
         try {
-            custJsVO.addToAlwaysHiddenCollection(countryUsaDO);
+            custJsWO.addToAlwaysHiddenCollection(countryUsaDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -231,7 +231,7 @@ public class MemberHiddenTest extends Ab
     public void whenCollectionHiddenDeclarativelyThenRemoveFromThrowsException() {
         custJsDO.removeFromAlwaysHiddenCollection(countryUsaDO);
         try {
-            custJsVO.removeFromAlwaysHiddenCollection(countryUsaDO);
+            custJsWO.removeFromAlwaysHiddenCollection(countryUsaDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -242,7 +242,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenCollectionHiddenDeclarativelyThenReadThrowsException() {
         try {
-            custJsVO.getAlwaysHiddenCollection();
+            custJsWO.getAlwaysHiddenCollection();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -253,7 +253,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenActionHiddenDeclarativelyThenThrowsException() {
         try {
-            custJsVO.alwaysHiddenAction();
+            custJsWO.alwaysHiddenAction();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HiddenFacetForMemberAnnotation.class));
@@ -267,7 +267,7 @@ public class MemberHiddenTest extends Ab
         final String[] values = new String[] { "Dick", null };
         for (final String value : values) {
             try {
-                custJsVO.setSessionHiddenValue(value);
+                custJsWO.setSessionHiddenValue(value);
                 fail("Should have thrown exception");
             } catch (final HiddenException ex) {
                 assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -279,7 +279,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenValueHiddenNotAuthorizedThenReadThrowsException() {
         try {
-            custJsVO.getSessionHiddenValue();
+            custJsWO.getSessionHiddenValue();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -292,7 +292,7 @@ public class MemberHiddenTest extends Ab
         final Country[] values = new Country[] { countryUsaDO, null };
         for (final Country value : values) {
             try {
-                custJsVO.setSessionHiddenAssociation(value);
+                custJsWO.setSessionHiddenAssociation(value);
                 fail("Should have thrown exception");
             } catch (final HiddenException ex) {
                 assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -304,7 +304,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenAssociationHiddenNotAuthorizedThenReadThrowsException() {
         try {
-            custJsVO.getSessionHiddenAssociation();
+            custJsWO.getSessionHiddenAssociation();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -315,7 +315,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenCollectionHiddenNotAuthorizedThenAddToThrowsException() {
         try {
-            custJsVO.addToSessionHiddenCollection(countryUsaDO);
+            custJsWO.addToSessionHiddenCollection(countryUsaDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -327,7 +327,7 @@ public class MemberHiddenTest extends Ab
     public void whenCollectionHiddenNotAuthorizedThenRemoveFromThrowsException() {
         custJsDO.addToSessionHiddenCollection(countryUsaDO);
         try {
-            custJsVO.removeFromSessionHiddenCollection(countryUsaDO);
+            custJsWO.removeFromSessionHiddenCollection(countryUsaDO);
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -338,7 +338,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenCollectionHiddenNotAuthorizedThenReadThrowsException() {
         try {
-            custJsVO.getSessionHiddenCollection();
+            custJsWO.getSessionHiddenCollection();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));
@@ -349,7 +349,7 @@ public class MemberHiddenTest extends Ab
     @Test
     public void whenActionHiddenNotAuthorizedThenThrowsException() {
         try {
-            custJsVO.sessionHiddenAction();
+            custJsWO.sessionHiddenAction();
             fail("Should have thrown exception");
         } catch (final HiddenException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(HideForSessionFacetViaMethod.class));

Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java Thu Feb 24 18:03:34 2011
@@ -47,7 +47,7 @@ public class MemberInvalidTest extends A
             custJsDO.validateFirstNameExpectedArg = value;
             custJsDO.validateFirstName = "bad first name";
             try {
-                custJsVO.setFirstName(value);
+                custJsWO.setFirstName(value);
                 fail("Should have thrown exception");
             } catch (final InvalidException ex) {
                 assertThat(ex.getAdvisorClass(), classEqualTo(PropertyValidateFacetViaMethod.class));
@@ -63,7 +63,7 @@ public class MemberInvalidTest extends A
         final Country[] values = new Country[] { countryUsaDO, null };
         for (final Country value : values) {
             try {
-                custJsVO.setCountryOfBirth(value);
+                custJsWO.setCountryOfBirth(value);
                 fail("Should have thrown exception");
             } catch (final InvalidException ex) {
                 assertThat(ex.getAdvisorClass(), classEqualTo(PropertyValidateFacetViaMethod.class));
@@ -77,7 +77,7 @@ public class MemberInvalidTest extends A
     public void whenCollectionInvalidImperativelyThenAddToThrowsException() {
         custJsDO.validateAddToVisitedCountries = "bad country";
         try {
-            custJsVO.addToVisitedCountries(countryGbrDO);
+            custJsWO.addToVisitedCountries(countryGbrDO);
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(CollectionValidateAddToFacetViaMethod.class));
@@ -91,7 +91,7 @@ public class MemberInvalidTest extends A
         custJsDO.addToVisitedCountries(countryGbrDO);
         custJsDO.validateRemoveFromVisitedCountries = "bad country";
         try {
-            custJsVO.removeFromVisitedCountries(countryGbrDO);
+            custJsWO.removeFromVisitedCountries(countryGbrDO);
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(CollectionValidateRemoveFromFacetViaMethod.class));
@@ -104,7 +104,7 @@ public class MemberInvalidTest extends A
     public void whenActionInvalidImperativelyThenThrowsException() {
         custJsDO.validatePlaceOrder = "can't place order";
         try {
-            custJsVO.placeOrder(product355DO, 3);
+            custJsWO.placeOrder(product355DO, 3);
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(ActionValidationFacetViaMethod.class));
@@ -115,18 +115,18 @@ public class MemberInvalidTest extends A
 
     @Test
     public void whenValueCanSetNullOnOptionalField() {
-        custJsVO.setOptionalValue(null);
+        custJsWO.setOptionalValue(null);
     }
 
     @Test
     public void whenAssociationCanSetNullOnOptionalField() {
-        custJsVO.setOptionalAssociation(null);
+        custJsWO.setOptionalAssociation(null);
     }
 
     @Test
     public void whenValueInvalidMandatoryThenThrowsException() {
         try {
-            custJsVO.setMandatoryValue(null);
+            custJsWO.setMandatoryValue(null);
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(MandatoryFacetDefault.class));
@@ -137,7 +137,7 @@ public class MemberInvalidTest extends A
     @Test
     public void whenAssociationInvalidMandatoryThenThrowsException() {
         try {
-            custJsVO.setMandatoryAssociation(null);
+            custJsWO.setMandatoryAssociation(null);
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(MandatoryFacetDefault.class));
@@ -149,7 +149,7 @@ public class MemberInvalidTest extends A
     @Test
     public void whenInvalidMaxLengthThenThrowsException() {
         try {
-            custJsVO.setMaxLengthField("This is far too long");
+            custJsWO.setMaxLengthField("This is far too long");
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(MaxLengthFacetAnnotationForProperty.class));
@@ -161,7 +161,7 @@ public class MemberInvalidTest extends A
     @Test
     public void whenInvalidRegExCaseSensitiveThenThrowsException() {
         try {
-            custJsVO.setRegExCaseSensitiveField("abCfoobar");
+            custJsWO.setRegExCaseSensitiveField("abCfoobar");
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getIdentifier().getMemberNaturalName(), equalTo("Reg Ex Case Sensitive Field"));
@@ -170,14 +170,14 @@ public class MemberInvalidTest extends A
 
     @Test
     public void whenCanSetValidRegExCaseSensitive() {
-        custJsVO.setRegExCaseInsensitiveField("abcfoobar");
+        custJsWO.setRegExCaseInsensitiveField("abcfoobar");
 
     }
 
     @Test
     public void whenInvalidRegExCaseInsensitiveThenThrowsException() {
         try {
-            custJsVO.setRegExCaseInsensitiveField("abXfoobar");
+            custJsWO.setRegExCaseInsensitiveField("abXfoobar");
             fail("Should have thrown exception");
         } catch (final InvalidException ex) {
             assertThat(ex.getAdvisorClass(), classEqualTo(RegExFacetAnnotationForProperty.class));
@@ -187,7 +187,7 @@ public class MemberInvalidTest extends A
 
     @Test
     public void whenCanSetValidRegExCaseInsensitive() {
-        custJsVO.setRegExCaseInsensitiveField("AbCfoobar");
+        custJsWO.setRegExCaseInsensitiveField("AbCfoobar");
     }
 
 }

Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberModifyTest.java Thu Feb 24 18:03:34 2011
@@ -39,45 +39,45 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void valueModifiedToNonNull() {
-        custJsVO.setFirstName("Dick");
+        custJsWO.setFirstName("Dick");
 
-        assertThat(custJsVO.getFirstName(), equalTo("Dick"));
+        assertThat(custJsWO.getFirstName(), equalTo("Dick"));
     }
 
     @Test
     public void valueModifiedToNull() {
-        custJsVO.setFirstName(null);
+        custJsWO.setFirstName(null);
 
-        assertThat(custJsVO.getFirstName(), nullValue());
+        assertThat(custJsWO.getFirstName(), nullValue());
     }
 
     @Test
     public void whenValueModifyCalledRatherThanSetForNonNull() {
-        custJsVO.setFirstName("Dick");
+        custJsWO.setFirstName("Dick");
         assertThat(custJsDO.modifyFirstNameCalled, is(true));
     }
 
     @Test
     public void whenValueClearCalledRatherThanSetForNull() {
-        custJsVO.setFirstName(null);
+        custJsWO.setFirstName(null);
         assertThat(custJsDO.clearFirstNameCalled, is(true));
     }
 
     @Test
     public void whenAssociationModifyCalledRatherThanSetForNonNull() {
-        custJsVO.setCountryOfBirth(countryUsaDO);
+        custJsWO.setCountryOfBirth(countryUsaDO);
         assertThat(custJsDO.modifyCountryOfBirthCalled, is(true));
     }
 
     @Test
     public void whenAssociationClearCalledRatherThanSetForNull() {
-        custJsVO.setCountryOfBirth(null);
+        custJsWO.setCountryOfBirth(null);
         assertThat(custJsDO.clearCountryOfBirthCalled, is(true));
     }
 
     @Test
     public void cannotUseAddDirectlyOnCollections() {
-        final List<Country> visitedCountries = custJsVO.getVisitedCountries();
+        final List<Country> visitedCountries = custJsWO.getVisitedCountries();
         try {
             visitedCountries.add(countryGbrDO);
             fail("UnsupportedOperationException should have been thrown.");
@@ -88,7 +88,7 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void cannotUseRemoveDirectlyOnCollections() {
-        final List<Country> visitedCountries = custJsVO.getVisitedCountries();
+        final List<Country> visitedCountries = custJsWO.getVisitedCountries();
         try {
             visitedCountries.remove(countryGbrDO);
             fail("UnsupportedOperationException should have been thrown.");
@@ -99,7 +99,7 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void cannotUseClearDirectlyOnCollections() {
-        final List<Country> visitedCountries = custJsVO.getVisitedCountries();
+        final List<Country> visitedCountries = custJsWO.getVisitedCountries();
         try {
             visitedCountries.clear();
             fail("UnsupportedOperationException should have been thrown.");
@@ -111,7 +111,7 @@ public class MemberModifyTest extends Ab
     @Test
     public void sttemptingToAddNullObjectIntoCollectionThrowsException() {
         try {
-            custJsVO.addToVisitedCountries(null);
+            custJsWO.addToVisitedCountries(null);
             fail("Exception should have been raised.");
         } catch (final IllegalArgumentException ex) {
             // expected
@@ -122,32 +122,32 @@ public class MemberModifyTest extends Ab
     public void removingNonExistentRemoveObjectFromCollectionDoesNothing() {
         assertThat(custJsDO.getVisitedCountries().contains(countryGbrDO), is(false));
 
-        custJsVO.removeFromVisitedCountries(countryGbrDO);
+        custJsWO.removeFromVisitedCountries(countryGbrDO);
         // no exception raised.
     }
 
     @Test
     public void canInvokeAction() {
-        final int sizeBefore = custJsVO.getOrders().size();
-        final Order orderBefore = custJsVO.getLastOrder();
-        custJsVO.placeOrder(product355DO, 3);
-        final Order orderAfter = custJsVO.getLastOrder();
+        final int sizeBefore = custJsWO.getOrders().size();
+        final Order orderBefore = custJsWO.getLastOrder();
+        custJsWO.placeOrder(product355DO, 3);
+        final Order orderAfter = custJsWO.getLastOrder();
 
-        final int sizeAfter = custJsVO.getOrders().size();
+        final int sizeAfter = custJsWO.getOrders().size();
         assertThat(sizeAfter, is(sizeBefore + 1));
         assertThat(orderAfter, is(not(orderBefore)));
     }
 
     @Test
     public void canInvokeActionIfOptionalValueParameterAndNullArgumentProvided() {
-        custJsVO.actionWithOptionalValueParameter(null);
+        custJsWO.actionWithOptionalValueParameter(null);
         assertThat(custJsDO.actionWithOptionalValueParameterArgument, nullValue());
     }
 
     @Test
     public void cannotInvokeActionIfMandatoryValueParameterAndNullArgumentProvided() {
         try {
-            custJsVO.actionWithMandatoryValueParameter(null);
+            custJsWO.actionWithMandatoryValueParameter(null);
             fail("InvalidMandatoryException should have been thrown");
         } catch (final InvalidException ex) {
             assertThat(custJsDO.actionWithMandatoryValueParameterArgument, equalTo(Long.MAX_VALUE)); // ie
@@ -156,14 +156,14 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void canInvokeActionIfOptionalReferenceParameterAndNullArgumentProvided() {
-        custJsVO.actionWithOptionalReferenceParameter(null);
+        custJsWO.actionWithOptionalReferenceParameter(null);
         assertThat(custJsDO.actionWithOptionalReferenceParameterArgument, nullValue());
     }
 
     @Test
     public void cannotInvokeActionIfMandatoryReferenceParameterAndNullArgumentProvided() {
         try {
-            custJsVO.actionWithMandatoryReferenceParameter(null);
+            custJsWO.actionWithMandatoryReferenceParameter(null);
             fail("InvalidMandatoryException should have been thrown");
         } catch (final InvalidException ex) {
             assertThat(custJsDO.actionWithMandatoryReferenceParameterArgument, not(nullValue()));
@@ -172,14 +172,14 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void canInvokeActionIfOptionalStringParameterAndEmptyStringProvidedAsArgument() {
-        custJsVO.actionWithOptionalStringParameter("");
+        custJsWO.actionWithOptionalStringParameter("");
         assertThat(custJsDO.actionWithOptionalStringParameterArgument, equalTo(""));
     }
 
     @Test
     public void cannotInvokeActionIfMandatoryStringParameterAndEmptyStringProvidedAsArgument() {
         try {
-            custJsVO.actionWithMandatoryStringParameter("");
+            custJsWO.actionWithMandatoryStringParameter("");
             fail("InvalidMandatoryException should have been thrown");
         } catch (final InvalidException ex) {
             assertThat(custJsDO.actionWithMandatoryStringParameterArgument, equalTo("original value")); // ie
@@ -188,14 +188,14 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void canInvokeActionIfParameterMatchRegularExpression() {
-        custJsVO.actionWithRegExStringParameter("6789");
+        custJsWO.actionWithRegExStringParameter("6789");
         assertThat(custJsDO.actionWithRegExStringParameterArgument, equalTo("6789"));
     }
 
     @Test
     public void cannotInvokeActionIfParameterDoesNotMatchRegularExpression() {
         try {
-            custJsVO.actionWithRegExStringParameter("abcd"); // doesn't match [0-9]{4}
+            custJsWO.actionWithRegExStringParameter("abcd"); // doesn't match [0-9]{4}
             fail("InvalidRegExException should have been thrown");
         } catch (final InvalidException ex) {
             assertThat(custJsDO.actionWithRegExStringParameterArgument, equalTo("1234")); // ie unchanged
@@ -204,14 +204,14 @@ public class MemberModifyTest extends Ab
 
     @Test
     public void canInvokeActionIfParameterNoLongerMaximumLength() {
-        custJsVO.actionWithMaxLengthStringParameter("abcd");
+        custJsWO.actionWithMaxLengthStringParameter("abcd");
         assertThat(custJsDO.actionWithMaxLengthStringParameterArgument, equalTo("abcd"));
     }
 
     @Test
     public void cannotInvokeActionIfParameterExceedsMaximumLength() {
         try {
-            custJsVO.actionWithMaxLengthStringParameter("abcde");
+            custJsWO.actionWithMaxLengthStringParameter("abcde");
             fail("InvalidMaxLengthException should have been thrown");
         } catch (final InvalidException ex) {
             assertThat(custJsDO.actionWithMaxLengthStringParameterArgument, equalTo("1234")); // ie unchanged

Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberReadTest.java Thu Feb 24 18:03:34 2011
@@ -35,31 +35,31 @@ public class MemberReadTest extends Abst
 
     @Test
     public void value() {
-        assertThat(custJsVO.getFirstName(), equalTo("Richard"));
+        assertThat(custJsWO.getFirstName(), equalTo("Richard"));
     }
 
     @Test
     public void valueWhenNull() {
         custJsDO.setFirstName(null);
-        assertThat(custJsVO.getFirstName(), nullValue());
+        assertThat(custJsWO.getFirstName(), nullValue());
     }
 
     @Test
     public void association() {
-        assertThat(custJsVO.getCountryOfBirth(), equalTo(countryGbrDO));
+        assertThat(custJsWO.getCountryOfBirth(), equalTo(countryGbrDO));
     }
 
     @Test
     public void associationWhenNull() {
         custJsDO.setCountryOfBirth(null);
-        assertThat(custJsVO.getCountryOfBirth(), nullValue());
+        assertThat(custJsWO.getCountryOfBirth(), nullValue());
     }
 
     @Test
     public void collectionContainsWhenDoesAndDoesNot() {
         custJsDO.addToVisitedCountries(countryGbrDO);
         custJsDO.addToVisitedCountries(countryUsaDO);
-        final List<Country> visitedCountries = custJsVO.getVisitedCountries();
+        final List<Country> visitedCountries = custJsWO.getVisitedCountries();
         assertThat(visitedCountries.contains(countryGbrDO), is(true));
         assertThat(visitedCountries.contains(countryUsaDO), is(true));
         assertThat(visitedCountries.contains(countryAusDO), is(false));
@@ -67,7 +67,7 @@ public class MemberReadTest extends Abst
 
     @Test
     public void collectionSizeWhenEmpty() {
-        assertThat(custJsVO.getVisitedCountries().size(), is(0));
+        assertThat(custJsWO.getVisitedCountries().size(), is(0));
     }
 
     @Test
@@ -75,12 +75,12 @@ public class MemberReadTest extends Abst
         custJsDO.addToVisitedCountries(countryGbrDO);
         custJsDO.addToVisitedCountries(countryUsaDO);
 
-        assertThat(custJsVO.getVisitedCountries().size(), is(2));
+        assertThat(custJsWO.getVisitedCountries().size(), is(2));
     }
 
     @Test
     public void isEmptySizeWhenEmpty() {
-        assertThat(custJsVO.getVisitedCountries().isEmpty(), is(true));
+        assertThat(custJsWO.getVisitedCountries().isEmpty(), is(true));
     }
 
     @Test
@@ -88,7 +88,7 @@ public class MemberReadTest extends Abst
         custJsDO.addToVisitedCountries(countryGbrDO);
         custJsDO.addToVisitedCountries(countryUsaDO);
 
-        assertThat(custJsVO.getVisitedCountries().isEmpty(), is(false));
+        assertThat(custJsWO.getVisitedCountries().isEmpty(), is(false));
     }
 
 }

Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java Thu Feb 24 18:03:34 2011
@@ -26,32 +26,32 @@ import static org.hamcrest.CoreMatchers.
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
+import org.junit.Test;
+
 import org.apache.isis.core.progmodel.facets.object.validate.method.ValidateObjectFacetViaValidateMethod;
 import org.apache.isis.progmodel.wrapper.applib.InvalidException;
 import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
 import org.apache.isis.viewer.junit.sample.domain.Customer;
-import org.junit.Test;
 
 public class SaveObjectsTest extends AbstractTest {
 
-	@SuppressWarnings("unchecked")
-	private WrapperObject<Customer> asViewObject(final Customer proxiedNewCustomer) {
-		return (WrapperObject<Customer>) proxiedNewCustomer;
+	private WrapperObject asWrapperObject(final Customer proxiedNewCustomer) {
+		return (WrapperObject) proxiedNewCustomer;
 	}
 
 	@Test
 	public void invokingSaveThroughProxyMakesTransientObjectPersistent() {
 		final Customer newCustomer = getDomainObjectContainer().newTransientInstance(Customer.class);
 		assertThat(getDomainObjectContainer().isPersistent(newCustomer),is(false));
-		final Customer newCustomerViewObject = getWrapperFactory().wrap(newCustomer);
-		newCustomerViewObject.setCustomerNumber(123);
-		newCustomerViewObject.setLastName("Smith");
-		newCustomerViewObject.setMandatoryAssociation(countryGbrDO);
-		newCustomerViewObject.setMandatoryValue("foo");
-		newCustomerViewObject.setMaxLengthField("abc");
-		newCustomerViewObject.setRegExCaseInsensitiveField("ABCd");
-		newCustomerViewObject.setRegExCaseSensitiveField("abcd");
-		final WrapperObject<Customer> proxyNewCustomer = asViewObject(newCustomerViewObject);
+		final Customer newCustomerVO = getWrapperFactory().wrap(newCustomer);
+		newCustomerVO.setCustomerNumber(123);
+		newCustomerVO.setLastName("Smith");
+		newCustomerVO.setMandatoryAssociation(countryGbrDO);
+		newCustomerVO.setMandatoryValue("foo");
+		newCustomerVO.setMaxLengthField("abc");
+		newCustomerVO.setRegExCaseInsensitiveField("ABCd");
+		newCustomerVO.setRegExCaseSensitiveField("abcd");
+		final WrapperObject proxyNewCustomer = asWrapperObject(newCustomerVO);
 		proxyNewCustomer.save();
 		assertThat(getDomainObjectContainer().isPersistent(newCustomer),
 				is(true));
@@ -70,8 +70,8 @@ public class SaveObjectsTest extends Abs
 
 		assertThat(getDomainObjectContainer().isPersistent(custJsDO), is(true));
 
-		final WrapperObject<Customer> proxyNewCustomer = asViewObject(custJsVO);
-		proxyNewCustomer.save();
+		final WrapperObject newCustomerWO = asWrapperObject(custJsWO);
+		newCustomerWO.save();
 
 		assertThat(getDomainObjectContainer().isPersistent(custJsDO), is(true));
 	}
@@ -89,14 +89,14 @@ public class SaveObjectsTest extends Abs
 		newCustomer.setRegExCaseInsensitiveField("ABCd");
 		newCustomer.setRegExCaseSensitiveField("abcd");
 
-		final Customer newCustomerViewObject = getWrapperFactory().wrap(newCustomer);
+		final Customer newCustomerWO = getWrapperFactory().wrap(newCustomer);
 		newCustomer.validate = "No shakes";
 
-		final WrapperObject<Customer> proxyNewCustomer = asViewObject(newCustomerViewObject);
+		final WrapperObject newCustomerWrapper = asWrapperObject(newCustomerWO);
 		try {
 			assertThat(getDomainObjectContainer().isPersistent(newCustomer),
 					is(false));
-			proxyNewCustomer.save();
+			newCustomerWrapper.save();
 			fail("An InvalidImperativelyException should have been thrown");
 		} catch (final InvalidException ex) {
 

Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/TitleTest.java Thu Feb 24 18:03:34 2011
@@ -30,6 +30,6 @@ public class TitleTest extends AbstractT
 
     @Test
     public void shouldAppendToDocumentor() {
-        assertThat(custJsVO.title(), equalTo("Richard Pawson"));
+        assertThat(custJsWO.title(), equalTo("Richard Pawson"));
     }
 }

Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ViewObjectTest.java Thu Feb 24 18:03:34 2011
@@ -27,23 +27,23 @@ import static org.junit.Assert.assertTha
 
 import java.util.List;
 
+import org.junit.Test;
+
 import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
 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 WrapperObject<Customer> asViewObject() {
-        return (WrapperObject<Customer>) custJsVO;
+    private WrapperObject asWrapperObject() {
+        return (WrapperObject) custJsWO;
     }
 
 	@Test
     public void canCastViewsToViewObject() {
         @SuppressWarnings("unused")
-        final WrapperObject<Customer> custRpVOAsViewObject = asViewObject();
+        final WrapperObject custRpVOAsViewObject = asWrapperObject();
     }
 
     @Test
@@ -78,7 +78,7 @@ public class ViewObjectTest extends Abst
     public void collectionInstanceOfViewObjectShouldReturnTrueWhenDealingWithView() {
         custJsDO.addToVisitedCountries(countryGbrDO);
         custJsDO.addToVisitedCountries(countryUsaDO);
-        final List<Country> visitedCountries = custJsVO.getVisitedCountries();
+        final List<Country> visitedCountries = custJsWO.getVisitedCountries();
         assertThat(visitedCountries instanceof WrapperObject, is(true));
     }
 
@@ -86,7 +86,7 @@ public class ViewObjectTest extends Abst
     public void containsOnViewedCollectionShouldIntercept() {
         custJsDO.addToVisitedCountries(countryGbrDO);
         custJsDO.addToVisitedCountries(countryUsaDO);
-        final List<Country> visitedCountries = custJsVO.getVisitedCountries();
+        final List<Country> visitedCountries = custJsWO.getVisitedCountries();
         assertThat(visitedCountries.contains(countryGbrDO), is(true));
     }
 

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=1074240&r1=1074239&r2=1074240&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 Thu Feb 24 18:03:34 2011
@@ -1,5 +1,8 @@
 package org.apache.isis.viewer.restful.viewer.embedded;
 
+import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
+import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
+
 import org.apache.isis.core.commons.lang.MapUtils;
 import org.apache.isis.core.runtime.web.EmbeddedWebViewer;
 import org.apache.isis.core.runtime.web.WebAppSpecification;
@@ -8,14 +11,14 @@ import org.apache.isis.core.webapp.Stati
 import org.apache.isis.core.webapp.servlets.ResourceServlet;
 import org.apache.isis.viewer.restful.viewer.RestfulApplication;
 import org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyTrusted;
-import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
-import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
 
 final class EmbeddedWebViewerRestful extends EmbeddedWebViewer {
     @Override
     public WebAppSpecification getWebAppSpecification() {
         WebAppSpecification webAppSpec = new WebAppSpecification();
 
+        webAppSpec.addContextParams("isis.viewers", "restful");
+
         webAppSpec.addContextParams(RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulApplication.class.getName());
 
         webAppSpec.addServletContextListener(ResteasyBootstrap.class);

Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java Thu Feb 24 18:03:34 2011
@@ -134,9 +134,9 @@ public abstract class ResourceAbstract {
 
         final Element ul = xhtmlRenderer.ul(HtmlClass.RESOURCES);
         
-        ul.appendChild(xhtmlRenderer.li_a("/services", "Services", "services", "resources", HtmlClass.RESOURCE));
-        ul.appendChild(xhtmlRenderer.li_a("/specs", "Specifications (MetaModel)", "specs", "resources", HtmlClass.RESOURCE));
-        ul.appendChild(xhtmlRenderer.li_a("/user", "User (Security)", "user", "resources", HtmlClass.RESOURCE));
+        ul.appendChild(xhtmlRenderer.li_a("services", "Services", "services", "resources", HtmlClass.RESOURCE));
+        ul.appendChild(xhtmlRenderer.li_a("specs", "Specifications (MetaModel)", "specs", "resources", HtmlClass.RESOURCE));
+        ul.appendChild(xhtmlRenderer.li_a("user", "User (Security)", "user", "resources", HtmlClass.RESOURCE));
         
         div.appendChild(ul);
 		return div;

Modified: incubator/isis/trunk/viewer/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/pom.xml?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/pom.xml Thu Feb 24 18:03:34 2011
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
@@ -196,12 +196,6 @@
 
 			<!-- Other -->
 			<dependency>
-				<groupId>com.google.collections</groupId>
-				<artifactId>google-collections</artifactId>
-				<version>1.0</version>
-			</dependency>
-
-			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
 				<version>1.4.2</version>

Modified: incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml (original)
+++ incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml Thu Feb 24 18:03:34 2011
@@ -17,8 +17,8 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"file:./src/docbkx/dtd-4.5/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"file:./src/docbkx/dtd-4.5/docbookx.dtd">
 <book>
   <bookinfo>
     <title>Apache Isis Wicket Viewer</title>
@@ -1422,30 +1422,11 @@
     Viewer</emphasis>, with the <acronym>HTML</acronym> of each
     <classname>Component</classname> using <acronym>CSS</acronym> classes for
     the styling. But you can override the default styling by supplying an
-    application-level <acronym>CSS</acronym> file, in the classpath (eg under
-    <filename>src/main/resources</filename>).</para>
+    application-level <acronym>CSS</acronym> file.</para>
 
-    <para>For example, if you want to bind to
-    <filename>src/main/resources/myapp.css</filename>, then subclass
-    <classname>IsisWicketApplication</classname> and override the
-    <methodname>newIsisWicketModule()</methodname> method:</para>
-
-    <programlisting>public class MyApplication extends IsisWicketApplication {
-  ...
-  protected Module newIsisWicketModule() {
-    return Modules.override(super.newIsisWicketModule()).with(
-      new AbstractModule() {
-        @Override
-        protected void configure() {
-          bindConstant().annotatedWith(ApplicationCssUrl.class).to("myapp.css");
-        }
-      }
-    );
-  }
-}</programlisting>
-
-    <para>Your custom application should then be registered in web.xml, as
-    described in <xref linkend="sec.CustomizingTheStartup" />.</para>
+    <para>By default this file should be called
+    <filename>application.css</filename> and should reside within
+    <filename>WEB-INF</filename> directory.</para>
 
     <para>There are two levels at which we can override the default styling,
     either generically or specific to a particular domain. Let's look at
@@ -1554,6 +1535,38 @@
       <para>This is a slightly trite example, but demonstrates the
       point.</para>
     </sect1>
+
+    <sect1>
+      <title>Changing the location/name of the application CSS file</title>
+
+      <para>As already mentioned, the default for the application
+      <acronym>CSS</acronym> file is in
+      <filename>WEB-INF/application.css</filename>. If for any reason you want
+      to change this, you can do so by subclassing
+      <classname>IsisWicketApplication</classname> and overriding the
+      <methodname>newIsisWicketModule()</methodname> method.</para>
+
+      <para>For example, to use <filename>css/myapp.css</filename> (under
+      <filename>WEB-INF</filename>) you would write:</para>
+
+      <programlisting>public class MyApplication extends IsisWicketApplication {
+  ...
+  protected Module newIsisWicketModule() {
+    return Modules.override(super.newIsisWicketModule()).with(
+      new AbstractModule() {
+        @Override
+        protected void configure() {
+          bindConstant().annotatedWith(ApplicationCssUrl.class).to("css/myapp.css");
+        }
+      }
+    );
+  }
+}</programlisting>
+
+      <para>Your custom application should then be registered in
+      <filename>web.xml</filename>, as described in <xref
+      linkend="sec.CustomizingTheStartup" />.</para>
+    </sect1>
   </chapter>
 
   <chapter>
@@ -1634,7 +1647,7 @@
 
       <para></para>
 
-      <para>There is further discussion on </para>
+      <para>There is further discussion on</para>
     </sect1>
 
     <sect1>

Modified: incubator/isis/trunk/viewer/wicket/ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/pom.xml?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/ui/pom.xml Thu Feb 24 18:03:34 2011
@@ -81,11 +81,6 @@
 			<artifactId>scriptaculous</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.collections</groupId>
-			<artifactId>google-collections</artifactId>
-		</dependency>
-
 
 		<!-- Dependency Injection support -->
 		<dependency>

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java Thu Feb 24 18:03:34 2011
@@ -26,17 +26,6 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
-import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory.LinkAndLabel;
-import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.isis.viewer.wicket.ui.util.Components;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
 import org.apache.wicket.Application;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -49,6 +38,18 @@ import org.apache.wicket.model.Model;
 
 import com.google.common.collect.Lists;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.ensure.Ensure;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory.LinkAndLabel;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
+import org.apache.isis.viewer.wicket.ui.util.Components;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+
 public class CssMenuItem implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -236,6 +237,7 @@ public class CssMenuItem implements Seri
 			Components.permanentlyHide(markupContainer, ID_MENU_LINK);
 			// ... and show label, along with disabled reason
 			label.add(new AttributeModifier("title", true, Model.of(this.getDisabledReason())));
+			label.add(new AttributeModifier("class", true, Model.of("disabled")));
 			markupContainer.add(label);
 			
 			return label;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css Thu Feb 24 18:03:34 2011
@@ -54,9 +54,9 @@
 	color: #A66144;
 	background-color: #C4D9EA;
 	text-decoration:none;
-	-moz-border-radius: 6px;
+/*	-moz-border-radius: 6px; 
 	-webkit-border-radius: 6px;
-	border-radius: 6px;
+	border-radius: 6px; */
 	}
 	
 .menuh a:hover, .menuh p:hover 						/* menu on mouse-over  */
@@ -76,9 +76,9 @@
 	background-image: url(navdown_secondarydark.gif);
 	background-position: right center;
 	background-repeat: no-repeat;
-	-moz-border-radius: 6px;
+/*	-moz-border-radius: 6px;
 	-webkit-border-radius: 6px;
-	border-radius: 6px;
+	border-radius: 6px; */
 	}
 
 .menuh a.top-parent:hover, .menuh p.top-parent:hover  /* attaches down-arrow to all top-parents */
@@ -153,6 +153,9 @@ span.menuh li li li li:hover ul
 
 
 
+li.cssSubMenuItem p.disabled {
+	color: gray;
+}
 
 
 /** TODO: tidy up this gunk, was experimenting in inlining; it may not be needed */

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.css?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.css (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.css Thu Feb 24 18:03:34 2011
@@ -18,9 +18,9 @@ a.entityDetailsLink {
 	color: #A66144;
 	background-color: #C4D9EA;
 	text-decoration:none;
-	-moz-border-radius: 6px;
+/*	-moz-border-radius: 6px;
 	-webkit-border-radius: 6px;
-	border-radius: 6px;
+	border-radius: 6px; */
 }
 
 a.entityDetailsLink:hover {

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/banner.pdn
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/banner.pdn?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/banner.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/banner.png?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/isis/trunk/viewer/wicket/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/pom.xml?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/pom.xml Thu Feb 24 18:03:34 2011
@@ -87,8 +87,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.google.collections</groupId>
-			<artifactId>google-collections</artifactId>
+			<groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
 		</dependency>
 
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Thu Feb 24 18:03:34 2011
@@ -22,12 +22,39 @@ package org.apache.isis.viewer.wicket.vi
 
 import java.util.ServiceLoader;
 
+import org.apache.wicket.Application;
+import org.apache.wicket.IConverterLocator;
+import org.apache.wicket.Page;
+import org.apache.wicket.Request;
+import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Response;
+import org.apache.wicket.authentication.AuthenticatedWebApplication;
+import org.apache.wicket.authentication.AuthenticatedWebSession;
+import org.apache.wicket.guice.GuiceComponentInjector;
+import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.util.convert.ConverterLocator;
+
+import com.google.inject.Guice;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
+import org.apache.isis.core.commons.resource.ResourceStreamSource;
+import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
+import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.runner.IsisModule;
 import org.apache.isis.core.runtime.system.DeploymentType;
 import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.webapp.ResourceStreamSourceServletContext;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
 import org.apache.isis.viewer.wicket.ui.ComponentFactory;
@@ -48,29 +75,6 @@ import org.apache.isis.viewer.wicket.vie
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapter;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
 import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
-import org.apache.wicket.Application;
-import org.apache.wicket.IConverterLocator;
-import org.apache.wicket.Page;
-import org.apache.wicket.Request;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.Response;
-import org.apache.wicket.authentication.AuthenticatedWebApplication;
-import org.apache.wicket.authentication.AuthenticatedWebSession;
-import org.apache.wicket.guice.GuiceComponentInjector;
-import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.util.convert.ConverterLocator;
-
-import com.google.inject.Guice;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
-import css.Css;
 
 /**
  * Main application, subclassing the Wicket {@link Application} and bootstrapping
@@ -173,13 +177,15 @@ public class IsisWicketApplication exten
 		
         DeploymentType deploymentType = determineDeploymentType();
         
-        final IsisModule isisModule = new IsisModule(deploymentType);
+        IsisConfigurationBuilder isisConfigurationBuilder = createConfigBuilder();
+        
+        final IsisModule isisModule = new IsisModule(deploymentType, isisConfigurationBuilder);
         final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
         injector.injectMembers(this);
 		
         initWicketComponentInjection(injector);
 	}
-	
+
    
     private DeploymentType determineDeploymentType() {
         if (getConfigurationType().equalsIgnoreCase(WICKET_CONFIGURATION_TYPE_DEVELOPMENT)) {
@@ -189,6 +195,14 @@ public class IsisWicketApplication exten
         }
     }
 
+    private IsisConfigurationBuilder createConfigBuilder() {
+        final ResourceStreamSource rssServletContext = new ResourceStreamSourceServletContext(getServletContext());
+        final ResourceStreamSource rssTcl = new ResourceStreamSourceContextLoaderClassPath();
+        final ResourceStreamSource rssClasspath = new ResourceStreamSourceCurrentClassClassPath();
+        IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderResourceStreams(rssTcl, rssClasspath, rssServletContext);
+        return isisConfigurationBuilder;
+    }
+
 
     protected void initWicketComponentInjection(final Injector injector) {
         addComponentInstantiationListener(new GuiceComponentInjector(this, injector));
@@ -265,13 +279,14 @@ public class IsisWicketApplication exten
      * does mean that the header is not first in the list, so can override other page-level CSS.  However, it still comes after
      * any component-level CSS, so is not ideal.
      */
+    @Override
     public void renderApplicationCss(HtmlHeaderContainer container) {
         final String cssUrl = getApplicationCssUrl();
         if (cssUrl == null) {
             return;
         }
         final IHeaderResponse headerResponse = container.getHeaderResponse();
-        headerResponse.renderCSSReference(new ResourceReference(Css.class, cssUrl));
+        headerResponse.renderCSSReference(cssUrl);
     }
 
 
@@ -282,7 +297,8 @@ public class IsisWicketApplication exten
 	/**
 	 * The {@link ComponentFactoryRegistry} created in {@link #newComponentFactoryRegistry()}.
 	 */
-	public final ComponentFactoryRegistry getComponentFactoryRegistry() {
+	@Override
+    public final ComponentFactoryRegistry getComponentFactoryRegistry() {
 		return componentFactoryRegistry;
 	}
 	
@@ -297,14 +313,16 @@ public class IsisWicketApplication exten
 	 * <p>
 	 * Non-final only for testing purposes; should not typically be overridden.
 	 */
-	public PageClassRegistry getPageClassRegistry() {
+	@Override
+    public PageClassRegistry getPageClassRegistry() {
 		return pageClassRegistry;
 	}
 	
 	/**
 	 * Delegates to the {@link #getPageClassRegistry() PageClassRegistry}.
 	 */
-	public Class<? extends Page> getHomePage() {
+	@Override
+    public Class<? extends Page> getHomePage() {
 		return getPageClassRegistry().getPageClass(PageType.HOME);
 	}
 	
@@ -321,7 +339,8 @@ public class IsisWicketApplication exten
 	// Images
 	///////////////////////////////////////////////////
 
-	public ImageCache getImageCache() {
+	@Override
+    public ImageCache getImageCache() {
 		return imageCache;
 	}
 
@@ -329,7 +348,8 @@ public class IsisWicketApplication exten
     // Authentication Session
     ///////////////////////////////////////////////////
 
-	public AuthenticationSession getAuthenticationSession() {
+	@Override
+    public AuthenticationSession getAuthenticationSession() {
 	    return IsisContext.getAuthenticationSession();
 	}
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java Thu Feb 24 18:03:34 2011
@@ -20,6 +20,8 @@
 
 package org.apache.isis.viewer.wicket.viewer;
 
+import com.google.inject.AbstractModule;
+
 import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCache;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryList;
 import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -31,12 +33,8 @@ import org.apache.isis.viewer.wicket.vie
 import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
 import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
 
-import com.google.inject.AbstractModule;
-
 public class IsisWicketModule extends AbstractModule {
 
-
-
     @Override
     protected void configure() {
         bind(ComponentFactoryRegistry.class).to(ComponentFactoryRegistryDefault.class);
@@ -47,5 +45,4 @@ public class IsisWicketModule extends Ab
         bindConstant().annotatedWith(ApplicationCssUrl.class).to("application.css");
     }
 
-
 }
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java Thu Feb 24 18:03:34 2011
@@ -22,6 +22,9 @@ package org.apache.isis.viewer.wicket.vi
 
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.authentication.pages.SignInPage;
+import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+
+import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
 
 /**
  * Boilerplate, pick up our HTML and CSS.
@@ -32,4 +35,19 @@ public final class WicketSignInPage exte
 
 	public WicketSignInPage(final PageParameters parameters) {
 	}
+	
+   /**
+     * Renders the application-supplied CSS, if any.
+     */
+    @Override
+    public void renderHead(HtmlHeaderContainer container) {
+        super.renderHead(container);
+        final ApplicationCssRenderer applicationCssRenderer = getApplicationCssRenderer();
+        applicationCssRenderer.renderApplicationCss(container);
+    }
+    
+    protected ApplicationCssRenderer getApplicationCssRenderer() {
+        return (ApplicationCssRenderer) getApplication();
+    }
+
 }
\ No newline at end of file

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java?rev=1074240&r1=1074239&r2=1074240&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java Thu Feb 24 18:03:34 2011
@@ -21,9 +21,27 @@
 package org.apache.isis.viewer.wicket.viewer.login;
 
 import org.apache.wicket.authentication.pages.SignOutPage;
+import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+
+import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
 
 /**
  * TODO.
  */
 public final class WicketSignOutPage extends SignOutPage {
+    
+    /**
+     * Renders the application-supplied CSS, if any.
+     */
+    @Override
+    public void renderHead(HtmlHeaderContainer container) {
+        super.renderHead(container);
+        final ApplicationCssRenderer applicationCssRenderer = getApplicationCssRenderer();
+        applicationCssRenderer.renderApplicationCss(container);
+    }
+    
+    protected ApplicationCssRenderer getApplicationCssRenderer() {
+        return (ApplicationCssRenderer) getApplication();
+    }
+
 }
\ No newline at end of file



Mime
View raw message