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/01/22 08:36:26 UTC
svn commit: r1234456 [17/17] - in /incubator/isis/trunk/framework/runtimes:
dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/classsubstitutor/
dflt/bytecode/dflt/src/main/java/org/apache/isis/runtimes/dflt/bytecode/dflt/obje...
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestSpecification.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/testsystem/TestSpecification.java Sun Jan 22 07:36:07 2012
@@ -41,7 +41,6 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Persistability;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
@@ -172,8 +171,7 @@ public class TestSpecification extends F
}
@Override
- public ObjectAction getObjectAction(final ActionType type, final String name,
- final List<ObjectSpecification> parameters) {
+ public ObjectAction getObjectAction(final ActionType type, final String name, final List<ObjectSpecification> parameters) {
if (action != null && action.getId().equals(name)) {
return action;
}
@@ -191,7 +189,7 @@ public class TestSpecification extends F
}
@Override
- public List<ObjectAction> getObjectActions(final ActionType type, Contributed contributed) {
+ public List<ObjectAction> getObjectActions(final ActionType type, final Contributed contributed) {
return null;
}
@@ -279,8 +277,7 @@ public class TestSpecification extends F
}
public Object newInstance() {
- throw new IsisException("Not able to create instance of " + getFullIdentifier()
- + "; newInstance() method should be overridden");
+ throw new IsisException("Not able to create instance of " + getFullIdentifier() + "; newInstance() method should be overridden");
}
@Override
@@ -358,14 +355,12 @@ public class TestSpecification extends F
}
@Override
- public ObjectValidityContext createValidityInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ public ObjectValidityContext createValidityInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
return null;
}
@Override
- public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ public ObjectTitleContext createTitleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
return null;
}
@@ -405,13 +400,13 @@ public class TestSpecification extends F
}
@Override
- public List<ObjectAction> getObjectActions(Contributed contributed) {
+ public List<ObjectAction> getObjectActions(final Contributed contributed) {
return null;
}
- @Override
- public List<ObjectAction> getObjectActions(List<ActionType> types, Contributed contributed) {
- return null;
- }
+ @Override
+ public List<ObjectAction> getObjectActions(final List<ActionType> types, final Contributed contributed) {
+ return null;
+ }
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisSessionFilter.java Sun Jan 22 07:36:07 2012
@@ -51,18 +51,21 @@ import com.google.common.collect.Lists;
public class IsisSessionFilter implements Filter {
/**
- * Recommended standard init parameter key for filters and servlets to lookup an implementation of {@link AuthenticationSessionStrategy}.
+ * Recommended standard init parameter key for filters and servlets to
+ * lookup an implementation of {@link AuthenticationSessionStrategy}.
*/
public static final String AUTHENTICATION_SESSION_STRATEGY_KEY = "authenticationSessionStrategy";
/**
- * Default value for {@link AuthenticationSessionLookupStrategyConstants#AUTHENTICATION_SESSION_STRATEGY_KEY} if not specified.
+ * Default value for
+ * {@link AuthenticationSessionLookupStrategyConstants#AUTHENTICATION_SESSION_STRATEGY_KEY}
+ * if not specified.
*/
- public static final String AUTHENTICATION_SESSION_STRATEGY_DEFAULT =
- AuthenticationSessionStrategyDefault.class.getName();
+ public static final String AUTHENTICATION_SESSION_STRATEGY_DEFAULT = AuthenticationSessionStrategyDefault.class.getName();
/**
- * Init parameter key for backward compatibility; if logonPage set then assume 'restricted' handling.
+ * Init parameter key for backward compatibility; if logonPage set then
+ * assume 'restricted' handling.
*/
public static final String LOGON_PAGE_KEY = "logonPage";
@@ -72,19 +75,25 @@ public class IsisSessionFilter implement
* <p>
* Valid values are:
* <ul>
- * <li>unauthorized - issue a 401 response.
- * <li>basicAuthChallenge - issue a basic auth 401 challenge. The idea here is that the configured logon strategy should handle the next request
- * <li>restricted - allow access but only to a restricted (comma-separated) list of paths. Access elsewhere should be redirected to the first of these paths
- * <li>continue - allow the request to continue (eg if there is no security requirements)
+ * <li>unauthorized - issue a 401 response.
+ * <li>basicAuthChallenge - issue a basic auth 401 challenge. The idea here
+ * is that the configured logon strategy should handle the next request
+ * <li>restricted - allow access but only to a restricted (comma-separated)
+ * list of paths. Access elsewhere should be redirected to the first of
+ * these paths
+ * <li>continue - allow the request to continue (eg if there is no security
+ * requirements)
* </ul>
*/
public static final String WHEN_NO_SESSION_KEY = "whenNoSession";
/**
- * Init parameter key to read the restricted list of paths (if {@link #WHEN_NO_SESSION_KEY} is for {@link WhenNoSession#RESTRICTED}).
+ * Init parameter key to read the restricted list of paths (if
+ * {@link #WHEN_NO_SESSION_KEY} is for {@link WhenNoSession#RESTRICTED}).
*
* <p>
- * The servlets mapped to these paths are expected to be able to deal with there being no session. Typically they will be logon pages.
+ * The servlets mapped to these paths are expected to be able to deal with
+ * there being no session. Typically they will be logon pages.
*/
public static final String RESTRICTED_KEY = "restricted";
@@ -94,61 +103,68 @@ public class IsisSessionFilter implement
public static final String REDIRECT_TO_ON_EXCEPTION_KEY = "redirectToOnException";
/**
- * Init parameter key for which extensions should be ignored (typically, mappings for other viewers within the webapp context).
+ * Init parameter key for which extensions should be ignored (typically,
+ * mappings for other viewers within the webapp context).
*
* <p>
- * It can also be used to specify ignored static resources (though putting the {@link ResourceCachingFilter} first in the
- * <tt>web.xml</tt> accomplishes the same thing).
+ * It can also be used to specify ignored static resources (though putting
+ * the {@link ResourceCachingFilter} first in the <tt>web.xml</tt>
+ * accomplishes the same thing).
*
* <p>
* The value is expected as a comma separated list, for example:
- * <pre>htmlviewer</pre>
+ *
+ * <pre>
+ * htmlviewer
+ * </pre>
*/
public static final String IGNORE_EXTENSIONS_KEY = "ignoreExtensions";
- private static final Function<String,Pattern> STRING_TO_PATTERN = new Function<String,Pattern>() {
+ private static final Function<String, Pattern> STRING_TO_PATTERN = new Function<String, Pattern>() {
@Override
- public Pattern apply(String input) {
+ public Pattern apply(final String input) {
return Pattern.compile(".*\\." + input);
}
-
+
};
- static void redirect(HttpServletRequest httpRequest, HttpServletResponse httpResponse, final String redirectTo) throws IOException {
+ static void redirect(final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final String redirectTo) throws IOException {
httpResponse.sendRedirect(PathUtils.combine(httpRequest.getContextPath(), redirectTo));
}
public enum WhenNoSession {
UNAUTHORIZED("unauthorized") {
@Override
- public void handle(IsisSessionFilter filter, HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain) throws IOException, ServletException {
+ public void handle(final IsisSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
httpResponse.sendError(401);
}
},
BASIC_AUTH_CHALLENGE("basicAuthChallenge") {
@Override
- public void handle(IsisSessionFilter filter, HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain) throws IOException, ServletException {
+ public void handle(final IsisSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
httpResponse.setHeader("WWW-Authenticate", "Basic realm=\"Apache Isis\"");
httpResponse.sendError(401);
}
},
/**
- * the destination servlet is expected to know that there will be no open context
+ * the destination servlet is expected to know that there will be no
+ * open context
*/
CONTINUE("continue") {
@Override
- public void handle(IsisSessionFilter filter, HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain) throws IOException, ServletException {
+ public void handle(final IsisSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
chain.doFilter(httpRequest, httpResponse);
}
},
/**
- * Allow access to a restricted list of URLs (else redirect to the first of that list of URLs)
+ * Allow access to a restricted list of URLs (else redirect to the first
+ * of that list of URLs)
*/
RESTRICTED("restricted") {
@Override
- public void handle(IsisSessionFilter filter, HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain) throws IOException, ServletException {
+ public void handle(final IsisSessionFilter filter, final HttpServletRequest httpRequest, final HttpServletResponse httpResponse, final FilterChain chain) throws IOException, ServletException {
- if(filter.restrictedPaths.contains(httpRequest.getServletPath())) {
+ if (filter.restrictedPaths.contains(httpRequest.getServletPath())) {
chain.doFilter(httpRequest, httpResponse);
return;
}
@@ -157,23 +173,28 @@ public class IsisSessionFilter implement
};
private final String initParamValue;
- private WhenNoSession(String initParamValue) {
+
+ private WhenNoSession(final String initParamValue) {
this.initParamValue = initParamValue;
}
+
public static WhenNoSession lookup(final String whenNoSessionStr) {
- for (WhenNoSession wns : values()) {
- if(wns.initParamValue.equals(whenNoSessionStr)) {
+ for (final WhenNoSession wns : values()) {
+ if (wns.initParamValue.equals(whenNoSessionStr)) {
return wns;
}
}
throw new IllegalStateException("require an init-param of '" + WHEN_NO_SESSION_KEY + "', taking a value of " + WhenNoSession.values());
}
+
public abstract void handle(IsisSessionFilter filter, HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain) throws IOException, ServletException;
}
/**
- * Used as a flag on {@link HttpServletRequest} so that if there are two {@link IsisSessionFilter}s in a request pipeline,
- * then the second can determine what processing has already been done (and is usually then just a no-op).
+ * Used as a flag on {@link HttpServletRequest} so that if there are two
+ * {@link IsisSessionFilter}s in a request pipeline, then the second can
+ * determine what processing has already been done (and is usually then just
+ * a no-op).
*/
private static final String SESSION_STATE_KEY = IsisSessionFilter.SessionState.class.getName();
@@ -183,12 +204,10 @@ public class IsisSessionFilter implement
private String redirectToOnException;
private Collection<Pattern> ignoreExtensions;
-
// /////////////////////////////////////////////////////////////////
// init, destroy
// /////////////////////////////////////////////////////////////////
-
@Override
public void init(final FilterConfig config) throws ServletException {
authSessionStrategy = lookup(config.getInitParameter(AUTHENTICATION_SESSION_STRATEGY_KEY));
@@ -197,7 +216,6 @@ public class IsisSessionFilter implement
lookupIgnoreExtensions(config);
}
-
/**
* Public visibility so can also be used by servlets.
*/
@@ -211,11 +229,11 @@ public class IsisSessionFilter implement
private void lookupWhenNoSession(final FilterConfig config) {
final String whenNoSessionStr = config.getInitParameter(WHEN_NO_SESSION_KEY);
-
+
// backward compatibility
final String logonPage = config.getInitParameter(LOGON_PAGE_KEY);
if (logonPage != null) {
- if(whenNoSessionStr != null) {
+ if (whenNoSessionStr != null) {
throw new IllegalStateException("The init-param '" + LOGON_PAGE_KEY + "' is only provided for backwards compatibility; remove if the init-param '" + WHEN_NO_SESSION_KEY + "' has been specified");
}
whenNoSession = WhenNoSession.RESTRICTED;
@@ -224,16 +242,16 @@ public class IsisSessionFilter implement
}
whenNoSession = WhenNoSession.lookup(whenNoSessionStr);
- if(whenNoSession == WhenNoSession.RESTRICTED) {
+ if (whenNoSession == WhenNoSession.RESTRICTED) {
final String restrictedPathsStr = config.getInitParameter(RESTRICTED_KEY);
- if(restrictedPathsStr == null) {
+ if (restrictedPathsStr == null) {
throw new IllegalStateException("Require an init-param of '" + RESTRICTED_KEY + "' key to be set.");
}
this.restrictedPaths = Lists.newArrayList(Splitter.on(",").split(restrictedPathsStr));
}
-
+
}
-
+
private void lookupRedirectToOnException(final FilterConfig config) {
redirectToOnException = config.getInitParameter(REDIRECT_TO_ON_EXCEPTION_KEY);
}
@@ -244,14 +262,13 @@ public class IsisSessionFilter implement
private Collection<Pattern> parseIgnorePatterns(final FilterConfig config) {
final String ignoreExtensionsStr = config.getInitParameter(IGNORE_EXTENSIONS_KEY);
- if(ignoreExtensionsStr != null) {
+ if (ignoreExtensionsStr != null) {
final List<String> ignoreExtensions = Lists.newArrayList(Splitter.on(",").split(ignoreExtensionsStr));
return Collections2.transform(ignoreExtensions, STRING_TO_PATTERN);
}
return Lists.newArrayList();
}
-
@Override
public void destroy() {
}
@@ -261,15 +278,15 @@ public class IsisSessionFilter implement
// /////////////////////////////////////////////////////////////////
public enum SessionState {
-
+
UNDEFINED {
@Override
- public void handle(IsisSessionFilter filter, ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-
+ public void handle(final IsisSessionFilter filter, final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException {
+
final HttpServletRequest httpRequest = (HttpServletRequest) request;
final HttpServletResponse httpResponse = (HttpServletResponse) response;
- if(requestIsIgnoreExtension(filter, httpRequest)) {
+ if (requestIsIgnoreExtension(filter, httpRequest)) {
try {
chain.doFilter(request, response);
return;
@@ -278,7 +295,7 @@ public class IsisSessionFilter implement
}
}
- if(ResourceCachingFilter.isCachedResource(httpRequest)) {
+ if (ResourceCachingFilter.isCachedResource(httpRequest)) {
try {
chain.doFilter(request, response);
return;
@@ -303,28 +320,29 @@ public class IsisSessionFilter implement
return;
}
-
try {
NO_SESSION_SINCE_NOT_AUTHENTICATED.setOn(request);
filter.whenNoSession.handle(filter, httpRequest, httpResponse, chain);
- } catch(RuntimeException ex) {
- // in case the destination servlet cannot cope, but we've been told
+ } catch (final RuntimeException ex) {
+ // in case the destination servlet cannot cope, but we've
+ // been told
// to redirect elsewhere
- if(filter.redirectToOnException != null) {
+ if (filter.redirectToOnException != null) {
redirect(httpRequest, httpResponse, filter.redirectToOnException);
return;
}
throw ex;
- } catch(IOException ex) {
- if(filter.redirectToOnException != null) {
+ } catch (final IOException ex) {
+ if (filter.redirectToOnException != null) {
redirect(httpRequest, httpResponse, filter.redirectToOnException);
return;
}
throw ex;
- } catch(ServletException ex) {
- // in case the destination servlet cannot cope, but we've been told
+ } catch (final ServletException ex) {
+ // in case the destination servlet cannot cope, but we've
+ // been told
// to redirect elsewhere
- if(filter.redirectToOnException != null) {
+ if (filter.redirectToOnException != null) {
redirect(httpRequest, httpResponse, filter.redirectToOnException);
return;
}
@@ -336,38 +354,35 @@ public class IsisSessionFilter implement
}
- private boolean requestIsIgnoreExtension(IsisSessionFilter filter, HttpServletRequest httpRequest) {
+ private boolean requestIsIgnoreExtension(final IsisSessionFilter filter, final HttpServletRequest httpRequest) {
final String servletPath = httpRequest.getServletPath();
for (final Pattern extension : filter.ignoreExtensions) {
- if(extension.matcher(servletPath).matches()) {
+ if (extension.matcher(servletPath).matches()) {
return true;
}
}
return false;
}
},
- NO_SESSION_SINCE_REDIRECTING_TO_LOGON_PAGE,
- NO_SESSION_SINCE_NOT_AUTHENTICATED,
- SESSION_IN_PROGRESS;
+ NO_SESSION_SINCE_REDIRECTING_TO_LOGON_PAGE, NO_SESSION_SINCE_NOT_AUTHENTICATED, SESSION_IN_PROGRESS;
- static SessionState lookup(ServletRequest request) {
+ static SessionState lookup(final ServletRequest request) {
final Object state = request.getAttribute(SESSION_STATE_KEY);
- return state != null ? (SessionState)state : SessionState.UNDEFINED;
+ return state != null ? (SessionState) state : SessionState.UNDEFINED;
}
-
boolean isValid(final AuthenticationSession authSession) {
return authSession != null && getAuthenticationManager().isSessionValid(authSession);
}
- void setOn(ServletRequest request) {
+ void setOn(final ServletRequest request) {
request.setAttribute(SESSION_STATE_KEY, this);
}
- public void handle(IsisSessionFilter filter, ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ public void handle(final IsisSessionFilter filter, final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException {
chain.doFilter(request, response);
}
-
+
AuthenticationManager getAuthenticationManager() {
return IsisContext.getAuthenticationManager();
}
@@ -379,17 +394,14 @@ public class IsisSessionFilter implement
void closeSession() {
IsisContext.closeSession();
}
-
+
}
-
@Override
- public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
- throws IOException, ServletException {
-
- SessionState sessionState = SessionState.lookup(request);
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException {
+
+ final SessionState sessionState = SessionState.lookup(request);
sessionState.handle(this, request, response, chain);
}
-
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/IsisWebAppBootstrapper.java Sun Jan 22 07:36:07 2012
@@ -44,10 +44,12 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
/**
- * Initialize the {@link IsisSystem} when the web application starts, and destroys it when it ends.
+ * Initialize the {@link IsisSystem} when the web application starts, and
+ * destroys it when it ends.
* <p>
- * Implementation note: we use a number of helper builders to keep this class as small and focused as possible. The
- * builders are available for reuse by other bootstrappers.
+ * Implementation note: we use a number of helper builders to keep this class as
+ * small and focused as possible. The builders are available for reuse by other
+ * bootstrappers.
*/
public class IsisWebAppBootstrapper implements ServletContextListener {
@@ -77,9 +79,7 @@ public class IsisWebAppBootstrapper impl
loggingConfigurer.configureLogging(webInfDir, new String[0]);
// will load either from WEB-INF or from the classpath.
- final IsisConfigurationBuilder isisConfigurationBuilder =
- new IsisConfigurationBuilderResourceStreams(new ResourceStreamSourceForWebInf(servletContext),
- ResourceStreamSourceContextLoaderClassPath.create());
+ final IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderResourceStreams(new ResourceStreamSourceForWebInf(servletContext), ResourceStreamSourceContextLoaderClassPath.create());
primeConfigurationBuilder(isisConfigurationBuilder, servletContext);
@@ -106,18 +106,14 @@ public class IsisWebAppBootstrapper impl
LOG.info("server started");
}
- private Injector createGuiceInjector(final IsisConfigurationBuilder isisConfigurationBuilder,
- final DeploymentType deploymentType, final InstallerLookup installerLookup) {
+ private Injector createGuiceInjector(final IsisConfigurationBuilder isisConfigurationBuilder, final DeploymentType deploymentType, final InstallerLookup installerLookup) {
final IsisModule isisModule = new IsisModule(deploymentType, isisConfigurationBuilder, installerLookup);
return Guice.createInjector(isisModule);
}
@SuppressWarnings("unchecked")
- private void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder,
- final ServletContext servletContext) {
- final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers =
- (List<IsisConfigurationBuilderPrimer>) servletContext
- .getAttribute(WebAppConstants.CONFIGURATION_PRIMERS_KEY);
+ private void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) {
+ final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers = (List<IsisConfigurationBuilderPrimer>) servletContext.getAttribute(WebAppConstants.CONFIGURATION_PRIMERS_KEY);
if (isisConfigurationBuilderPrimers == null) {
return;
}
@@ -127,16 +123,17 @@ public class IsisWebAppBootstrapper impl
}
/**
- * Checks {@link IsisConfigurationBuilder configuration} for {@value SystemConstants#DEPLOYMENT_TYPE_KEY}, (that is,
- * from the command line), but otherwise searches in the {@link ServletContext}, first for
- * {@value WebAppConstants#DEPLOYMENT_TYPE_KEY} and also {@value SystemConstants#DEPLOYMENT_TYPE_KEY}.
+ * Checks {@link IsisConfigurationBuilder configuration} for
+ * {@value SystemConstants#DEPLOYMENT_TYPE_KEY}, (that is, from the command
+ * line), but otherwise searches in the {@link ServletContext}, first for
+ * {@value WebAppConstants#DEPLOYMENT_TYPE_KEY} and also
+ * {@value SystemConstants#DEPLOYMENT_TYPE_KEY}.
* <p>
- * If no setting is found, defaults to {@value WebAppConstants#DEPLOYMENT_TYPE_DEFAULT}.
+ * If no setting is found, defaults to
+ * {@value WebAppConstants#DEPLOYMENT_TYPE_DEFAULT}.
*/
- private DeploymentType determineDeploymentType(final IsisConfigurationBuilder isisConfigurationBuilder,
- final ServletContext servletContext) {
- String deploymentTypeStr =
- isisConfigurationBuilder.getConfiguration().getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
+ private DeploymentType determineDeploymentType(final IsisConfigurationBuilder isisConfigurationBuilder, final ServletContext servletContext) {
+ String deploymentTypeStr = isisConfigurationBuilder.getConfiguration().getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
if (deploymentTypeStr == null) {
deploymentTypeStr = servletContext.getInitParameter(WebAppConstants.DEPLOYMENT_TYPE_KEY);
}
@@ -149,8 +146,7 @@ public class IsisWebAppBootstrapper impl
return DeploymentType.lookup(deploymentTypeStr);
}
- private void addConfigurationResourcesForDeploymentType(final IsisConfigurationBuilder configurationLoader,
- final DeploymentType deploymentType) {
+ private void addConfigurationResourcesForDeploymentType(final IsisConfigurationBuilder configurationLoader, final DeploymentType deploymentType) {
final String type = deploymentType.name().toLowerCase();
configurationLoader.addConfigurationResource(type + ".properties", NotFoundPolicy.CONTINUE);
}
@@ -163,14 +159,12 @@ public class IsisWebAppBootstrapper impl
}
}
- private void addConfigurationResourcesForViewers(final IsisConfigurationBuilder configurationLoader,
- final ServletContext servletContext) {
+ private void addConfigurationResourcesForViewers(final IsisConfigurationBuilder configurationLoader, final ServletContext servletContext) {
addConfigurationResourcesForContextParam(configurationLoader, servletContext, "isis.viewers");
addConfigurationResourcesForContextParam(configurationLoader, servletContext, "isis.viewer");
}
- private void addConfigurationResourcesForContextParam(final IsisConfigurationBuilder configurationLoader,
- final ServletContext servletContext, final String name) {
+ private void addConfigurationResourcesForContextParam(final IsisConfigurationBuilder configurationLoader, final ServletContext servletContext, final String name) {
final String viewers = servletContext.getInitParameter(name);
if (viewers == null) {
return;
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/WebAppConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/WebAppConstants.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/WebAppConstants.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/WebAppConstants.java Sun Jan 22 07:36:07 2012
@@ -28,39 +28,42 @@ import org.apache.isis.runtimes.dflt.run
public final class WebAppConstants {
/**
- * Name of context-param (<tt>ServletContext#getInitParameter(String)</tt>) to specify the deployment type.
+ * Name of context-param (<tt>ServletContext#getInitParameter(String)</tt>)
+ * to specify the deployment type.
*/
public static final String DEPLOYMENT_TYPE_KEY = "deploymentType";
/**
- * Deployment type to use if there is none {@link DEPLOYMENT_TYPE_KEY specified}.
+ * Deployment type to use if there is none {@link DEPLOYMENT_TYPE_KEY
+ * specified}.
*/
public static final String DEPLOYMENT_TYPE_DEFAULT = DeploymentType.SERVER.name();
/**
- * Key under which the list of {@link IsisConfigurationBuilderPrimer}s is bound as a servlet context attribute (
- * <tt>ServletContext#getAttribute(String)</tt>); used to pass from the <tt>webserver</tt> module to this.
+ * Key under which the list of {@link IsisConfigurationBuilderPrimer}s is
+ * bound as a servlet context attribute (
+ * <tt>ServletContext#getAttribute(String)</tt>); used to pass from the
+ * <tt>webserver</tt> module to this.
*/
public static final String CONFIGURATION_PRIMERS_KEY = "isis.configurationPrimers";
/**
- * Key under which the {@link IsisSystem} is bound as a servlet context attribute (
- * <tt>ServletContext#getAttribute(String)</tt>).
+ * Key under which the {@link IsisSystem} is bound as a servlet context
+ * attribute ( <tt>ServletContext#getAttribute(String)</tt>).
*/
public final static String ISIS_SYSTEM_KEY = WebAppConstants.class.getPackage().getName() + ".isisSystem";
/**
- * Key under which the {@link AuthenticationSession} is bound as a session attribute (
- * <tt>HttpSession#getAttribute(String)</tt>).
+ * Key under which the {@link AuthenticationSession} is bound as a session
+ * attribute ( <tt>HttpSession#getAttribute(String)</tt>).
*/
- public final static String HTTP_SESSION_AUTHENTICATION_SESSION_KEY = WebAppConstants.class.getPackage().getName()
- + ".authenticationSession";
+ public final static String HTTP_SESSION_AUTHENTICATION_SESSION_KEY = WebAppConstants.class.getPackage().getName() + ".authenticationSession";
/**
- * Key used to determine if a logon has already been performed implicitly using the {@link LogonFixture}, meaning
- * that a Logout should be followed by the Logon page.
+ * Key used to determine if a logon has already been performed implicitly
+ * using the {@link LogonFixture}, meaning that a Logout should be followed
+ * by the Logon page.
*/
- public final static String HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY = WebAppConstants.class
- .getPackage().getName() + ".loggedOnPreviouslyUsingLogonFixture";
+ public final static String HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY = WebAppConstants.class.getPackage().getName() + ".loggedOnPreviouslyUsingLogonFixture";
/**
* Property name given to the web app directory.
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategy.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategy.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategy.java Sun Jan 22 07:36:07 2012
@@ -27,12 +27,15 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter;
/**
- * Decouples the {@link IsisSessionFilter} from the mechanism of obtaining the {@link AuthenticationSession}.
+ * Decouples the {@link IsisSessionFilter} from the mechanism of obtaining the
+ * {@link AuthenticationSession}.
*/
public interface AuthenticationSessionStrategy {
/**
- * Returns a {@link AuthenticationManager#isSessionValid(AuthenticationSession) still-valid} {@link AuthenticationSession}.
+ * Returns a
+ * {@link AuthenticationManager#isSessionValid(AuthenticationSession)
+ * still-valid} {@link AuthenticationSession}.
*/
AuthenticationSession lookupValid(ServletRequest servletRequest, ServletResponse servletResponse);
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyAbstract.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyAbstract.java Sun Jan 22 07:36:07 2012
@@ -37,7 +37,7 @@ public abstract class AuthenticationSess
final HttpSession httpSession = getHttpSession(servletRequest);
return httpSession.getServletContext();
}
-
+
@Override
public void bind(final ServletRequest servletRequest, final ServletResponse servletResponse, final AuthenticationSession authSession) {
// no-op
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/auth/AuthenticationSessionStrategyDefault.java Sun Jan 22 07:36:07 2012
@@ -35,19 +35,22 @@ import org.apache.isis.runtimes.dflt.web
/**
* Returns a valid {@link AuthenticationSession} through a number of mechanisms;
- * supports caching of the {@link AuthenticationSession} onto the {@link HttpSession}.
+ * 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>
+ * <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 {
@@ -57,7 +60,7 @@ public class AuthenticationSessionStrate
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) {
@@ -84,13 +87,12 @@ public class AuthenticationSessionStrate
}
}
- final boolean loggedInUsingLogonFixture =
- httpSession.getAttribute(WebAppConstants.HTTP_SESSION_LOGGED_ON_PREVIOUSLY_USING_LOGON_FIXTURE_KEY) != null;
+ 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;
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/monitor/MonitorServlet.java Sun Jan 22 07:36:07 2012
@@ -37,8 +37,7 @@ public class MonitorServlet extends Http
private MonitorListenerImpl monitor;
@Override
- protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException,
- IOException {
+ 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");
@@ -61,17 +60,19 @@ public class MonitorServlet extends Http
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 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 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 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()); }
+ * session.getAttribute("NOF_SESSION_ATTRIBUTE"); if (nofSession !=
+ * null) { str.append(nofSession.getUserName()); }
*
* str.append("\n"); }
*/
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServer.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServer.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServer.java Sun Jan 22 07:36:07 2012
@@ -38,16 +38,15 @@ import org.mortbay.jetty.webapp.WebAppCo
public class WebServer {
public static enum StartupMode {
- FOREGROUND,
- BACKGROUND;
+ FOREGROUND, BACKGROUND;
- public static StartupMode lookup(String value) {
- if(value == null) {
+ public static StartupMode lookup(final String value) {
+ if (value == null) {
return null;
}
try {
return valueOf(value.toUpperCase());
- } catch (Exception e) {
+ } catch (final Exception e) {
return null;
}
}
@@ -71,10 +70,10 @@ public class WebServer {
/**
* Originally introduced to allow the WebServer to be used by tests.
*/
- public void run(int port) {
+ public void run(final int port) {
String[] args = new String[0];
- args = OptionHandlerStartupMode.appendArg(args,StartupMode.BACKGROUND);
- args = OptionHandlerPort.appendArg(args,port);
+ args = OptionHandlerStartupMode.appendArg(args, StartupMode.BACKGROUND);
+ args = OptionHandlerPort.appendArg(args, port);
run(args);
}
@@ -91,18 +90,18 @@ public class WebServer {
return;
}
- WebServerBootstrapper bootstrapper = new WebServerBootstrapper(runner);
+ final WebServerBootstrapper bootstrapper = new WebServerBootstrapper(runner);
runner.bootstrap(bootstrapper);
jettyServer = bootstrapper.getJettyServer();
}
public void stop() {
- if(jettyServer == null) {
+ if (jettyServer == null) {
return;
}
try {
jettyServer.stop();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace(System.err);
}
}
@@ -111,23 +110,23 @@ public class WebServer {
return URI.create(baseFor(jettyServer));
}
- private String baseFor(Server jettyServer) {
- Connector connector = jettyServer.getConnectors()[0];
- String scheme = "http";
- String host = StringUtils.coalesce(connector.getHost(), "localhost");
- int port = connector.getPort();
+ private String baseFor(final Server jettyServer) {
+ final Connector connector = jettyServer.getConnectors()[0];
+ final String scheme = "http";
+ final String host = StringUtils.coalesce(connector.getHost(), "localhost");
+ final int port = connector.getPort();
- WebAppContext handler = (WebAppContext) jettyServer.getHandler();
- String contextPath = handler.getContextPath();
+ final WebAppContext handler = (WebAppContext) jettyServer.getHandler();
+ final String contextPath = handler.getContextPath();
final StringBuilder buf = new StringBuilder();
- Formatter formatter = new Formatter(buf);
+ final Formatter formatter = new Formatter(buf);
formatter.format("%s://%s:%d/%s", scheme, host, port, contextPath);
return appendSlashIfRequired(buf).toString();
}
- private static StringBuilder appendSlashIfRequired(StringBuilder buf) {
- if(buf.charAt(buf.length()-1) != '/') {
+ private static StringBuilder appendSlashIfRequired(final StringBuilder buf) {
+ if (buf.charAt(buf.length() - 1) != '/') {
buf.append('/');
}
return buf;
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerBootstrapper.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerBootstrapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerBootstrapper.java Sun Jan 22 07:36:07 2012
@@ -23,8 +23,8 @@ import static org.apache.isis.runtimes.d
import static org.apache.isis.runtimes.dflt.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_PORT_KEY;
import static org.apache.isis.runtimes.dflt.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT;
import static org.apache.isis.runtimes.dflt.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY;
-import static org.apache.isis.runtimes.dflt.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY;
import static org.apache.isis.runtimes.dflt.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_STARTUP_MODE_DEFAULT;
+import static org.apache.isis.runtimes.dflt.webserver.WebServerConstants.EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY;
import java.util.HashMap;
import java.util.List;
@@ -45,13 +45,12 @@ import org.mortbay.jetty.webapp.WebAppCo
import com.google.inject.Injector;
final class WebServerBootstrapper implements IsisBootstrapper {
-
+
private static final String SRC_MAIN_WEBAPP = "src/main/webapp";
-
+
private final IsisRunner runner;
-
- private Server jettyServer;
+ private Server jettyServer;
WebServerBootstrapper(final IsisRunner runner) {
this.runner = runner;
@@ -65,14 +64,13 @@ final class WebServerBootstrapper implem
final IsisConfigurationBuilder isisConfigurationBuilder = injector.getInstance(IsisConfigurationBuilder.class);
- // we don't actually bootstrap the system here; instead we expect it to be bootstrapped
+ // we don't actually bootstrap the system here; instead we expect it to
+ // be bootstrapped
// from the ServletContextInitializer in the web.xml
final IsisConfiguration configuration = isisConfigurationBuilder.getConfiguration();
final int port = configuration.getInteger(EMBEDDED_WEB_SERVER_PORT_KEY, EMBEDDED_WEB_SERVER_PORT_DEFAULT);
- final String webappContextPath =
- configuration.getString(EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY, EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT);
- StartupMode startupMode = StartupMode.lookup(
- configuration.getString(EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY, EMBEDDED_WEB_SERVER_STARTUP_MODE_DEFAULT));
+ final String webappContextPath = configuration.getString(EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY, EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT);
+ final StartupMode startupMode = StartupMode.lookup(configuration.getString(EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY, EMBEDDED_WEB_SERVER_STARTUP_MODE_DEFAULT));
jettyServer = new Server(port);
final WebAppContext context = new WebAppContext(SRC_MAIN_WEBAPP, webappContextPath);
@@ -80,30 +78,30 @@ final class WebServerBootstrapper implem
copyConfigurationPrimersIntoServletContext(context);
jettyServer.setHandler(context);
-
+
try {
jettyServer.start();
- if(startupMode.isForeground()) {
+ if (startupMode.isForeground()) {
jettyServer.join();
}
} catch (final Exception ex) {
throw new IsisException("Unable to start Jetty server", ex);
}
}
-
+
public Server getJettyServer() {
return jettyServer;
}
/**
- * Bound to the {@link WebAppContext} so that they can be used when bootstrapping.
+ * Bound to the {@link WebAppContext} so that they can be used when
+ * bootstrapping.
*
* @param context
*/
@SuppressWarnings("unchecked")
private void copyConfigurationPrimersIntoServletContext(final WebAppContext context) {
- final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers =
- (List<IsisConfigurationBuilderPrimer>) (List<?>) runner.getOptionHandlers();
+ final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers = (List<IsisConfigurationBuilderPrimer>) (List<?>) runner.getOptionHandlers();
context.setAttribute(WebAppConstants.CONFIGURATION_PRIMERS_KEY, isisConfigurationBuilderPrimers);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerConstants.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerConstants.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/WebServerConstants.java Sun Jan 22 07:36:07 2012
@@ -34,10 +34,12 @@ public final class WebServerConstants {
public static final String EMBEDDED_WEB_SERVER_ADDRESS_DEFAULT = "localhost";
public static final String EMBEDDED_WEB_SERVER_RESOURCE_BASE_KEY = ROOT + "webapp";
- public static final String EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT = ""; // or "webapp" ??
+ public static final String EMBEDDED_WEB_SERVER_RESOURCE_BASE_DEFAULT = ""; // or
+ // "webapp"
+ // ??
public static final String EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY = ROOT + "startupMode";
- public static final String EMBEDDED_WEB_SERVER_STARTUP_MODE_DEFAULT = StartupMode.FOREGROUND.name();
+ public static final String EMBEDDED_WEB_SERVER_STARTUP_MODE_DEFAULT = StartupMode.FOREGROUND.name();
private WebServerConstants() {
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/EmbeddedWebServerJetty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/EmbeddedWebServerJetty.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/EmbeddedWebServerJetty.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/EmbeddedWebServerJetty.java Sun Jan 22 07:36:07 2012
@@ -75,7 +75,8 @@ public class EmbeddedWebServerJetty exte
sessionHandler.setHandler(servletHandler);
handlers.addHandler(sessionHandler);
- // commenting out; this grabs '/' but we might want to use it ourselves, instead?
+ // commenting out; this grabs '/' but we might want to use it ourselves,
+ // instead?
// handlers.addHandler(new DefaultHandler());
// TODO use properties to set up
@@ -95,8 +96,8 @@ public class EmbeddedWebServerJetty exte
* TODO: the welcome files don't seem to be picked up.
*
* <p>
- * not sure if meant to add welcome files here or at the context handler level, in fact, doesn't seem to work even
- * when register in both...
+ * not sure if meant to add welcome files here or at the context handler
+ * level, in fact, doesn't seem to work even when register in both...
*
* @see #setWelcomeFiles(ContextHandler)
*/
@@ -174,8 +175,7 @@ public class EmbeddedWebServerJetty exte
private void addServletContextListeners(final ContextHandler contextHandler) {
for (final WebAppSpecification specification : getSpecifications()) {
for (final Class<?> servletContextListenerClass : specification.getServletContextListeners()) {
- final ServletContextListener servletContext =
- (ServletContextListener) InstanceUtil.createInstance(servletContextListenerClass);
+ final ServletContextListener servletContext = (ServletContextListener) InstanceUtil.createInstance(servletContextListenerClass);
contextHandler.addEventListener(servletContext);
}
}
@@ -185,8 +185,8 @@ public class EmbeddedWebServerJetty exte
* TODO: this doesn't seem to be being picked up
*
* <p>
- * not sure if meant to add welcome files here or at the resource base level, in fact, doesn't seem to work even
- * when register in both...
+ * not sure if meant to add welcome files here or at the resource base
+ * level, in fact, doesn't seem to work even when register in both...
*
* @see #addResourcesAndWelcomeFiles(HandlerList)
*/
@@ -197,9 +197,7 @@ public class EmbeddedWebServerJetty exte
}
private void startServer(final ContextHandler contextHandler) {
- final int port =
- getConfiguration().getInteger(WebServerConstants.EMBEDDED_WEB_SERVER_PORT_KEY,
- WebServerConstants.EMBEDDED_WEB_SERVER_PORT_DEFAULT);
+ final int port = getConfiguration().getInteger(WebServerConstants.EMBEDDED_WEB_SERVER_PORT_KEY, WebServerConstants.EMBEDDED_WEB_SERVER_PORT_DEFAULT);
if (LOG.isInfoEnabled()) {
LOG.info("Starting web server on http://localhost:" + port);
for (final WebAppSpecification specification : getSpecifications()) {
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java Sun Jan 22 07:36:07 2012
@@ -28,8 +28,8 @@ import org.apache.isis.runtimes.dflt.run
import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
/**
- * Not to be confused with {@link IsisViewerInstaller}, this installer is for a component to <i>host</i> any
- * {@link EmbeddedWebViewer} implementations.
+ * Not to be confused with {@link IsisViewerInstaller}, this installer is for a
+ * component to <i>host</i> any {@link EmbeddedWebViewer} implementations.
*/
public class JettyEmbeddedWebServerInstaller extends InstallerAbstract implements EmbeddedWebServerInstaller {
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerAddress.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerAddress.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerAddress.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerAddress.java Sun Jan 22 07:36:07 2012
@@ -39,9 +39,7 @@ public final class OptionHandlerAddress
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option =
- OptionBuilder.withArgName("address").hasArg().withLongOpt(OptionHandlerAddress.ADDRESS_LONG_OPT)
- .withDescription("address to listen on").create(OptionHandlerAddress.ADDRESS_OPT);
+ final Option option = OptionBuilder.withArgName("address").hasArg().withLongOpt(OptionHandlerAddress.ADDRESS_LONG_OPT).withDescription("address to listen on").create(OptionHandlerAddress.ADDRESS_OPT);
options.addOption(option);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerDeploymentTypeWebServer.java Sun Jan 22 07:36:07 2012
@@ -28,8 +28,7 @@ import org.apache.isis.runtimes.dflt.run
public class OptionHandlerDeploymentTypeWebServer extends OptionHandlerDeploymentType {
- private static final String TYPES =
- TYPE_SERVER_EXPLORATION + "; " + TYPE_SERVER_PROTOTYPE + " (default); " + TYPE_SERVER;
+ private static final String TYPES = TYPE_SERVER_EXPLORATION + "; " + TYPE_SERVER_PROTOTYPE + " (default); " + TYPE_SERVER;
public OptionHandlerDeploymentTypeWebServer() {
super(DeploymentType.SERVER_PROTOTYPE, TYPES);
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerPort.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerPort.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerPort.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerPort.java Sun Jan 22 07:36:07 2012
@@ -37,7 +37,7 @@ public final class OptionHandlerPort imp
static final String PORT_LONG_OPT = "port";
static final String PORT_OPT = "p";
- public static String[] appendArg(String[] args, int port) {
+ public static String[] appendArg(final String[] args, final int port) {
return ArrayUtils.append(args, "--" + PORT_LONG_OPT, "" + port);
}
@@ -45,9 +45,7 @@ public final class OptionHandlerPort imp
@SuppressWarnings("static-access")
public void addOption(final Options options) {
OptionBuilder.withArgName("port");
- final Option option =
- OptionBuilder.hasArg().withLongOpt(OptionHandlerPort.PORT_LONG_OPT).withDescription("port to listen on")
- .create(OptionHandlerPort.PORT_OPT);
+ final Option option = OptionBuilder.hasArg().withLongOpt(OptionHandlerPort.PORT_LONG_OPT).withDescription("port to listen on").create(OptionHandlerPort.PORT_OPT);
options.addOption(option);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerResourceBase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerResourceBase.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerResourceBase.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerResourceBase.java Sun Jan 22 07:36:07 2012
@@ -36,10 +36,7 @@ public final class OptionHandlerResource
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option =
- OptionBuilder.withArgName("webapp directory").hasArg()
- .withLongOpt(OptionHandlerResourceBase.RESOURCE_BASE_LONG_OPT)
- .withDescription("directory holding webapp").create(OptionHandlerResourceBase.RESOURCE_BASE_OPT);
+ final Option option = OptionBuilder.withArgName("webapp directory").hasArg().withLongOpt(OptionHandlerResourceBase.RESOURCE_BASE_LONG_OPT).withDescription("directory holding webapp").create(OptionHandlerResourceBase.RESOURCE_BASE_OPT);
options.addOption(option);
}
Modified: incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerStartupMode.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerStartupMode.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerStartupMode.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/webserver/src/main/java/org/apache/isis/runtimes/dflt/webserver/internal/OptionHandlerStartupMode.java Sun Jan 22 07:36:07 2012
@@ -31,11 +31,11 @@ import org.apache.isis.runtimes.dflt.web
import org.apache.isis.runtimes.dflt.webserver.WebServerConstants;
public final class OptionHandlerStartupMode implements OptionHandler {
-
+
static final String STARTUP_MODE_LONG_OPT = "startup";
static final String STARTUP_MODE_BASE_OPT = "a";
- public static String[] appendArg(String[] args, StartupMode startupMode) {
+ public static String[] appendArg(final String[] args, final StartupMode startupMode) {
return ArrayUtils.append(args, "--" + STARTUP_MODE_LONG_OPT, "" + startupMode.name());
}
@@ -44,10 +44,7 @@ public final class OptionHandlerStartupM
@Override
@SuppressWarnings("static-access")
public void addOption(final Options options) {
- final Option option =
- OptionBuilder.withArgName("startup mode").hasArg()
- .withLongOpt(OptionHandlerStartupMode.STARTUP_MODE_LONG_OPT)
- .withDescription("start in foreground (sync) or background (async)").create(OptionHandlerStartupMode.STARTUP_MODE_BASE_OPT);
+ final Option option = OptionBuilder.withArgName("startup mode").hasArg().withLongOpt(OptionHandlerStartupMode.STARTUP_MODE_LONG_OPT).withDescription("start in foreground (sync) or background (async)").create(OptionHandlerStartupMode.STARTUP_MODE_BASE_OPT);
options.addOption(option);
}
@@ -59,7 +56,7 @@ public final class OptionHandlerStartupM
@Override
public void primeConfigurationBuilder(final IsisConfigurationBuilder isisConfigurationBuilder) {
- if(startupMode != null) {
+ if (startupMode != null) {
isisConfigurationBuilder.add(WebServerConstants.EMBEDDED_WEB_SERVER_STARTUP_MODE_KEY, startupMode.name());
}
}
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContext.java Sun Jan 22 07:36:07 2012
@@ -28,27 +28,35 @@ import org.apache.isis.core.commons.auth
public interface EmbeddedContext {
AuthenticationSession getAuthenticationSession();
+
Localization getLocalization();
Object instantiate(Class<?> type);
-
+
void resolve(Object parent);
+
void resolve(Object parent, Object field);
void makePersistent(Object object);
+
void objectChanged(Object object);
+
void remove(Object object);
PersistenceState getPersistenceState(Object object);
<T> List<T> allMatchingQuery(Query<T> query);
+
<T> T firstMatchingQuery(Query<T> query);
boolean flush();
+
void commit();
void informUser(String message);
+
void warnUser(String message);
+
void raiseError(String message);
}
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/EmbeddedContextNoop.java Sun Jan 22 07:36:07 2012
@@ -98,5 +98,4 @@ public class EmbeddedContextNoop impleme
public void raiseError(final String message) {
}
-
}
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/IsisMetaModel.java Sun Jan 22 07:36:07 2012
@@ -67,7 +67,7 @@ public class IsisMetaModel implements Ap
private final EmbeddedContext context;
private final List<Object> services = Lists.newArrayList();
-
+
private State state = State.NOT_INITIALIZED;
private ObjectReflectorDefault reflector;
@@ -82,7 +82,7 @@ public class IsisMetaModel implements Ap
private Set<FacetDecorator> facetDecorators;
private MetaModelValidator metaModelValidator;
- private DomainObjectContainer container;
+ private DomainObjectContainer container;
public IsisMetaModel(final EmbeddedContext context, final Object... services) {
this(context, Arrays.asList(services));
@@ -91,24 +91,26 @@ public class IsisMetaModel implements Ap
public IsisMetaModel(final EmbeddedContext context, final List<Object> services) {
this.services.addAll(services);
setConfiguration(new IsisConfigurationDefault());
- setClassSubstitutor(new ClassSubstitutorAbstract(){});
+ setClassSubstitutor(new ClassSubstitutorAbstract() {
+ });
setCollectionTypeRegistry(new CollectionTypeRegistryDefault());
setSpecificationTraverser(new SpecificationTraverserDefault());
setMemberLayoutArranger(new MemberLayoutArrangerDefault());
setFacetDecorators(new TreeSet<FacetDecorator>());
setProgrammingModelFacets(new ProgrammingModelFacetsJava5());
-
+
setMetaModelValidator(new MetaModelValidatorDefault());
-
+
this.context = context;
}
/**
- * The list of classes representing services, as specified in the {@link #IsisMetaModel(EmbeddedContext, Class...)
- * constructor}.
+ * The list of classes representing services, as specified in the
+ * {@link #IsisMetaModel(EmbeddedContext, Class...) constructor}.
*
* <p>
- * To obtain the instantiated services, use the {@link ServicesInjector#getRegisteredServices()} (available from
+ * To obtain the instantiated services, use the
+ * {@link ServicesInjector#getRegisteredServices()} (available from
* {@link #getServicesInjector()}).
*/
public List<Object> getServices() {
@@ -122,9 +124,7 @@ public class IsisMetaModel implements Ap
@Override
public void init() {
ensureNotInitialized();
- reflector =
- new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser,
- memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
+ reflector = new ObjectReflectorDefault(configuration, classSubstitutor, collectionTypeRegistry, specificationTraverser, memberLayoutArranger, programmingModel, facetDecorators, metaModelValidator);
runtimeContext = new RuntimeContextForEmbeddedMetaModel(context, services);
this.container = new DomainObjectContainerDefault();
@@ -178,7 +178,8 @@ public class IsisMetaModel implements Ap
// ///////////////////////////////////////////////////////
/**
- * The {@link ServicesInjector}; can use to obtain the set of registered services.
+ * The {@link ServicesInjector}; can use to obtain the set of registered
+ * services.
*
* <p>
* Available once {@link #init() initialized}.
@@ -233,8 +234,9 @@ public class IsisMetaModel implements Ap
}
/**
- * The {@link CollectionTypeRegistry} in force, either defaulted or specified
- * {@link #setCollectionTypeRegistry(CollectionTypeRegistry) explicitly.}
+ * The {@link CollectionTypeRegistry} in force, either defaulted or
+ * specified {@link #setCollectionTypeRegistry(CollectionTypeRegistry)
+ * explicitly.}
*/
public CollectionTypeRegistry getCollectionTypeRegistry() {
return collectionTypeRegistry;
@@ -253,8 +255,9 @@ public class IsisMetaModel implements Ap
}
/**
- * The {@link SpecificationTraverser} in force, either defaulted or specified
- * {@link #setSpecificationTraverser(SpecificationTraverser) explicitly}.
+ * The {@link SpecificationTraverser} in force, either defaulted or
+ * specified {@link #setSpecificationTraverser(SpecificationTraverser)
+ * explicitly}.
*/
public SpecificationTraverser getSpecificationTraverser() {
return specificationTraverser;
@@ -295,7 +298,8 @@ public class IsisMetaModel implements Ap
}
/**
- * The {@link FacetDecorator}s in force, either defaulted or specified {@link #setFacetDecorators(Set) explicitly}.
+ * The {@link FacetDecorator}s in force, either defaulted or specified
+ * {@link #setFacetDecorators(Set) explicitly}.
*/
public Set<FacetDecorator> getFacetDecorators() {
return Collections.unmodifiableSet(facetDecorators);
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/RuntimeContextForEmbeddedMetaModel.java Sun Jan 22 07:36:07 2012
@@ -60,8 +60,9 @@ import org.apache.isis.runtimes.embedded
import org.apache.isis.runtimes.embedded.PersistenceState;
/**
- * Acts as a bridge between the {@link RuntimeContext} (as used internally within the meta-model) and the
- * {@link EmbeddedContext} provided by the embedder (which deals only with pojos).
+ * Acts as a bridge between the {@link RuntimeContext} (as used internally
+ * within the meta-model) and the {@link EmbeddedContext} provided by the
+ * embedder (which deals only with pojos).
*/
public class RuntimeContextForEmbeddedMetaModel extends RuntimeContextAbstract implements ApplicationScopedComponent {
@@ -102,15 +103,13 @@ public class RuntimeContextForEmbeddedMe
this.adapterMap = new AdapterMapAbstract() {
@Override
public ObjectAdapter adapterFor(final Object domainObject) {
- final ObjectSpecification domainObjectSpec =
- getSpecificationLookup().loadSpecification(domainObject.getClass());
+ final ObjectSpecification domainObjectSpec = getSpecificationLookup().loadSpecification(domainObject.getClass());
final PersistenceState persistenceState = context.getPersistenceState(domainObject);
return new StandaloneAdapter(domainObjectSpec, domainObject, persistenceState);
}
@Override
- public ObjectAdapter adapterFor(final Object domainObject, final ObjectAdapter ownerAdapter,
- final IdentifiedHolder identifiedHolder) {
+ public ObjectAdapter adapterFor(final Object domainObject, final ObjectAdapter ownerAdapter, final IdentifiedHolder identifiedHolder) {
return adapterFor(domainObject);
}
@@ -226,13 +225,13 @@ public class RuntimeContextForEmbeddedMe
};
this.localizationProvider = new LocalizationProviderAbstract() {
-
+
@Override
public Localization getLocalization() {
return context.getLocalization();
}
};
-
+
this.dependencyInjector = new DependencyInjectorAbstract() {
@Override
public void injectDependenciesInto(final Object domainObject) {
@@ -314,7 +313,7 @@ public class RuntimeContextForEmbeddedMe
public LocalizationProvider getLocalizationProvider() {
return localizationProvider;
}
-
+
@Override
public QuerySubmitter getQuerySubmitter() {
return querySubmitter;
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/main/java/org/apache/isis/runtimes/embedded/internal/StandaloneAdapter.java Sun Jan 22 07:36:07 2012
@@ -31,7 +31,8 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.runtimes.embedded.PersistenceState;
/**
- * Only provides a concrete implementation of the methods corresponding to the {@link ObjectMetaModel} interface.
+ * Only provides a concrete implementation of the methods corresponding to the
+ * {@link ObjectMetaModel} interface.
*/
public class StandaloneAdapter implements ObjectAdapter {
@@ -41,8 +42,7 @@ public class StandaloneAdapter implement
private ElementSpecificationProvider elementSpecificationProvider;
- public StandaloneAdapter(final ObjectSpecification spec, final Object domainObject,
- final PersistenceState persistenceState) {
+ public StandaloneAdapter(final ObjectSpecification spec, final Object domainObject, final PersistenceState persistenceState) {
this.spec = spec;
this.domainObject = domainObject;
this.persistenceState = persistenceState;
@@ -236,7 +236,7 @@ public class StandaloneAdapter implement
@Override
public ObjectAdapter getAggregateRoot() {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException();
}
}
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_constructWithServices.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_constructWithServices.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_constructWithServices.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_constructWithServices.java Sun Jan 22 07:36:07 2012
@@ -68,14 +68,14 @@ public class IsisMetaModelTest_construct
return new TypeSafeMatcher<List<Object>>() {
@Override
- public void describeTo(Description desc) {
+ public void describeTo(final Description desc) {
desc.appendText("contains instance of type " + cls.getName());
}
@Override
- public boolean matchesSafely(List<Object> items) {
- for (Object object : items) {
- if(cls.isAssignableFrom(object.getClass())) {
+ public boolean matchesSafely(final List<Object> items) {
+ for (final Object object : items) {
+ if (cls.isAssignableFrom(object.getClass())) {
return true;
}
}
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_init.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_init.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_init.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_init.java Sun Jan 22 07:36:07 2012
@@ -26,8 +26,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepositoryImpl;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepositoryImpl;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_shutdown.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_shutdown.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_shutdown.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/IsisMetaModelTest_shutdown.java Sun Jan 22 07:36:07 2012
@@ -26,8 +26,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.runtimes.embedded.dom.claim.ClaimRepositoryImpl;
-import org.apache.isis.runtimes.embedded.dom.employee.EmployeeRepositoryImpl;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
Modified: incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/dom/employee/Employee.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/dom/employee/Employee.java?rev=1234456&r1=1234455&r2=1234456&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/dom/employee/Employee.java (original)
+++ incubator/isis/trunk/framework/runtimes/embedded/src/test/java/org/apache/isis/runtimes/embedded/dom/employee/Employee.java Sun Jan 22 07:36:07 2012
@@ -102,18 +102,19 @@ public class Employee extends AbstractDo
public void setApprover(final Approver approver) {
this.approver = approver;
}
+
// }}
-
// {{ injected: EmployeeRepository
private EmployeeRepository employeeRepository;
+
public EmployeeRepository getEmployeeRepository() {
return employeeRepository;
}
+
public void setEmployeeRepository(final EmployeeRepository employeeRepository) {
this.employeeRepository = employeeRepository;
}
// }}
-
}