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 2010/11/08 20:38:12 UTC
svn commit: r1032676 [12/13] - in /incubator/isis/trunk:
alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/
alternatives/progmodel/wrapper/metamodel/src/main/java/org/apache/isis/progmod...
Copied: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/StaticContentFilter.java (from r1032552, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/StaticContentFilter.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/StaticContentFilter.java?p2=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/StaticContentFilter.java&p1=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/StaticContentFilter.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/StaticContentFilter.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/StaticContentFilter.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
import java.io.IOException;
import java.text.DateFormat;
Copied: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java (from r1032552, incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java?p2=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java&p1=incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
import javax.servlet.ServletContext;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategy.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategy.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategy.java Mon Nov 8 19:37:44 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.core.webapp.auth;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.webapp.IsisSessionFilter;
+import org.apache.isis.core.webapp.IsisSessionFilter;
/**
* Decouples the {@link IsisSessionFilter} from the mechanism of obtaining
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyAbstract.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.core.webapp.auth;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
@@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.webapp.WebAppConstants;
public abstract class AuthenticationSessionLookupStrategyAbstract implements
AuthenticationSessionLookupStrategy {
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionLookupStrategyDefault.java Mon Nov 8 19:37:44 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.auth;
+package org.apache.isis.core.webapp.auth;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
@@ -26,12 +26,12 @@ import javax.servlet.http.HttpSession;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.webapp.WebAppConstants;
/**
* Looks up from the {@link HttpSession}, failing that attempts to logon using a {@link LogonFixture} (if available and
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/MonitorServlet.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webapp.monitor;
+package org.apache.isis.core.webapp.monitor;
import java.io.IOException;
import java.io.OutputStreamWriter;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webapp.monitor;
+package org.apache.isis.core.webapp.monitor;
import org.apache.isis.runtime.viewer.IsisViewer;
import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/servlets/ResourceServlet.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/servlets/ResourceServlet.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/servlets/ResourceServlet.java Mon Nov 8 19:37:44 2010
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.servlets;
+package org.apache.isis.core.webapp.servlets;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/WebServer.java Mon Nov 8 19:37:44 2010
@@ -23,7 +23,7 @@ package org.apache.isis;
public class WebServer {
public static void main(String[] args) {
- org.apache.isis.webserver.WebServer.main(args);
+ org.apache.isis.core.webserver.WebServer.main(args);
}
Copied: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java (from r1032552, incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java?p2=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java&p1=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServer.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServer.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java Mon Nov 8 19:37:44 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.webserver;
+package org.apache.isis.core.webserver;
import org.apache.isis.core.commons.lang.ArrayUtils;
+import org.apache.isis.core.webserver.internal.OptionHandlerAddress;
+import org.apache.isis.core.webserver.internal.OptionHandlerDeploymentTypeWebServer;
+import org.apache.isis.core.webserver.internal.OptionHandlerPort;
+import org.apache.isis.core.webserver.internal.OptionHandlerResourceBase;
import org.apache.isis.runtime.runner.IsisRunner;
-import org.apache.isis.webserver.internal.OptionHandlerAddress;
-import org.apache.isis.webserver.internal.OptionHandlerDeploymentTypeWebServer;
-import org.apache.isis.webserver.internal.OptionHandlerPort;
-import org.apache.isis.webserver.internal.OptionHandlerResourceBase;
public class WebServer {
Copied: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java (from r1032552, incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java?p2=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java&p1=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java Mon Nov 8 19:37:44 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.webserver;
+package org.apache.isis.core.webserver;
-import static org.apache.isis.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_DEFAULT;
-import static org.apache.isis.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_KEY;
-import static org.apache.isis.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT;
-import static org.apache.isis.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY;
+import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_DEFAULT;
+import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_KEY;
+import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT;
+import static org.apache.isis.core.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY;
import java.util.HashMap;
import java.util.List;
@@ -36,9 +36,9 @@ import org.apache.isis.core.commons.lang
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.runtime.runner.IsisBootstrapper;
import org.apache.isis.runtime.runner.IsisRunner;
-import org.apache.isis.webapp.WebAppConstants;
import com.google.inject.Injector;
Copied: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java (from r1032552, incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java?p2=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java&p1=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webserver;
+package org.apache.isis.core.webserver;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.web.EmbeddedWebServerInstaller;
Copied: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerException.java (from r1032552, incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerException.java?p2=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerException.java&p1=incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerException.java&r1=1032552&r2=1032676&rev=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerException.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerException.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webserver;
+package org.apache.isis.core.webserver;
public class WebServerException extends RuntimeException {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java Mon Nov 8 19:37:44 2010
@@ -19,7 +19,7 @@
-package org.apache.isis.webserver.embedded.jetty;
+package org.apache.isis.core.webserver.embedded.jetty;
import java.util.List;
@@ -38,12 +38,12 @@ import org.mortbay.jetty.servlet.Servlet
import org.mortbay.jetty.servlet.ServletMapping;
import org.mortbay.jetty.servlet.SessionHandler;
import org.apache.isis.core.commons.factory.InstanceFactory;
+import org.apache.isis.core.webserver.WebServerConstants;
+import org.apache.isis.core.webserver.WebServerException;
import org.apache.isis.runtime.web.EmbeddedWebServerAbstract;
import org.apache.isis.runtime.web.FilterSpecification;
import org.apache.isis.runtime.web.ServletSpecification;
import org.apache.isis.runtime.web.WebAppSpecification;
-import org.apache.isis.webserver.WebServerConstants;
-import org.apache.isis.webserver.WebServerException;
public class EmbeddedWebServerJetty extends EmbeddedWebServerAbstract {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webserver.embedded.jetty;
+package org.apache.isis.core.webserver.embedded.jetty;
import java.util.List;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java Mon Nov 8 19:37:44 2010
@@ -21,16 +21,16 @@
/**
*
*/
-package org.apache.isis.webserver.internal;
+package org.apache.isis.core.webserver.internal;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.webserver.WebServerConstants;
import org.apache.isis.runtime.runner.BootPrinter;
import org.apache.isis.runtime.runner.options.OptionHandler;
-import org.apache.isis.webserver.WebServerConstants;
public final class OptionHandlerAddress implements OptionHandler {
private String address;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java Mon Nov 8 19:37:44 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.webserver.internal;
+package org.apache.isis.core.webserver.internal;
import static org.apache.isis.runtime.runner.Constants.TYPE_SERVER;
import static org.apache.isis.runtime.runner.Constants.TYPE_SERVER_EXPLORATION;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java Mon Nov 8 19:37:44 2010
@@ -21,16 +21,16 @@
/**
*
*/
-package org.apache.isis.webserver.internal;
+package org.apache.isis.core.webserver.internal;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.webserver.WebServerConstants;
import org.apache.isis.runtime.runner.BootPrinter;
import org.apache.isis.runtime.runner.options.OptionHandler;
-import org.apache.isis.webserver.WebServerConstants;
public final class OptionHandlerPort implements OptionHandler {
private Integer port;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java?rev=1032676&r1=1032552&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java Mon Nov 8 19:37:44 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.webserver.internal;
+package org.apache.isis.core.webserver.internal;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.webserver.WebServerConstants;
import org.apache.isis.runtime.runner.BootPrinter;
import org.apache.isis.runtime.runner.options.OptionHandler;
-import org.apache.isis.webserver.WebServerConstants;
public final class OptionHandlerResourceBase implements OptionHandler {
private String resourceBase;
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Mon Nov 8 19:37:44 2010
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.ja
import org.apache.isis.core.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.spec.JavaSpecification;
+import org.apache.isis.core.progmodel.spec.JavaSpecification;
import org.apache.isis.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
import org.apache.isis.runtime.persistence.objectfactory.ObjectResolver;
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java Mon Nov 8 19:37:44 2010
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.specloader.internal.instances.InstanceCollectionSpecification;
+import org.apache.isis.core.progmodel.spec.JavaSpecification;
+import org.apache.isis.core.progmodel.specloader.internal.instances.InstanceCollectionSpecification;
public class JavaReflector extends ObjectReflectorAbstract {
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java Mon Nov 8 19:37:44 2010
@@ -27,69 +27,69 @@ import org.apache.isis.core.metamodel.ja
import org.apache.isis.core.metamodel.java5.RemoveStaticGettersAndSettersFacetFactory;
import org.apache.isis.core.metamodel.java5.RemoveSuperclassMethodsFacetFactory;
import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsAbstract;
-import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.actions.ActionMethodsFacetFactory;
-import org.apache.isis.metamodel.facets.actions.IteratorFilteringFacetFactory;
-import org.apache.isis.metamodel.facets.actions.SyntheticMethodFilteringFacetFactory;
-import org.apache.isis.metamodel.facets.actions.debug.DebugAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.actions.executed.ExecutedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.actions.executed.ExecutedViaNamingConventionFacetFactory;
-import org.apache.isis.metamodel.facets.actions.exploration.ExplorationAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.actions.notinrepositorymenu.NotInRepositoryMenuAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.actions.prototype.PrototypeAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.collections.CollectionFacetFactory;
-import org.apache.isis.metamodel.facets.collections.CollectionFieldMethodsFacetFactory;
-import org.apache.isis.metamodel.facets.collections.aggregated.AggregatedIfCollectionFacetFactory;
-import org.apache.isis.metamodel.facets.disable.DisabledAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.hide.HiddenAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.ignore.RemoveIgnoreAnnotationMethodsFacetFactory;
-import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.naming.named.NamedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.aggregated.AggregatedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.bounded.BoundedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.bounded.BoundedMarkerInterfaceFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.CreatedCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.LoadCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.PersistCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.RemoveCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.SaveCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.callbacks.UpdateCallbackFacetFactory;
-import org.apache.isis.metamodel.facets.object.defaults.DefaultedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.dirty.DirtyMethodsFacetFactory;
-import org.apache.isis.metamodel.facets.object.encodeable.EncodableAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.facets.FacetsAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.ident.icon.IconMethodFacetFactory;
-import org.apache.isis.metamodel.facets.object.ident.plural.PluralAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.ident.plural.PluralMethodFacetFactory;
-import org.apache.isis.metamodel.facets.object.ident.singular.SingularMethodFacetFactory;
-import org.apache.isis.metamodel.facets.object.ident.title.TitleMethodFacetFactory;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.immutable.ImmutableMarkerInterfacesFacetFactory;
-import org.apache.isis.metamodel.facets.object.notpersistable.NotPersistableAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.object.notpersistable.NotPersistableMarkerInterfacesFacetFactory;
-import org.apache.isis.metamodel.facets.object.parseable.ParseableFacetFactory;
-import org.apache.isis.metamodel.facets.object.validate.ValidateObjectViaValidateMethodFacetFactory;
-import org.apache.isis.metamodel.facets.object.validprops.ObjectValidPropertiesFacetFactory;
-import org.apache.isis.metamodel.facets.object.value.ValueFacetFactory;
-import org.apache.isis.metamodel.facets.ordering.actionorder.ActionOrderAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.ordering.fieldorder.FieldOrderAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.ordering.memberorder.MemberOrderAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.propcoll.notpersisted.NotPersistedAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.properties.PropertyMethodsFacetFactory;
-import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateDefaultFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.enums.EnumFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.enums.PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.multiline.MultiLineAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.typicallength.TypicalLengthDerivedFromTypeFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryDefaultFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.OptionalAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.validate.mask.MaskAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthAnnotationFacetFactory;
-import org.apache.isis.metamodel.facets.propparam.validate.regex.RegExAnnotationFacetFactory;
-import org.apache.isis.metamodel.java5.FallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.actcoll.typeof.TypeOfAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.ActionMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.IteratorFilteringFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.SyntheticMethodFilteringFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.debug.DebugAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.executed.ExecutedViaNamingConventionFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.exploration.ExplorationAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.notcontributed.NotContributedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.notinrepositorymenu.NotInRepositoryMenuAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.actions.prototype.PrototypeAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.CollectionFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.CollectionFieldMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.collections.aggregated.AggregatedIfCollectionFacetFactory;
+import org.apache.isis.core.progmodel.facets.disable.DisabledAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.hide.HiddenAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.ignore.RemoveIgnoreAnnotationMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.naming.describedas.DescribedAsAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.naming.named.NamedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.aggregated.AggregatedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.bounded.BoundedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.bounded.BoundedMarkerInterfaceFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.CreatedCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.LoadCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.PersistCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.RemoveCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.SaveCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.callbacks.UpdateCallbackFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.defaults.DefaultedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.dirty.DirtyMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.facets.FacetsAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ident.icon.IconMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ident.singular.SingularMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.ident.title.TitleMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.immutable.ImmutableAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.immutable.ImmutableMarkerInterfacesFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableMarkerInterfacesFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.parseable.ParseableFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.validate.ValidateObjectViaValidateMethodFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.validprops.ObjectValidPropertiesFacetFactory;
+import org.apache.isis.core.progmodel.facets.object.value.ValueFacetFactory;
+import org.apache.isis.core.progmodel.facets.ordering.actionorder.ActionOrderAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.ordering.fieldorder.FieldOrderAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.ordering.memberorder.MemberOrderAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propcoll.notpersisted.NotPersistedAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.PropertyMethodsFacetFactory;
+import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateDefaultFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.enums.EnumFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.enums.PropertyAndParameterChoicesFacetDerivedFromChoicesFacetFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.multiline.MultiLineAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.specification.MustSatisfySpecificationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.typicallength.TypicalLengthDerivedFromTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryDefaultFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.OptionalAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mask.MaskAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.MaxLengthAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExAnnotationFacetFactory;
+import org.apache.isis.core.progmodel.java5.FallbackFacetFactory;
import org.apache.isis.metamodel.value.BigDecimalValueTypeFacetFactory;
import org.apache.isis.metamodel.value.BigIntegerValueTypeFacetFactory;
import org.apache.isis.metamodel.value.BooleanPrimitiveValueTypeFacetFactory;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java Mon Nov 8 19:37:44 2010
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorNoop;
-import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authorization.AuthorizationManager;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java Mon Nov 8 19:37:44 2010
@@ -28,10 +28,10 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.facets.naming.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
-import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
-import org.apache.isis.metamodel.facets.object.notpersistable.NotPersistableFacet;
-import org.apache.isis.metamodel.facets.object.validprops.ObjectValidPropertiesFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.plural.PluralFacet;
+import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
+import org.apache.isis.core.progmodel.facets.object.notpersistable.NotPersistableFacet;
+import org.apache.isis.core.progmodel.facets.object.validprops.ObjectValidPropertiesFacet;
import org.apache.isis.metamodel.specloader.JavaReflector;
import org.apache.isis.runtime.system.TestDomainObject;
Modified: incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/webapp/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -7,7 +7,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>logonPage</param-name>
<param-value>/logon.app</param-value>
@@ -16,7 +16,7 @@
<filter>
<filter-name>StaticContentFilter</filter-name>
- <filter-class>org.apache.isis.webapp.StaticContentFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.StaticContentFilter</filter-class>
<init-param>
<param-name>CacheTime</param-name>
<param-value>86400</param-value>
@@ -46,7 +46,7 @@
</filter-mapping>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
@@ -61,7 +61,7 @@
<servlet>
<servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlets.ResourceServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlets.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/ecs/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -9,12 +9,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>username</param-name>
<param-value>shopper</param-value>
Modified: incubator/isis/trunk/examples/expenses/scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/expenses/scimpi/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/examples/expenses/scimpi/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/expenses/scimpi/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -7,12 +7,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.servlet.SystemInitializer</listener-class>
+ <listener-class>org.apache.isis.core.webapp.servlet.SystemInitializer</listener-class>
</listener>
<servlet >
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: incubator/isis/trunk/examples/library/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/library/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/examples/library/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/library/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -9,12 +9,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>username</param-name>
<param-value>shopper</param-value>
@@ -41,7 +41,7 @@
<!--
<servlet>
<servlet-name>remoting</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.HttpRemoting</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.HttpRemoting</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-->
Modified: incubator/isis/trunk/examples/shopping-cart/cart/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/shopping-cart/cart/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/examples/shopping-cart/cart/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/shopping-cart/cart/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -7,12 +7,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet >
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>username</param-name>
<param-value>shopper</param-value>
Modified: incubator/isis/trunk/examples/shopping-cart/catalogue/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/shopping-cart/catalogue/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/examples/shopping-cart/catalogue/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/shopping-cart/catalogue/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -7,12 +7,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet >
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -9,12 +9,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>username</param-name>
<param-value>webapp</param-value>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -7,7 +7,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>logonPage</param-name>
<param-value>/logon.app</param-value>
@@ -16,7 +16,7 @@
<filter>
<filter-name>StaticContentFilter</filter-name>
- <filter-class>org.apache.isis.webapp.StaticContentFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.StaticContentFilter</filter-class>
<init-param>
<param-name>CacheTime</param-name>
<param-value>86400</param-value>
@@ -46,7 +46,7 @@
</filter-mapping>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
@@ -61,7 +61,7 @@
<servlet>
<servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlets.ResourceServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlets.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -9,12 +9,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>username</param-name>
<param-value>webapp</param-value>
Modified: incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/prototype/viewer-html/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -6,7 +6,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<param-name>logonPage</param-name>
<param-value>/logon.app</param-value>
@@ -15,7 +15,7 @@
<filter>
<filter-name>StaticContentFilter</filter-name>
- <filter-class>org.apache.isis.webapp.StaticContentFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.StaticContentFilter</filter-class>
<init-param>
<param-name>CacheTime</param-name>
<param-value>86400</param-value>
@@ -45,7 +45,7 @@
</filter-mapping>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
@@ -60,7 +60,7 @@
<servlet>
<servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlets.ResourceServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlets.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/prototype/viewer-restful/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -12,7 +12,7 @@
<filter>
<filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.webapp.IsisSessionFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<init-param>
<!-- trusted client, so no authentication required -->
<param-name>authenticationSessionLookupStrategy</param-name>
@@ -26,7 +26,7 @@
</filter-mapping>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<listener>
@@ -40,7 +40,7 @@
<servlet>
<servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlets.ResourceServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlets.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/prototype/viewer-scimpi/src/main/webapp/WEB-INF/web.xml Mon Nov 8 19:37:44 2010
@@ -10,12 +10,12 @@
</welcome-file-list>
<listener>
- <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.isis.core.webapp.servlet.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarGrid.java Mon Nov 8 19:37:44 2010
@@ -23,12 +23,12 @@ package org.apache.isis.extensions.dnd.c
import java.util.Date;
-import org.apache.isis.metamodel.facets.value.DateValueFacet;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Location;
import org.apache.isis.extensions.dnd.drawing.Size;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarSpecification.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/calendar/CalendarSpecification.java Mon Nov 8 19:37:44 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.dnd.c
import java.util.List;
-import org.apache.isis.metamodel.facets.value.DateValueFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.CompositeViewSpecification;
import org.apache.isis.extensions.dnd.view.Content;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/CheckboxField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/CheckboxField.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/CheckboxField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/CheckboxField.java Mon Nov 8 19:37:44 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.dnd.field;
-import org.apache.isis.metamodel.facets.value.BooleanValueFacet;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ColorField.java Mon Nov 8 19:37:44 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.dnd.field;
-import org.apache.isis.metamodel.facets.value.ColorValueFacet;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.adapter.InvalidEntryException;
+import org.apache.isis.core.progmodel.facets.value.ColorValueFacet;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DateFieldSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DateFieldSpecification.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DateFieldSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DateFieldSpecification.java Mon Nov 8 19:37:44 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.field;
-import org.apache.isis.metamodel.facets.value.DateValueFacet;
+import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DatePicker.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DatePicker.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DatePicker.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/DatePicker.java Mon Nov 8 19:37:44 2010
@@ -26,8 +26,8 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import org.apache.isis.metamodel.facets.value.DateValueFacet;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.progmodel.facets.value.DateValueFacet;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ImageField.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ImageField.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ImageField.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/ImageField.java Mon Nov 8 19:37:44 2010
@@ -32,7 +32,7 @@ import java.io.File;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
import org.apache.isis.extensions.dnd.drawing.Canvas;
import org.apache.isis.extensions.dnd.drawing.Color;
import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordFieldSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordFieldSpecification.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordFieldSpecification.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/field/PasswordFieldSpecification.java Mon Nov 8 19:37:44 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.dnd.field;
-import org.apache.isis.metamodel.facets.value.PasswordValueFacet;
+import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
import org.apache.isis.extensions.dnd.view.View;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/NumberAdapters.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/NumberAdapters.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/NumberAdapters.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/histogram/NumberAdapters.java Mon Nov 8 19:37:44 2010
@@ -23,10 +23,10 @@ package org.apache.isis.extensions.dnd.h
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.facets.value.DoubleFloatingPointValueFacet;
-import org.apache.isis.metamodel.facets.value.FloatingPointValueFacet;
-import org.apache.isis.metamodel.facets.value.IntegerValueFacet;
-import org.apache.isis.metamodel.facets.value.MoneyValueFacet;
+import org.apache.isis.core.progmodel.facets.value.DoubleFloatingPointValueFacet;
+import org.apache.isis.core.progmodel.facets.value.FloatingPointValueFacet;
+import org.apache.isis.core.progmodel.facets.value.IntegerValueFacet;
+import org.apache.isis.core.progmodel.facets.value.MoneyValueFacet;
public class NumberAdapters {
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/table/TableCellBuilder.java Mon Nov 8 19:37:44 2010
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.facets.value.BooleanValueFacet;
-import org.apache.isis.metamodel.facets.value.ImageValueFacet;
+import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
+import org.apache.isis.core.progmodel.facets.value.ImageValueFacet;
import org.apache.isis.extensions.dnd.field.CheckboxField;
import org.apache.isis.extensions.dnd.view.Axes;
import org.apache.isis.extensions.dnd.view.Content;
Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java (original)
+++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/content/AbstractTextParsableContent.java Mon Nov 8 19:37:44 2010
@@ -20,12 +20,12 @@
package org.apache.isis.extensions.dnd.view.content;
-import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.facets.FacetHolder;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter;
+import org.apache.isis.core.progmodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.extensions.dnd.drawing.Image;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/component/html/HtmlComponentFactory.java Mon Nov 8 19:37:44 2010
@@ -26,13 +26,13 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
-import org.apache.isis.metamodel.facets.value.BooleanValueFacet;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.propparam.multiline.MultiLineFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.progmodel.facets.value.BooleanValueFacet;
import org.apache.isis.extensions.html.component.Block;
import org.apache.isis.extensions.html.component.Component;
import org.apache.isis.extensions.html.component.ComponentFactory;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java Mon Nov 8 19:37:44 2010
@@ -30,6 +30,8 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.webapp.WebAppConstants;
+import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
import org.apache.isis.extensions.html.component.html.HtmlComponentFactory;
import org.apache.isis.extensions.html.component.html.LogonFormPage;
import org.apache.isis.extensions.html.context.Context;
@@ -40,8 +42,6 @@ import org.apache.isis.runtime.authentic
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.internal.monitor.Monitor;
-import org.apache.isis.webapp.WebAppConstants;
-import org.apache.isis.webapp.auth.AuthenticationSessionLookupStrategyDefault;
public class LogonServlet extends HttpServlet {
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/Task.java Mon Nov 8 19:37:44 2010
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.facets.value.PasswordValueFacet;
+import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet;
import org.apache.isis.extensions.html.component.Page;
import org.apache.isis.extensions.html.context.Context;
import org.apache.isis.extensions.html.request.Request;
Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java Mon Nov 8 19:37:44 2010
@@ -21,6 +21,9 @@
package org.apache.isis.extensions.html.viewer;
import org.apache.isis.core.commons.lang.MapUtils;
+import org.apache.isis.core.webapp.IsisSessionFilter;
+import org.apache.isis.core.webapp.StaticContentFilter;
+import org.apache.isis.core.webapp.servlets.ResourceServlet;
import org.apache.isis.extensions.html.servlet.ControllerServlet;
import org.apache.isis.extensions.html.servlet.HtmlServletConstants;
import org.apache.isis.extensions.html.servlet.LogonServlet;
@@ -29,9 +32,6 @@ import org.apache.isis.runtime.viewer.Is
import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
import org.apache.isis.runtime.web.EmbeddedWebViewer;
import org.apache.isis.runtime.web.WebAppSpecification;
-import org.apache.isis.webapp.IsisSessionFilter;
-import org.apache.isis.webapp.StaticContentFilter;
-import org.apache.isis.webapp.servlets.ResourceServlet;
/**
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberDisabledTest.java Mon Nov 8 19:37:44 2010
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
import java.util.List;
-import org.apache.isis.metamodel.facets.disable.DisableForContextFacetViaMethod;
-import org.apache.isis.metamodel.facets.disable.DisabledFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.disable.DisableForContextFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.disable.DisabledFacetAnnotation;
import org.apache.isis.progmodel.wrapper.applib.DisabledException;
import org.apache.isis.viewer.junit.sample.domain.Order;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberHiddenTest.java Mon Nov 8 19:37:44 2010
@@ -25,9 +25,9 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.facets.hide.HiddenFacetAnnotation;
-import org.apache.isis.metamodel.facets.hide.HideForContextFacetViaMethod;
-import org.apache.isis.metamodel.facets.hide.HideForSessionFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.hide.HiddenFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.hide.HideForContextFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.hide.HideForSessionFacetViaMethod;
import org.apache.isis.progmodel.wrapper.applib.HiddenException;
import org.apache.isis.viewer.junit.sample.domain.Country;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/MemberInvalidTest.java Mon Nov 8 19:37:44 2010
@@ -25,13 +25,13 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.facets.actions.validate.ActionValidationFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
-import org.apache.isis.metamodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
-import org.apache.isis.metamodel.facets.properties.validate.PropertyValidateFacetViaMethod;
-import org.apache.isis.metamodel.facets.propparam.validate.mandatory.MandatoryFacetDefault;
-import org.apache.isis.metamodel.facets.propparam.validate.maxlength.MaxLengthFacetAnnotation;
-import org.apache.isis.metamodel.facets.propparam.validate.regex.RegExFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.actions.validate.ActionValidationFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacetViaMethod;
+import org.apache.isis.core.progmodel.facets.propparam.validate.mandatory.MandatoryFacetDefault;
+import org.apache.isis.core.progmodel.facets.propparam.validate.maxlength.MaxLengthFacetAnnotation;
+import org.apache.isis.core.progmodel.facets.propparam.validate.regex.RegExFacetAnnotation;
import org.apache.isis.progmodel.wrapper.applib.InvalidException;
import org.apache.isis.viewer.junit.sample.domain.Country;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/ObjectImmutableTest.java Mon Nov 8 19:37:44 2010
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.facets.object.immutable.DisabledFacetDerivedFromImmutable;
+import org.apache.isis.core.progmodel.facets.object.immutable.DisabledFacetDerivedFromImmutable;
import org.apache.isis.progmodel.wrapper.applib.DisabledException;
import org.junit.Test;
Modified: incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java (original)
+++ incubator/isis/trunk/viewer/junit/src/test/java/org/apache/isis/viewer/junit/SaveObjectsTest.java Mon Nov 8 19:37:44 2010
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.facets.object.validate.ValidateObjectFacetViaValidateMethod;
+import org.apache.isis.core.progmodel.facets.object.validate.ValidateObjectFacetViaValidateMethod;
import org.apache.isis.progmodel.wrapper.applib.InvalidException;
import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
import org.apache.isis.viewer.junit.sample.domain.Customer;
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyParams.java Mon Nov 8 19:37:44 2010
@@ -5,9 +5,9 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.webapp.auth.AuthenticationSessionLookupStrategyDefault;
public class AuthenticationSessionLookupStrategyParams extends AuthenticationSessionLookupStrategyDefault {
Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java?rev=1032676&r1=1032675&r2=1032676&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java (original)
+++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/authentication/AuthenticationSessionLookupStrategyTrusted.java Mon Nov 8 19:37:44 2010
@@ -4,9 +4,9 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault;
import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.webapp.auth.AuthenticationSessionLookupStrategyDefault;
public class AuthenticationSessionLookupStrategyTrusted extends AuthenticationSessionLookupStrategyDefault {