Author: mfranklin
Date: Thu Oct 18 04:36:32 2012
New Revision: 1399515
URL: http://svn.apache.org/viewvc?rev=1399515&view=rev
Log:
Fixed repository bugs
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java
- copied, changed from r1399504,
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/PageTemplateImplConverter.java
Removed:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/PageTemplateImplConverter.java
Modified:
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
rave/branches/mongo/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.js
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
Modified:
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java
Thu Oct 18 04:36:32 2012
@@ -27,4 +27,5 @@ public interface PageTemplateRepository
List<PageTemplate> getAll();
PageTemplate getDefaultPage(PageType pageType);
+ PageTemplate save(PageTemplate template);
}
Modified:
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
(original)
+++
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
Thu Oct 18 04:36:32 2012
@@ -116,10 +116,9 @@ public class DataImporter {
categoryRepository.save(category);
}
}
-/* TODO Update PageTemplateRepository
- for(PortalPreference preference :
wrapper.getPortalPreferences()) {
- pageTemplateRepository.save(preference);
- }*/
+ for(PageTemplate template : wrapper.getPageTemplates()) {
+ pageTemplateRepository.save(template);
+ }
}
}
Modified:
rave/branches/mongo/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
Thu Oct 18 04:36:32 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.JpaPageTemplate;
import org.apache.rave.portal.model.PageTemplate;
import org.apache.rave.portal.model.PageType;
+import org.apache.rave.portal.model.conversion.JpaConverter;
import org.apache.rave.portal.repository.PageTemplateRepository;
import org.apache.rave.util.CollectionUtils;
import org.springframework.stereotype.Repository;
@@ -30,6 +31,8 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import java.util.List;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
+
@Repository
public class JpaPageTemplateRepository implements PageTemplateRepository {
@@ -48,4 +51,9 @@ public class JpaPageTemplateRepository i
query.setParameter("pageType", pageType);
return query.getSingleResult();
}
+
+ @Override
+ public PageTemplate save(PageTemplate template) {
+ return (PageTemplate) saveOrUpdate(template.getId(), manager,
JpaConverter.getInstance().convert(template, PageTemplate.class));
+ }
}
\ No newline at end of file
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java?rev=1399515&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java
Thu Oct 18 04:36:32 2012
@@ -0,0 +1,35 @@
+/*
+ * 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.model;
+
+import org.apache.rave.portal.model.impl.AuthorityImpl;
+
+
+public class MongoDbAuthority extends AuthorityImpl {
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java?rev=1399515&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
Thu Oct 18 04:36:32 2012
@@ -0,0 +1,60 @@
+/*
+ * 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.model;
+
+
+import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.repository.PageLayoutRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+
+@XmlAccessorType(value = XmlAccessType.FIELD)
+public class MongoDbPageTemplate extends PageTemplateImpl {
+
+ @XmlTransient @JsonIgnore
+ private PageLayoutRepository pageLayoutRepository;
+ private String pageLayoutCode;
+
+ public void setPageLayoutRepository(PageLayoutRepository
pageLayoutRepository) {
+ this.pageLayoutRepository = pageLayoutRepository;
+ }
+
+ public String getPageLayoutCode() {
+ return pageLayoutCode;
+ }
+
+ public void setPageLayoutCode(String pageLayoutCode) {
+ this.pageLayoutCode = pageLayoutCode;
+
+ }
+
+ @Override
+ public PageLayout getPageLayout() {
+ PageLayout layout = super.getPageLayout();
+ if(layout == null) {
+ layout = pageLayoutRepository.getByPageLayoutCode(pageLayoutCode);
+ super.setPageLayout(layout);
+ }
+ return layout;
+ }
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java?rev=1399515&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java
Thu Oct 18 04:36:32 2012
@@ -0,0 +1,54 @@
+/*
+ * 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.model.conversion.impl;
+
+import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.MongoDbAuthority;
+import org.apache.rave.portal.model.conversion.HydratingModelConverter;
+import org.springframework.stereotype.Component;
+
+import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
+
+@Component
+public class MongoDbAuthorityConverter implements
HydratingModelConverter<Authority, MongoDbAuthority> {
+ @Override
+ public void hydrate(MongoDbAuthority dehydrated) {
+ //NOOP
+ }
+
+ @Override
+ public Class<Authority> getSourceType() {
+ return Authority.class;
+ }
+
+ @Override
+ public MongoDbAuthority convert(Authority source) {
+ MongoDbAuthority converted;
+ if(source instanceof MongoDbAuthority) {
+ converted = ((MongoDbAuthority)source);
+ } else {
+ converted = new MongoDbAuthority();
+ converted.setId(generateId());
+ }
+ converted.setAuthority(source.getAuthority());
+ converted.setDefaultForNewUser(source.isDefaultForNewUser());
+ return converted;
+ }
+}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
Thu Oct 18 04:36:32 2012
@@ -44,6 +44,9 @@ public class MongoDbCategoryConverter im
@Override
public void hydrate(MongoDbCategory dehydrated) {
+ if(dehydrated == null) {
+ return;
+ }
dehydrated.setUserRepository(userRepository);
dehydrated.setWidgetTagRepository(widgetRepository);
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
Thu Oct 18 04:36:32 2012
@@ -57,6 +57,7 @@ public class MongoDbPageConverter implem
page.setPageLayoutCode(sourcePage.getPageLayout().getCode());
page.setName(sourcePage.getName());
page.setRegions(sourcePage.getRegions());
+ page.setPageType(sourcePage.getPageType());
page.setOwner(null);
page.setPageLayout(null);
@@ -76,7 +77,7 @@ public class MongoDbPageConverter implem
region.setId(generateId());
}
region.setPage(null);
- manipulateRegion(region, false);
+ convert(region);
}
if (page.getSubPages() != null) {
List<Page> convertedPages = Lists.newArrayList();
@@ -92,6 +93,9 @@ public class MongoDbPageConverter implem
MongoDbPageUser user = sourceUser instanceof MongoDbPageUser ?
(MongoDbPageUser) sourceUser : new MongoDbPageUser();
user.setId(sourceUser.getId() == null ? generateId() :
sourceUser.getId());
user.setUserId(sourceUser.getUser().getId());
+ user.setEditor(sourceUser.isEditor());
+ user.setPageStatus(sourceUser.getPageStatus());
+ user.setRenderSequence(sourceUser.getRenderSequence());
user.setPage(null);
user.setUser(null);
user.setUserRepository(null);
@@ -100,6 +104,9 @@ public class MongoDbPageConverter implem
@Override
public void hydrate(MongoDbPage page) {
+ if (page == null) {
+ return;
+ }
page.setPageLayoutRepository(pageLayoutRepository);
page.setUserRepository(userRepository);
@@ -111,7 +118,7 @@ public class MongoDbPageConverter implem
}
for (Region region : page.getRegions()) {
region.setPage(page);
- manipulateRegion(region, true);
+ hydrate(region);
}
if (page.getSubPages() != null) {
for (Page subPage : page.getSubPages()) {
@@ -140,22 +147,34 @@ public class MongoDbPageConverter implem
regionWidget.setWidget(null);
regionWidget.setWidgetRepository(null);
regionWidget.setPreferences(sourceRegionWidget.getPreferences());
- for (RegionWidgetPreference preference :
regionWidget.getPreferences()) {
- preference.setRegionWidgetId(regionWidget.getId());
- }
+ updatePreferences(regionWidget);
return regionWidget;
}
- private void manipulateRegion(Region region, Boolean hydrate) {
- for (RegionWidget regionWidget : region.getRegionWidgets()) {
- if (hydrate) {
+ private void updatePreferences(MongoDbRegionWidget regionWidget) {
+ if (regionWidget.getPreferences() != null) {
+ for (RegionWidgetPreference preference :
regionWidget.getPreferences()) {
+ preference.setRegionWidgetId(regionWidget.getId());
+ }
+ }
+ }
+
+ private void hydrate(Region region) {
+ if (region.getRegionWidgets() != null) {
+ for (RegionWidget regionWidget : region.getRegionWidgets()) {
hydrate((MongoDbRegionWidget) regionWidget, region);
- } else {
- region.getRegionWidgets().remove(regionWidget);
- region.getRegionWidgets().add(convert(regionWidget));
}
}
}
+ private void convert(Region region) {
+ if (region.getRegionWidgets() != null) {
+ List<RegionWidget> convertedWidgets = Lists.newArrayList();
+ for (RegionWidget widget : region.getRegionWidgets()) {
+ convertedWidgets.add(convert(widget));
+ }
+ region.setRegionWidgets(convertedWidgets);
+ }
+ }
}
Copied:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java
(from r1399504,
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/PageTemplateImplConverter.java)
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java?p2=rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java&p1=rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/PageTemplateImplConverter.java&r1=1399504&r2=1399515&rev=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/PageTemplateImplConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java
Thu Oct 18 04:36:32 2012
@@ -19,31 +19,45 @@
package org.apache.rave.portal.model.conversion.impl;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.rave.portal.model.MongoDbPageTemplateWidget;
-import org.apache.rave.portal.model.PageTemplate;
-import org.apache.rave.portal.model.PageTemplateRegion;
-import org.apache.rave.portal.model.PageTemplateWidget;
+import com.google.common.collect.Lists;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.conversion.HydratingModelConverter;
-import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.model.impl.PageTemplateRegionImpl;
+import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.repository.WidgetRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.List;
+
+import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
+
@Component
-public class PageTemplateImplConverter implements
HydratingModelConverter<PageTemplate, PageTemplateImpl> {
+public class MongoDbPageTemplateConverter implements
HydratingModelConverter<PageTemplate, MongoDbPageTemplate> {
@Autowired
private WidgetRepository widgetRepository;
+ @Autowired
+ private PageLayoutRepository pageLayoutRepository;
+
@Override
- public void hydrate(PageTemplateImpl dehydrated) {
- for(PageTemplateRegion region : dehydrated.getPageTemplateRegions()) {
+ public void hydrate(MongoDbPageTemplate dehydrated) {
+ if (dehydrated == null) {
+ return;
+ }
+ dehydrated.setPageLayoutRepository(pageLayoutRepository);
+ for (PageTemplateRegion region : dehydrated.getPageTemplateRegions()) {
region.setPageTemplate(dehydrated);
- for(PageTemplateWidget widget : region.getPageTemplateWidgets()) {
-
((MongoDbPageTemplateWidget)widget).setWidgetRepository(widgetRepository);
+ for (PageTemplateWidget widget : region.getPageTemplateWidgets()) {
+ ((MongoDbPageTemplateWidget)
widget).setWidgetRepository(widgetRepository);
widget.setPageTemplateRegion(region);
}
}
+
+ for(PageTemplate sub : dehydrated.getSubPageTemplates()) {
+ sub.setParentPageTemplate(dehydrated);
+ hydrate((MongoDbPageTemplate)sub);
+ }
}
@Override
@@ -52,7 +66,77 @@ public class PageTemplateImplConverter i
}
@Override
- public PageTemplateImpl convert(PageTemplate source) {
- throw new NotImplementedException("Page Templates are currently not
saved by the Portal");
+ public MongoDbPageTemplate convert(PageTemplate source) {
+ MongoDbPageTemplate converted = source instanceof MongoDbPageTemplate
? ((MongoDbPageTemplate) source) : new MongoDbPageTemplate();
+ updateProperties(source, converted);
+
+ if (source.getSubPageTemplates() != null) {
+ List<PageTemplate> subPages = Lists.newArrayList();
+ for (PageTemplate sub : source.getSubPageTemplates()) {
+ subPages.add(convert(sub));
+ }
+ converted.setSubPageTemplates(subPages);
+ }
+
+ if(source.getPageTemplateRegions() != null) {
+ List<PageTemplateRegion> convertedRegions = Lists.newArrayList();
+ for(PageTemplateRegion region : source.getPageTemplateRegions()) {
+ convertedRegions.add(convert(region));
+ }
+ converted.setPageTemplateRegions(convertedRegions);
+ }
+ return converted;
+ }
+
+ private PageTemplateRegion convert(PageTemplateRegion region) {
+ PageTemplateRegionImpl converted = region instanceof
PageTemplateRegionImpl ? ((PageTemplateRegionImpl)region) : new
PageTemplateRegionImpl();
+ updateProperties(region, converted);
+
+ if(region.getPageTemplateWidgets() != null) {
+ List<PageTemplateWidget> convertedWidgets = Lists.newArrayList();
+ for(PageTemplateWidget widget : region.getPageTemplateWidgets()) {
+ convertedWidgets.add(convert(widget));
+ }
+ converted.setPageTemplateWidgets(convertedWidgets);
+ }
+ return converted;
}
+
+ private PageTemplateWidget convert(PageTemplateWidget widget) {
+ MongoDbPageTemplateWidget converted = widget instanceof
MongoDbPageTemplateWidget ? ((MongoDbPageTemplateWidget)widget) : new
MongoDbPageTemplateWidget();
+ updateProperties(widget, converted);
+ return converted;
+ }
+
+
+ private void updateProperties(PageTemplateWidget source,
MongoDbPageTemplateWidget converted) {
+ converted.setId(source.getId() == null ? generateId() :
source.getId());
+ converted.setHideChrome(source.isHideChrome());
+ converted.setPageTemplateRegion(null);
+ converted.setRenderSeq(source.getRenderSeq());
+ converted.setWidgetId(source.getWidget().getId());
+ converted.setWidget(null);
+ converted.setLocked(source.isLocked());
+ }
+
+ private void updateProperties(PageTemplateRegion source,
PageTemplateRegionImpl converted) {
+ converted.setId(source.getId() == null ? generateId() :
source.getId());
+ converted.setRenderSequence(source.getRenderSequence());
+ converted.setPageTemplate(null);
+ converted.setLocked(source.isLocked());
+ }
+
+ private void updateProperties(PageTemplate source, MongoDbPageTemplate
converted) {
+ converted.setId(source.getId() == null ? generateId() :
source.getId());
+ converted.setName(source.getName());
+ converted.setDescription(source.getDescription());
+ converted.setPageType(source.getPageType());
+ converted.setParentPageTemplate(null);
+ converted.setPageLayoutCode(source.getPageLayout().getCode());
+ converted.setPageLayout(null);
+ converted.setRenderSequence(source.getRenderSequence());
+ converted.setDefaultTemplate(source.isDefaultTemplate());
+ }
+
+
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java
Thu Oct 18 04:36:32 2012
@@ -39,6 +39,9 @@ public class MongoDbUserConverter implem
@Override
public void hydrate(MongoDbUser dehydrated) {
+ if(dehydrated == null) {
+ return;
+ }
dehydrated.setPageLayoutRepository(pageLayoutRepository);
}
@@ -95,6 +98,7 @@ public class MongoDbUserConverter implem
}
} else {
code = source.getDefaultPageLayout().getCode();
+ source.setDefaultPageLayout(null);
}
return code;
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java
Thu Oct 18 04:36:32 2012
@@ -49,6 +49,9 @@ public class MongoDbWidgetConverter impl
@Override
public void hydrate(MongoDbWidget dehydrated) {
+ if(dehydrated == null) {
+ return;
+ }
dehydrated.setCategoryRepository(categoryRepository);
dehydrated.setUserRepository(userRepository);
if(dehydrated.getComments() != null) {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
Thu Oct 18 04:36:32 2012
@@ -21,6 +21,8 @@ package org.apache.rave.portal.repositor
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.Authority;
+import org.apache.rave.portal.model.MongoDbAuthority;
+import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.repository.AuthorityRepository;
import org.apache.rave.util.CollectionUtils;
@@ -38,11 +40,14 @@ import static org.springframework.data.m
public class MongoDbAuthorityRepository implements AuthorityRepository {
public static final String COLLECTION = "authority";
- public static final Class<AuthorityImpl> CLASS = AuthorityImpl.class;
+ public static final Class<MongoDbAuthority> CLASS = MongoDbAuthority.class;
@Autowired
private MongoOperations template;
+ @Autowired
+ private HydratingConverterFactory converter;
+
@Override
public Authority getByAuthority(String authorityName) {
return template.findOne(query(where("authority").is(authorityName)),
CLASS, COLLECTION);
@@ -78,7 +83,7 @@ public class MongoDbAuthorityRepository
Authority fromDb = getByAuthority(item.getAuthority());
Authority save;
if(fromDb == null) {
- save = item;
+ save = converter.convert(item, Authority.class);
} else {
fromDb.setDefaultForNewUser(item.isDefaultForNewUser());
save=fromDb;
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
Thu Oct 18 04:36:32 2012
@@ -47,7 +47,7 @@ public class MongoDbCategoryRepository i
@Override
public List<Category> getAll() {
- return
CollectionUtils.<Category>toBaseTypedList(template.findAll(CLASS, COLLECTION));
+ return
CollectionUtils.<Category>toBaseTypedList(hydrate(template.findAll(CLASS,
COLLECTION)));
}
@Override
@@ -91,6 +91,13 @@ public class MongoDbCategoryRepository i
return category;
}
+ private List<MongoDbCategory> hydrate(List<MongoDbCategory> all) {
+ for(MongoDbCategory category : all) {
+ hydrate(category);
+ }
+ return all;
+ }
+
private boolean updateCategory(long userId, MongoDbCategory category) {
boolean updated = false;
if(category.getCreatedUserId().equals(userId)) {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
Thu Oct 18 04:36:32 2012
@@ -46,7 +46,7 @@ public class MongoDbPageRepository imple
@Override
public List<Page> getAllPages(Long userId, PageType pageType) {
- return template.find(new
Query(where("pageType").is(pageType).andOperator(where("ownerId").is(userId))));
+ return template.find(new
Query(where("pageType").is(pageType.getPageType().toUpperCase()).andOperator(where("ownerId").is(userId))));
}
@Override
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
Thu Oct 18 04:36:32 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.portal.model.MongoDbPageTemplate;
import org.apache.rave.portal.model.PageTemplate;
import org.apache.rave.portal.model.PageType;
import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
@@ -48,7 +49,7 @@ public class MongoDbPageTemplateReposito
@Override
public List<PageTemplate> getAll() {
- List<PageTemplateImpl> templates =
template.findAll(PageTemplateImpl.class, COLLECTION);
+ List<MongoDbPageTemplate> templates =
template.findAll(MongoDbPageTemplate.class, COLLECTION);
for(PageTemplateImpl temp : templates) {
converter.hydrate(temp, PageTemplate.class);
}
@@ -57,8 +58,16 @@ public class MongoDbPageTemplateReposito
@Override
public PageTemplate getDefaultPage(PageType pageType) {
- PageTemplate temp = template.findOne(new
Query(where("pageType").is(pageType).andOperator(where("defaultTemplate").is(true))),
PageTemplateImpl.class, COLLECTION);
+ PageTemplate temp = template.findOne(new
Query(where("pageType").is(pageType.getPageType().toUpperCase()).andOperator(where("defaultTemplate").is(true))),
MongoDbPageTemplate.class, COLLECTION);
converter.hydrate(temp, PageTemplate.class);
return temp;
}
+
+ @Override
+ public PageTemplate save(PageTemplate pageTemplate) {
+ MongoDbPageTemplate converted = converter.convert(pageTemplate,
PageTemplate.class);
+ template.save(converted, COLLECTION);
+ converter.hydrate(converted, PageTemplate.class);
+ return converted;
+ }
}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
Thu Oct 18 04:36:32 2012
@@ -44,10 +44,10 @@ import static org.springframework.data.m
@Repository
public class MongoDbWidgetRepository implements WidgetRepository {
- public static final String RATINGS_MAP = "classpath:WidgetRatingsMap.js";
- public static final String RATINGS_REDUCE =
"classpath:WidgetRatingsReduce.js";
- public static final String USERS_MAP = "WidgetUsersMap.js";
- public static final String USERS_REDUCE = "WidgetUsersReduce.js";
+ public static final String RATINGS_MAP = "classpath*:WidgetRatingsMap.js";
+ public static final String RATINGS_REDUCE =
"classpath*:WidgetRatingsReduce.js";
+ public static final String USERS_MAP = "classpath*:WidgetUsersMap.js";
+ public static final String USERS_REDUCE =
"classpath*:WidgetUsersReduce.js";
@Autowired
private MongoWidgetOperations template;
Modified:
rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.js
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.js?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.js
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/resources/initial-data.js
Thu Oct 18 04:36:32 2012
@@ -1130,7 +1130,7 @@
},
{
"id" : 22,
- "title": "Ohloh Apache Rave Fanguages",
+ "title": "Ohloh Apache Rave Languages",
"url": "http://www.ohloh.net/p/521520/widgets/project_languages.xml";,
"type": "OpenSocial",
"author": "Ohloh",
@@ -1965,118 +1965,87 @@
},
{
"id": 2,
- "name": "About",
- "description": "Template for the About sub page for the person
profile",
- "pageType": "SUB_PAGE",
+ "name": "Default Home",
+ "description": "Default User Template",
+ "pageType": "USER",
"parentPageTemplate": null,
"subPageTemplates": [],
"pageLayout": {
"id": 1,
- "code": "columns_1",
+ "code": "columns_3_newuser",
"numberOfRegions": 1,
"renderSequence": 0,
"userSelectable": true
},
"pageTemplateRegions": [
{
- "id": 2,
"renderSequence": 0,
"pageTemplate": null,
"pageTemplateWidgets": [
{
- "id": 3,
"pageTemplateRegion": null,
- "widget": {
- "id" : 15,
- "title": "Favorite Websites",
- "url":
"http://localhost:8080/demogadgets/favorite_websites.xml";,
- "type": "OpenSocial",
- "author": "Anthony Carlucci",
- "description": "Static widget of favorite websites
for demoing on the Person Profile page",
- "disableRendering": false,
- "featured": false,
- "status": "PUBLISHED"
- },
+ "widget": {"id": 2},
"locked": true,
"hideChrome": false,
"id": 3,
"renderSeq": 0
},
{
+ "pageTemplateRegion": null,
+ "widget": {"id": 7},
+ "locked": true,
+ "hideChrome": false,
"id": 4,
+ "renderSeq": 1
+ }
+ ],
+ "locked": false,
+ "id": 2
+ },
+ {
+ "renderSequence": 1,
+ "pageTemplate": null,
+ "pageTemplateWidgets": [
+ {
"pageTemplateRegion": null,
- "widget": {
- "id" :14,
- "title": "Current Schedule",
- "url":
"http://localhost:8080/demogadgets/schedule.xml";,
- "type": "OpenSocial",
- "author": "Anthony Carlucci",
- "description": "Static widget of a schedule for
demoing on the Person Profile page",
- "disableRendering": false,
- "featured": false,
- "status": "PUBLISHED"
- },
+ "widget": {"id": 10},
+ "locked": true,
+ "hideChrome": false,
+ "id": 3,
+ "renderSeq": 0
+ },
+ {
+ "pageTemplateRegion": null,
+ "widget": {"id": 23},
"locked": true,
"hideChrome": false,
"id": 4,
"renderSeq": 1
}
],
- "locked": true,
+ "locked": false,
"id": 2
- }
- ],
- "renderSequence": 0,
- "defaultTemplate": false,
- "id": 2
- },
- {
- "id": 3,
- "name": "My Activity",
- "description": "Template for the My Activity sub page for the person
profile",
- "pageType": "SUB_PAGE",
- "parentPageTemplate": null,
- "subPageTemplates": [],
- "pageLayout": {
- "id": 1,
- "code": "columns_1",
- "numberOfRegions": 1,
- "renderSequence": 0,
- "userSelectable": true
- },
- "pageTemplateRegions": [
+ },
{
- "id": 3,
- "renderSequence": 0,
+ "renderSequence": 2,
"pageTemplate": null,
"pageTemplateWidgets": [
{
- "id": 5,
"pageTemplateRegion": null,
- "widget": {
- "id": 3,
- "title": "My Activity",
- "url":
"http://localhost:8080/demogadgets/my_activity.xml";,
- "type": "OpenSocial",
- "author": "Anthony Carlucci",
- "description": "Static widget of activities for
demoing on the Person Profile page",
- "disableRendering": false,
- "featured": false,
- "status": "PUBLISHED"
- },
+ "widget": {"id": 11},
"locked": true,
"hideChrome": false,
- "id": 5,
+ "id": 3,
"renderSeq": 0
}
],
- "locked": true,
- "id": 3
+ "locked": false,
+ "id": 2
}
],
- "renderSequence": 1,
- "defaultTemplate": false,
- "id": 3
+ "renderSequence": 0,
+ "defaultTemplate": true,
+ "id": 2
}
]
}
\ No newline at end of file
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
Thu Oct 18 04:36:32 2012
@@ -42,7 +42,7 @@
<h2><fmt:message key="admin.preferences.shorttitle"/></h2>
<spring:url value="/app/admin/preferencedetail/edit"
var="detaillink"/>
- <%--@elvariable id="preferenceMap"
type="java.util.Map<java.lang.String,
org.apache.rave.portal.model.JpaPortalPreference>"--%>
+ <%--@elvariable id="preferenceMap"
type="java.util.Map<java.lang.String,
org.apache.rave.portal.model.PortalPreference>"--%>
<c:choose>
<c:when test="${fn:length(preferenceMap) eq 0}">
<a class="btn btn-primary" href="<c:out
value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
Thu Oct 18 04:36:32 2012
@@ -115,7 +115,7 @@
</fieldset>
<fieldset>
<span class="control-label"><fmt:message
key="admin.userdata.authorities"/></span>
- <%--@elvariable id="authorities"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.JpaAuthority>"--%>
+ <%--@elvariable id="authorities"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
<ul class="checkboxlist">
<form:checkboxes path="authorities"
items="${authorities.resultSet}" itemLabel="authority" itemValue="authority"
element="li"/>
</ul>
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
Thu Oct 18 04:36:32 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.JpaUser>"--%>
+<%--@elvariable id="searchResult"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.User>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
Thu Oct 18 04:36:32 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.JpaWidget>"--%>
+<%--@elvariable id="searchResult"
type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Widget>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Thu Oct 18 04:36:32 2012
@@ -22,7 +22,7 @@
<fmt:setBundle basename="messages"/>
<jsp:useBean id="pages"
type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
<jsp:useBean id="pageUser" type="org.apache.rave.portal.model.PageUser"
scope="request"/>
-<jsp:useBean id="pageLayouts"
type="java.util.List<org.apache.rave.portal.model.JpaPageLayout>"
scope="request"/>
+<jsp:useBean id="pageLayouts" type="java.util.List" scope="request"/>
<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
<sec:authentication property="principal.username" var="principleUsername"
scope="request"/>
<sec:authentication property="principal.displayName" var="displayName"
scope="request"/>
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Thu Oct 18 04:36:32 2012
@@ -21,7 +21,7 @@
<%@ page errorPage="/WEB-INF/jsp/views/error.jsp" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.JpaUser"
scope="request"/>
+<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.User"
scope="request"/>
<sec:authentication property="principal.username" var="principleUsername"
scope="request"/>
<sec:authentication property="principal.displayName" var="displayName"
scope="request"/>
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
Thu Oct 18 04:36:32 2012
@@ -77,7 +77,7 @@
</c:if>
<ul class="storeItems">
- <%--@elvariable id="widget"
type="org.apache.rave.portal.model.JpaWidget"--%>
+ <%--@elvariable id="widget"
type="org.apache.rave.portal.model.Widget"--%>
<c:forEach var="widget" items="${widgets.resultSet}">
<%--@elvariable id="widgetsStatistics"
type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
<c:set var="widgetStatistics"
value="${widgetsStatistics[widget.id]}"/>
Modified:
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp?rev=1399515&r1=1399514&r2=1399515&view=diff
==============================================================================
---
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
(original)
+++
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
Thu Oct 18 04:36:32 2012
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.JpaUser"
scope="request"/>
+<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.User"
scope="request"/>
<div id="content">
<h1>${pagetitle}</h1>
<form:form id="userProfileForm" commandName="userProfile"
action="updateUserProfile" method="POST">
