You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/06 12:09:57 UTC
[37/51] [partial] ISIS-188: moving components into correct
directories.
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/groovy/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/groovy/src/site/apt/index.apt b/framework/progmodels/groovy/src/site/apt/index.apt
deleted file mode 100644
index fe34cef..0000000
--- a/framework/progmodels/groovy/src/site/apt/index.apt
+++ /dev/null
@@ -1,44 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-Groovy Programming Model
-
- The <groovy progmodel> configures Apache Isis to allow you to write your domain objects
- in {{{http://groovy.codehaus.org}Groovy}}.
-
- The conventions are based on the <default programming> model; the purposes of this
- programming model is to instruct Isis to ignore synthetic methods created by the
- Groovy compiler.
-
-Alternatives
-
- Alternatives include:
-
- * the {{{../dflt/index.html}default}} programming model.
-
- For domain objects written with Java.
-
- * the {{{../wrapper/index.html}wrapper}} programming model.
-
- This extends the default programming model by providing the ability for domain objects to
- interact with each other <as if> through the user interface (that is, obeying any business
- rules that would otherwise be enforced at the application layer).
-
- []
-
- Note that these are <not> necessarily mutually exclusive (they can be combined).
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/groovy/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/groovy/src/site/apt/jottings.apt b/framework/progmodels/groovy/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/framework/progmodels/groovy/src/site/apt/jottings.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-Jottings
-
- This page is to capture any random jottings relating to this module prior
- to being moved into formal documentation.
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/groovy/src/site/resources/images/HexagonalArchitectureOverview.png
----------------------------------------------------------------------
diff --git a/framework/progmodels/groovy/src/site/resources/images/HexagonalArchitectureOverview.png b/framework/progmodels/groovy/src/site/resources/images/HexagonalArchitectureOverview.png
deleted file mode 100644
index fd3db18..0000000
Binary files a/framework/progmodels/groovy/src/site/resources/images/HexagonalArchitectureOverview.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/groovy/src/site/resources/images/NO-powered-by-logo.png
----------------------------------------------------------------------
diff --git a/framework/progmodels/groovy/src/site/resources/images/NO-powered-by-logo.png b/framework/progmodels/groovy/src/site/resources/images/NO-powered-by-logo.png
deleted file mode 100644
index 802db39..0000000
Binary files a/framework/progmodels/groovy/src/site/resources/images/NO-powered-by-logo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/groovy/src/site/resources/images/hal-logo-for-maven-site.jpg
----------------------------------------------------------------------
diff --git a/framework/progmodels/groovy/src/site/resources/images/hal-logo-for-maven-site.jpg b/framework/progmodels/groovy/src/site/resources/images/hal-logo-for-maven-site.jpg
deleted file mode 100644
index 7c508b4..0000000
Binary files a/framework/progmodels/groovy/src/site/resources/images/hal-logo-for-maven-site.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/groovy/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/groovy/src/site/site.xml b/framework/progmodels/groovy/src/site/site.xml
deleted file mode 100644
index 87ad7f5..0000000
--- a/framework/progmodels/groovy/src/site/site.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project name="${project.name}">
-
- <body>
- <breadcrumbs>
- <item name="Groovy" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Groovy Support">
- <item name="About" href="index.html" />
- <item name="Groovy" href="http://groovy.codehaus.org" />
- </menu>
-
- <menu name="Progmodel Modules">
- <item name="Default (Java)" href="../dflt/index.html" />
- <item name="Groovy" href="../groovy/index.html" />
- <item name="Wrapper" href="../wrapper/index.html" />
- </menu>
-
- <menu name="Groovy Modules">
- <item name="Applib" href="./groovy-applib/index.html" />
- <item name="Metamodel" href="./groovy-metamodel/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports" />
- </body>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/NOTICE
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/NOTICE b/framework/progmodels/wrapper/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/progmodels/wrapper/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/pom.xml b/framework/progmodels/wrapper/pom.xml
deleted file mode 100644
index 434517d..0000000
--- a/framework/progmodels/wrapper/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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</groupId>
- <artifactId>isis</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
-
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper</artifactId>
-
- <name>Wrapper ProgModel</name>
-
- <packaging>pom</packaging>
-
- <properties>
- <siteBaseDir>../..</siteBaseDir>
- <relativeUrl>progmodels/wrapper/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
- <modules>
- <module>wrapper-applib</module>
- <module>wrapper-metamodel</module>
- </modules>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
- <inherited>false</inherited>
- <reportSets>
- <reportSet>
- <inherited>false</inherited>
- <reports>
- <report>dependency-management</report>
- <report>plugins</report>
- <report>modules</report>
- <report>summary</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <!-- wrapper applib -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wrapper-applib</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wrapper-applib</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
-
- <!-- wrapper impl -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>wrapper-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/src/site/apt/index.apt b/framework/progmodels/wrapper/src/site/apt/index.apt
deleted file mode 100644
index 3cbbd45..0000000
--- a/framework/progmodels/wrapper/src/site/apt/index.apt
+++ /dev/null
@@ -1,45 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-Wrapper Programming Model
-
- The <wrapper> programming model allows a domain object to be "wrapped" so that when another domain object interact with it,
- it is <as if> through a viewer. That is, if a property or action is unusable on the wrapped domain object, then the
- calling domain object will be receive an exception indicating the fact.
-
- The wrapper programming model is provided as an implementation of Isis' <<<DomainObjectContainer>>> interface (in the
- {{{../../applib/index.html}applib}}.
- This can be downcast into a <<<WrapperFactory>>>, from which the domain object is wrapped using a {{{http://cglib.sourceforge.net/}CgLib}} proxy.
- This proxy implements the checks to ensure that the wrapped object is visible, is not disabled, and the interaction is
- valid ("see it, use it, do it").
-
-Alternatives
-
- Alternatives include:
-
- * the {{{../dflt/index.html}default}} programming model.
-
- * the {{{../groovy/index.html}wrapper}} programming model.
-
- For domain objects written with Groovy.
-
- []
-
- Note that these are <i>not</i> necessarily mutually exclusive (they can be combined).
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/src/site/apt/jottings.apt b/framework/progmodels/wrapper/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/framework/progmodels/wrapper/src/site/apt/jottings.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-Jottings
-
- This page is to capture any random jottings relating to this module prior
- to being moved into formal documentation.
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/src/site/site.xml b/framework/progmodels/wrapper/src/site/site.xml
deleted file mode 100644
index f9cf5e7..0000000
--- a/framework/progmodels/wrapper/src/site/site.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Wrapper" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Wrapper Progmodel">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Progmodel Modules">
- <item name="Default (Java)" href="../dflt/index.html" />
- <item name="Groovy" href="../groovy/index.html" />
- <item name="Wrapper" href="../wrapper/index.html" />
- </menu>
-
- <menu name="Wrapper Modules">
- <item name="Applib" href="./wrapper-applib/index.html" />
- <item name="Metamodel" href="./wrapper-metamodel/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports" />
- </body>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/NOTICE
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/NOTICE b/framework/progmodels/wrapper/wrapper-applib/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/pom.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/pom.xml b/framework/progmodels/wrapper/wrapper-applib/pom.xml
deleted file mode 100644
index 76af819..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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.progmodels</groupId>
- <artifactId>wrapper</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wrapper-applib</artifactId>
- <name>Wrapper ProgModel Applib</name>
- <description>Wrapper Applib</description>
-
-
- <!-- shouldn't be needed, but was being built as a pom for some reason -->
- <packaging>jar</packaging>
-
- <properties>
- <siteBaseDir>../../..</siteBaseDir>
- <relativeUrl>progmodels/wrapper/wrapper-applib/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
- <inherited>false</inherited>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- <reportSets>
- <reportSet>
- <inherited>false</inherited>
- <reports>
- <report>dependencies</report>
- <report>dependency-convergence</report>
- <report>plugins</report>
- <report>summary</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java
deleted file mode 100644
index b2cc3ff..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/DisabledException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib;
-
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.UsabilityEvent;
-
-/**
- * Superclass of exceptions which indicate an attempt to interact with a class
- * member that is disabled.
- */
-public class DisabledException extends InteractionException {
-
- private static final long serialVersionUID = 1L;
-
- public DisabledException(final InteractionEvent interactionEvent) {
- super(interactionEvent);
- }
-
- @Override
- public UsabilityEvent getInteractionEvent() {
- return (UsabilityEvent) super.getInteractionEvent();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java
deleted file mode 100644
index 9d3c451..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/HiddenException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib;
-
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
-
-/**
- * Superclass of exceptions which indicate an attempt to interact with a class
- * member that is in some way hidden or invisible.
- */
-public class HiddenException extends InteractionException {
-
- private static final long serialVersionUID = 1L;
-
- public HiddenException(final InteractionEvent interactionEvent) {
- super(interactionEvent);
- }
-
- @Override
- public VisibilityEvent getInteractionEvent() {
- return (VisibilityEvent) super.getInteractionEvent();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java
deleted file mode 100644
index 3931d05..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InteractionException.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib;
-
-import org.apache.isis.applib.ApplicationException;
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.events.InteractionEvent;
-
-public abstract class InteractionException extends ApplicationException {
-
- private static final long serialVersionUID = 1L;
-
- private final InteractionEvent interactionEvent;
-
- public InteractionException(final InteractionEvent interactionEvent) {
- super(interactionEvent.getReason());
- this.interactionEvent = interactionEvent;
- }
-
- /**
- * The {@link InteractionEvent event} passed into the
- * {@link #InteractionException(InteractionEvent) constructor}.
- *
- * <p>
- * Not part of the API, but made available so that subclasses can expose as
- * the appropriate subtype of {@link InteractionEvent}. This would have been
- * more obvious to see if {@link InteractionException} was generic, but
- * generic subclasses of {@link Throwable} are (apparently) not allowed.
- *
- * @return
- */
- protected InteractionEvent getInteractionEvent() {
- return interactionEvent;
- }
-
- /**
- * Convenience method that returns the
- * {@link InteractionEvent#getAdvisorClass() advisor class} of the wrapped
- * {@link #getInteractionEvent() interaction event}.
- *
- * @return
- */
- public Class<?> getAdvisorClass() {
- return interactionEvent.getAdvisorClass();
- }
-
- /**
- * Convenience method that returns the
- * {@link InteractionEvent#getIdentifier() identifier} of the wrapped
- * {@link #getInteractionEvent() interaction event}.
- *
- * @return
- */
- public Identifier getIdentifier() {
- return interactionEvent.getIdentifier();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java
deleted file mode 100644
index d8aa401..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/InvalidException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib;
-
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.ValidityEvent;
-
-/**
- * Superclass of exceptions which indicate an attempt to interact with an object
- * or member in a way that is invalid.
- *
- * <p>
- *
- */
-public class InvalidException extends InteractionException {
-
- private static final long serialVersionUID = 1L;
-
- public InvalidException(final InteractionEvent interactionEvent) {
- super(interactionEvent);
- }
-
- @Override
- public ValidityEvent getInteractionEvent() {
- return (ValidityEvent) super.getInteractionEvent();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java
deleted file mode 100644
index fe5e7a2..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperFactory.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib;
-
-import java.util.List;
-
-import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
-
-/**
- * Provides the ability to "wrap" of a domain object such that it can
- * be interacted with while enforcing the hide/disable/validate rules implies by
- * the Isis programming model.
- *
- * <p>
- * The "wrap" is a CGLib proxy that wraps the underlying domain
- * object. The wrapper can then be interacted with as follows:
- * <ul>
- * <li>a <tt>get</tt> method for properties or collections</li>
- * <li>a <tt>set</tt> method for properties</li>
- * <li>an <tt>addTo</tt> or <tt>removeFrom</tt> method for collections</li>
- * <li>any action</li>
- * </ul>
- *
- * <p>
- * Calling any of the above methods may result in a (subclass of)
- * {@link InteractionException} if the object disallows it. For example, if a
- * property is annotated with {@link Hidden} then a {@link HiddenException} will
- * be thrown. Similarly if an action has a <tt>validate</tt> method and the
- * supplied arguments are invalid then a {@link InvalidException} will be
- * thrown.
- *
- * <p>
- * In addition, the following methods may also be called:
- * <ul>
- * <li>the <tt>title</tt> method</li>
- * <li>any <tt>defaultXxx</tt> or <tt>choicesXxx</tt> method</li>
- * </ul>
- *
- * <p>
- * An exception will be thrown if any other methods are thrown.
- */
-public interface WrapperFactory {
-
- /**
- * Whether interactions with the wrapper are actually passed onto the
- * underlying domain object.
- *
- * @see WrapperFactory#wrap(Object, ExecutionMode)
- */
- public static enum ExecutionMode {
- EXECUTE, NO_EXECUTE
- }
-
- /**
- * Provides the "wrapper" of the underlying domain object.
- *
- * <p>
- * If the object has (see {@link #isWrapper(Object)} already been wrapped),
- * then should just return the object back unchanged.
- *
- * @see #addInteractionListener(InteractionListener)
- */
- <T> T wrap(T domainObject);
-
- /**
- * Same as {@link #wrap(Object)}, except the actual execution occurs only if
- * the <tt>execute</tt> parameter indicates.
- *
- * <p>
- * Otherwise, will do all the validations (raise exceptions as required
- * etc.), but doesn't modify the model.
- */
- <T> T wrap(T domainObject, ExecutionMode mode);
-
- /**
- * Whether the supplied object has been wrapped.
- *
- * @param <T>
- * @param possibleWrapper
- * - object that might or might not be a wrapper.
- * @return
- */
- <T> boolean isWrapper(T possibleWrapper);
-
- /**
- * All {@link InteractionListener}s that have been registered using
- * {@link #addInteractionListener(InteractionListener)}.
- */
- List<InteractionListener> getListeners();
-
- /**
- * Registers an {@link InteractionListener}, to be notified of interactions
- * on all wrappers.
- *
- * <p>
- * This is retrospective: the listener will be notified of interactions even
- * on wrappers created before the listener was installed. (From an
- * implementation perspective this is because the wrappers delegate back to
- * the container to fire the events).
- *
- * @param listener
- * @return
- */
- public boolean addInteractionListener(InteractionListener listener);
-
- /**
- * Remove an {@link InteractionListener}, to no longer be notified of
- * interactions on wrappers.
- *
- * <p>
- * This is retrospective: the listener will no longer be notified of any
- * interactions created on any wrappers, not just on those wrappers created
- * subsequently. (From an implementation perspective this is because the
- * wrappers delegate back to the container to fire the events).
- *
- * @param listener
- * @return
- */
- public boolean removeInteractionListener(InteractionListener listener);
-
- public void notifyListeners(InteractionEvent ev);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
deleted file mode 100644
index a4e01ae..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/WrapperObject.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib;
-
-/**
- * Implemented by all objects that have been viewed as per
- * {@link WrapperFactory#wrap(Object)}.
- */
-public interface WrapperObject {
-
- /**
- * Programmatic equivalent of invoking save for a transient object (that is,
- * like hitting the <i>save</i> button that the DnD viewer automatically
- * renders.
- */
- void save();
-
- /**
- * Provide access to the underlying, wrapped object.
- *
- * <p>
- * Used to unwrap objects used as arguments to actions (otherwise, end up
- * creating a <tt>ObjectSpecification</tt> for the CGLib-enhanced class, not
- * the original class).
- *
- * <p>
- * <b>NOTE: there is a string-literal reference to this name
- * <tt>DomainObjectInvocationHandler</tt>, so it should not be changed.</b>.
- */
- Object wrapped();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java
deleted file mode 100644
index db14735..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionAdapter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib.listeners;
-
-import org.apache.isis.applib.events.ActionArgumentEvent;
-import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.ObjectValidityEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
-
-/**
- * Provides no-op implementations of each of the methods within
- * {@link InteractionListener}, to simplify the creation of new listeners.
- */
-public class InteractionAdapter implements InteractionListener {
-
- @Override
- public void propertyVisible(final PropertyVisibilityEvent ev) {
- }
-
- @Override
- public void propertyUsable(final PropertyUsabilityEvent ev) {
- }
-
- @Override
- public void propertyAccessed(final PropertyAccessEvent ev) {
- }
-
- @Override
- public void propertyModified(final PropertyModifyEvent ev) {
- }
-
- @Override
- public void collectionVisible(final CollectionVisibilityEvent ev) {
- }
-
- @Override
- public void collectionUsable(final CollectionUsabilityEvent ev) {
- }
-
- @Override
- public void collectionAccessed(final CollectionAccessEvent ev) {
- }
-
- @Override
- public void collectionAddedTo(final CollectionAddToEvent ev) {
- }
-
- @Override
- public void collectionRemovedFrom(final CollectionRemoveFromEvent ev) {
- }
-
- @Override
- public void collectionMethodInvoked(final CollectionMethodEvent interactionEvent) {
- }
-
- @Override
- public void actionVisible(final ActionVisibilityEvent interactionEvent) {
- }
-
- @Override
- public void actionUsable(final ActionUsabilityEvent ev) {
- }
-
- @Override
- public void actionArgument(final ActionArgumentEvent ev) {
- }
-
- @Override
- public void actionInvoked(final ActionInvocationEvent ev) {
- }
-
- @Override
- public void objectPersisted(final ObjectValidityEvent ev) {
- }
-
- @Override
- public void objectTitleRead(final ObjectTitleEvent ev) {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java b/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java
deleted file mode 100644
index 58a1228..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/main/java/org/apache/isis/progmodel/wrapper/applib/listeners/InteractionListener.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.applib.listeners;
-
-import org.apache.isis.applib.events.ActionArgumentEvent;
-import org.apache.isis.applib.events.ActionInvocationEvent;
-import org.apache.isis.applib.events.ActionUsabilityEvent;
-import org.apache.isis.applib.events.ActionVisibilityEvent;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.CollectionAddToEvent;
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.CollectionRemoveFromEvent;
-import org.apache.isis.applib.events.CollectionUsabilityEvent;
-import org.apache.isis.applib.events.CollectionVisibilityEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.ObjectValidityEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.PropertyModifyEvent;
-import org.apache.isis.applib.events.PropertyUsabilityEvent;
-import org.apache.isis.applib.events.PropertyVisibilityEvent;
-
-public interface InteractionListener {
-
- /**
- * The title was read.
- *
- * @param ev
- */
- void objectTitleRead(ObjectTitleEvent ev);
-
- /**
- * The object was persisted (or an attempt to persist it was made).
- *
- * @param ev
- */
- void objectPersisted(ObjectValidityEvent ev);
-
- /**
- * A check was made to determine if a property was visible.
- *
- * @param ev
- */
- void propertyVisible(PropertyVisibilityEvent ev);
-
- /**
- * A check was made to determine if a property was usable.
- *
- * @param ev
- */
- void propertyUsable(PropertyUsabilityEvent ev);
-
- /**
- * A property was read.
- *
- * <p>
- * Unlike most other events, a {@link PropertyAccessEvent} will never have
- * been vetoed (that is, {@link PropertyAccessEvent#isVeto()} will always be
- * <tt>false</tt>).
- *
- * @param ev
- */
- void propertyAccessed(PropertyAccessEvent ev);
-
- /**
- * A property was modified (or an attempt to modify it was made)
- *
- * <p>
- * Use {@link PropertyModifyEvent#getProposed()} to determine whether the
- * property was being set or cleared.
- *
- * @param ev
- */
- void propertyModified(PropertyModifyEvent ev);
-
- /**
- * A check was made to determine if a collection was visible.
- *
- * <p>
- * Will be fired prior to
- * {@link #collectionUsable(CollectionUsabilityEvent)}.
- *
- * @param ev
- */
- void collectionVisible(CollectionVisibilityEvent ev);
-
- /**
- * A check was made to determine if a collection was usable.
- *
- * <p>
- * Will be fired prior to either
- * {@link #collectionAccessed(CollectionAccessEvent)} or
- * {@link #collectionAddedTo(CollectionAddToEvent)} or
- * {@link #collectionRemovedFrom(CollectionRemoveFromEvent)}.
- *
- * @param ev
- */
- void collectionUsable(CollectionUsabilityEvent ev);
-
- /**
- * A collection was read.
- *
- * <p>
- * Unlike most other events, a {@link CollectionAccessEvent} will never have
- * been vetoed (that is, {@link CollectionAccessEvent#isVeto()} will always
- * be <tt>false</tt>).
- *
- * @param ev
- */
- void collectionAccessed(CollectionAccessEvent ev);
-
- /**
- * An object was added to the collection (or an attempt to add it was made).
- *
- * @param ev
- */
- void collectionAddedTo(CollectionAddToEvent ev);
-
- /**
- * An object was removed from the collection (or an attempt to remove it was
- * made).
- *
- * @param ev
- */
- void collectionRemovedFrom(CollectionRemoveFromEvent ev);
-
-/**
- * A method of a collection (such as <tt>isEmpty()</tt> or <tt>size()</tt>) has been invoked.
- *
- *
- * <p>
- * Unlike the other methods in this interface, the source of these events will be an instance of a
- * Collection (such as <tt>java.util.List</tt>) rather than the domain object. (The domain object is
- * {@link CollectionMethodEvent#getDomainObject() still available, however).
- *
- * @param interactionEvent
- */
- void collectionMethodInvoked(CollectionMethodEvent interactionEvent);
-
- /**
- * A check was made to determine if an action was visible.
- *
- * <p>
- * Will be fired prior to {@link #actionUsable(ActionUsabilityEvent)}.
- *
- * @param ev
- */
- void actionVisible(ActionVisibilityEvent interactionEvent);
-
- /**
- * A check was made to determine if an action was usable.
- *
- * <p>
- * Will be fired prior to {@link #actionArgument(ActionArgumentEvent)}.
- *
- * @param ev
- */
- void actionUsable(ActionUsabilityEvent ev);
-
- /**
- * A check was made as to whether an argument proposed for an action was
- * valid.
- *
- * <p>
- * Will be fired prior to {@link #actionInvoked(ActionInvocationEvent)}.
- *
- * @param ev
- */
- void actionArgument(ActionArgumentEvent ev);
-
- /**
- * An action was invoked (or an attempt to invoke it was made).
- *
- * @param ev
- */
- void actionInvoked(ActionInvocationEvent ev);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/site/apt/index.apt b/framework/progmodels/wrapper/wrapper-applib/src/site/apt/index.apt
deleted file mode 100644
index ae48c91..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/site/apt/index.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-Headless AppLib
-
- The <headless applib> decouples the domain objects from the <headless> viewer implementation. Its main
- responsibility is to define the <<<HeadlessViewer>>> interface, by which the domain object proxies are obtained.
- It also defines the exceptions that are raised to indicate invalid interactions between domain objects.
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/site/apt/jottings.apt b/framework/progmodels/wrapper/wrapper-applib/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/site/apt/jottings.apt
+++ /dev/null
@@ -1,24 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one
-~~ or more contributor license agreements. See the NOTICE file
-~~ distributed with this work for additional information
-~~ regarding copyright ownership. The ASF licenses this file
-~~ to you under the Apache License, Version 2.0 (the
-~~ "License"); you may not use this file except in compliance
-~~ with the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing,
-~~ software distributed under the License is distributed on an
-~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-~~ KIND, either express or implied. See the License for the
-~~ specific language governing permissions and limitations
-~~ under the License.
-
-
-
-Jottings
-
- This page is to capture any random jottings relating to this module prior
- to being moved into formal documentation.
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-applib/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-applib/src/site/site.xml b/framework/progmodels/wrapper/wrapper-applib/src/site/site.xml
deleted file mode 100644
index 692a6a3..0000000
--- a/framework/progmodels/wrapper/wrapper-applib/src/site/site.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project>
-
- <body>
- <breadcrumbs>
- <item name="Applib" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Wrapper Applib">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Wrapper Modules">
- <item name="Applib" href="../wrapper-applib/index.html" />
- <item name="Metamodel" href="../wrapper-metamodel/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports" />
- </body>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/NOTICE
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/NOTICE b/framework/progmodels/wrapper/wrapper-metamodel/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Isis
-Copyright 2010-2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/pom.xml b/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
deleted file mode 100644
index d8e633c..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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.progmodels</groupId>
- <artifactId>wrapper</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wrapper-metamodel</artifactId>
-
- <name>Wrapper ProgModel MetaModel</name>
- <description>Wrapper Metamodel</description>
-
-
- <properties>
- <siteBaseDir>../../..</siteBaseDir>
- <relativeUrl>progmodels/wrapper/wrapper-metamodel/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${maven-project-info-reports-plugin}</version>
- <inherited>false</inherited>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- <reportSets>
- <reportSet>
- <inherited>false</inherited>
- <reports>
- <report>dependencies</report>
- <report>dependency-convergence</report>
- <report>plugins</report>
- <report>summary</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-dom</artifactId>
- <scope>test</scope>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </dependency>
-
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java
deleted file mode 100644
index a5f09e8..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/DomainObjectContainerWrapperFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel;
-
-import java.util.List;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.adapter.ObjectPersistor;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
-import org.apache.isis.progmodel.wrapper.applib.listeners.InteractionListener;
-import org.apache.isis.progmodel.wrapper.metamodel.internal.WrapperFactoryDefault;
-
-/**
- * A combined {@link DomainObjectContainer} and {@link WrapperFactory}.
- */
-public class DomainObjectContainerWrapperFactory extends DomainObjectContainerDefault implements WrapperFactory {
-
- private final WrapperFactoryDefault wrapperFactoryDelegate;
-
- public DomainObjectContainerWrapperFactory() {
- this.wrapperFactoryDelegate = new WrapperFactoryDefault();
- }
-
- // /////////////////////////////////////////////////////////////
- // Views
- // /////////////////////////////////////////////////////////////
-
- @Override
- public <T> T wrap(final T domainObject) {
- return wrapperFactoryDelegate.wrap(domainObject);
- }
-
- @Override
- public <T> T wrap(final T domainObject, final ExecutionMode mode) {
- return wrapperFactoryDelegate.wrap(domainObject, mode);
- }
-
- @Override
- public boolean isWrapper(final Object possibleView) {
- return wrapperFactoryDelegate.isWrapper(possibleView);
- }
-
- // /////////////////////////////////////////////////////////////
- // Listeners
- // /////////////////////////////////////////////////////////////
-
- @Override
- public List<InteractionListener> getListeners() {
- return wrapperFactoryDelegate.getListeners();
- }
-
- @Override
- public boolean addInteractionListener(final InteractionListener listener) {
- return wrapperFactoryDelegate.addInteractionListener(listener);
- }
-
- @Override
- public boolean removeInteractionListener(final InteractionListener listener) {
- return wrapperFactoryDelegate.removeInteractionListener(listener);
- }
-
- @Override
- public void notifyListeners(final InteractionEvent interactionEvent) {
- wrapperFactoryDelegate.notifyListeners(interactionEvent);
- }
-
- // /////////////////////////////////////////////////////////////
- // Dependencies
- // /////////////////////////////////////////////////////////////
-
- @Override
- public void setSpecificationLookup(final SpecificationLoader specificationLookup) {
- super.setSpecificationLookup(specificationLookup);
- wrapperFactoryDelegate.setSpecificationLookup(specificationLookup);
- }
-
- @Override
- public void setAuthenticationSessionProvider(final AuthenticationSessionProvider authenticationSessionProvider) {
- super.setAuthenticationSessionProvider(authenticationSessionProvider);
- wrapperFactoryDelegate.setAuthenticationSessionProvider(authenticationSessionProvider);
- }
-
- @Override
- public void setAdapterManager(final AdapterManager adapterManager) {
- super.setAdapterManager(adapterManager);
- wrapperFactoryDelegate.setAdapterManager(adapterManager);
- }
-
- @Override
- public void setObjectPersistor(final ObjectPersistor objectPersistor) {
- super.setObjectPersistor(objectPersistor);
- wrapperFactoryDelegate.setObjectPersistor(objectPersistor);
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java
deleted file mode 100644
index 75e5fce..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/AbstractCollectionInvocationHandler.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel.internal;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.isis.applib.events.CollectionMethodEvent;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-
-abstract class AbstractCollectionInvocationHandler<T, C> extends DelegatingInvocationHandlerDefault<C> {
-
- private final List<Method> interceptedMethods = new ArrayList<Method>();
- private final List<Method> vetoedMethods = new ArrayList<Method>();
- private final String collectionName;
- private final OneToManyAssociation oneToManyAssociation;
- private final T domainObject;
-
- public AbstractCollectionInvocationHandler(final C collectionOrMapToProxy, final String collectionName, final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
- super(collectionOrMapToProxy, handler.getHeadlessViewer(), handler.getExecutionMode());
- this.collectionName = collectionName;
- this.oneToManyAssociation = otma;
- this.domainObject = handler.getDelegate();
- }
-
- protected Method intercept(final Method method) {
- this.interceptedMethods.add(method);
- return method;
- }
-
- protected Method veto(final Method method) {
- this.vetoedMethods.add(method);
- return method;
- }
-
- public String getCollectionName() {
- return collectionName;
- }
-
- public OneToManyAssociation getCollection() {
- return oneToManyAssociation;
- }
-
- public T getDomainObject() {
- return domainObject;
- }
-
- @Override
- public Object invoke(final Object collectionObject, final Method method, final Object[] args) throws Throwable {
-
- // delegate
- final Object returnValueObj = delegate(method, args);
-
- if (interceptedMethods.contains(method)) {
-
- resolveIfRequired(domainObject);
-
- final InteractionEvent ev = new CollectionMethodEvent(getDelegate(), getCollection().getIdentifier(), getDomainObject(), method.getName(), args, returnValueObj);
- notifyListeners(ev);
- return returnValueObj;
- }
-
- if (vetoedMethods.contains(method)) {
- throw new UnsupportedOperationException(String.format("Method '%s' may not be called directly.", method.getName()));
- }
-
- return returnValueObj;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java
deleted file mode 100644
index aaa2ae0..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibClassProxyFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel.internal;
-
-import java.lang.reflect.InvocationHandler;
-
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
-import net.sf.cglib.proxy.MethodInterceptor;
-
-import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
-
-/**
- * Factory generating a mock for a class.
- * <p>
- * Note that this class is stateful
- */
-public class CgLibClassProxyFactory<T> implements IProxyFactory<T> {
-
- @Override
- @SuppressWarnings("unchecked")
- public T createProxy(final T toProxy, final InvocationHandler handler) {
- final Class<T> proxyClass = (Class<T>) toProxy.getClass();
- return createProxy(proxyClass, handler);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public T createProxy(final Class<T> toProxyClass, final InvocationHandler handler) {
-
- final MethodInterceptor interceptor = new InvocationHandlerMethodInterceptor(handler);
-
- // Create the proxy
- final Enhancer enhancer = new Enhancer();
- enhancer.setSuperclass(toProxyClass);
- enhancer.setInterfaces(new Class[] { WrapperObject.class });
- enhancer.setCallbackType(interceptor.getClass());
-
- final Class<?> enhancedClass = enhancer.createClass();
-
- Enhancer.registerCallbacks(enhancedClass, new Callback[] { interceptor });
-
- Factory factory;
- try {
- factory = (Factory) ClassInstantiatorFactoryCE.getInstantiator().newInstance(enhancedClass);
- } catch (final InstantiationException e) {
- throw new RuntimeException("Fail to instantiate mock for " + toProxyClass + " on " + ClassInstantiatorFactoryCE.getJVM() + " JVM");
- }
-
- return (T) factory;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
deleted file mode 100644
index 2d2cec8..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CgLibProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.Factory;
-
-import org.apache.isis.core.metamodel.specloader.classsubstitutor.CglibEnhanced;
-import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
-
-public class CgLibProxy<T> {
-
- private final DelegatingInvocationHandler<T> handler;
-
- public CgLibProxy(final DelegatingInvocationHandler<T> handler) {
- this.handler = handler;
- }
-
- @SuppressWarnings("unchecked")
- public T proxy() {
-
- final T toProxy = handler.getDelegate();
-
- // handle if already proxied using cglib.
- if (CglibEnhanced.class.isAssignableFrom(toProxy.getClass())) {
-
- handler.setResolveObjectChangedEnabled(true);
-
- final Class<? extends Object> enhancedClass = toProxy.getClass();
- final Class<? extends Object> origSuperclass = toProxy.getClass().getSuperclass();
-
- final List<Class> interfaces = new ArrayList<Class>();
- interfaces.addAll(Arrays.asList(enhancedClass.getInterfaces()));
- interfaces.remove(Factory.class); // if there.
- interfaces.add(WrapperObject.class);
-
- return (T) Enhancer.create(origSuperclass, interfaces.toArray(new Class[] {}), new InvocationHandlerMethodInterceptor(handler));
- }
-
- final Class<T> clazz = (Class<T>) toProxy.getClass();
-
- T proxy = null;
- try {
- final IProxyFactory<T> proxyFactory = clazz.isInterface() ? new JavaProxyFactory<T>() : new CgLibClassProxyFactory<T>();
- proxy = proxyFactory.createProxy(clazz, handler);
- } catch (final RuntimeExceptionWrapper e) {
- throw (RuntimeException) e.getRuntimeException().fillInStackTrace();
- }
- return proxy;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ClassInstantiatorFactoryCE.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ClassInstantiatorFactoryCE.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ClassInstantiatorFactoryCE.java
deleted file mode 100644
index 85bc196..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/ClassInstantiatorFactoryCE.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel.internal;
-
-/**
- * Factory returning a {@link IClassInstantiatorCE}for the current JVM
- */
-class ClassInstantiatorFactoryCE {
-
- private static IClassInstantiatorCE instantiator = new ObjenesisClassInstantiatorCE();
-
- // ///CLOVER:OFF
- private ClassInstantiatorFactoryCE() {
- }
-
- // ///CLOVER:ON
-
- /**
- * Returns the current JVM as specified in the Systtem properties
- *
- * @return current JVM
- */
- public static String getJVM() {
- return System.getProperty("java.vm.vendor");
- }
-
- /**
- * Returns the current JVM specification version (1.5, 1.4, 1.3)
- *
- * @return current JVM specification version
- */
- public static String getJVMSpecificationVersion() {
- return System.getProperty("java.specification.version");
- }
-
- public static boolean is1_3Specifications() {
- return getJVMSpecificationVersion().equals("1.3");
- }
-
- /**
- * Returns a class instantiator suitable for the current JVM
- *
- * @return a class instantiator usable on the current JVM
- */
- public static IClassInstantiatorCE getInstantiator() {
- return instantiator;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java
deleted file mode 100644
index d143af6..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/CollectionInvocationHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel.internal;
-
-import static org.apache.isis.core.commons.lang.MethodUtils.getMethod;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-
-class CollectionInvocationHandler<T, R> extends AbstractCollectionInvocationHandler<T, R> {
-
- public CollectionInvocationHandler(final R collectionToProxy, final String collectionName, final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
- super(collectionToProxy, collectionName, handler, otma);
-
- try {
- intercept(getMethod(collectionToProxy, "contains", Object.class));
- intercept(getMethod(collectionToProxy, "size"));
- intercept(getMethod(collectionToProxy, "isEmpty"));
- if (collectionToProxy instanceof List) {
- intercept(getMethod(collectionToProxy, "get", int.class));
- }
- veto(getMethod(collectionToProxy, "add", Object.class));
- veto(getMethod(collectionToProxy, "remove", Object.class));
- veto(getMethod(collectionToProxy, "addAll", Collection.class));
- veto(getMethod(collectionToProxy, "removeAll", Collection.class));
- veto(getMethod(collectionToProxy, "retainAll", Collection.class));
- veto(getMethod(collectionToProxy, "clear"));
- } catch (final NoSuchMethodException e) {
- // ///CLOVER:OFF
- throw new RuntimeException("A Collection method could not be found: " + e.getMessage());
- // ///CLOVER:ON
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/cd9f2e4a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java b/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java
deleted file mode 100644
index 5772b88..0000000
--- a/framework/progmodels/wrapper/wrapper-metamodel/src/main/java/org/apache/isis/progmodel/wrapper/metamodel/internal/DelegatingInvocationHandler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.progmodel.wrapper.metamodel.internal;
-
-import java.lang.reflect.InvocationHandler;
-
-public interface DelegatingInvocationHandler<T> extends InvocationHandler {
-
- T getDelegate();
-
- public boolean isResolveObjectChangedEnabled();
-
- public void setResolveObjectChangedEnabled(boolean resolveObjectChangedEnabled);
-
-}