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
[11/11] ISIS-188: more refactoring of artifacts
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java b/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java
deleted file mode 100644
index e0f1c1d..0000000
--- a/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ /dev/null
@@ -1,113 +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.webapp.auth;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.AuthenticationRequestExploration;
-import org.apache.isis.runtimes.dflt.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
-import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
-import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.runtimes.dflt.webapp.WebAppConstants;
-
-/**
- * Returns a valid {@link AuthenticationSession} through a number of mechanisms;
- * supports caching of the {@link AuthenticationSession} onto the
- * {@link HttpSession}.
- *
- * <p>
- * The session is looked-up as follows:
- * <ul>
- * <li>it looks up from the {@link HttpSession} using the value
- * {@value WebAppConstants#HTTP_SESSION_AUTHENTICATION_SESSION_KEY}</li>
- * <li>failing that, if in exploration mode, then returns an exploration session
- * </li>
- * <li>failing that, if a {@link LogonFixture} has been provided and not already
- * used, will provide an session for that fixture. The {@link HttpSession} also
- * stores the value
- * {@value WebAppConstants#HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY}
- * in the session to track whether this has been done</li>
- * </ul>
- * <p>
- */
-public class AuthenticationSessionStrategyDefault extends AuthenticationSessionStrategyAbstract {
-
- @Override
- public AuthenticationSession lookupValid(final ServletRequest servletRequest, final ServletResponse servletResponse) {
-
- final AuthenticationManager authenticationManager = getAuthenticationManager();
- final HttpSession httpSession = getHttpSession(servletRequest);
-
- // use previously authenticated session if available
- AuthenticationSession authSession = (AuthenticationSession) httpSession.getAttribute(WebAppConstants.HTTP_SESSION_AUTHENTICATION_SESSION_KEY);
- if (authSession != null) {
- final boolean sessionValid = authenticationManager.isSessionValid(authSession);
- if (sessionValid) {
- return authSession;
- }
- }
-
- // otherwise, look for LogonFixture and try to authenticate
- final ServletContext servletContext = getServletContext(servletRequest);
- final IsisSystem system = (IsisSystem) servletContext.getAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
- if (system == null) {
- // not expected to happen...
- return null;
- }
- final LogonFixture logonFixture = system.getLogonFixture();
-
- // see if exploration is supported
- if (system.getDeploymentType().isExploring()) {
- authSession = authenticationManager.authenticate(new AuthenticationRequestExploration(logonFixture));
- if (authSession != null) {
- return authSession;
- }
- }
-
- final boolean loggedInUsingLogonFixture = httpSession.getAttribute(WebAppConstants.HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY) != null;
- if (logonFixture != null && !loggedInUsingLogonFixture) {
- httpSession.setAttribute(WebAppConstants.HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY, true);
- return authenticationManager.authenticate(new AuthenticationRequestLogonFixture(logonFixture));
- }
-
- return null;
- }
-
- @Override
- public void bind(final ServletRequest servletRequest, final ServletResponse servletResponse, final AuthenticationSession authSession) {
- final HttpSession httpSession = getHttpSession(servletRequest);
- httpSession.setAttribute(WebAppConstants.HTTP_SESSION_AUTHENTICATION_SESSION_KEY, authSession);
- }
-
- // //////////////////////////////////////////////////////////
- // Dependencies (from context)
- // //////////////////////////////////////////////////////////
-
- protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getAuthenticationManager();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java b/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
deleted file mode 100644
index c5eb3f3..0000000
--- a/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
+++ /dev/null
@@ -1,87 +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.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/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java b/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java
deleted file mode 100644
index 2f8612d..0000000
--- a/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/WebServerMonitorInstaller.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.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/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/framework/runtimes/dflt/webserver/pom.xml b/framework/runtimes/dflt/webserver/pom.xml
index dfe777c..305c526 100644
--- a/framework/runtimes/dflt/webserver/pom.xml
+++ b/framework/runtimes/dflt/webserver/pom.xml
@@ -27,7 +27,7 @@
</parent>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<name>Default Runtime WebServer (Jetty)</name>
<properties>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/tck/pom.xml b/framework/tck/pom.xml
index 7c3e8ac..26d2627 100644
--- a/framework/tck/pom.xml
+++ b/framework/tck/pom.xml
@@ -202,13 +202,6 @@
<version>0.3.1-SNAPSHOT</version>
</dependency>
- <!-- isis: progmodels: dflt -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
-
<!-- isis: progmodel: wrapper -->
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
@@ -282,7 +275,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
+ <artifactId>isis-webserver</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/bdd/common/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/bdd/common/pom.xml b/framework/viewer/bdd/common/pom.xml
index d62428c..24521df 100755
--- a/framework/viewer/bdd/common/pom.xml
+++ b/framework/viewer/bdd/common/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<!-- TODO: remove this dependency -->
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/bdd/concordion-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/bdd/concordion-tck/pom.xml b/framework/viewer/bdd/concordion-tck/pom.xml
index 365efa7..afd8611 100644
--- a/framework/viewer/bdd/concordion-tck/pom.xml
+++ b/framework/viewer/bdd/concordion-tck/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<!-- isis default runtime -->
@@ -85,10 +85,6 @@
<!-- isis defaults (other) -->
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/dnd-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/dnd-tck/pom.xml b/framework/viewer/dnd-tck/pom.xml
index ff6c83d..392fd14 100644
--- a/framework/viewer/dnd-tck/pom.xml
+++ b/framework/viewer/dnd-tck/pom.xml
@@ -78,7 +78,7 @@
<!-- isis core -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<!-- isis default runtime -->
@@ -101,10 +101,6 @@
<!-- isis defaults (other) -->
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/dnd/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/dnd/pom.xml b/framework/viewer/dnd/pom.xml
index ea26393..d0bc024 100644
--- a/framework/viewer/dnd/pom.xml
+++ b/framework/viewer/dnd/pom.xml
@@ -94,11 +94,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/html-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/html-tck/pom.xml b/framework/viewer/html-tck/pom.xml
index 440a5a6..0e2351d 100644
--- a/framework/viewer/html-tck/pom.xml
+++ b/framework/viewer/html-tck/pom.xml
@@ -114,12 +114,6 @@
<artifactId>xml</artifactId>
</dependency>
- <!-- isis progmodel -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
@@ -133,7 +127,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/viewer/html/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/html/pom.xml b/framework/viewer/html/pom.xml
index 4a6a959..644eb43 100644
--- a/framework/viewer/html/pom.xml
+++ b/framework/viewer/html/pom.xml
@@ -93,6 +93,10 @@
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
@@ -106,20 +110,6 @@
<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.core</groupId>
- <artifactId>webapp</artifactId>
- </dependency>
-
<!-- TODO: remove these dependencies (they prevent the viewer using different runtimes) -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/junit-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/junit-tck/pom.xml b/framework/viewer/junit-tck/pom.xml
index 7202a68..3798e1d 100644
--- a/framework/viewer/junit-tck/pom.xml
+++ b/framework/viewer/junit-tck/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<!-- isis default runtime -->
@@ -68,10 +68,6 @@
<!-- isis defaults (other) -->
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/junit/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/junit/pom.xml b/framework/viewer/junit/pom.xml
index f02cb98..78c1b60 100644
--- a/framework/viewer/junit/pom.xml
+++ b/framework/viewer/junit/pom.xml
@@ -113,6 +113,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
<artifactId>dflt</artifactId>
</dependency>
@@ -133,6 +138,10 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -145,10 +154,6 @@
</dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
<dependency>
<groupId>asm</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml b/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
index 95724e5..395e0ec 100644
--- a/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
+++ b/framework/viewer/restfulobjects/restfulobjects-tck/pom.xml
@@ -105,12 +105,6 @@
<artifactId>dflt</artifactId>
</dependency>
- <!-- isis progmodel -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
@@ -124,7 +118,7 @@
<!-- to run using WebServer -->
<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/viewer/restfulobjects/restfulobjects-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml b/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
index 9bad2f1..bbef306 100644
--- a/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
+++ b/framework/viewer/restfulobjects/restfulobjects-viewer/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>webapp</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/scimpi/scimpi-dispatcher/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/scimpi/scimpi-dispatcher/pom.xml b/framework/viewer/scimpi/scimpi-dispatcher/pom.xml
index 64dfde9..483323c 100644
--- a/framework/viewer/scimpi/scimpi-dispatcher/pom.xml
+++ b/framework/viewer/scimpi/scimpi-dispatcher/pom.xml
@@ -66,14 +66,9 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
- <!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/scimpi/scimpi-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/scimpi/scimpi-tck/pom.xml b/framework/viewer/scimpi/scimpi-tck/pom.xml
index 9420bc0..70d93b3 100644
--- a/framework/viewer/scimpi/scimpi-tck/pom.xml
+++ b/framework/viewer/scimpi/scimpi-tck/pom.xml
@@ -91,12 +91,6 @@
<artifactId>xml</artifactId>
</dependency>
- <!-- isis progmodel -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
@@ -110,7 +104,7 @@
<!-- to run using WebServer -->
<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/viewer/wicket/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/pom.xml b/framework/viewer/wicket/pom.xml
index 3600ddc..b91f847 100644
--- a/framework/viewer/wicket/pom.xml
+++ b/framework/viewer/wicket/pom.xml
@@ -129,12 +129,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>
+ <artifactId>isis-metamodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/wicket/wicket-model/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/wicket-model/pom.xml b/framework/viewer/wicket/wicket-model/pom.xml
index d4cb181..ecc2d40 100644
--- a/framework/viewer/wicket/wicket-model/pom.xml
+++ b/framework/viewer/wicket/wicket-model/pom.xml
@@ -46,11 +46,11 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
+ <artifactId>isis-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/wicket/wicket-tck/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/wicket-tck/pom.xml b/framework/viewer/wicket/wicket-tck/pom.xml
index b403f1c..b787c9e 100644
--- a/framework/viewer/wicket/wicket-tck/pom.xml
+++ b/framework/viewer/wicket/wicket-tck/pom.xml
@@ -103,12 +103,6 @@
<artifactId>dflt</artifactId>
</dependency>
- <!-- isis progmodel -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
@@ -122,7 +116,7 @@
<!-- to run using WebServer -->
<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/viewer/wicket/wicket-ui/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/wicket-ui/pom.xml b/framework/viewer/wicket/wicket-ui/pom.xml
index cfc0a2b..3005529 100644
--- a/framework/viewer/wicket/wicket-ui/pom.xml
+++ b/framework/viewer/wicket/wicket-ui/pom.xml
@@ -60,7 +60,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/6de87443/framework/viewer/wicket/wicket-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/framework/viewer/wicket/wicket-viewer/pom.xml b/framework/viewer/wicket/wicket-viewer/pom.xml
index a6e0a79..5ea7909 100644
--- a/framework/viewer/wicket/wicket-viewer/pom.xml
+++ b/framework/viewer/wicket/wicket-viewer/pom.xml
@@ -69,13 +69,11 @@
<scope>test</scope>
</dependency>
- <!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>runtime</artifactId>
</dependency>
- <!-- TODO: remove this dependency -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>webapp</artifactId>