Author: mfranklin
Date: Tue Oct 16 01:28:00 2012
New Revision: 1398602
URL: http://svn.apache.org/viewvc?rev=1398602&view=rev
Log:
Added PageTemplates
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
Removed:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageLayout.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateConverter.java?rev=1398602&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateConverter.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateConverter.java
Tue Oct 16 01:28:00 2012
@@ -0,0 +1,63 @@
+/*
+ * 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.commons.lang.NotImplementedException;
+import org.apache.rave.portal.model.conversion.HydratingModelConverter;
+import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.repository.WidgetRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ */
+public class MongoDbPageTemplateConverter implements
HydratingModelConverter<PageTemplate, PageTemplateImpl> {
+ @Autowired
+ private WidgetRepository widgetRepository;
+
+ @Override
+ public void hydrate(PageTemplateImpl dehydrated) {
+
+ for(PageTemplateRegion region : dehydrated.getPageTemplateRegions()) {
+ region.setPageTemplate(dehydrated);
+ for(PageTemplateWidget widget : region.getPageTemplateWidgets()) {
+ MongoDbPageTemplateWidget mongoWidget =
((MongoDbPageTemplateWidget)widget);
+ mongoWidget.setPageTemplateRegion(region);
+ mongoWidget.setWidgetRepository(widgetRepository);
+ }
+ }
+
+ if(dehydrated.getSubPageTemplates() != null) {
+ for(PageTemplate subPage:dehydrated.getSubPageTemplates()) {
+ subPage.setParentPageTemplate(dehydrated);
+ hydrate((PageTemplateImpl)subPage);
+ }
+ }
+ }
+
+ @Override
+ public Class<PageTemplate> getSourceType() {
+ return PageTemplate.class;
+ }
+
+ @Override
+ public PageTemplateImpl convert(PageTemplate source) {
+ throw new NotImplementedException("Not currently necessary");
+ }
+}
Added:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java?rev=1398602&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
Tue Oct 16 01:28:00 2012
@@ -0,0 +1,56 @@
+/*
+ * 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.PageTemplateWidgetImpl;
+import org.apache.rave.portal.repository.WidgetRepository;
+
+public class MongoDbPageTemplateWidget extends PageTemplateWidgetImpl{
+
+ private WidgetRepository widgetRepository;
+ private Long widgetId;
+
+ public WidgetRepository getWidgetRepository() {
+ return widgetRepository;
+ }
+
+ public void setWidgetRepository(WidgetRepository widgetRepository) {
+ this.widgetRepository = widgetRepository;
+ }
+
+ public Long getWidgetId() {
+ return widgetId;
+ }
+
+ public void setWidgetId(Long widgetId) {
+ this.widgetId = widgetId;
+
+ }
+
+ @Override
+ public Widget getWidget() {
+ Widget widget = super.getWidget();
+ if(widget == null) {
+ widget = widgetRepository.get(widgetId);
+ super.setWidget(widget);
+ }
+ return widget;
+ }
+}
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java?rev=1398602&r1=1398601&r2=1398602&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/MongoDbWidgetConverter.java
Tue Oct 16 01:28:00 2012
@@ -34,6 +34,7 @@ import static org.apache.rave.portal.mod
*/
@Component
public class MongoDbWidgetConverter implements HydratingModelConverter<Widget,
MongoDbWidget> {
+
@Autowired
private UserRepository userRepository;
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java?rev=1398602&r1=1398601&r2=1398602&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
Tue Oct 16 01:28:00 2012
@@ -19,9 +19,11 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.portal.model.MongoDbPageLayout;
+import org.apache.commons.lang.NotImplementedException;
import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.portal.model.impl.PageLayoutImpl;
import org.apache.rave.portal.repository.PageLayoutRepository;
+import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
@@ -33,42 +35,46 @@ import static org.springframework.data.m
@Repository
public class MongoDbPageLayoutRepository implements PageLayoutRepository {
+
+ public static final String COLLECTION = "mongoDbPageLayout";
+
@Autowired
private MongoOperations template;
@Override
public PageLayout getByPageLayoutCode(String codename) {
- return template.findOne(new Query(where("code").is(codename)),
MongoDbPageLayout.class);
+ return template.findOne(new Query(where("code").is(codename)),
PageLayoutImpl.class, COLLECTION);
}
@Override
public List<PageLayout> getAll() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return
CollectionUtils.<PageLayout>toBaseTypedList(template.findAll(PageLayoutImpl.class,
COLLECTION));
}
@Override
public List<PageLayout> getAllUserSelectable() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ List<PageLayoutImpl> userSelectable = template.find(new
Query(where("userSelectable").is(true)), PageLayoutImpl.class, COLLECTION);
+ return CollectionUtils.<PageLayout>toBaseTypedList(userSelectable);
}
@Override
public Class<? extends PageLayout> getType() {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return PageLayoutImpl.class;
}
@Override
public PageLayout get(long id) {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ throw new NotImplementedException("No use for an id");
}
@Override
public PageLayout save(PageLayout item) {
- template.save(item);
+ template.save(item, COLLECTION);
return item;
}
@Override
public void delete(PageLayout item) {
- //To change body of implemented methods use File | Settings | File
Templates.
+ template.remove(getByPageLayoutCode(item.getCode()));
}
}
Added:
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=1398602&view=auto
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
(added)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
Tue Oct 16 01:28:00 2012
@@ -0,0 +1,50 @@
+/*
+ * 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.repository.impl;
+
+import org.apache.rave.portal.model.PageTemplate;
+import org.apache.rave.portal.model.PageType;
+import org.apache.rave.portal.model.conversion.MongoDbConverter;
+import org.apache.rave.portal.repository.PageTemplateRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoOperations;
+
+import java.util.List;
+
+/**
+ */
+public class MongoDbPageTemplateRepository implements PageTemplateRepository {
+
+ @Autowired
+ private MongoDbConverter converter;
+
+ @Autowired
+ private MongoOperations template;
+
+ @Override
+ public List<PageTemplate> getAll() {
+ return null;
+ }
+
+ @Override
+ public PageTemplate getDefaultPage(PageType pageType) {
+ return null;
+ }
+}
