Author: ate
Date: Mon Sep 10 15:02:43 2012
New Revision: 1382924
URL: http://svn.apache.org/viewvc?rev=1382924&view=rev
Log:
RAVE-695 more cleanup
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
Modified:
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1382924&r1=1382923&r2=1382924&view=diff
==============================================================================
---
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(original)
+++
rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Mon Sep 10 15:02:43 2012
@@ -148,7 +148,7 @@
</bean>
<!-- JCR|File based LOADING -->
- <bean name="routedHandlerMapping"
class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping"
depends-on="repositoryBootstrap" destroy-method="shutdown">
+ <bean name="routedHandlerMapping"
class="org.apache.rave.portal.web.mvc.RoutedRequestMappingHandlerMapping">
<property name="order" value="-1"/>
<property name="routesManager" ref="filePageRoutesManager"/>
<!--
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java?rev=1382924&r1=1382923&r2=1382924&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/RoutedRequestMappingHandlerMapping.java
Mon Sep 10 15:02:43 2012
@@ -57,12 +57,10 @@ import org.springframework.web.servlet.m
/**
* @version "$Id$"
*/
-public class RoutedRequestMappingHandlerMapping extends
RequestMappingHandlerMapping { //implements LazyRepositoryFactoryListener {
+public class RoutedRequestMappingHandlerMapping extends
RequestMappingHandlerMapping {
private static final Logger log =
LoggerFactory.getLogger(RoutedRequestMappingHandlerMapping.class);
-// private LazyRepositoryFactory repositoryFactory;
-
private RoutesManager routesManager;
private volatile Routes routes;
@@ -117,65 +115,21 @@ public class RoutedRequestMappingHandler
@Override
protected void initHandlerMethods() {
- // TODO: figure out better way to inject JcrConfigManager
-/*
- if (credentials != null) {
-
- Repository repository = repositoryFactory.getRepository(this);
- if (repository != null) {
- repositoryAvailable(repositoryFactory.getFactoryKey(),
repository);
- }
- } else {
-*/
routes = routesManager.getRoutes();
processConfiguration(routes);
- // }
}
protected void reloadConfigIfNeeded() {
Routes latestConfiguration = routesManager.getRoutes();
- if (routes != latestConfiguration) {
+ if ((routes == null && latestConfiguration != null) ||
+ (routes != null && latestConfiguration == null) ||
+ (routes != latestConfiguration)) {
synchronized (routesManager) {
routes = latestConfiguration;
processConfiguration(routes);
}
}
-
- }
-
-/* TODO: externalize routesManager specific logic
-
- @Override
- public synchronized void repositoryAvailable(final Object factoryKey,
final Repository repository) {
- Session session = null;
- try {
- configured = true;
- session = repository.login(credentials);
- routesManager = new JcrConfigManager(session, configurationPath);
- final PageDefinitions configuration =
routesManager.getPageDefinitions(configurationName);
- log.info("configuration {}", configuration);
- // TODO use urlConfig
- final Routes urlConfig = routesManager.getRoutes(urlMappingsPath,
configuration);
- processConfiguration(urlConfig);
- } catch (RepositoryException e) {
- log.error("Error obtaining session", e);
- } finally {
- if (session != null) {
- session.logout();
- }
- }
- }
-
- @Override
- public synchronized void repositoryNotAvailable(final Object factoryKey) {
- configured = false;
- // TODO
- }
-*/
-
- public void shutdown() {
-// repositoryFactory.removeListener(this);
}
protected boolean isNamedMethod(Method method) {
@@ -202,7 +156,6 @@ public class RoutedRequestMappingHandler
}
protected Method getActionOrDefaultMethod(final Class<?> userType, String
action) {
-
if (!isHandler(userType)) {
return null;
}
@@ -236,15 +189,16 @@ public class RoutedRequestMappingHandler
return actionMethods.get("default");
}
- private void processConfiguration(Routes configuration) {
+ private void processConfiguration(Routes routes) {
// reset
getHandlerMethodsInternal().clear();
getUrlMapInternal().clear();
- for (Route route : configuration.getRoutes()) {
-
- // TODO rewrite to find the correct Router OR PageRouter
+ if (routes != null) {
+ for (Route route : routes.getRoutes()) {
+
+ // TODO rewrite to find the correct Router OR PageRouter
// PageDefinition pageDefinition = route.getPageDefinition();
// final String controller = pageDefinition.getController();
// log.info("Processing controller [ {} ]", controller);
@@ -263,6 +217,7 @@ public class RoutedRequestMappingHandler
// }
// }
// }
+ }
}
}
@@ -355,16 +310,6 @@ public class RoutedRequestMappingHandler
this.routesManager = routesManager;
}
-/*
- public void setCredentials(Credentials credentials) {
- this.credentials = credentials;
- }
-
- public void setLazyRepositoryFactory(LazyRepositoryFactory
repositoryFactory) {
- this.repositoryFactory = repositoryFactory;
- }
-*/
-
@Override
protected void handleMatch(RequestMappingInfo info, String lookupPath,
HttpServletRequest request) {
super.handleMatch(info, lookupPath, request);
@@ -373,12 +318,7 @@ public class RoutedRequestMappingHandler
@Override
protected HandlerMethod getHandlerInternal(HttpServletRequest request)
throws Exception {
- // force check repository available
-/*
- if (repositoryFactory != null) {
- repositoryFactory.getRepository();
- }
-*/
+
reloadConfigIfNeeded();
String lookupPath =
getUrlPathHelper().getLookupPathForRequest(request);
