incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1228921 - in /incubator/isis/trunk/framework: ./ core/ core/commons/src/main/java/org/apache/isis/core/commons/config/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/ core/metamodel/src/main/java/org/apache/isis/core/me...
Date Sun, 08 Jan 2012 19:07:37 GMT
Author: danhaywood
Date: Sun Jan  8 19:07:35 2012
New Revision: 1228921

URL: http://svn.apache.org/viewvc?rev=1228921&view=rev
Log:
ISIS-165: updating to latest versions of dependencies (and corresponding fixes where using com.google.inject.internal instead of com.google.common.collect); fixed some java warnings; upgraded to v3.0 of site-plugin

Modified:
    incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java
    incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
    incubator/isis/trunk/framework/core/pom.xml
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java
    incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
    incubator/isis/trunk/framework/pom.xml
    incubator/isis/trunk/framework/progmodels/groovy/pom.xml
    incubator/isis/trunk/framework/progmodels/wrapper/pom.xml
    incubator/isis/trunk/framework/quickstart-archetype/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/bytecode/identity/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/bytecode/javassist/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java
    incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java
    incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java
    incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestProxyReflector.java
    incubator/isis/trunk/framework/runtimes/embedded/pom.xml
    incubator/isis/trunk/framework/security/file/pom.xml
    incubator/isis/trunk/framework/security/ldap/pom.xml
    incubator/isis/trunk/framework/security/sql/pom.xml
    incubator/isis/trunk/framework/src/docbkx/guide/images/release/bdd-concordion-output.png
    incubator/isis/trunk/framework/src/site/site.xml
    incubator/isis/trunk/framework/viewer/bdd/pom.xml
    incubator/isis/trunk/framework/viewer/dnd/pom.xml
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TypeBasedColumnWidthStrategy.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
    incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
    incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java
    incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
    incubator/isis/trunk/framework/viewer/html/pom.xml
    incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java
    incubator/isis/trunk/framework/viewer/json/pom.xml
    incubator/isis/trunk/framework/viewer/scimpi/pom.xml
    incubator/isis/trunk/framework/viewer/src/site/apt/index.apt
    incubator/isis/trunk/framework/viewer/wicket/pom.xml

Modified: incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java (original)
+++ incubator/isis/trunk/framework/core/commons/src/main/java/org/apache/isis/core/commons/config/InstallerAbstract.java Sun Jan  8 19:07:35 2012
@@ -21,11 +21,10 @@ package org.apache.isis.core.commons.con
 
 import java.util.Collections;
 import java.util.List;
+import com.google.common.collect.*;
 
 import org.apache.isis.core.commons.components.Installer;
 
