You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/06/06 01:15:52 UTC
svn commit: r544674 [1/3] - in /roller/branches/roller_guice: ./
apps/weblogger/src/java/org/apache/roller/weblogger/pojos/
apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/
apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/ ...
Author: snoopdave
Date: Tue Jun 5 16:15:47 2007
New Revision: 544674
URL: http://svn.apache.org/viewvc?view=rev&rev=544674
Log:
Latest from trunk
Added:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryAttributeWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryAttributeWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryTagWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryTagWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogReferrerWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogReferrerWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/
- copied from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
- copied unchanged from r544642, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp
- copied unchanged from r544642, roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp
Removed:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/BookmarkDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/CommentDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/EntryAttributeDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/RefererDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/TemplateWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/UserDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryTagDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/DateTag.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/package.html
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ResponseContent.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/SplitPrintWriter.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/SplitServletOutputStream.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/StrutsUtil.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/META-INF/
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/authoring/
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayOutputStreamWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayResponseWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagementBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/CommentsBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntriesBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd-validation.xml
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit-validation.xml
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Resources.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit-validation.xml
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/MailUtil.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Entries.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Members.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Resources.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/403.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/404.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/errors/error.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head-ajax.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/tiles/messages.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml
roller/branches/roller_guice/merges.txt
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java Tue Jun 5 16:15:47 2007
@@ -20,7 +20,7 @@
import java.io.Serializable;
import java.util.Comparator;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
/**
* Sorts WeblogEntryData objects in reverse chronological order
@@ -36,8 +36,8 @@
public int compare(Object val1, Object val2)
throws ClassCastException
{
- WeblogEntryDataWrapper entry1 = (WeblogEntryDataWrapper)val1;
- WeblogEntryDataWrapper entry2 = (WeblogEntryDataWrapper)val2;
+ WeblogEntryWrapper entry1 = (WeblogEntryWrapper)val1;
+ WeblogEntryWrapper entry2 = (WeblogEntryWrapper)val2;
long pubTime1 = entry1.getPubTime().getTime();
long pubTime2 = entry2.getPubTime().getTime();
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerContext.java Tue Jun 5 16:15:47 2007
@@ -113,7 +113,13 @@
// Parts of database upgrade are not included in migration scripts
upgradeDatabaseIfNeeded();
- // Initialize Aceigy based on Roller configuration
+ // trigger bootstrapping process
+ RollerFactory.bootstrap();
+
+ // flush any changes made during bootstrapping
+ RollerFactory.getRoller().flush();
+
+ // Initialize Acegi based on Roller configuration
initializeSecurityFeatures(servletContext);
// Setup Velocity template engine
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayOutputStreamWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayOutputStreamWrapper.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayOutputStreamWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayOutputStreamWrapper.java Tue Jun 5 16:15:47 2007
@@ -1,83 +1,76 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. 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. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. 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. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
package org.apache.roller.weblogger.ui.core.util;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-
import javax.servlet.ServletOutputStream;
-/*
- * @author llavandowska
- *
+
+/**
* Implementation of ServletOutputStream that allows the filter to hold the
* Response content for insertion into the cache.
*/
-public class ByteArrayOutputStreamWrapper extends ServletOutputStream
-{
+public class ByteArrayOutputStreamWrapper extends ServletOutputStream {
+
protected OutputStream intStream;
protected ByteArrayOutputStream baStream;
protected boolean finallized = false;
protected boolean flushOnFinalizeOnly = true;
-
- public ByteArrayOutputStreamWrapper(OutputStream outStream)
- {
+
+
+ public ByteArrayOutputStreamWrapper(OutputStream outStream) {
intStream = outStream;
baStream = new ByteArrayOutputStream();
}
-
- public ByteArrayOutputStreamWrapper()
- {
+
+ public ByteArrayOutputStreamWrapper() {
intStream = System.out;
baStream = new ByteArrayOutputStream();
}
-
- public ByteArrayOutputStream getByteArrayStream()
- {
+
+
+ public ByteArrayOutputStream getByteArrayStream() {
return baStream;
}
-
- public void setFinallized()
- {
+
+ public void setFinallized() {
finallized = true;
}
-
- public boolean isFinallized()
- {
+
+ public boolean isFinallized() {
return finallized;
}
-
-
- public void write(int i) throws java.io.IOException
- {
+
+
+ public void write(int i) throws java.io.IOException {
baStream.write(i);
}
-
- public void close() throws java.io.IOException
- {
+
+ public void close() throws java.io.IOException {
if (finallized) {
processStream();
intStream.close();
}
}
-
- public void flush() throws java.io.IOException
- {
+
+ public void flush() throws java.io.IOException {
if (baStream.size() != 0) {
if (!flushOnFinalizeOnly || finallized) {
processStream();
@@ -85,15 +78,14 @@
}
}
}
-
- protected void processStream() throws java.io.IOException
- {
+
+ protected void processStream() throws java.io.IOException {
intStream.write(baStream.toByteArray());
intStream.flush();
}
- public void clear()
- {
+ public void clear() {
baStream = new ByteArrayOutputStream();
}
+
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayResponseWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayResponseWrapper.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayResponseWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/util/ByteArrayResponseWrapper.java Tue Jun 5 16:15:47 2007
@@ -1,70 +1,66 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. 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. For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. 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. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
package org.apache.roller.weblogger.ui.core.util;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-
import javax.servlet.ServletOutputStream;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-/*
- * @author llavandowska
- *
+
+/**
* Implementation of HttpServletResponseWrapper.
*/
-public class ByteArrayResponseWrapper extends HttpServletResponseWrapper
-{
+public class ByteArrayResponseWrapper extends HttpServletResponseWrapper {
+
private PrintWriter tpWriter;
private ByteArrayOutputStreamWrapper tpStream;
-
- public ByteArrayResponseWrapper(ServletResponse inResp)
- throws java.io.IOException
- {
+
+
+ public ByteArrayResponseWrapper(ServletResponse inResp) throws IOException {
super((HttpServletResponse) inResp);
tpStream = new ByteArrayOutputStreamWrapper(inResp.getOutputStream());
tpWriter = new PrintWriter(new OutputStreamWriter(tpStream,"UTF-8"));
}
-
- public ServletOutputStream getOutputStream()
- throws java.io.IOException
- {
+
+
+ public ServletOutputStream getOutputStream() throws IOException {
return tpStream;
}
-
- public PrintWriter getWriter() throws java.io.IOException
- {
+
+ public PrintWriter getWriter() throws IOException {
return tpWriter;
}
-
- /** Get a String representation of the entire buffer.
- */
- public String toString()
- {
+
+ /**
+ * Get a String representation of the entire buffer.
+ */
+ public String toString() {
return tpStream.getByteArrayStream().toString();
}
- public ByteArrayOutputStream getByteArrayOutputStream()
- throws java.io.IOException
- {
+ public ByteArrayOutputStream getByteArrayOutputStream() throws IOException {
return tpStream.getByteArrayStream();
}
+
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/CalendarModel.java Tue Jun 5 16:15:47 2007
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.tags.calendar.BigWeblogCalendarModel;
import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag;
import org.apache.roller.weblogger.ui.core.tags.calendar.WeblogCalendarModel;
@@ -73,17 +73,17 @@
}
- public String showWeblogEntryCalendar(WebsiteDataWrapper websiteWrapper, String catArgument) {
+ public String showWeblogEntryCalendar(WeblogWrapper websiteWrapper, String catArgument) {
return showWeblogEntryCalendar(websiteWrapper, catArgument, false);
}
- public String showWeblogEntryCalendarBig(WebsiteDataWrapper websiteWrapper, String catArgument) {
+ public String showWeblogEntryCalendarBig(WeblogWrapper websiteWrapper, String catArgument) {
return showWeblogEntryCalendar(websiteWrapper, catArgument, true);
}
- private String showWeblogEntryCalendar(WebsiteDataWrapper websiteWrapper, String catArgument, boolean big) {
+ private String showWeblogEntryCalendar(WeblogWrapper websiteWrapper, String catArgument, boolean big) {
if ("nil".equals(catArgument)) catArgument = null;
String ret = null;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java Tue Jun 5 16:15:47 2007
@@ -26,7 +26,7 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.rendering.pagers.Pager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesListPager;
@@ -87,8 +87,8 @@
/**
* Get weblog being displayed.
*/
- public WebsiteDataWrapper getWeblog() {
- return WebsiteDataWrapper.wrap(weblog);
+ public WeblogWrapper getWeblog() {
+ return WeblogWrapper.wrap(weblog);
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java Tue Jun 5 16:15:47 2007
@@ -29,10 +29,10 @@
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.TemplateWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.ThemeTemplateWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesDayPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesLatestPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesMonthPager;
@@ -113,8 +113,8 @@
/**
* Get weblog being displayed.
*/
- public WebsiteDataWrapper getWeblog() {
- return WebsiteDataWrapper.wrap(weblog);
+ public WeblogWrapper getWeblog() {
+ return WeblogWrapper.wrap(weblog);
}
@@ -138,9 +138,9 @@
/**
* Get weblog entry being displayed or null if none specified by request.
*/
- public WeblogEntryDataWrapper getWeblogEntry() {
+ public WeblogEntryWrapper getWeblogEntry() {
if(pageRequest.getWeblogEntry() != null) {
- return WeblogEntryDataWrapper.wrap(pageRequest.getWeblogEntry());
+ return WeblogEntryWrapper.wrap(pageRequest.getWeblogEntry());
}
return null;
}
@@ -149,12 +149,12 @@
/**
* Get weblog entry being displayed or null if none specified by request.
*/
- public TemplateWrapper getWeblogPage() {
+ public ThemeTemplateWrapper getWeblogPage() {
if(pageRequest.getWeblogPageName() != null) {
- return TemplateWrapper.wrap(pageRequest.getWeblogPage());
+ return ThemeTemplateWrapper.wrap(pageRequest.getWeblogPage());
} else {
try {
- return TemplateWrapper.wrap(weblog.getDefaultPage());
+ return ThemeTemplateWrapper.wrap(weblog.getDefaultPage());
} catch (WebloggerException ex) {
log.error("Error getting default page", ex);
}
@@ -167,9 +167,9 @@
* Get weblog category specified by request, or null if the category path
* found in the request does not exist in the current weblog.
*/
- public WeblogCategoryDataWrapper getWeblogCategory() {
+ public WeblogCategoryWrapper getWeblogCategory() {
if(pageRequest.getWeblogCategory() != null) {
- return WeblogCategoryDataWrapper.wrap(pageRequest.getWeblogCategory());
+ return WeblogCategoryWrapper.wrap(pageRequest.getWeblogCategory());
}
return null;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PreviewPageModel.java Tue Jun 5 16:15:47 2007
@@ -20,7 +20,7 @@
import java.util.Map;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesLatestPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPreviewPager;
@@ -66,11 +66,11 @@
}
- public WeblogEntryDataWrapper getWeblogEntry() {
+ public WeblogEntryWrapper getWeblogEntry() {
if(previewRequest.getPreviewEntry() != null ||
previewRequest.getWeblogAnchor() != null) {
- return WeblogEntryDataWrapper.wrap(previewRequest.getWeblogEntry());
+ return WeblogEntryWrapper.wrap(previewRequest.getWeblogEntry());
}
return null;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModel.java Tue Jun 5 16:15:47 2007
@@ -42,9 +42,9 @@
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.Pager;
import org.apache.roller.weblogger.ui.rendering.pagers.SearchResultsFeedPager;
import org.apache.roller.weblogger.ui.rendering.util.WeblogFeedRequest;
@@ -204,7 +204,7 @@
// or entry's user is not the requested user.
// but don't return future posts
if (entry != null && entry.getPubTime().before(now)) {
- results.add(WeblogEntryDataWrapper.wrap(entry));
+ results.add(WeblogEntryWrapper.wrap(entry));
}
}
@@ -219,8 +219,8 @@
/**
* Get weblog being displayed.
*/
- public WebsiteDataWrapper getWeblog() {
- return WebsiteDataWrapper.wrap(weblog);
+ public WeblogWrapper getWeblog() {
+ return WeblogWrapper.wrap(weblog);
}
public String getTerm() {
@@ -259,9 +259,9 @@
return feedRequest.getWeblogCategoryName();
}
- public WeblogCategoryDataWrapper getWeblogCategory() {
+ public WeblogCategoryWrapper getWeblogCategory() {
if(feedRequest.getWeblogCategory() != null) {
- return WeblogCategoryDataWrapper.wrap(feedRequest.getWeblogCategory());
+ return WeblogCategoryWrapper.wrap(feedRequest.getWeblogCategory());
}
return null;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java Tue Jun 5 16:15:47 2007
@@ -39,8 +39,8 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogEntryWrapperComparator;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.SearchResultsPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPager;
import org.apache.roller.weblogger.ui.rendering.util.WeblogSearchRequest;
@@ -193,7 +193,7 @@
// or entry's user is not the requested user.
// but don't return future posts
if (entry != null && entry.getPubTime().before(now)) {
- addEntryToResults(WeblogEntryDataWrapper.wrap(entry));
+ addEntryToResults(WeblogEntryWrapper.wrap(entry));
}
}
@@ -206,7 +206,7 @@
}
- private void addEntryToResults(WeblogEntryDataWrapper entry) {
+ private void addEntryToResults(WeblogEntryWrapper entry) {
// convert entry's each date to midnight (00m 00h 00s)
Date midnight = DateUtil.getStartOfDay(entry.getPubTime());
@@ -259,9 +259,9 @@
return searchRequest.getWeblogCategoryName();
}
- public WeblogCategoryDataWrapper getWeblogCategory() {
+ public WeblogCategoryWrapper getWeblogCategory() {
if(searchRequest.getWeblogCategory() != null) {
- return WeblogCategoryDataWrapper.wrap(searchRequest.getWeblogCategory());
+ return WeblogCategoryWrapper.wrap(searchRequest.getWeblogCategory());
}
return null;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java Tue Jun 5 16:15:47 2007
@@ -40,9 +40,9 @@
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.UserDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.UserWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.rendering.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.rendering.pagers.Pager;
import org.apache.roller.weblogger.ui.rendering.pagers.UsersPager;
@@ -312,7 +312,7 @@
List perms = umgr.getAllPermissions(user);
for (Iterator it = perms.iterator(); it.hasNext();) {
WeblogPermission perm = (WeblogPermission) it.next();
- results.add(WebsiteDataWrapper.wrap(perm.getWebsite()));
+ results.add(WeblogWrapper.wrap(perm.getWebsite()));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);
@@ -333,7 +333,7 @@
List perms = umgr.getAllPermissions(website);
for (Iterator it = perms.iterator(); it.hasNext();) {
WeblogPermission perm = (WeblogPermission) it.next();
- results.add(UserDataWrapper.wrap(perm.getUser()));
+ results.add(UserWrapper.wrap(perm.getUser()));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);
@@ -344,13 +344,13 @@
/** Get User object by username */
- public UserDataWrapper getUser(String username) {
- UserDataWrapper wrappedUser = null;
+ public UserWrapper getUser(String username) {
+ UserWrapper wrappedUser = null;
try {
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
User user = umgr.getUserByUserName(username, Boolean.TRUE);
- wrappedUser = UserDataWrapper.wrap(user);
+ wrappedUser = UserWrapper.wrap(user);
} catch (Exception e) {
log.error("ERROR: fetching users by letter", e);
}
@@ -359,13 +359,13 @@
/** Get Website object by handle */
- public WebsiteDataWrapper getWeblog(String handle) {
- WebsiteDataWrapper wrappedWebsite = null;
+ public WeblogWrapper getWeblog(String handle) {
+ WeblogWrapper wrappedWebsite = null;
try {
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
Weblog website = umgr.getWebsiteByHandle(handle);
- wrappedWebsite = WebsiteDataWrapper.wrap(website);
+ wrappedWebsite = WeblogWrapper.wrap(website);
} catch (Exception e) {
log.error("ERROR: fetching users by letter", e);
}
@@ -394,7 +394,7 @@
null, Boolean.TRUE, Boolean.TRUE, startDate, null, 0, length);
for (Iterator it = weblogs.iterator(); it.hasNext();) {
Weblog website = (Weblog) it.next();
- results.add(WebsiteDataWrapper.wrap(website));
+ results.add(WeblogWrapper.wrap(website));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);
@@ -416,7 +416,7 @@
List users = umgr.getUsers(null, Boolean.TRUE, null, null, 0, length);
for (Iterator it = users.iterator(); it.hasNext();) {
User user = (User) it.next();
- results.add(UserDataWrapper.wrap(user));
+ results.add(UserWrapper.wrap(user));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);
@@ -521,7 +521,7 @@
List weblogs = wmgr.getWeblogEntriesPinnedToMain(new Integer(length));
for (Iterator it = weblogs.iterator(); it.hasNext();) {
WeblogEntry entry = (WeblogEntry) it.next();
- results.add(WeblogEntryDataWrapper.wrap(entry));
+ results.add(WeblogEntryWrapper.wrap(entry));
}
} catch (Exception e) {
log.error("ERROR: fetching pinned weblog entries", e);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java Tue Jun 5 16:15:47 2007
@@ -33,8 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
import org.apache.roller.weblogger.util.DateUtil;
@@ -117,7 +116,7 @@
//---------------------------------------------------- Authentication utils
- public boolean isUserAuthorizedToAuthor(WebsiteDataWrapper weblog) {
+ public boolean isUserAuthorizedToAuthor(WeblogWrapper weblog) {
try {
RollerSession rses = RollerSession.getRollerSession(request);
if (rses != null && rses.getAuthenticatedUser() != null) {
@@ -129,7 +128,7 @@
return false;
}
- public boolean isUserAuthorizedToAdmin(WebsiteDataWrapper weblog) {
+ public boolean isUserAuthorizedToAdmin(WeblogWrapper weblog) {
try {
RollerSession rses = RollerSession.getRollerSession(request);
if (rses != null && rses.getAuthenticatedUser() != null) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java Tue Jun 5 16:15:47 2007
@@ -30,7 +30,7 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.CommentDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
/**
@@ -103,7 +103,7 @@
// wrap the results
for (Iterator it = entries.iterator(); it.hasNext();) {
WeblogEntryComment comment = (WeblogEntryComment) it.next();
- results.add(CommentDataWrapper.wrap(comment));
+ results.add(WeblogEntryCommentWrapper.wrap(comment));
}
} catch (Exception e) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java Tue Jun 5 16:15:47 2007
@@ -29,7 +29,7 @@
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
-import org.apache.roller.weblogger.pojos.wrapper.UserDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.UserWrapper;
/**
@@ -149,7 +149,7 @@
// wrap the results
for (Iterator it = rawUsers.iterator(); it.hasNext();) {
User user = (User) it.next();
- results.add(UserDataWrapper.wrap(user));
+ results.add(UserWrapper.wrap(user));
}
} catch (Exception e) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java Tue Jun 5 16:15:47 2007
@@ -34,7 +34,7 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
@@ -139,7 +139,7 @@
List unwrapped = (List) mmap.get(key);
for(int i=0; i < unwrapped.size(); i++) {
if (count++ < length) {
- wrapped.add(i,WeblogEntryDataWrapper.wrap((WeblogEntry)unwrapped.get(i)));
+ wrapped.add(i,WeblogEntryWrapper.wrap((WeblogEntry)unwrapped.get(i)));
} else {
more = true;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java Tue Jun 5 16:15:47 2007
@@ -34,7 +34,7 @@
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogTemplate;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
/**
@@ -98,7 +98,7 @@
List unwrapped= (List) mmap.get(key);
for(int i=0; i < unwrapped.size(); i++) {
if (count++ < length) {
- wrapped.add(i,WeblogEntryDataWrapper.wrap((WeblogEntry)unwrapped.get(i)));
+ wrapped.add(i,WeblogEntryWrapper.wrap((WeblogEntry)unwrapped.get(i)));
} else {
more = true;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java Tue Jun 5 16:15:47 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
/**
@@ -125,7 +125,7 @@
for (Iterator it = rawEntries.iterator(); it.hasNext();) {
WeblogEntry entry = (WeblogEntry) it.next();
if (count++ < length) {
- results.add(WeblogEntryDataWrapper.wrap(entry));
+ results.add(WeblogEntryWrapper.wrap(entry));
}
}
if (rawEntries.size() > length) more = true;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java Tue Jun 5 16:15:47 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
@@ -131,7 +131,7 @@
List unwrapped= (List) mmap.get(key);
for(int i=0; i < unwrapped.size(); i++) {
if (count++ < length) {
- wrapped.add(i,WeblogEntryDataWrapper.wrap((WeblogEntry)unwrapped.get(i)));
+ wrapped.add(i,WeblogEntryWrapper.wrap((WeblogEntry)unwrapped.get(i)));
} else {
more = true;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java Tue Jun 5 16:15:47 2007
@@ -32,7 +32,7 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.util.I18nMessages;
import org.apache.roller.weblogger.util.Utilities;
@@ -75,12 +75,12 @@
currEntry = wmgr.getWeblogEntryByAnchor(weblog, entryAnchor);
if (currEntry != null && currEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
entries = new TreeMap();
- entries.put(new Date(currEntry.getPubTime().getTime()),
- Collections.singletonList(WeblogEntryDataWrapper.wrap(currEntry)));
+ entries.put(new Date(currEntry.getPubTime().getTime()),Collections.singletonList(WeblogEntryWrapper.wrap(currEntry)));
}
} catch (Exception e) {
log.error("ERROR: fetching entry");
}
+
return entries;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPreviewPager.java Tue Jun 5 16:15:47 2007
@@ -31,7 +31,7 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
/**
@@ -78,12 +78,12 @@
// store the entry in the collection
entries = new TreeMap();
- entries.put(tmpEntry.getPubTime(),
- Collections.singletonList(WeblogEntryDataWrapper.wrap(tmpEntry)));
+ entries.put(tmpEntry.getPubTime(),Collections.singletonList(WeblogEntryWrapper.wrap(tmpEntry)));
}
} catch (Exception e) {
log.error("ERROR: fetching entry", e);
}
+
return entries;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogsPager.java Tue Jun 5 16:15:47 2007
@@ -31,7 +31,7 @@
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
/**
@@ -161,7 +161,7 @@
// wrap the results
for (Iterator it = weblogs.iterator(); it.hasNext();) {
Weblog website = (Weblog) it.next();
- results.add(WebsiteDataWrapper.wrap(website));
+ results.add(WeblogWrapper.wrap(website));
}
} catch (Exception e) {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java Tue Jun 5 16:15:47 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.ui.rendering.util;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.pojos.wrapper.CommentDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
/**
@@ -61,8 +61,8 @@
this.message = errorMessage;
}
- public CommentDataWrapper getPreviewComment() {
- return CommentDataWrapper.wrap(previewComment);
+ public WeblogEntryCommentWrapper getPreviewComment() {
+ return WeblogEntryCommentWrapper.wrap(previewComment);
}
public boolean isPreview() {
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java Tue Jun 5 16:15:47 2007
@@ -41,9 +41,9 @@
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.TemplateWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.ThemeTemplateWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.rendering.util.WeblogEntryCommentForm;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
@@ -227,7 +227,7 @@
// setup Timezone for future rendering
ctx.put("timezone", weblog.getTimeZoneInstance());
ctx.put("timeZone", weblog.getTimeZoneInstance());
- ctx.put("website", WebsiteDataWrapper.wrap(weblog) );
+ ctx.put("website",WeblogWrapper.wrap(weblog) );
String siteName = ((RuntimeConfigProperty)props.get("site.name")).getValue();
if ("Roller-based Site".equals(siteName)) siteName = "Main";
@@ -243,7 +243,7 @@
// alternative display pages - customization
ThemeTemplate entryPage = weblog.getPageByName("_entry");
if (entryPage != null) {
- ctx.put("entryPage", TemplateWrapper.wrap(entryPage));
+ ctx.put("entryPage",ThemeTemplateWrapper.wrap(entryPage));
}
// TODO: ATLAS: no templates use this, should be safe to remove
// Template descPage = weblog.getPageByName("_desc");
@@ -304,7 +304,7 @@
}
if (entry.getStatus().equals(WeblogEntry.PUBLISHED)) {
- ctx.put("entry", WeblogEntryDataWrapper.wrap(entry));
+ ctx.put("entry",WeblogEntryWrapper.wrap(entry));
}
}
@@ -377,7 +377,7 @@
// the Entry Day link.
ctx.put("plainFormat", "yyyyMMdd");
- ctx.put("page", TemplateWrapper.wrap(page));
+ ctx.put("page",ThemeTemplateWrapper.wrap(page));
ctx.put("utilities", new OldUtilities() );
ctx.put("stringUtils", new OldStringUtils() );
ctx.put("rollerVersion", RollerFactory.getRoller().getVersion() );
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Tue Jun 5 16:15:47 2007
@@ -37,8 +37,8 @@
import org.apache.roller.weblogger.config.RollerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.RefererDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogReferrerWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarModel;
import org.apache.roller.weblogger.ui.core.tags.calendar.CalendarTag;
@@ -123,12 +123,12 @@
/** Build the URL for editing an WeblogEntry **/
- public String getEntryEditUrl(WeblogEntryDataWrapper entry) {
+ public String getEntryEditUrl(WeblogEntryWrapper entry) {
return URLUtilities.getEntryEditURL(entry.getWebsite().getHandle(), entry.getId(), false);
}
- public String getToggleLinkbackDisplayHTML(RefererDataWrapper referer) {
+ public String getToggleLinkbackDisplayHTML(WeblogReferrerWrapper referer) {
// NOTE: this was EOLed as part of Roller 4.0 since we no longer
// have an action for toggling linkback display
return "";
@@ -294,7 +294,7 @@
* @param str String to which plugins are to be applied.
* @return Result of applying plugins to str.
*/
- public String renderPlugins(WeblogEntryDataWrapper entry, String str) {
+ public String renderPlugins(WeblogEntryWrapper entry, String str) {
String ret = str;
mLogger.debug("Applying page plugins to string");
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Tue Jun 5 16:15:47 2007
@@ -46,13 +46,13 @@
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.wrapper.CommentDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.RefererDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.TemplateWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryCommentWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogBookmarkFolderWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogReferrerWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.ThemeTemplateWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogCategoryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
+import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.util.DateUtil;
import org.apache.commons.lang.StringUtils;
@@ -84,10 +84,10 @@
private boolean mIsDaySpecified = false;
private boolean mIsMonthSpecified = false;
private String mLocale = null;
- private WeblogEntryDataWrapper mNextEntry = null;
- private WeblogEntryDataWrapper mPreviousEntry = null;
- private WeblogEntryDataWrapper mLastEntry = null;
- private WeblogEntryDataWrapper mFirstEntry = null;
+ private WeblogEntryWrapper mNextEntry = null;
+ private WeblogEntryWrapper mPreviousEntry = null;
+ private WeblogEntryWrapper mLastEntry = null;
+ private WeblogEntryWrapper mFirstEntry = null;
//------------------------------------------------------------------------
@@ -141,7 +141,7 @@
Iterator pageIter = pages.iterator();
while (pageIter.hasNext()) {
ThemeTemplate page = (ThemeTemplate) pageIter.next();
- mPageMap.put(page.getName(), TemplateWrapper.wrap(page));
+ mPageMap.put(page.getName(),ThemeTemplateWrapper.wrap(page));
}
}
}
@@ -149,7 +149,7 @@
//------------------------------------------------------------------------
/** Encapsulates folder.getBookmarks() & sorting */
- public Collection getBookmarks(FolderDataWrapper folder) {
+ public Collection getBookmarks(WeblogBookmarkFolderWrapper folder) {
Collection bookmarks = null;
if (folder != null) {
mLogger.debug("Getting bookmarks for folder : "+folder.getName());
@@ -179,7 +179,7 @@
Iterator it = mTops.iterator();
int i=0;
while(it.hasNext()) {
- tops.add(i,FolderDataWrapper.wrap((WeblogBookmarkFolder) it.next()));
+ tops.add(i,WeblogBookmarkFolderWrapper.wrap((WeblogBookmarkFolder) it.next()));
i++;
}
} catch (WebloggerException e) {
@@ -207,19 +207,19 @@
//------------------------------------------------------------------------
/** Get comments for weblog entry specified by request */
- public List getComments(WeblogEntryDataWrapper entry) {
+ public List getComments(WeblogEntryWrapper entry) {
return getComments(entry, true, true);
}
/** Get comments for weblog entry specified by request */
- public List getComments(WeblogEntryDataWrapper wrapper, boolean noSpam, boolean approvedOnly) {
+ public List getComments(WeblogEntryWrapper wrapper, boolean noSpam, boolean approvedOnly) {
WeblogEntry entry = wrapper.getPojo();
List comments = new ArrayList();
List unwrappped = entry.getComments(noSpam, approvedOnly);
comments = new ArrayList(unwrappped.size());
Iterator it = unwrappped.iterator();
while(it.hasNext()) {
- comments.add(CommentDataWrapper.wrap((WeblogEntryComment)it.next()));
+ comments.add(WeblogEntryCommentWrapper.wrap((WeblogEntryComment)it.next()));
}
return comments;
}
@@ -242,9 +242,9 @@
//------------------------------------------------------------------------
/** Encapsulates BookmarkManager.getFolder() */
- public FolderDataWrapper getFolder(String folderPath) {
+ public WeblogBookmarkFolderWrapper getFolder(String folderPath) {
try {
- return FolderDataWrapper.wrap(
+ return WeblogBookmarkFolderWrapper.wrap(
mBookmarkMgr.getFolder(
mUserMgr.getWebsiteByHandle(mWebsite.getHandle()), folderPath));
} catch (WebloggerException e) {
@@ -256,9 +256,9 @@
//------------------------------------------------------------------------
/** Encapsulates UserManager.getPageByName() */
- public TemplateWrapper getUsersPageByName(WebsiteDataWrapper wrapper, String pageName) {
+ public ThemeTemplateWrapper getUsersPageByName(WeblogWrapper wrapper, String pageName) {
Weblog website = wrapper.getPojo();
- TemplateWrapper page = null;
+ ThemeTemplateWrapper page = null;
try {
if (website == null)
throw new NullPointerException("website is null");
@@ -266,7 +266,7 @@
if (pageName == null)
throw new NullPointerException("pageName is null");
- page = TemplateWrapper.wrap(website.getPageByName(pageName));
+ page = ThemeTemplateWrapper.wrap(website.getPageByName(pageName));
} catch (NullPointerException npe) {
mLogger.warn(npe.getMessage());
} catch (WebloggerException e) {
@@ -278,8 +278,8 @@
//------------------------------------------------------------------------
/** Encapsulates UserManager.getPageByName() */
- public TemplateWrapper getPageByName(String pageName) {
- return (TemplateWrapper) mPageMap.get(pageName);
+ public ThemeTemplateWrapper getPageByName(String pageName) {
+ return (ThemeTemplateWrapper) mPageMap.get(pageName);
}
//------------------------------------------------------------------------
@@ -398,7 +398,7 @@
List wrappedEntries = new ArrayList();
List entries = (List) mRet.get(key);
for(int i=0; i < entries.size(); i++) {
- wrappedEntries.add(i,WeblogEntryDataWrapper.wrap((WeblogEntry)entries.get(i)));
+ wrappedEntries.add(i,WeblogEntryWrapper.wrap((WeblogEntry)entries.get(i)));
}
mRet.put(key, wrappedEntries);
}
@@ -427,14 +427,14 @@
List vals = (List)days.get( keys[0] );
int valSize = vals.size();
if (valSize > 0) {
- mFirstEntry = (WeblogEntryDataWrapper)vals.get(0);
+ mFirstEntry = (WeblogEntryWrapper)vals.get(0);
}
// get last entry in map
vals = (List)days.get( keys[--numDays] );
valSize = vals.size();
if (valSize > 0) {
- mLastEntry = (WeblogEntryDataWrapper)vals.get(--valSize);
+ mLastEntry = (WeblogEntryWrapper)vals.get(--valSize);
}
}
}
@@ -498,7 +498,7 @@
Iterator it = mEntries.iterator();
int i=0;
while(it.hasNext()) {
- ret.add(i,WeblogEntryDataWrapper.wrap((WeblogEntry) it.next()));
+ ret.add(i,WeblogEntryWrapper.wrap((WeblogEntry) it.next()));
i++;
}
} catch (Exception e) {
@@ -527,7 +527,7 @@
&& StringUtils.isNotEmpty(excerpt) ) {
if ( referer.getVisible().booleanValue()
|| rses.isUserAuthorizedToAdmin(referer.getWebsite()) ) {
- referers.add(RefererDataWrapper.wrap(referer));
+ referers.add(WeblogReferrerWrapper.wrap(referer));
}
}
}
@@ -540,7 +540,7 @@
}
/** Encapsulates RefererManager **/
- public List getEntryReferers(WeblogEntryDataWrapper entry) {
+ public List getEntryReferers(WeblogEntryWrapper entry) {
ArrayList referers = new ArrayList();
try {
List refs = mRefererMgr.getReferersToEntry(entry.getId());
@@ -555,7 +555,7 @@
&& StringUtils.isNotEmpty(excerpt) ) {
if (referer.getVisible().booleanValue()
|| rses.isUserAuthorizedToAdmin(referer.getWebsite()) ) {
- referers.add(RefererDataWrapper.wrap(referer));
+ referers.add(WeblogReferrerWrapper.wrap(referer));
}
}
}
@@ -635,7 +635,7 @@
Iterator it = mRet.iterator();
int i=0;
while(it.hasNext()) {
- ret.add(WeblogCategoryDataWrapper.wrap((WeblogCategory)it.next()));
+ ret.add(WeblogCategoryWrapper.wrap((WeblogCategory)it.next()));
i++;
}
if (categoryName != null) {
@@ -653,10 +653,10 @@
//------------------------------------------------------------------------
/** Encapsulates RollerRequest.getWeblogEntry() */
- public WeblogEntryDataWrapper getWeblogEntry() {
+ public WeblogEntryWrapper getWeblogEntry() {
if(mEntry != null && mEntry.getStatus().equals(WeblogEntry.PUBLISHED))
- return WeblogEntryDataWrapper.wrap(mEntry);
+ return WeblogEntryWrapper.wrap(mEntry);
else
return null;
}
@@ -666,8 +666,8 @@
/**
* Get the next occurring Entry.
*/
- public WeblogEntryDataWrapper getNextEntry() {
- WeblogEntryDataWrapper currentEntry = getWeblogEntry();
+ public WeblogEntryWrapper getNextEntry() {
+ WeblogEntryWrapper currentEntry = getWeblogEntry();
if (mFirstEntry != null) currentEntry = mFirstEntry;
if (mNextEntry == null && currentEntry != null) {
String catName = null;
@@ -679,7 +679,7 @@
mWeblogMgr.getNextEntry(currentEntry.getPojo(), catName, mLocale);
if(nextEntry != null)
- mNextEntry = WeblogEntryDataWrapper.wrap(nextEntry);
+ mNextEntry = WeblogEntryWrapper.wrap(nextEntry);
// make sure that mNextEntry is not published to future
if (mNextEntry != null &&
@@ -698,8 +698,8 @@
/**
* Get the previous occurring Entry.
*/
- public WeblogEntryDataWrapper getPreviousEntry() {
- WeblogEntryDataWrapper currentEntry = getWeblogEntry();
+ public WeblogEntryWrapper getPreviousEntry() {
+ WeblogEntryWrapper currentEntry = getWeblogEntry();
if (mLastEntry != null) currentEntry = mLastEntry;
if (mPreviousEntry == null && currentEntry != null ) {
String catName = null;
@@ -711,7 +711,7 @@
mWeblogMgr.getPreviousEntry(currentEntry.getPojo(), catName, mLocale);
if(prevEntry != null)
- mPreviousEntry = WeblogEntryDataWrapper.wrap(prevEntry);
+ mPreviousEntry = WeblogEntryWrapper.wrap(prevEntry);
} catch (WebloggerException e) {
mLogger.error("PageModel.getPreviousEntry)", e);
}
@@ -767,12 +767,12 @@
//------------------------------------------------------------------------
- public FolderDataWrapper getFolderByPath(String path) {
+ public WeblogBookmarkFolderWrapper getFolderByPath(String path) {
try {
WeblogBookmarkFolder folder = mBookmarkMgr.getFolder(mWebsite, path);
if(folder != null)
- return FolderDataWrapper.wrap(folder);
+ return WeblogBookmarkFolderWrapper.wrap(folder);
} catch (WebloggerException e) {
mLogger.error(e);
}
@@ -805,7 +805,7 @@
recentComments = new ArrayList(recent.size());
Iterator it = recent.iterator();
while(it.hasNext()) {
- recentComments.add(CommentDataWrapper.wrap((WeblogEntryComment) it.next()));
+ recentComments.add(WeblogEntryCommentWrapper.wrap((WeblogEntryComment) it.next()));
}
} catch (WebloggerException e) {
mLogger.error(e);
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?view=diff&rev=544674&r1=544673&r2=544674
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java Tue Jun 5 16:15:47 2007
@@ -21,18 +21,22 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.ArrayStack;
+import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.ui.struts2.pagers.CommentsPager;
import org.apache.roller.weblogger.ui.struts2.util.KeyValueObject;
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
+import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.weblogger.util.Utilities;
@@ -43,11 +47,14 @@
private static Log log = LogFactory.getLog(GlobalCommentManagement.class);
+ // number of comments to show per page
+ private static final int COUNT = 30;
+
// bean for managing submitted data
private GlobalCommentManagementBean bean = new GlobalCommentManagementBean();
- // list of comments to display
- private List comments = Collections.EMPTY_LIST;
+ // pager for the comments we are viewing
+ private CommentsPager pager = null;
// first comment in the list
private WeblogEntryComment firstComment = null;
@@ -55,15 +62,6 @@
// last comment in the list
private WeblogEntryComment lastComment = null;
- // are there more results for the query?
- private boolean moreResults = false;
-
- // link to previous page of results
- private String prevLink = null;
-
- // linke to next page of results
- private String nextLink = null;
-
// indicates number of comments that would be deleted by bulk removal
// a non-zero value here indicates bulk removal is a valid option
private int bulkDeleteCount = 0;
@@ -89,9 +87,11 @@
public void loadComments() {
+ List comments = Collections.EMPTY_LIST;
+ boolean hasMore = false;
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- List comments = wmgr.getComments(
+ comments = wmgr.getComments(
null,
null,
getBean().getSearchString(),
@@ -99,27 +99,55 @@
getBean().getEndDate(),
getBean().getStatus(),
true, // reverse chrono order
- getBean().getOffset(),
- getBean().getCount() + 1);
+ getBean().getPage() * COUNT,
+ COUNT + 1);
if(comments != null && comments.size() > 0) {
- if(comments.size() > getBean().getCount()) {
+ if(comments.size() > COUNT) {
comments.remove(comments.size()-1);
- setMoreResults(true);
+ hasMore = true;
}
- setComments(comments);
setFirstComment((WeblogEntryComment)comments.get(0));
setLastComment((WeblogEntryComment)comments.get(comments.size()-1));
- loadNextPrevLinks(isMoreResults());
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
// TODO: i18n
addError("Error looking up comments");
}
+
+ // build comments pager
+ String baseUrl = buildBaseUrl();
+ setPager(new CommentsPager(baseUrl, getBean().getPage(), comments, hasMore));
+ }
+
+
+ // use the action data to build a url representing this action, including query data
+ private String buildBaseUrl() {
+
+ Map<String, String> params = new HashMap();
+
+ if(!StringUtils.isEmpty(getBean().getSearchString())) {
+ params.put("bean.searchString", getBean().getSearchString());
+ }
+ if(!StringUtils.isEmpty(getBean().getStartDateString())) {
+ params.put("bean.startDateString", getBean().getStartDateString());
+ }
+ if(!StringUtils.isEmpty(getBean().getEndDateString())) {
+ params.put("bean.endDateString", getBean().getEndDateString());
+ }
+ if(!StringUtils.isEmpty(getBean().getApprovedString())) {
+ params.put("bean.approvedString", getBean().getApprovedString());
+ }
+ if(!StringUtils.isEmpty(getBean().getSpamString())) {
+ params.put("bean.spamString", getBean().getSpamString());
+ }
+
+ return URLUtilities.getActionURL("globalCommentManagement", "/roller-ui/admin",
+ null, params, false);
}
-
+
// show comment management page
public String execute() {
@@ -128,7 +156,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
return LIST;
}
@@ -143,7 +171,7 @@
loadComments();
// load bean data using comments list
- getBean().loadCheckboxes(getComments());
+ getBean().loadCheckboxes(getPager().getItems());
try {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
@@ -158,7 +186,7 @@
0,
-1);
- if(allMatchingComments.size() > getBean().getCount()) {
+ if(allMatchingComments.size() > COUNT) {
setBulkDeleteCount(allMatchingComments.size());
}
@@ -284,11 +312,6 @@
}
- private void loadNextPrevLinks(boolean moreResults) {
-
- }
-
-
public List getCommentStatusOptions() {
List opts = new ArrayList();
@@ -321,14 +344,6 @@
this.bean = bean;
}
- public List getComments() {
- return comments;
- }
-
- public void setComments(List comments) {
- this.comments = comments;
- }
-
public int getBulkDeleteCount() {
return bulkDeleteCount;
}
@@ -353,28 +368,12 @@
this.lastComment = lastComment;
}
- public String getPrevLink() {
- return prevLink;
- }
-
- public void setPrevLink(String prevLink) {
- this.prevLink = prevLink;
- }
-
- public String getNextLink() {
- return nextLink;
- }
-
- public void setNextLink(String nextLink) {
- this.nextLink = nextLink;
- }
-
- public boolean isMoreResults() {
- return moreResults;
+ public CommentsPager getPager() {
+ return pager;
}
- public void setMoreResults(boolean moreResults) {
- this.moreResults = moreResults;
+ public void setPager(CommentsPager pager) {
+ this.pager = pager;
}
}