isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1026073 - in /incubator/isis/trunk: examples/ examples/wicket-testapp/claims/ examples/wicket-testapp/claims/commandline/ examples/wicket-testapp/claims/dom/ examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicke...
Date Thu, 21 Oct 2010 17:11:20 GMT
Author: danhaywood
Date: Thu Oct 21 17:11:18 2010
New Revision: 1026073

URL: http://svn.apache.org/viewvc?rev=1026073&view=rev
Log:
wicket POMs updated

Modified:
    incubator/isis/trunk/examples/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/commandline/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/dom/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/Claim.java
    incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/ClaimantExpenseSummary.java
    incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/employee/Employee.java
    incubator/isis/trunk/examples/wicket-testapp/claims/fixture/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/fixture/ClaimsFixture.java
    incubator/isis/trunk/examples/wicket-testapp/claims/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/service/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/ui/pom.xml
    incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardComponentFactory.java
    incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardPanel.java
    incubator/isis/trunk/examples/wicket-testapp/claims/webapp/pom.xml
    incubator/isis/trunk/release/pom.xml
    incubator/isis/trunk/viewer/pom.xml
    incubator/isis/trunk/viewer/wicket/applib/pom.xml
    incubator/isis/trunk/viewer/wicket/facets/pom.xml
    incubator/isis/trunk/viewer/wicket/model/pom.xml
    incubator/isis/trunk/viewer/wicket/pom.xml
    incubator/isis/trunk/viewer/wicket/ui/pom.xml
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/value/StandaloneValuePanelFactory.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
    incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/panels/ProcessObjectPanelAbstract.java
    incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java
    incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
    incubator/isis/trunk/viewer/wicket/viewer/pom.xml
    incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/integration/nof/IsisContextForWicket.java
    incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java
    incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java

Modified: incubator/isis/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/pom.xml (original)
+++ incubator/isis/trunk/examples/pom.xml Thu Oct 21 17:11:18 2010
@@ -50,6 +50,10 @@
         <module>claims</module>
         <module>expenses</module>
         <module>shopping-cart</module>
+        <module>wicket-testapp/claims</module>
+        <!-- 
+        <module>restful-testapp/claims</module>
+         -->
         <module>metamodel-examples/namefile</module>
     </modules>
 

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/commandline/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/commandline/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/commandline/pom.xml Thu Oct 21 17:11:18 2010
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>wicket-testapp-claims</artifactId>
+    	<groupId>org.apache.isis.examples.apps</groupId>
+    	<artifactId>wicket-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>wicket-testapp-claims-commandline</artifactId>
+	<artifactId>wicket-claims-commandline</artifactId>
 	<name>Wicket Viewer TestApp: Claims Commandline</name>
 
 	<properties>
@@ -19,82 +19,68 @@
 		<!-- other modules in this project -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-fixture</artifactId>
+			<artifactId>wicket-claims-fixture</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-ui</artifactId>
+			<artifactId>wicket-claims-ui</artifactId>
 		</dependency>
 
 		<!-- apache isis -->
-	    <dependency>
-			<groupId>org.apache.isis.core</groupId>
-	        <artifactId>bytecode-cglib</artifactId>
-	    </dependency>
-	    <dependency>
-			<groupId>org.apache.isis.core</groupId>
-	        <artifactId>bytecode-javassist</artifactId>
-	    </dependency>
-		<dependency>
-			<groupId>org.apache.isis.core</groupId>
-			<artifactId>remoting</artifactId>
-		</dependency>
         <dependency>
 			<groupId>org.apache.isis.core</groupId>
             <artifactId>webserver</artifactId>
         </dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>dnd-viewer</artifactId>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>dnd</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>html-viewer</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-server</artifactId>
+			<groupId>org.apache.isis.viewer</groupId>
+			<artifactId>html</artifactId>
 		</dependency>
+
 	    <dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-	        <artifactId>headless-embedded</artifactId>
+			<groupId>org.apache.isis.defaults</groupId>
+	        <artifactId>bytecode</artifactId>
 	    </dependency>
+	    <dependency>
+			<groupId>org.apache.isis.alternatives.bytecode</groupId>
+	        <artifactId>javassist</artifactId>
+	    </dependency>
+
 		<dependency>
-			<groupId>org.apache.isis.plugins</groupId>
-			<artifactId>xml-persistor</artifactId>
+			<groupId>org.apache.isis.alternatives.objectstore</groupId>
+			<artifactId>xml</artifactId>
 		</dependency>