-import com.google.inject.internal.Lists;
-
 public abstract class InstallerAbstract implements Installer, IsisConfigurationBuilderAware {
 
     private final String type;

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetedMethod.java Sun Jan  8 19:07:35 2012
@@ -30,7 +30,8 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 
-import com.google.inject.internal.Lists;
+import com.google.common.collect.Lists;
+
 
 /**
  * non-final only so it can be mocked if need be.

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java Sun Jan  8 19:07:35 2012
@@ -21,11 +21,12 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
-import com.google.inject.internal.Lists;
 
 import org.apache.isis.core.metamodel.facets.FacetedMethod;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
+import com.google.common.collect.Lists;
+
 public abstract class MemberLayoutArrangerComposite implements MemberLayoutArranger {
     
     private static final Logger LOG = Logger.getLogger(MemberLayoutArrangerComposite.class);

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/speccache/SpecificationCacheDefault.java Sun Jan  8 19:07:35 2012
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public class SpecificationCacheDefault implements SpecificationCache {
     private final Map<String, ObjectSpecification> specByClassName = Maps.newHashMap();

Modified: incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java (original)
+++ incubator/isis/trunk/framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java Sun Jan  8 19:07:35 2012
@@ -83,7 +83,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.log4j.Logger;
 
 import com.google.common.collect.Lists;
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
 

Modified: incubator/isis/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/pom.xml (original)
+++ incubator/isis/trunk/framework/core/pom.xml Sun Jan  8 19:07:35 2012
@@ -18,9 +18,7 @@
         <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.isis</groupId>
     <artifactId>core</artifactId>
-    <version>0.2.0-incubating-SNAPSHOT</version>
 
     <name>Isis Core</name>
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java Sun Jan  8 19:07:35 2012
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.conf
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTemporal.java Sun Jan  8 19:07:35 2012
@@ -41,7 +41,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 import org.apache.isis.core.progmodel.facets.value.date.DateValueFacet;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSemanticsProviderAndFacetAbstract<T>
     implements DateValueFacet {

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/date/DateValueSemanticsProviderAbstract.java Sun Jan  8 19:07:35 2012
@@ -29,7 +29,8 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAbstractTemporal;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
+
 
 public abstract class DateValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProvider.java Sun Jan  8 19:07:35 2012
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.conf
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public class TimeValueSemanticsProvider extends TimeValueSemanticsProviderAbstract<org.apache.isis.applib.value.Time> {
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java Sun Jan  8 19:07:35 2012
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 import org.apache.isis.core.progmodel.facets.value.time.TimeValueSemanticsProviderAbstract;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 /**
  * Treats {@link java.sql.Time} as a time-only value type.

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestamp/TimeStampValueSemanticsProvider.java Sun Jan  8 19:07:35 2012
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public class TimeStampValueSemanticsProvider extends TimeStampValueSemanticsProviderAbstract<TimeStamp> {
 

Modified: incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java (original)
+++ incubator/isis/trunk/framework/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java Sun Jan  8 19:07:35 2012
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
 import org.apache.isis.core.progmodel.facets.value.timestamp.TimeStampValueSemanticsProviderAbstract;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public class JavaSqlTimeStampValueSemanticsProvider extends TimeStampValueSemanticsProviderAbstract<java.sql.Timestamp> {
 

Modified: incubator/isis/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/pom.xml (original)
+++ incubator/isis/trunk/framework/pom.xml Sun Jan  8 19:07:35 2012
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>9</version>
+        <version>10</version>
     </parent>
 
     <groupId>org.apache.isis</groupId>
@@ -664,7 +664,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.0-beta-3</version>
+                    <version>3.0-beta3</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.doxia</groupId>
@@ -1003,7 +1003,7 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
@@ -1028,7 +1028,7 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.4</version>
+                <version>1.6</version>
             </dependency>
             <dependency>
                 <groupId>commons-jxpath</groupId>
@@ -1040,14 +1040,14 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>r08</version>
+                <version>11.0</version>
             </dependency>
 
             <!-- Google Guice (dependency injection) -->
             <dependency>
                 <groupId>com.google.inject</groupId>
                 <artifactId>guice</artifactId>
-                <version>2.0</version>
+                <version>3.0</version>
             </dependency>
 
             <!-- Bytecode libraries -->
@@ -1092,12 +1092,12 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
-                <version>1.2.2</version>
+                <version>1.4.2</version>
             </dependency>
 			<dependency>
 			    <groupId>org.codehaus.jettison</groupId>
 			    <artifactId>jettison</artifactId>
-			    <version>1.3</version>
+			    <version>1.3.1</version>
 			</dependency>
 
 
@@ -1110,12 +1110,12 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-core-asl</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.3</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.8.2</version>
+                <version>1.9.3</version>
             </dependency>
             
 
@@ -1174,7 +1174,7 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty</artifactId>
-                <version>6.1.25</version>
+                <version>6.1.26</version>
             </dependency>
 			<dependency>
 		        <groupId>org.mortbay.jetty</groupId>
@@ -1205,7 +1205,7 @@ archetype includes this explicit depende
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.2</version>
+                <version>4.10</version>
             </dependency>
 
             <dependency>

Modified: incubator/isis/trunk/framework/progmodels/groovy/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/groovy/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/groovy/pom.xml (original)
+++ incubator/isis/trunk/framework/progmodels/groovy/pom.xml Sun Jan  8 19:07:35 2012
@@ -29,7 +29,6 @@
 
 	<groupId>org.apache.isis.progmodels</groupId>
 	<artifactId>groovy</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Groovy ProgModel</name>
 

Modified: incubator/isis/trunk/framework/progmodels/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/wrapper/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/wrapper/pom.xml (original)
+++ incubator/isis/trunk/framework/progmodels/wrapper/pom.xml Sun Jan  8 19:07:35 2012
@@ -29,7 +29,6 @@
 
 	<groupId>org.apache.isis.progmodels</groupId>
 	<artifactId>wrapper</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Wrapper ProgModel</name>
 

Modified: incubator/isis/trunk/framework/quickstart-archetype/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/pom.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/pom.xml Sun Jan  8 19:07:35 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -16,8 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
-<?xml version="1.0" encoding="UTF-8"?>
 <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>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/bytecode/identity/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/bytecode/identity/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/bytecode/identity/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/bytecode/identity/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
 	<artifactId>identity</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Default Runtime Identity Bytecode Implementation</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/bytecode/javassist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/bytecode/javassist/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/bytecode/javassist/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/bytecode/javassist/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
 	<artifactId>javassist</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Default Runtime Javassist Bytecode Implementation</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/nosql/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
     <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
     <artifactId>nosql</artifactId>
-    <version>0.2.0-incubating-SNAPSHOT</version>
 
     <name>Default Runtime NOSQL ObjectStore</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/pom.xml Sun Jan  8 19:07:35 2012
@@ -20,7 +20,6 @@
 
     <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
     <artifactId>sql</artifactId>
-    <version>0.2.0-incubating-SNAPSHOT</version>
 
     <name>Default Runtime SQL ObjectStore</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/xml/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
 	<artifactId>xml</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Default Runtime XML ObjectStore</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/profilestores/xml/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
 	<artifactId>xml</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Default Runtime XML ProfileStore</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/ExecuteServerActionResponse.java Sun Jan  8 19:07:35 2012
@@ -33,7 +33,7 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageList;
 import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.WarningList;
 
-import com.google.inject.internal.Lists;
+import com.google.common.collect.Lists;
 
 public class ExecuteServerActionResponse implements Encodable, Serializable, MessageList, WarningList {
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/exchange/KnownObjectsRequest.java Sun Jan  8 19:07:35 2012
@@ -24,7 +24,7 @@ import java.util.Map;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.runtimes.dflt.remoting.common.data.common.ObjectData;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 /**
  * A lookup of the objects that are part of a request or response. As only one instance of data per object should be

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/common/src/main/java/org/apache/isis/runtimes/dflt/remoting/common/facade/ServerFacadeLogger.java Sun Jan  8 19:07:35 2012
@@ -76,7 +76,7 @@ import org.apache.isis.runtimes.dflt.rem
 import org.apache.isis.runtimes.dflt.remoting.common.protocol.ObjectEncoderDecoder;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 
-import com.google.inject.internal.Lists;
+import com.google.common.collect.Lists;
 
 /**
  * previously called <tt>DistributionLogger</tt>.

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/marshalling-xstream/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
     <groupId>org.apache.isis.runtimes.dflt.remoting</groupId>
 	<artifactId>marshalling-xstream</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Default Runtime XStream Marshalling</name>
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/remoting/transport-http/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 	
 	<groupId>org.apache.isis.runtimes.dflt.remoting</groupId>
 	<artifactId>transport-http</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 	
 	<name>Default Runtime HTTP Transport</name>
 	

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java Sun Jan  8 19:07:35 2012
@@ -34,11 +34,11 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.systemusinginstallers.IsisSystemThatUsesInstallersFactory;
 import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
 
+import com.google.common.collect.Lists;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
-import com.google.inject.internal.Lists;
 
 public class IsisModule extends AbstractModule {
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java Sun Jan  8 19:07:35 2012
@@ -59,9 +59,9 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionValidatorForViewers;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 
+import com.google.common.collect.Lists;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.google.inject.internal.Lists;
 
 public class IsisRunner {
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestProxyReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestProxyReflector.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestProxyReflector.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestProxyReflector.java Sun Jan  8 19:07:35 2012
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.te
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.ObjectFactory;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 
-import com.google.inject.internal.Maps;
+import com.google.common.collect.Maps;
 
 public class TestProxyReflector implements ObjectReflector {
 

Modified: incubator/isis/trunk/framework/runtimes/embedded/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/pom.xml Sun Jan  8 19:07:35 2012
@@ -29,7 +29,6 @@
 
 	<groupId>org.apache.isis.runtimes</groupId>
 	<artifactId>embedded</artifactId>
-    <version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Embedded Runtime</name>
 

Modified: incubator/isis/trunk/framework/security/file/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/file/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/file/pom.xml (original)
+++ incubator/isis/trunk/framework/security/file/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>file</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>File Security Implementation</name>
 

Modified: incubator/isis/trunk/framework/security/ldap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/ldap/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/ldap/pom.xml (original)
+++ incubator/isis/trunk/framework/security/ldap/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>ldap</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>LDAP Security Implementation</name>
 

Modified: incubator/isis/trunk/framework/security/sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/security/sql/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/security/sql/pom.xml (original)
+++ incubator/isis/trunk/framework/security/sql/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.security</groupId>
 	<artifactId>sql</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>SQL Security Implementation</name>
 

Modified: incubator/isis/trunk/framework/src/docbkx/guide/images/release/bdd-concordion-output.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/images/release/bdd-concordion-output.png?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/isis/trunk/framework/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/site/site.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/src/site/site.xml Sun Jan  8 19:07:35 2012
@@ -52,8 +52,8 @@
 
         <!-- This 'global' menu is inherited -->
         <menu name="Use Cases" inherit="bottom">
-            <item name="Develop" inherit="bottom" href="use-cases/develop.html"/>
-            <item name="Specify and Test" inherit="bottom" href="use-cases/specify-and-test.html"/>
+            <item name="Develop" href="use-cases/develop.html"/>
+            <item name="Specify and Test" href="use-cases/specify-and-test.html"/>
             <item name="Deploy on own framework" href="use-cases/deploy-own-framework.html" />
 	        <item name="Deploy as REST service" href="use-cases/deploy-as-rest.html" />
 	        <item name="Deploy as webapp" href="use-cases/deploy-as-webapp.html" />
@@ -120,9 +120,7 @@
         </menu>
 
         <menu name="Other Resources">
-            <item name="Blogs">
-                <item name="Dan Haywood's blog" href="http://danhaywood.com/" />
-            </item>
+            <item name="Dan Haywood's blog" href="http://danhaywood.com/" />
             <item name="Presentation Materials (feel free to reuse)" href="./presentations/">
                 <item name="Introducing Apache Isis" href="./presentations/">
                     <item name="PPTX (Microsoft)" href="./presentations/IntroducingApacheIsis.pptx" />
@@ -132,7 +130,7 @@
                     <item name="PDF notes" href="./presentations/IntroducingApacheIsis-notes.pdf" />
                 </item>
             </item>
-            <item name="Naked Objects">
+            <item name="Naked Objects" href="#">
                 <item name="Books on Naked Objects" href="naked-objects-books.html" />
                 <item name="Richard Pawson's Thesis" href="Pawson-Naked-Objects-thesis.pdf" />
                 <item name="Naked Objects for .NET" href="http://www.nakedobjects.net/" />
@@ -143,7 +141,7 @@
         </menu>
 
         <menu name="For Contributors">
-            <item name="Contributor's Guide">
+            <item name="Contributor's Guide" href="#">
                 <item name="PDF" href="docbkx/pdf/${docbkxGuideName}.pdf" />
                 <item name="HTML" href="docbkx/html/guide/${docbkxGuideName}.html" />
             </item>

Modified: incubator/isis/trunk/framework/viewer/bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/bdd/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/bdd/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
     <groupId>org.apache.isis.viewer</groupId>
     <artifactId>bdd</artifactId>
-    <version>0.2.0-incubating-SNAPSHOT</version>
     
     <name>BDD Viewers</name>
 

Modified: incubator/isis/trunk/framework/viewer/dnd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/dnd/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>dnd</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Drag-n-Drop Viewer</name>
 

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java Sun Jan  8 19:07:35 2012
@@ -54,7 +54,7 @@ import org.apache.log4j.Logger;
 public abstract class DebugFrame extends Frame {
     private static final long serialVersionUID = 1L;
     private static final Logger LOG = Logger.getLogger(DebugFrame.class);
-    private static Vector frames = new Vector();
+    private static Vector<Frame> frames = new Vector<Frame>();
     private int panel = 0;
 
     /**

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/ViewerFrame.java Sun Jan  8 19:07:35 2012
@@ -52,7 +52,7 @@ public class ViewerFrame extends Frame i
          * compensate for change in tab handling in Java 1.4
          */
         try {
-            final Class c = getClass();
+            final Class<?> c = getClass();
             final Method m = c.getMethod("setFocusTraversalKeysEnabled", new Class[] { Boolean.TYPE });
             m.invoke(this, new Object[] { Boolean.FALSE });
         } catch (final SecurityException e1) {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/awt/XFeedbackManager.java Sun Jan  8 19:07:35 2012
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.dnd.view.m
 
 public class XFeedbackManager implements Feedback {
     private final XViewer viewer;
-    private final Vector busy = new Vector();
+    private final Vector<ObjectAdapter> busy = new Vector<ObjectAdapter>();
     private String messages;
     private String view;
     private String action;

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TypeBasedColumnWidthStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TypeBasedColumnWidthStrategy.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TypeBasedColumnWidthStrategy.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/table/TypeBasedColumnWidthStrategy.java Sun Jan  8 19:07:35 2012
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 
 public class TypeBasedColumnWidthStrategy implements ColumnWidthStrategy {
-    private final Hashtable types = new Hashtable();
+    private final Hashtable<ObjectSpecification, Integer> types = new Hashtable<ObjectSpecification, Integer>();
 
     public TypeBasedColumnWidthStrategy() {
         /*

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java Sun Jan  8 19:07:35 2012
@@ -28,7 +28,7 @@ import org.apache.log4j.Logger;
 
 public class Axes {
     private static final Logger LOG = Logger.getLogger(Axes.class);
-    private final Map<Class, ViewAxis> axes = new HashMap<Class, ViewAxis>();
+    private final Map<Class<?>, ViewAxis> axes = new HashMap<Class<?>, ViewAxis>();
 
     public void add(final ViewAxis axis) {
         if (axis != null) {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/AbstractCollectionContent.java Sun Jan  8 19:07:35 2012
@@ -50,12 +50,12 @@ public abstract class AbstractCollection
     private boolean reverse;
 
     @Override
-    public final Enumeration allElements() {
+    public final Enumeration<ObjectAdapter> allElements() {
         final ObjectAdapter[] elements = elements();
 
         sorter.sort(elements, order, reverse);
 
-        return new Enumeration() {
+        return new Enumeration<ObjectAdapter>() {
             int i = 0;
             int size = elements.length;
 
@@ -65,7 +65,7 @@ public abstract class AbstractCollection
             }
 
             @Override
-            public Object nextElement() {
+            public ObjectAdapter nextElement() {
                 return elements[i++];
             }
         };

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/collection/SimpleCollectionSorter.java Sun Jan  8 19:07:35 2012
@@ -32,12 +32,12 @@ public class SimpleCollectionSorter impl
             return;
         }
 
-        final Vector sorted = new Vector(elements.length);
+        final Vector<ObjectAdapter> sorted = new Vector<ObjectAdapter>(elements.length);
         outer: for (int j = 0; j < elements.length; j++) {
             final ObjectAdapter element = elements[j];
             order.init(element);
             int i = 0;
-            for (final Enumeration f = sorted.elements(); f.hasMoreElements();) {
+            for (final Enumeration<ObjectAdapter> f = sorted.elements(); f.hasMoreElements();) {
                 final ObjectAdapter sortedElement = (ObjectAdapter) f.nextElement();
                 if (sortedElement != null && (order.compare(sortedElement) > 0 ^ reverse)) {
                     sorted.insertElementAt(element, i);

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java Sun Jan  8 19:07:35 2012
@@ -52,7 +52,7 @@ public abstract class CompositeView exte
 
     public CompositeView(final Content content, final ViewSpecification specification) {
         super(content, specification);
-        views = new Vector();
+        views = new Vector<View>();
     }
 
     @Override
@@ -69,7 +69,7 @@ public abstract class CompositeView exte
     }
 
     // TODO make private
-    protected void add(final Vector views, final View view) {
+    protected void add(final Vector<View> views, final View view) {
         LOG.debug("adding " + view + " to " + this);
         views.addElement(view);
         getViewManager().addToNotificationList(view);

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java Sun Jan  8 19:07:35 2012
@@ -248,7 +248,7 @@ public class PopupMenu extends AbstractV
         simpleFocusManager = new SubviewFocusManager(this);
     }
 
-    private void addItems(final View target, final UserAction[] options, final int len, final Vector list,
+    private void addItems(final View target, final UserAction[] options, final int len, final Vector<Item> list,
         final ActionType type) {
         final int initialSize = list.size();
         for (int i = 0; i < len; i++) {

Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java Sun Jan  8 19:07:35 2012
@@ -477,7 +477,7 @@ public final class ApplicationWorkspace 
         return createArrayOfViews(views);
     }
 
-    private View[] createArrayOfViews(final Vector views) {
+    private View[] createArrayOfViews(final Vector<View> views) {
         final View[] array = new View[views.size()];
         views.copyInto(array);
         return array;

Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/DummyView.java Sun Jan  8 19:07:35 2012
@@ -66,7 +66,7 @@ public class DummyView implements View {
     public int invlidateLayout;
     public int invalidateContent;
     private final ViewState state = new ViewState();
-    private final Vector subviews = new Vector();
+    private final Vector<View> subviews = new Vector<View>();
     private boolean allowSubviewsToBeAdded;
     private final Axes axes = new Axes();
 

Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java (original)
+++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java Sun Jan  8 19:07:35 2012
@@ -215,7 +215,7 @@ public class ViewUpdateNotifierTest {
 
         object.setupResolveState(ResolveState.RESOLVED);
 
-        final Vector vector = new Vector();
+        final Vector<View> vector = new Vector<View>();
         final DummyView view1 = createView(object);
         vector.addElement(view1);
 
@@ -243,7 +243,7 @@ public class ViewUpdateNotifierTest {
 
         final DummyWorkspaceView workspace = new DummyWorkspaceView();
 
-        final Vector vector = new Vector();
+        final Vector<View> vector = new Vector<View>();
         final DummyView view1 = createView(object);
         view1.setParent(workspace);
         workspace.addView(view1);
@@ -271,11 +271,11 @@ class ExposedViewUpdateNotifier extends 
 
     public void assertContainsViewForObject(final View view, final ObjectAdapter object) {
         Assert.assertTrue(viewListByAdapter.containsKey(object));
-        final Vector viewsForObject = viewListByAdapter.get(object);
+        final Vector<View> viewsForObject = viewListByAdapter.get(object);
         Assert.assertTrue(viewsForObject.contains(view));
     }
 
-    public void setupViewsForObject(final ObjectAdapter object, final Vector vector) {
+    public void setupViewsForObject(final ObjectAdapter object, final Vector<View> vector) {
         viewListByAdapter.put(object, vector);
     }
 

Modified: incubator/isis/trunk/framework/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/html/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>html</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Html Viewer</name>
 

Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/action/view/util/MenuUtil.java Sun Jan  8 19:07:35 2012
@@ -33,8 +33,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.html.component.Component;
 import org.apache.isis.viewer.html.context.Context;
 
-import com.google.inject.internal.Lists;
-
 public class MenuUtil {
 
     public static Component[] menu(final ObjectAdapter target, final String targetObjectId, final Context context) {

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java Sun Jan  8 19:07:35 2012
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.ObjectActionSet;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 
-import com.google.inject.internal.Lists;
+import com.google.common.collect.Lists;
 
 public final class ActionUtils {
 

Modified: incubator/isis/trunk/framework/viewer/json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/json/pom.xml Sun Jan  8 19:07:35 2012
@@ -29,7 +29,6 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>json</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>JSON Viewer</name>
 

Modified: incubator/isis/trunk/framework/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/scimpi/pom.xml Sun Jan  8 19:07:35 2012
@@ -28,7 +28,6 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>scimpi</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 	
 	<name>Scimpi Viewer</name>
 	

Modified: incubator/isis/trunk/framework/viewer/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/src/site/apt/index.apt?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/src/site/apt/index.apt (original)
+++ incubator/isis/trunk/framework/viewer/src/site/apt/index.apt Sun Jan  8 19:07:35 2012
@@ -17,7 +17,7 @@
 
 
 
-* {Deployable viewers}
+{Deployable viewers}
  
  The <viewer> module is the parent of the different viewer implementations.
 
@@ -61,7 +61,7 @@
   exceptions thrown by proxied domain objects.
  
 
-* {Other viewers}
+{Other viewers}
 
  There are a number of other viewers that should be considered as being of alpha-quality.
  That means that they are either incomplete implementations, inadequately documented, or 

Modified: incubator/isis/trunk/framework/viewer/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/pom.xml?rev=1228921&r1=1228920&r2=1228921&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/pom.xml Sun Jan  8 19:07:35 2012
@@ -29,7 +29,6 @@
 
 	<groupId>org.apache.isis.viewer</groupId>
 	<artifactId>wicket</artifactId>
-	<version>0.2.0-incubating-SNAPSHOT</version>
 
 	<name>Wicket Viewer</name>
 



Mime
View raw message