Author: ard
Date: Wed Sep 12 09:39:00 2012
New Revision: 1383867
URL: http://svn.apache.org/viewvc?rev=1383867&view=rev
Log:
RAVE-697 move innerclass pageconfigimpl to real class as it is needed more
Added:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigImpl.java
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
Added:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigImpl.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigImpl.java?rev=1383867&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigImpl.java
(added)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/PagesConfigImpl.java
Wed Sep 12 09:39:00 2012
@@ -0,0 +1,44 @@
+/*
+ * 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.rave.portal.web.mvc.config;
+
+import java.util.List;
+import java.util.Map;
+
+
+public class PagesConfigImpl implements PagesConfig {
+
+ private List<Route> routes;
+ private Map<String, PageFragment> pages;
+
+ public PagesConfigImpl(List<Route> routes, Map<String, PageFragment>
pages) {
+ this.routes = routes;
+ this.pages = pages;
+ }
+
+ @Override
+ public Map<String, PageFragment> getPages() {
+ return pages;
+ }
+
+ @Override
+ public List<Route> getRoutes() {
+ return routes;
+ }
+}
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java?rev=1383867&r1=1383866&r2=1383867&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/main/java/org/apache/rave/portal/web/mvc/config/xml/XmlPagesConfigManager.java
Wed Sep 12 09:39:00 2012
@@ -34,6 +34,7 @@ import org.apache.commons.lang.StringUti
import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException;
import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.apache.rave.portal.web.mvc.config.PagesConfig;
+import org.apache.rave.portal.web.mvc.config.PagesConfigImpl;
import org.apache.rave.portal.web.mvc.config.PagesConfigManager;
import org.apache.rave.portal.web.mvc.config.Route;
import org.slf4j.Logger;
@@ -53,27 +54,6 @@ public class XmlPagesConfigManager imple
private static Logger log =
LoggerFactory.getLogger(XmlPagesConfigManager.class);
- private static class PagesConfigImpl implements PagesConfig {
-
- private List<Route> routes;
- private Map<String, PageFragment> pages;
-
- public PagesConfigImpl(List<Route> routes, Map<String, PageFragment>
pages) {
- this.routes = routes;
- this.pages = pages;
- }
-
- @Override
- public Map<String, PageFragment> getPages() {
- return pages;
- }
-
- @Override
- public List<Route> getRoutes() {
- return routes;
- }
- }
-
private ResourceLoader resourceLoader;
private String routesPath;
Modified:
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java?rev=1383867&r1=1383866&r2=1383867&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
(original)
+++
rave/sandbox/content-services/rave-web-jcr/src/main/java/org/apache/rave/portal/web/mvc/config/jcr/JcrPagesConfigManager.java
Wed Sep 12 09:39:00 2012
@@ -38,6 +38,7 @@ import org.apache.rave.jcr.LazyRepositor
import org.apache.rave.portal.web.mvc.config.PageFragment;
import org.apache.rave.portal.web.mvc.config.PagesConfig;
import org.apache.rave.portal.web.mvc.config.InvalidConfigurationException;
+import org.apache.rave.portal.web.mvc.config.PagesConfigImpl;
import org.apache.rave.portal.web.mvc.config.PagesConfigManager;
import org.apache.rave.portal.web.mvc.config.Route;
import org.slf4j.Logger;
@@ -50,27 +51,6 @@ public class JcrPagesConfigManager imple
private static Logger log =
LoggerFactory.getLogger(JcrPagesConfigManager.class);
- private static class PagesConfigImpl implements PagesConfig {
-
- private List<Route> routes;
- private Map<String, PageFragment> pages;
-
- public PagesConfigImpl(List<Route> routes, Map<String, PageFragment>
pages) {
- this.routes = routes;
- this.pages = pages;
- }
-
- @Override
- public Map<String, PageFragment> getPages() {
- return pages;
- }
-
- @Override
- public List<Route> getRoutes() {
- return routes;
- }
- }
-
private LazyRepositoryFactory repositoryFactory;
private Credentials credetials;
private Repository repository;