-
+        
 		<!-- Wicket Viewer -->
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-viewer</artifactId>
 		</dependency>
 
 		<!-- Wicket Viewer View API Implementations -->
 		<!-- 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-gmap2-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-gmap2-view</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-googlecharts-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-googlecharts-view</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-calendarviews-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-calendarviews-view</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-cooldatasoftmenu-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-cooldatasoftmenu-view</artifactId>
 		</dependency>
 		-->
 

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/pom.xml Thu Oct 21 17:11:18 2010
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-        <artifactId>wicket-testapp-claims</artifactId>
+    	<groupId>org.apache.isis.examples.apps</groupId>
+    	<artifactId>wicket-claims</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>wicket-testapp-claims-dom</artifactId>
+	<artifactId>wicket-claims-dom</artifactId>
 	<name>Wicket Viewer TestApp: Claims DOM</name>
 
 	<dependencies>
@@ -18,24 +18,26 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-applib</artifactId>
 		</dependency>
 		
+        <!-- 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-calendarviews-applib</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-calendarviews-applib</artifactId>
 		</dependency>
 		
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-gmap2-applib</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-gmap2-applib</artifactId>
 		</dependency>
 		
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-googlecharts-applib</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-googlecharts-applib</artifactId>
 		</dependency>
+        -->        
 		
 	</dependencies>
 </project>

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/Claim.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/Claim.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/Claim.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/Claim.java Thu Oct 21 17:11:18 2010
@@ -26,7 +26,6 @@ import java.util.List;
 
 import org.apache.isis.applib.AbstractDomainObject;
 import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Ignore;
 import org.apache.isis.applib.annotation.MaxLength;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.Named;
@@ -34,10 +33,8 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.util.Reasons;
 import org.apache.isis.applib.value.Date;
 import org.apache.isis.applib.value.Money;
-import org.apache.isis.extensions.wicket.view.calendarviews.applib.CalendarEvent;
-import org.apache.isis.extensions.wicket.view.calendarviews.applib.Calendarable;
 
