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/05 09:07:35 UTC
[9/11] ISIS-188: more refactoring of artifacts
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java
deleted file mode 100644
index 1234c00..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/OptionsClient.java
+++ /dev/null
@@ -1,27 +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.core.runtime.userprofile;
-
-public interface OptionsClient {
-
- void loadOptions(Options viewOptions);
-
- void saveOptions(Options viewOptions);
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
deleted file mode 100644
index 87c3764..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/PerspectiveEntry.java
+++ /dev/null
@@ -1,115 +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.core.runtime.userprofile;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-public class PerspectiveEntry {
-
- public PerspectiveEntry() {
- }
-
- // ///////////////////////////////////////////////////////
- // Name & Title
- // ///////////////////////////////////////////////////////
-
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getTitle() {
- return name + " (" + services.size() + " classes)";
- }
-
- // ///////////////////////////////////////////////////////
- // Objects, save
- // ///////////////////////////////////////////////////////
-
- private final List<Object> objects = Lists.newArrayList();
-
- // REVIEW should this deal with Isis, and the services with IDs (or Isis)
- public List<Object> getObjects() {
- return objects;
- }
-
- public void addToObjects(final Object obj) {
- if (!objects.contains(obj)) {
- objects.add(obj);
- }
- }
-
- public void removeFromObjects(final Object obj) {
- objects.remove(obj);
- }
-
- public void save(final List<ObjectAdapter> adapters) {
- this.objects.clear();
- for (final ObjectAdapter adapter : adapters) {
- addToObjects(adapter.getObject());
- }
- }
-
- // ///////////////////////////////////////////////////////
- // Services
- // ///////////////////////////////////////////////////////
-
- private final List<Object> services = Lists.newArrayList();
-
- public List<Object> getServices() {
- return services;
- }
-
- public void addToServices(final Object service) {
- if (service != null && !services.contains(service)) {
- services.add(service);
- }
- }
-
- public void removeFromServices(final Object service) {
- if (service != null && services.contains(service)) {
- services.remove(service);
- }
- }
-
- // ///////////////////////////////////////////////////////
- // copy
- // ///////////////////////////////////////////////////////
-
- public void copy(final PerspectiveEntry template) {
- name = template.getName();
- for (final Object service : template.getServices()) {
- addToServices(service);
- }
- for (final Object obj : template.getObjects()) {
- addToObjects(obj);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java
deleted file mode 100644
index f61c5ce..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserLocalization.java
+++ /dev/null
@@ -1,46 +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.core.runtime.userprofile;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.apache.isis.applib.profiles.Localization;
-
-public class UserLocalization implements Localization {
-
- private final TimeZone timeZone;
- private final Locale locale;
-
- public UserLocalization(final Locale locale, final TimeZone timeZone) {
- this.locale = locale == null ? Locale.getDefault() : locale;
- this.timeZone = timeZone == null ? TimeZone.getDefault() : timeZone;
- }
-
- @Override
- public Locale getLocale() {
- return locale;
- }
-
- @Override
- public TimeZone getTimeZone() {
- return timeZone;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
deleted file mode 100644
index b0a755f..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfile.java
+++ /dev/null
@@ -1,168 +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.core.runtime.userprofile;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.debug.DebugBuilder;
-import org.apache.isis.core.commons.debug.DebuggableWithTitle;
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-public class UserProfile implements DebuggableWithTitle {
-
- public UserProfile() {
- }
-
- // ///////////////////////////////////////////////////////
- // Perspective
- // ///////////////////////////////////////////////////////
-
- private PerspectiveEntry entry;
-
- public PerspectiveEntry getPerspective() {
- if (entry == null) {
- if (entries.size() == 0) {
- throw new IsisException("No perspective in user profile");
- } else {
- entry = entries.get(0);
- }
- }
- return entry;
- }
-
- public PerspectiveEntry newPerspective(final String name) {
- entry = new PerspectiveEntry();
- entry.setName(name);
- entries.add(entry);
- return entry;
- }
-
- public void removeCurrent() {
- if (entries.size() > 1) {
- entries.remove(entry);
- entry = entries.get(0);
- }
- }
-
- // ///////////////////////////////////////////////////////
- // Perspective Entries
- // ///////////////////////////////////////////////////////
-
- private final List<PerspectiveEntry> entries = Lists.newArrayList();
-
- public PerspectiveEntry getPerspective(final String name) {
- for (final PerspectiveEntry entry : entries) {
- if (entry.getName().equals(name)) {
- return entry;
- }
- }
- throw new IsisException("No perspective " + name);
- }
-
- public void addToPerspectives(final PerspectiveEntry perspective) {
- final PerspectiveEntry e = new PerspectiveEntry();
- e.copy(perspective);
- entries.add(e);
- }
-
- public List<String> list() {
- final List<String> list = Lists.newArrayList();
- for (final PerspectiveEntry entry : entries) {
- list.add(entry.getName());
- }
- return list;
- }
-
- public void select(final String name) {
- for (final PerspectiveEntry entry : entries) {
- if (entry.getName().equals(name)) {
- this.entry = entry;
- break;
- }
- }
- }
-
- public void copy(final UserProfile template) {
- for (final PerspectiveEntry entry : template.entries) {
- final PerspectiveEntry e = new PerspectiveEntry();
- e.copy(entry);
- entries.add(e);
- }
- options.copy(template.getOptions());
- }
-
- /**
- * Introduced for debugging.
- */
- public List<PerspectiveEntry> getEntries() {
- return Collections.unmodifiableList(entries);
- }
-
- // ///////////////////////////////////////////////////////
- // Options
- // ///////////////////////////////////////////////////////
-
- private final Options options = new Options();
-
- public Options getOptions() {
- return options;
- }
-
- public void addToOptions(final String name, final String value) {
- options.addOption(name, value);
- }
-
- // ///////////////////////////////
- // Localization
- // ///////////////////////////////
-
- private Localization localization;
-
- public Localization getLocalization() {
- return localization;
- }
-
- public void setLocalization(final Localization localization) {
- this.localization = localization;
- }
-
- // ///////////////////////////////
- // Save
- // ///////////////////////////////
-
- public void saveObjects(final List<ObjectAdapter> objects) {
- entry.save(objects);
- }
-
- public String debugTitle() {
- return "User Profle";
- }
-
- public void debugData(DebugBuilder debug) {
- debug.appendln("Localization", localization);
- debug.appendln("Options", options);
- debug.appendln("Entry", entry);
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
deleted file mode 100644
index 3b37241..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoader.java
+++ /dev/null
@@ -1,78 +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.core.runtime.userprofile;
-
-import java.util.List;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-
-/**
- * Intended to acts like a bridge, loading the profile from the underlying
- * store.
- *
- * <p>
- * This is an interface only to make it easy to mock in tests. In practice there
- * is only a single implementation, {@link UserProfileLoaderDefault}.
- */
-public interface UserProfileLoader extends ApplicationScopedComponent {
-
- // //////////////////////////////////////////////////////
- // Fixtures
- // //////////////////////////////////////////////////////
-
- /**
- * @see PersistenceSession#isFixturesInstalled()
- */
- public boolean isFixturesInstalled();
-
- // //////////////////////////////////////////////////////
- // saveAs...
- // //////////////////////////////////////////////////////
-
- public void saveAsDefault(UserProfile userProfile);
-
- public void saveForUser(String userName, UserProfile userProfile);
-
- // //////////////////////////////////////////////////////
- // saveSession
- // //////////////////////////////////////////////////////
-
- public void saveSession(List<ObjectAdapter> objects);
-
- // //////////////////////////////////////////////////////
- // getProfile
- // //////////////////////////////////////////////////////
-
- public UserProfile getProfile(AuthenticationSession session);
-
- @Deprecated
- public UserProfile getProfile();
-
- // //////////////////////////////////////////////////////
- // Services
- // //////////////////////////////////////////////////////
-
- public void setServices(List<Object> servicesList);
-
- public List<Object> getServices();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java
----------------------------------------------------------------------
diff --git a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java b/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java
deleted file mode 100644
index 0ccc7ea..0000000
--- a/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileStore.java
+++ /dev/null
@@ -1,30 +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.core.runtime.userprofile;
-
-public interface UserProfileStore {
-
- boolean isFixturesInstalled();
-
- void save(String userName, UserProfile userProfile);
-
- UserProfile getUserProfile(String userName);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/webapp/NOTICE
----------------------------------------------------------------------
diff --git a/framework/core/webapp/NOTICE b/framework/core/webapp/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/core/webapp/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/6de87443/framework/core/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/framework/core/webapp/pom.xml b/framework/core/webapp/pom.xml
deleted file mode 100644
index 26cc8b6..0000000
--- a/framework/core/webapp/pom.xml
+++ /dev/null
@@ -1,100 +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>core</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.isis.core</groupId>
- <artifactId>webapp</artifactId>
- <name>Core Webapp</name>
-
- <properties>
- <siteBaseDir>../..</siteBaseDir>
- <relativeUrl>core/webapp/</relativeUrl>
- </properties>
-
- <!-- used in Site generation for relative references. -->
- <url>http://incubator.apache.org/isis/${relativeUrl}</url>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <wtpversion>2.0</wtpversion>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <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.core</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/webapp/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/core/webapp/src/site/apt/index.apt b/framework/core/webapp/src/site/apt/index.apt
deleted file mode 100644
index 22b019f..0000000
--- a/framework/core/webapp/src/site/apt/index.apt
+++ /dev/null
@@ -1,27 +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.
-
-
-
-
-Documentation
-
- See the {{{../index.html}core}} documentation
- ({{{../docbkx/html/guide/isis-core.html}HTML}} or
- {{{../docbkx/pdf/isis-core.pdf}PDF}}).
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/core/webapp/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/core/webapp/src/site/apt/jottings.apt b/framework/core/webapp/src/site/apt/jottings.apt
deleted file mode 100755
index c5d1200..0000000
--- a/framework/core/webapp/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/6de87443/framework/core/webapp/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/core/webapp/src/site/site.xml b/framework/core/webapp/src/site/site.xml
deleted file mode 100644
index 2d26fce..0000000
--- a/framework/core/webapp/src/site/site.xml
+++ /dev/null
@@ -1,43 +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="Webapp" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Webapp">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Core Modules">
- <item name="Core Test Support" href="../testsupport/index.html" />
- <item name="Core Commons" href="../commons/index.html" />
- <item name="Core Metamodel" href="../metamodel/index.html" />
- <item name="Core Progmodel" href="../progmodel/index.html" />
- <item name="Core Runtime" href="../runtime/index.html" />
- <item name="Core Webapp" href="../webapp/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports"/>
- </body>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/progmodels/dflt/NOTICE
----------------------------------------------------------------------
diff --git a/framework/progmodels/dflt/NOTICE b/framework/progmodels/dflt/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/progmodels/dflt/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/6de87443/framework/progmodels/dflt/pom.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/dflt/pom.xml b/framework/progmodels/dflt/pom.xml
deleted file mode 100644
index a6e6354..0000000
--- a/framework/progmodels/dflt/pom.xml
+++ /dev/null
@@ -1,109 +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>progmodels</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <name>Default Progmodel (Java)</name>
-
- <properties>
- <siteBaseDir>../..</siteBaseDir>
- <relativeUrl>defaults/progmodel/</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>
-
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <!-- TODO: remove this dependency -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/progmodels/dflt/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/dflt/src/site/apt/index.apt b/framework/progmodels/dflt/src/site/apt/index.apt
deleted file mode 100644
index 3a54754..0000000
--- a/framework/progmodels/dflt/src/site/apt/index.apt
+++ /dev/null
@@ -1,46 +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.
-
-
-
-Default Programming Model (Java)
-
- The <default progmodel> module defines an implementation of the default programming model as described by the
- {{{../../applib/index.html}applib}} documentation.
-
- This programming model is defined by specifying a collection of <<<FacetFactory>>>s, which are
- used to build up the metamodel. The actual <<<FacetFactory>>>s are defined within the
- {{{../../core/index.html}core}} framework (in the <<<progmodel>>> module).
-
-Alternatives
-
- Alternatives include:
-
- * 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).
-
- * the {{{../groovy/index.html}Groovy}} programming model.
-
- This provides the ability to write domain objects using {{{http://groovy.codehaus.org}Groovy}}.
-
- []
-
- Note that these are <i>not</i> necessarily mutually exclusive (they can be combined).
-
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/progmodels/dflt/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/progmodels/dflt/src/site/apt/jottings.apt b/framework/progmodels/dflt/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/framework/progmodels/dflt/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/6de87443/framework/progmodels/dflt/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/dflt/src/site/site.xml b/framework/progmodels/dflt/src/site/site.xml
deleted file mode 100644
index 59810fb..0000000
--- a/framework/progmodels/dflt/src/site/site.xml
+++ /dev/null
@@ -1,40 +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="Default" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Default 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="Maven Reports" ref="reports"/>
- </body>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/progmodels/pom.xml
----------------------------------------------------------------------
diff --git a/framework/progmodels/pom.xml b/framework/progmodels/pom.xml
index 48544f3..f1cc9d8 100644
--- a/framework/progmodels/pom.xml
+++ b/framework/progmodels/pom.xml
@@ -59,7 +59,6 @@
<url>http://incubator.apache.org/isis/${relativeUrl}</url>
<modules>
- <module>dflt</module>
<module>wrapper</module>
<module>groovy</module>
</modules>
@@ -99,18 +98,6 @@
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
<artifactId>wrapper</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/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
index ba7183c..d8e633c 100644
--- a/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
+++ b/framework/progmodels/wrapper/wrapper-metamodel/pom.xml
@@ -71,6 +71,11 @@
<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>
@@ -92,11 +97,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
- <dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml b/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
index 6a52ad0..098898e 100644
--- a/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/framework/quickstart-archetype/src/main/resources/archetype-resources/pom.xml
@@ -303,7 +303,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
----------------------------------------------------------------------
diff --git a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
index c5e2b2b..d7653a2 100644
--- a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
+++ b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-html/pom.xml
@@ -159,7 +159,7 @@
<!-- to run using WebServer (optional) -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
index fb5eb68..f308e5f 100644
--- a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
+++ b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-restfulobjects/pom.xml
@@ -154,7 +154,7 @@
<!-- to run using WebServer (optional) -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
index 247cc74..274e2a7 100644
--- a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
+++ b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-scimpi/pom.xml
@@ -155,7 +155,7 @@
<!-- to run using WebServer (optional) -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
index d40f314..52f1309 100644
--- a/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
+++ b/framework/quickstart-archetype/src/main/resources/archetype-resources/viewer-wicket/pom.xml
@@ -156,7 +156,7 @@
<!-- to run using WebServer (optional) -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/bytecode/identity/NOTICE
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/NOTICE b/framework/runtimes/dflt/bytecode/identity/NOTICE
deleted file mode 100644
index d391f54..0000000
--- a/framework/runtimes/dflt/bytecode/identity/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/6de87443/framework/runtimes/dflt/bytecode/identity/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/pom.xml b/framework/runtimes/dflt/bytecode/identity/pom.xml
deleted file mode 100644
index bda3f7e..0000000
--- a/framework/runtimes/dflt/bytecode/identity/pom.xml
+++ /dev/null
@@ -1,74 +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.runtimes.dflt</groupId>
- <artifactId>bytecode</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>identity</artifactId>
-
- <name>Default Runtime Identity Bytecode Implementation</name>
-
- <properties>
- <siteBaseDir>../../../..</siteBaseDir>
- <relativeUrl>runtimes/dflt/bytecode/identity/</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.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java b/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java
deleted file mode 100644
index f19b0b8..0000000
--- a/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java
+++ /dev/null
@@ -1,29 +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.runtimes.dflt.bytecode.identity.classsubstitutor;
-
-import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
-
-public class ClassSubstitutorIdentity extends ClassSubstitutorAbstract {
-
- public ClassSubstitutorIdentity() {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java b/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java
deleted file mode 100644
index 8bfe64f..0000000
--- a/framework/runtimes/dflt/bytecode/identity/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.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.runtimes.dflt.bytecode.identity.objectfactory;
-
-import java.lang.reflect.Modifier;
-
-import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
-import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactoryAbstract;
-
-public class ObjectFactoryBasic extends ObjectFactoryAbstract {
-
- public ObjectFactoryBasic() {
- }
-
- public ObjectFactoryBasic(final Mode mode) {
- super(mode);
- }
-
- /**
- * Simply instantiates reflectively, does not enhance bytecode etc in any
- * way.
- */
- @Override
- protected <T> T doInstantiate(final Class<T> cls) throws ObjectInstantiationException {
- if (Modifier.isAbstract(cls.getModifiers())) {
- throw new ObjectInstantiationException("Cannot create an instance of an abstract class: " + cls);
- }
- try {
- return cls.newInstance();
- } catch (final IllegalAccessException e) {
- throw new ObjectInstantiationException(e);
- } catch (final InstantiationException e) {
- throw new ObjectInstantiationException(e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/bytecode/identity/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/src/site/apt/index.apt b/framework/runtimes/dflt/bytecode/identity/src/site/apt/index.apt
deleted file mode 100644
index 3809ccf..0000000
--- a/framework/runtimes/dflt/bytecode/identity/src/site/apt/index.apt
+++ /dev/null
@@ -1,39 +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.
-
-
-
-Identity Bytecode
-
- The <identity> bytecode module is a no-op implementation of the bytecode
- APIs. It is provided for those object stores that do not need the use of
- bytecode enhancement, typically because they hook into the lazy loading
- of the underlying ORM.
-
-Alternatives
-
- * {{{../dflt/index.html}Default}}
-
- The <dflt> (default) implementation provides transparent lazy-loading/object dirtying
- using the {{{http://cglib.sourceforge.net/}CGLib}} library.
-
- * {{{../javassist/index.html}Javassist}}
-
- The <javassist> implementation is similar to the <dflt> implementation, but using the
- {{{http://www.jboss.org/javassist}Javassist}} library.
-
- []
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/bytecode/identity/src/site/apt/jottings.apt
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/src/site/apt/jottings.apt b/framework/runtimes/dflt/bytecode/identity/src/site/apt/jottings.apt
deleted file mode 100644
index c5d1200..0000000
--- a/framework/runtimes/dflt/bytecode/identity/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/6de87443/framework/runtimes/dflt/bytecode/identity/src/site/site.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/identity/src/site/site.xml b/framework/runtimes/dflt/bytecode/identity/src/site/site.xml
deleted file mode 100644
index 4154964..0000000
--- a/framework/runtimes/dflt/bytecode/identity/src/site/site.xml
+++ /dev/null
@@ -1,40 +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="Identity" href="index.html"/>
- </breadcrumbs>
-
- <menu name="Identity Bytecode">
- <item name="About" href="index.html" />
- <item name="Jottings" href="jottings.html" />
- </menu>
-
- <menu name="Bytecode Modules">
- <item name="Default (cglib)" href="../dflt/index.html" />
- <item name="Javassist" href="../javassist/index.html" />
- <item name="Identity" href="../identity/index.html" />
- </menu>
-
- <menu name="Maven Reports" ref="reports" />
- </body>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/bytecode/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/bytecode/pom.xml b/framework/runtimes/dflt/bytecode/pom.xml
index f58d95b..d29430b 100644
--- a/framework/runtimes/dflt/bytecode/pom.xml
+++ b/framework/runtimes/dflt/bytecode/pom.xml
@@ -44,7 +44,6 @@
<modules>
<module>dflt</module>
<module>javassist</module>
- <module>identity</module>
</modules>
<reporting>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/monitoring/pom.xml b/framework/runtimes/dflt/monitoring/pom.xml
index 1b4573f..c91c9cb 100644
--- a/framework/runtimes/dflt/monitoring/pom.xml
+++ b/framework/runtimes/dflt/monitoring/pom.xml
@@ -70,5 +70,11 @@
<artifactId>runtime</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java b/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
new file mode 100644
index 0000000..c5eb3f3
--- /dev/null
+++ b/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
@@ -0,0 +1,87 @@
+/*
+ * 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.runtimes.dflt.webapp.monitor;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.URLDecoder;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.isis.runtimes.dflt.monitoring.servermonitor.MonitorListenerImpl;
+
+public class MonitorServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ private MonitorListenerImpl monitor;
+
+ @Override
+ protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
+ final String queryString = request.getQueryString();
+ final String query = queryString == null ? "Overview" : URLDecoder.decode(queryString, "UTF-8");
+ response.setContentType("text/html");
+ final PrintWriter writer = new PrintWriter(new OutputStreamWriter(response.getOutputStream()));
+ if (query.equals("Sessions")) {
+ writer.println("<HTML><HEAD><TITLE>NOF System Monitor - " + "Sessions" + "</TITLE></HEAD>");
+ writer.println("<BODY>");
+
+ writer.println("<h1>" + "Sessions" + "</h1>");
+ writer.println("<pre>");
+ writer.println(listSessions());
+ writer.println("</pre>");
+ writer.println("</BODY></HTML>");
+ } else {
+ monitor.writeHtmlPage(query, writer);
+ }
+ writer.flush();
+ }
+
+ private static String listSessions() {
+ final StringBuffer str = new StringBuffer();
+ /*
+ * final Iterator<?> it = SessionAccess.getSessions().iterator(); while
+ * (it.hasNext()) { final HttpSession session = (HttpSession) it.next();
+ * final String id = session.getId(); str.append(id); str.append(" \t");
+ *
+ * final long creationTime = session.getCreationTime(); str.append(new
+ * Date(creationTime)); str.append(" \t");
+ *
+ * final long lastAccessedTime = session.getLastAccessedTime();
+ * str.append(new Date(lastAccessedTime)); str.append(" \t");
+ *
+ * final AuthenticationSession nofSession = (AuthenticationSession)
+ * session.getAttribute("NOF_SESSION_ATTRIBUTE"); if (nofSession !=
+ * null) { str.append(nofSession.getUserName()); }
+ *
+ * str.append("\n"); }
+ */
+ return str.toString();
+ }
+
+ @Override
+ public void init(final ServletConfig servletConfig) throws ServletException {
+ super.init(servletConfig);
+ monitor = new MonitorListenerImpl();
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java b/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java
new file mode 100644
index 0000000..2f8612d
--- /dev/null
+++ b/framework/runtimes/dflt/monitoring/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java
@@ -0,0 +1,45 @@
+/*
+ * 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.runtimes.dflt.webapp.monitor;
+
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstallerAbstract;
+import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
+import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
+import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
+
+public class WebServerMonitorInstaller extends IsisViewerInstallerAbstract {
+
+ public WebServerMonitorInstaller() {
+ super("web-monitor");
+ }
+
+ @Override
+ public IsisViewer doCreateViewer() {
+ return new EmbeddedWebViewer() {
+ @Override
+ public WebAppSpecification getWebAppSpecification() {
+ final WebAppSpecification requirements = new WebAppSpecification();
+ requirements.addServletSpecification(MonitorServlet.class, "/monitor/*");
+ return requirements;
+ }
+ };
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/pom.xml b/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/pom.xml
index 6e71264..ea44b2b 100644
--- a/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/pom.xml
+++ b/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/pom.xml
@@ -47,24 +47,19 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
<!-- LOGGING DEPENDENCIES - LOG4J -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/objectstores/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/objectstores/jdo/pom.xml b/framework/runtimes/dflt/objectstores/jdo/pom.xml
index 2803be9..45efe6c 100644
--- a/framework/runtimes/dflt/objectstores/jdo/pom.xml
+++ b/framework/runtimes/dflt/objectstores/jdo/pom.xml
@@ -115,19 +115,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
+ <artifactId>isis-metamodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
@@ -139,12 +127,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
-
<!-- DataNucleus -->
<dependency>
<groupId>javax.jdo</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/objectstores/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/objectstores/nosql/pom.xml b/framework/runtimes/dflt/objectstores/nosql/pom.xml
index 78b8162..c4c5477 100644
--- a/framework/runtimes/dflt/objectstores/nosql/pom.xml
+++ b/framework/runtimes/dflt/objectstores/nosql/pom.xml
@@ -195,7 +195,6 @@
<scope>test</scope>
</dependency>
- <!-- TODO: remove this dependency when can -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
@@ -203,21 +202,12 @@
<scope>test</scope>
</dependency>
- <!-- TODO: remove this dependency when can -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>isis-integtestsupport</artifactId>
<scope>test</scope>
</dependency>
- <!-- TODO: remove this dependency when can -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>dflt</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml b/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
index 992aaef..9645e09 100644
--- a/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
+++ b/framework/runtimes/dflt/objectstores/sql/sql-tests-common/pom.xml
@@ -140,11 +140,6 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.isis.tck</groupId>
<artifactId>tck-dom</artifactId>
<version>0.3.1-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/pom.xml b/framework/runtimes/dflt/pom.xml
index c7d6252..882be53 100644
--- a/framework/runtimes/dflt/pom.xml
+++ b/framework/runtimes/dflt/pom.xml
@@ -131,12 +131,12 @@
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/runtime/pom.xml b/framework/runtimes/dflt/runtime/pom.xml
index 7ef737e..41f3e4f 100644
--- a/framework/runtimes/dflt/runtime/pom.xml
+++ b/framework/runtimes/dflt/runtime/pom.xml
@@ -79,16 +79,6 @@
</plugins>
</reporting>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.isis</groupId>
@@ -103,13 +93,11 @@
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
@@ -117,28 +105,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -150,5 +116,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java b/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java
new file mode 100644
index 0000000..f19b0b8
--- /dev/null
+++ b/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/classsubstitutor/ClassSubstitutorIdentity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.runtimes.dflt.bytecode.identity.classsubstitutor;
+
+import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
+
+public class ClassSubstitutorIdentity extends ClassSubstitutorAbstract {
+
+ public ClassSubstitutorIdentity() {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java b/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java
new file mode 100644
index 0000000..8bfe64f
--- /dev/null
+++ b/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/bytecode/identity/objectfactory/ObjectFactoryBasic.java
@@ -0,0 +1,54 @@
+/*
+ * 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.runtimes.dflt.bytecode.identity.objectfactory;
+
+import java.lang.reflect.Modifier;
+
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
+import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactoryAbstract;
+
+public class ObjectFactoryBasic extends ObjectFactoryAbstract {
+
+ public ObjectFactoryBasic() {
+ }
+
+ public ObjectFactoryBasic(final Mode mode) {
+ super(mode);
+ }
+
+ /**
+ * Simply instantiates reflectively, does not enhance bytecode etc in any
+ * way.
+ */
+ @Override
+ protected <T> T doInstantiate(final Class<T> cls) throws ObjectInstantiationException {
+ if (Modifier.isAbstract(cls.getModifiers())) {
+ throw new ObjectInstantiationException("Cannot create an instance of an abstract class: " + cls);
+ }
+ try {
+ return cls.newInstance();
+ } catch (final IllegalAccessException e) {
+ throw new ObjectInstantiationException(e);
+ } catch (final InstantiationException e) {
+ throw new ObjectInstantiationException(e);
+ }
+ }
+
+}