-public class Claim extends AbstractDomainObject implements Calendarable {
+public class Claim extends AbstractDomainObject /* implements Calendarable */ {
 
     // {{ Title
     public String title() {
@@ -252,10 +249,10 @@ public class Claim extends AbstractDomai
         return null;
     }
 
-    @Ignore
-    @Override
-    public CalendarEvent getCalendarEvent() {
-        return CalendarEvent.newAllDayEvent(getDate().dateValue());
-    }
-
+//    @Ignore
+//    @Override
+//    public CalendarEvent getCalendarEvent() {
+//        return CalendarEvent.newAllDayEvent(getDate().dateValue());
+//    }
+     
 }

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/ClaimantExpenseSummary.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/ClaimantExpenseSummary.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/ClaimantExpenseSummary.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/claim/ClaimantExpenseSummary.java Thu Oct 21 17:11:18 2010
@@ -25,11 +25,10 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.NotPersistable;
 import org.apache.isis.applib.value.Money;
-import org.apache.isis.extensions.wicket.view.googlecharts.applib.PieChartable;
 
 @NotPersistable
-public class ClaimantExpenseSummary implements PieChartable,
-        Comparable<ClaimantExpenseSummary> {
+public class ClaimantExpenseSummary /* implements  PieChartable, 
+        Comparable<ClaimantExpenseSummary> */ {
 
     // {{ Identification
     public String title() {
@@ -79,28 +78,27 @@ public class ClaimantExpenseSummary impl
 
     // }}
 
-    // {{ PieChartable impl
-    @Ignore
-    @Override
-    public double getPieChartValue() {
-        return getAmount().doubleValue();
-    }
-
-    @Ignore
-    @Override
-    public String getPieChartLabel() {
-        return title();
-    }
-
-    // }}
-
-    @Override
-    public int compareTo(ClaimantExpenseSummary o) {
-        if (getPieChartValue() < o.getPieChartValue())
-            return -1;
-        if (getPieChartValue() > o.getPieChartValue())
-            return +1;
-        return 0;
-    }
+//    // {{ PieChartable impl
+//    @Ignore
+//    @Override
+//    public double getPieChartValue() {
+//        return getAmount().doubleValue();
+//    }
+//
+//    @Ignore
+//    @Override
+//    public String getPieChartLabel() {
+//        return title();
+//    }
+//
+//    // }}
+//    @Override
+//    public int compareTo(ClaimantExpenseSummary o) {
+//        if (getPieChartValue() < o.getPieChartValue())
+//            return -1;
+//        if (getPieChartValue() > o.getPieChartValue())
+//            return +1;
+//        return 0;
+//    }
 
 }

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/employee/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/employee/Employee.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/employee/Employee.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/dom/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/dom/employee/Employee.java Thu Oct 21 17:11:18 2010
@@ -26,11 +26,9 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.Optional;
 import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Approver;
 import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Claimant;
-import org.apache.isis.extensions.wicket.view.gmap2.applib.Locatable;
-import org.apache.isis.extensions.wicket.view.gmap2.applib.Location;
 
 public class Employee extends AbstractDomainObject implements Claimant,
-        Approver, Locatable {
+        Approver /* , Locatable */{
 
     // {{ Title
     public String title() {
@@ -74,19 +72,19 @@ public class Employee extends AbstractDo
 
     // }}
 
-    // {{ Location
-    private Location location;
-
-    @Disabled
-    @MemberOrder(sequence = "1")
-    public Location getLocation() {
-        return location;
-    }
-
-    public void setLocation(final Location location) {
-        this.location = location;
-    }
-    // }}
+//    // {{ Location
+//    private Location location;
+//
+//    @Disabled
+//    @MemberOrder(sequence = "1")
+//    public Location getLocation() {
+//        return location;
+//    }
+//
+//    public void setLocation(final Location location) {
+//        this.location = location;
+//    }
+//    // }}
     
 
     

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/fixture/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/fixture/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/fixture/pom.xml Thu Oct 21 17:11:18 2010
@@ -2,19 +2,19 @@
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-	    <artifactId>wicket-testapp-claims</artifactId>
-		<version>0.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.isis.examples.apps</groupId>
+        <artifactId>wicket-claims</artifactId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>wicket-testapp-claims-fixture</artifactId>
+	<artifactId>wicket-claims-fixture</artifactId>
 	<name>Wicket Viewer TestApp: Claims Fxtures</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-service</artifactId>
+			<artifactId>wicket-claims-service</artifactId>
 		</dependency>
 	</dependencies>
 

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/fixture/ClaimsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/fixture/ClaimsFixture.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/fixture/ClaimsFixture.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/fixture/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/fixture/ClaimsFixture.java Thu Oct 21 17:11:18 2010
@@ -32,16 +32,15 @@ import org.apache.isis.applib.value.Mone
 import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.Claim;
 import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimItem;
 import org.apache.isis.extensions.wicket.testapp.claims.dom.employee.Employee;
-import org.apache.isis.extensions.wicket.view.gmap2.applib.Location;
 
 
 public class ClaimsFixture extends AbstractFixture {
 
     @Override
     public void install() {
-        Employee fred = createEmployee("Fred Smith", null, new Location().north(0.5));
-        Employee tom = createEmployee("Tom Brown", fred, new Location().west(0.5));
-        createEmployee("Sam Jones", fred, new Location().west(1).south(0.25));
+        Employee fred = createEmployee("Fred Smith", null /*, new Location().north(0.5)*/);
+        Employee tom = createEmployee("Tom Brown", fred /*, new Location().west(0.5)*/);
+        createEmployee("Sam Jones", fred /*, new Location().west(1).south(0.25)*/);
 
         Claim claim = createClaim(tom, -16, "Meeting with client");
         addItem(claim, -16, 38.50, "Lunch with client");
@@ -57,12 +56,12 @@ public class ClaimsFixture extends Abstr
 
     }
     
-    private Employee createEmployee(String name, Employee approver, Location location) {
+    private Employee createEmployee(String name, Employee approver /*, Location location*/) {
         Employee claimant;
         claimant = newTransientInstance(Employee.class);
         claimant.setName(name);
         claimant.setApprover(approver);
-        claimant.setLocation(location);
+        //claimant.setLocation(location);
         persist(claimant);
         return claimant;
     }

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/pom.xml Thu Oct 21 17:11:18 2010
@@ -3,8 +3,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.apache.isis.extensions</groupId>
-	<artifactId>wicket-testapp-claims</artifactId>
+	<groupId>org.apache.isis.examples.apps</groupId>
+	<artifactId>wicket-claims</artifactId>
 	<version>0.1-SNAPSHOT</version>
 	
 	<name>Wicket Viewer TestApp: Claims</name>
@@ -101,64 +101,66 @@
 			<!-- this project's own modules -->
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>wicket-testapp-claims-dom</artifactId>
+				<artifactId>wicket-claims-dom</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>wicket-testapp-claims-fixture</artifactId>
+				<artifactId>wicket-claims-fixture</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>wicket-testapp-claims-service</artifactId>
+				<artifactId>wicket-claims-service</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>wicket-testapp-claims-ui</artifactId>
+				<artifactId>wicket-claims-ui</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>wicket-testapp-claims-commandline</artifactId>
+				<artifactId>wicket-claims-commandline</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>wicket-testapp-claims-webapp</artifactId>
+				<artifactId>wicket-claims-webapp</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<!-- Isis Wicket Viewer: view API extensions -->
+            <!-- 
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>wicket-view-gmap2-applib</artifactId>
+				<groupId>net.sf.isiscontrib.viewer.wicket</groupId>
+				<artifactId>view-gmap2-applib</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>wicket-view-gmap2-view</artifactId>
+				<groupId>net.sf.isiscontrib.viewer.wicket</groupId>
+				<artifactId>view-gmap2-view</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>wicket-view-googlecharts-applib</artifactId>
+				<groupId>net.sf.isiscontrib.viewer.wicket</groupId>
+				<artifactId>view-googlecharts-applib</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
-				<artifactId>wicket-view-googlecharts-view</artifactId>
+				<groupId>net.sf.isiscontrib.viewer.wicket</groupId>
+				<artifactId>view-googlecharts-view</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
+            -->            
 
 			<dependency>
 				<groupId>org.apache.isis.extensions</groupId>

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/service/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/service/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/service/pom.xml Thu Oct 21 17:11:18 2010
@@ -2,13 +2,13 @@
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-        <groupId>org.apache.isis.extensions</groupId>
-        <artifactId>wicket-testapp-claims</artifactId>
-		<version>0.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.isis.examples.apps</groupId>
+        <artifactId>wicket-claims</artifactId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>wicket-testapp-claims-service</artifactId>
+	<artifactId>wicket-claims-service</artifactId>
 	<name>Wicket Viewer TestApp: Claims Services</name>
 
 	<dependencies>
@@ -16,7 +16,7 @@
 		<!-- other modules in this project -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-dom</artifactId>
+			<artifactId>wicket-claims-dom</artifactId>
 		</dependency>
 		
 	</dependencies>

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/ui/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/ui/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/ui/pom.xml Thu Oct 21 17:11:18 2010
@@ -2,14 +2,14 @@
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-		<artifactId>wicket-testapp-claims</artifactId>
-		<version>0.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.isis.examples.apps</groupId>
+        <artifactId>wicket-claims</artifactId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
 
 	<name>Wicket Viewer TestApp: Claims UI</name>
-	<artifactId>wicket-testapp-claims-ui</artifactId>
+	<artifactId>wicket-claims-ui</artifactId>
 
 	<properties>
 		<jetty.version>6.1.4</jetty.version>
@@ -39,12 +39,12 @@
 		<!-- other modules in this project -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-dom</artifactId>
+			<artifactId>wicket-claims-dom</artifactId>
 		</dependency>
 
 		<!-- Wicket Viewer -->
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-viewer</artifactId>
 		</dependency>
 	</dependencies>

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardComponentFactory.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardComponentFactory.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardComponentFactory.java Thu Oct 21 17:11:18 2010
@@ -20,6 +20,7 @@
 
 package org.apache.isis.extensions.wicket.testapp.claims.ui.claimwizard;
 
+
 import org.apache.isis.extensions.wicket.model.models.EntityModel;
 import org.apache.isis.extensions.wicket.testapp.claims.dom.claim.ClaimWizard;
 import org.apache.isis.extensions.wicket.ui.ComponentType;

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardPanel.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardPanel.java (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/ui/src/main/java/org/apache/isis/extensions/wicket/testapp/claims/ui/claimwizard/ClaimWizardPanel.java Thu Oct 21 17:11:18 2010
@@ -34,6 +34,7 @@ import org.apache.wicket.markup.html.pan
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.Model;
 
+
 public class ClaimWizardPanel extends ProcessObjectPanelAbstract {
 
     private static final long serialVersionUID = 1L;

Modified: incubator/isis/trunk/examples/wicket-testapp/claims/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/wicket-testapp/claims/webapp/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/examples/wicket-testapp/claims/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/wicket-testapp/claims/webapp/pom.xml Thu Oct 21 17:11:18 2010
@@ -2,13 +2,13 @@
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
-        <artifactId>wicket-testapp-claims</artifactId>
-		<version>0.1-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.apache.isis.examples.apps</groupId>
+        <artifactId>wicket-claims</artifactId>
+        <version>0.1-SNAPSHOT</version>
+    </parent>
 
-	<artifactId>wicket-testapp-claims-webapp</artifactId>
+	<artifactId>wicket-claims-webapp</artifactId>
 	<name>Wicket Viewer TestApp: Claims WebApp</name>
 	
 	<packaging>war</packaging>
@@ -28,43 +28,23 @@
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-fixture</artifactId>
+			<artifactId>wicket-claims-fixture</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>wicket-testapp-claims-ui</artifactId>
+			<artifactId>wicket-claims-ui</artifactId>
 		</dependency>
 
 
 		<!-- Isis -->
-	    <dependency>
-	        <groupId>org.apache.isis.core</groupId>
-	        <artifactId>bytecode-cglib</artifactId>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.apache.isis.core</groupId>
-	        <artifactId>bytecode-javassist</artifactId>
-	    </dependency>
 		<dependency>
-	        <groupId>org.apache.isis.core</groupId>
-			<artifactId>remoting</artifactId>
+	        <groupId>org.apache.isis.viewer</groupId>
+			<artifactId>html</artifactId>
 		</dependency>
 		<dependency>
-	        <groupId>org.apache.isis.plugins</groupId>
-			<artifactId>html-viewer</artifactId>
-		</dependency>
-		<dependency>
-	        <groupId>org.apache.isis.plugins</groupId>
-			<artifactId>http-remoting-server</artifactId>
-		</dependency>
-	    <dependency>
-	        <groupId>org.apache.isis.plugins</groupId>
-	        <artifactId>headless-embedded</artifactId>
-	    </dependency>
-		<dependency>
-	        <groupId>org.apache.isis.plugins</groupId>
-			<artifactId>xml-persistor</artifactId>
+	        <groupId>org.apache.isis.alternatives.objectstore</groupId>
+			<artifactId>xml</artifactId>
 		</dependency>
 		<!--
 		comment in to run simple web server (uses Jetty)
@@ -74,32 +54,41 @@
 		</dependency>
 		-->
 
+	    <dependency>
+	        <groupId>org.apache.isis.defaults</groupId>
+	        <artifactId>bytecode</artifactId>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.apache.isis.alternatives.bytecode</groupId>
+	        <artifactId>javassist</artifactId>
+	    </dependency>
+
 		<!-- Isis Wicket -->
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-viewer</artifactId>
 		</dependency>
 
 		<!-- Isis Wicket views -->
+        <!-- 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-gmap2-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-gmap2-view</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-googlecharts-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-googlecharts-view</artifactId>
 		</dependency>
 
-		<!--
 		<dependency>
-			<groupId>org.starobjects.wicket</groupId>
-			<artifactId>view-calendarviews-view</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>calendarviews-view</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
-			<artifactId>wicket-view-cooldatasoftmenu</artifactId>
+			<groupId>net.sourceforge.isiscontrib.viewer.wicket</groupId>
+			<artifactId>view-cooldatasoftmenu</artifactId>
 		</dependency>
 		-->
 

Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Thu Oct 21 17:11:18 2010
@@ -29,6 +29,7 @@
         <isis.viewer-dnd.version>0.1-SNAPSHOT</isis.viewer-dnd.version>
         <isis.viewer-html.version>0.1-SNAPSHOT</isis.viewer-html.version>
         <isis.viewer-scimpi.version>0.1-SNAPSHOT</isis.viewer-scimpi.version>
+        <isis.viewer-wicket.version>0.1-SNAPSHOT</isis.viewer-wicket.version>
         <isis.viewer-junit.version>0.1-SNAPSHOT</isis.viewer-junit.version>
 
         <isis.alternatives-objectstore-xml.version>0.1-SNAPSHOT</isis.alternatives-objectstore-xml.version>
@@ -116,19 +117,21 @@
             </dependency>
 
 
-            <!-- viewers -->
+            <!-- viewer: dnd -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
                 <artifactId>dnd</artifactId>
                 <version>${isis.viewer-dnd.version}</version>
             </dependency>
 
+            <!-- viewer: html -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
                 <artifactId>html</artifactId>
                 <version>${isis.viewer-html.version}</version>
             </dependency>
 
+            <!-- viewer: scimpi -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
                 <artifactId>scimpi</artifactId>
@@ -145,12 +148,45 @@
                 <version>${isis.viewer-scimpi.version}</version>
             </dependency>
 
+            <!-- viewer: junit -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
                 <artifactId>junit</artifactId>
                 <version>${isis.viewer-junit.version}</version>
             </dependency>
 
+            <!-- viewer: wicket -->
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>wicket</artifactId>
+                <version>${isis.viewer-wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>wicket-applib</artifactId>
+                <version>${isis.viewer-wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>wicket-facets</artifactId>
+                <version>${isis.viewer-wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>wicket-model</artifactId>
+                <version>${isis.viewer-wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>wicket-ui</artifactId>
+                <version>${isis.viewer-wicket.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>wicket-viewer</artifactId>
+                <version>${isis.viewer-wicket.version}</version>
+            </dependency>
+
 
             <!-- alternatives: bytecode -->
             <dependency>

Modified: incubator/isis/trunk/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/pom.xml Thu Oct 21 17:11:18 2010
@@ -26,9 +26,9 @@
 		<module>dnd</module>
 		<module>html</module>
 		<module>scimpi</module>
+		<module>wicket</module>
 		<!-- 
 		<module>restful</module>
-		<module>wicket</module>
 		<module>bdd</module>
 		-->
 		<module>junit</module>

Modified: incubator/isis/trunk/viewer/wicket/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/applib/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/applib/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/applib/pom.xml Thu Oct 21 17:11:18 2010
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
+		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>wicket</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>

Modified: incubator/isis/trunk/viewer/wicket/facets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/facets/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/facets/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/facets/pom.xml Thu Oct 21 17:11:18 2010
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
+		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>wicket</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
@@ -13,7 +13,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-applib</artifactId>
 		</dependency>
 
@@ -23,7 +23,6 @@
 		</dependency>
 
 		<!-- LOGGING DEPENDENCIES - LOG4J -->
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>

Modified: incubator/isis/trunk/viewer/wicket/model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/model/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/model/pom.xml Thu Oct 21 17:11:18 2010
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
+		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>wicket</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
@@ -25,7 +25,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-facets</artifactId>
 		</dependency>
 

Modified: incubator/isis/trunk/viewer/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/pom.xml Thu Oct 21 17:11:18 2010
@@ -5,11 +5,11 @@
 
 	<parent>
 		<groupId>org.apache.isis</groupId>
-		<artifactId>plugins</artifactId>
+		<artifactId>viewer</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.apache.isis.extensions</groupId>
+	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>wicket</artifactId>
 	<version>0.1-SNAPSHOT</version>
 
@@ -17,6 +17,10 @@
 
 	<packaging>pom</packaging>
 
+    <!-- 
+    commenting out, pretty sure I don't use
+    -->
+    <!-- 
 	<repositories>
 		<repository>
 			<id>guiceyfruit.release</id>
@@ -30,14 +34,17 @@
 			</releases>
 		</repository>
 	</repositories>
+    -->
 
 	<properties>
-		<wicket.version>1.4.9</wicket.version>
-		<wicketstuff.version>1.4.9.1</wicketstuff.version>
-		<guiceyfruit-version>2.0</guiceyfruit-version>
-
-		<!-- <pmd.ruleset>../../../STAR/trunk/main/standards/src/main/resources/pmd.xml</pmd.ruleset> 
-			<checkstyle.configLocation>../../../STAR/trunk/main/standards/src/main/resources/checkstyle.xml</checkstyle.configLocation> -->
+		<wicket.version>1.4.12</wicket.version>
+		<wicketstuff.version>1.4.12</wicketstuff.version>
+        <!-- 
+        commenting out, pretty sure I don't use
+        -->
+        <!-- 
+    		<guiceyfruit-version>2.0</guiceyfruit-version>
+        -->
 	</properties>
 
 	<modules>
@@ -63,48 +70,48 @@
 
 			<!-- Apache Isis Wicket Viewer -->
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-applib</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-applib</artifactId>
 				<version>0.1-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-facets</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-facets</artifactId>
 				<version>0.1-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-model</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-model</artifactId>
 				<version>0.1-SNAPSHOT</version>
 				<scope>test</scope>
 				<type>test-jar</type>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-ui</artifactId>
 				<version>0.1-SNAPSHOT</version>
 			</dependency>
 			<dependency>
-				<groupId>org.apache.isis.extensions</groupId>
+				<groupId>org.apache.isis.viewer</groupId>
 				<artifactId>wicket-ui</artifactId>
 				<version>0.1-SNAPSHOT</version>
 				<scope>test</scope>
@@ -158,7 +165,7 @@
 			</dependency>
 
 
-			<!-- Wicket & WicketStuff -->
+			<!-- Wicket -->
 			<dependency>
 				<groupId>org.apache.wicket</groupId>
 				<artifactId>wicket</artifactId>
@@ -189,6 +196,7 @@
 				<version>${wicket.version}</version>
 			</dependency>
 
+            <!-- Wicket & WicketStuff -->
 			<dependency>
 				<groupId>org.wicketstuff</groupId>
 				<artifactId>scriptaculous</artifactId>
@@ -198,7 +206,7 @@
 			<dependency>
 				<groupId>org.wicketstuff</groupId>
 				<artifactId>calendarviews</artifactId>
-				<version>1.4.7-SNAPSHOT</version>
+				<version>${wicketstuff.version}</version>
 			</dependency>
 
 
@@ -209,6 +217,10 @@
 				<version>1.0</version>
 			</dependency>
 
+            <!-- 
+            commenting out, pretty sure I don't use
+            -->
+            <!-- 
 			<dependency>
 				<groupId>org.guiceyfruit</groupId>
 				<artifactId>guiceyfruit-core</artifactId>
@@ -221,6 +233,7 @@
 				<version>${guiceyfruit-version}</version>
 				<scope>test</scope>
 			</dependency>
+            -->
 
 			<dependency>
 				<groupId>org.slf4j</groupId>

Modified: incubator/isis/trunk/viewer/wicket/ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/ui/pom.xml Thu Oct 21 17:11:18 2010
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
+		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>wicket</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
@@ -45,14 +45,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-model</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>commons</artifactId>
-			<type>test-jar</type>
+			<artifactId>testsupport</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -88,6 +87,7 @@
 			<artifactId>wicket-guice</artifactId>
 		</dependency>
 
+        <!-- 
 		<dependency>
 			<groupId>org.guiceyfruit</groupId>
 			<artifactId>guiceyfruit-core</artifactId>
@@ -97,6 +97,7 @@
 			<artifactId>guiceyfruit-junit4</artifactId>
 			<scope>test</scope>
 		</dependency>
+        -->
 
 
 

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/appactions/cssmenu/AppActionsCssMenuFactory.java Thu Oct 21 17:11:18 2010
@@ -29,9 +29,9 @@ import org.apache.isis.extensions.wicket
 import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
 import org.apache.isis.extensions.wicket.ui.ComponentType;
 import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuItem;
+import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuItem.Builder;
 import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
 import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuPanel;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuItem.Builder;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.metamodel.facets.actions.notinrepositorymenu.NotInRepositoryMenuFacet;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/entity/blocks/action/EntityActionLinkFactory.java Thu Oct 21 17:11:18 2010
@@ -20,13 +20,11 @@
 
 package org.apache.isis.extensions.wicket.ui.components.entity.blocks.action;
 
-import java.util.List;
-
 import org.apache.isis.extensions.wicket.model.mementos.ActionMemento;
 import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.extensions.wicket.model.models.ActionModel;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
 import org.apache.isis.extensions.wicket.model.models.ActionModel.SingleResultsMode;
+import org.apache.isis.extensions.wicket.model.models.EntityModel;
 import org.apache.isis.extensions.wicket.model.util.Actions;
 import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/value/StandaloneValuePanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/value/StandaloneValuePanelFactory.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/value/StandaloneValuePanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/value/StandaloneValuePanelFactory.java Thu Oct 21 17:11:18 2010
@@ -20,11 +20,11 @@
 
 package org.apache.isis.extensions.wicket.ui.components.value;
 
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.extensions.wicket.model.models.ScalarModel;
 import org.apache.isis.extensions.wicket.ui.ComponentFactory;
 import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
 import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
 

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java Thu Oct 21 17:11:18 2010
@@ -20,10 +20,10 @@
 
 package org.apache.isis.extensions.wicket.ui.components.voidreturn;
 
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.extensions.wicket.ui.ComponentFactory;
 import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
 import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
 

Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/panels/ProcessObjectPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/panels/ProcessObjectPanelAbstract.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/panels/ProcessObjectPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/panels/ProcessObjectPanelAbstract.java Thu Oct 21 17:11:18 2010
@@ -27,9 +27,9 @@ import org.apache.isis.extensions.wicket
 import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.extensions.wicket.model.mementos.PropertyMemento;
 import org.apache.isis.extensions.wicket.model.models.ActionModel;
+import org.apache.isis.extensions.wicket.model.models.ActionModel.SingleResultsMode;
 import org.apache.isis.extensions.wicket.model.models.EntityModel;
 import org.apache.isis.extensions.wicket.model.models.ScalarModel;
-import org.apache.isis.extensions.wicket.model.models.ActionModel.SingleResultsMode;
 import org.apache.isis.extensions.wicket.model.util.Mementos;
 import org.apache.isis.extensions.wicket.ui.ComponentType;
 import org.apache.isis.extensions.wicket.ui.pages.action.ActionPage;

Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java Thu Oct 21 17:11:18 2010
@@ -23,7 +23,6 @@ package org.apache.isis.extensions.wicke
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.extensions.wicket.ui.ComponentType;
 import org.junit.Test;
 
 public class ComponentType_ConstantsTest {

Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java Thu Oct 21 17:11:18 2010
@@ -22,7 +22,8 @@
 package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
 
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
 import java.util.Collections;
@@ -30,8 +31,6 @@ import java.util.List;
 
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuItem;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
 import org.apache.isis.extensions.wicket.ui.fixtures.ActionFixtures;
 import org.apache.isis.extensions.wicket.ui.fixtures.AdapterFixtures;
 import org.apache.isis.extensions.wicket.ui.fixtures.Customers;

Modified: incubator/isis/trunk/viewer/wicket/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/pom.xml?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/pom.xml Thu Oct 21 17:11:18 2010
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.isis.extensions</groupId>
+		<groupId>org.apache.isis.viewer</groupId>
 		<artifactId>wicket</artifactId>
 		<version>0.1-SNAPSHOT</version>
 	</parent>
@@ -44,14 +44,13 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.isis.extensions</groupId>
+			<groupId>org.apache.isis.viewer</groupId>
 			<artifactId>wicket-ui</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.isis.core</groupId>
-			<artifactId>commons</artifactId>
-			<type>test-jar</type>
+			<artifactId>testsupport</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/integration/nof/IsisContextForWicket.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/integration/nof/IsisContextForWicket.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/integration/nof/IsisContextForWicket.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/integration/nof/IsisContextForWicket.java Thu Oct 21 17:11:18 2010
@@ -24,9 +24,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.isis.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.session.IsisSession;
 import org.apache.isis.runtime.session.IsisSessionFactory;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java Thu Oct 21 17:11:18 2010
@@ -27,8 +27,8 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
 import org.apache.isis.extensions.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.isis.extensions.wicket.ui.ComponentType;
 import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryList;
 import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.wicket.Component;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java Thu Oct 21 17:11:18 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.extensions.wicket.viewer;
 
-import org.apache.isis.commons.jmock.MockFixture;
-import org.apache.isis.commons.jmock.MockFixtureAdapter;
+import org.apache.isis.common.jmock.MockFixture;
+import org.apache.isis.common.jmock.MockFixtureAdapter;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 import org.jmock.Expectations;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java Thu Oct 21 17:11:18 2010
@@ -25,8 +25,8 @@ package org.apache.isis.extensions.wicke
 
 import java.util.Locale;
 
-import org.apache.isis.commons.jmock.MockFixture;
-import org.apache.isis.commons.jmock.MockFixtureAdapter;
+import org.apache.isis.common.jmock.MockFixture;
+import org.apache.isis.common.jmock.MockFixtureAdapter;
 import org.apache.wicket.Request;
 import org.jmock.Expectations;
 import org.jmock.Mockery;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java Thu Oct 21 17:11:18 2010
@@ -31,7 +31,6 @@ import org.apache.isis.extensions.wicket
 import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.isis.extensions.wicket.ui.pages.PageClassList;
 import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.extensions.wicket.viewer.WicketObjectsModule;
 import org.apache.isis.extensions.wicket.viewer.registries.components.ComponentFactoryListDefault;
 import org.apache.isis.extensions.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
 import org.apache.isis.extensions.wicket.viewer.registries.pages.PageClassListDefault;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java Thu Oct 21 17:11:18 2010
@@ -24,7 +24,6 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.extensions.wicket.viewer.WicketObjectsModule;
 import org.apache.isis.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.runtime.system.DeploymentType;
 import org.apache.isis.runtime.system.IsisSystem;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java Thu Oct 21 17:11:18 2010
@@ -25,9 +25,8 @@ import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.viewer.WicketObjectsApplication;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java Thu Oct 21 17:11:18 2010
@@ -23,11 +23,10 @@ package org.apache.isis.extensions.wicke
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
 import org.apache.isis.extensions.wicket.ui.pages.PageType;
 import org.apache.isis.extensions.wicket.ui.pages.home.HomePage;
-import org.apache.isis.extensions.wicket.viewer.WicketObjectsApplication;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.WebPage;
 import org.jmock.Expectations;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java Thu Oct 21 17:11:18 2010
@@ -24,8 +24,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.AbstractJMockForInterfacesTest;
-import org.apache.isis.extensions.wicket.viewer.WicketObjectsApplication;
+import org.apache.isis.common.jmock.AbstractJMockForInterfacesTest;
 import org.apache.wicket.settings.IResourceSettings;
 import org.apache.wicket.settings.ISecuritySettings;
 import org.junit.Before;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java Thu Oct 21 17:11:18 2010
@@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.extensions.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
 import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java Thu Oct 21 17:11:18 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.extensions.wicket.viewer.app.wicket;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java Thu Oct 21 17:11:18 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.wicke
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.extensions.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
 import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java Thu Oct 21 17:11:18 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.wicke
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java Thu Oct 21 17:11:18 2010
@@ -23,9 +23,9 @@ package org.apache.isis.extensions.wicke
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.commons.jmock.FixtureMockery;
-import org.apache.isis.commons.jmock.MockFixture;
-import org.apache.isis.commons.jmock.MockFixtureAdapter;
+import org.apache.isis.common.jmock.FixtureMockery;
+import org.apache.isis.common.jmock.MockFixture;
+import org.apache.isis.common.jmock.MockFixtureAdapter;
 import org.apache.isis.extensions.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
 import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java?rev=1026073&r1=1026072&r2=1026073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java Thu Oct 21 17:11:18 2010
@@ -22,7 +22,7 @@ package org.apache.isis.extensions.wicke
 
 import static org.junit.Assert.fail;
 
-import org.apache.isis.commons.jmock.AbstractJMockForClassesTest;
+import org.apache.isis.common.jmock.AbstractJMockForClassesTest;
 import org.apache.isis.extensions.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
 import org.apache.wicket.Response;
 import org.apache.wicket.protocol.http.WebApplication;



Mime
View raw message