You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/05/17 00:56:39 UTC
svn commit: r407098 [4/4] - in /incubator/roller/trunk: ./ metadata/xdoclet/
src/org/apache/roller/presentation/ src/org/apache/roller/ui/
src/org/apache/roller/ui/admin/ src/org/apache/roller/ui/admin/struts/
src/org/apache/roller/ui/admin/struts/acti...
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchAction.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchAction.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchAction.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchAction.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchAction.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchAction.java Tue May 16 15:54:47 2006
@@ -20,7 +20,7 @@
*
* Created on September 21, 2005, 11:36 AM
*/
-package org.apache.roller.presentation.search;
+package org.apache.roller.ui.rendering.search;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
@@ -31,7 +31,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.presentation.BasePageModel;
+import org.apache.roller.ui.core.BasePageModel;
/**
* Executes site wide search.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchResultsPageModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchResultsPageModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchResultsPageModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchResultsPageModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchResultsPageModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchResultsPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchResultsPageModel.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on September 23, 2005, 11:27 AM
*/
-package org.apache.roller.presentation.search;
+package org.apache.roller.ui.rendering.search;
import java.io.IOException;
import java.util.Date;
@@ -48,7 +48,7 @@
import org.apache.roller.pojos.WeblogEntryWrapperComparator;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.StringUtils;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/search/SearchServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/search/SearchServlet.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.search;
+package org.apache.roller.ui.rendering.search;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -28,9 +28,9 @@
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.roller.RollerException;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.velocity.ContextLoader;
-import org.apache.roller.presentation.velocity.PageServlet;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.rendering.velocity.ContextLoader;
+import org.apache.roller.ui.rendering.velocity.PageServlet;
/**
* This servlet retrieves (and displays) search results.
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentAuthenticatorServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentAuthenticatorServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentAuthenticatorServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentAuthenticatorServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentAuthenticatorServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentAuthenticatorServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentAuthenticatorServlet.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on January 5, 2006, 12:37 PM
*/
-package org.apache.roller.presentation.servlets;
+package org.apache.roller.ui.rendering.servlets;
import java.io.IOException;
import java.io.PrintWriter;
@@ -33,8 +33,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerConfig;
-import org.apache.roller.presentation.velocity.CommentAuthenticator;
-import org.apache.roller.presentation.velocity.DefaultCommentAuthenticator;
+import org.apache.roller.ui.rendering.velocity.CommentAuthenticator;
+import org.apache.roller.ui.rendering.velocity.DefaultCommentAuthenticator;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/servlets/CommentServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.servlets;
+package org.apache.roller.ui.rendering.servlets;
import java.io.IOException;
import java.util.ArrayList;
@@ -48,15 +48,15 @@
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.velocity.CommentAuthenticator;
-import org.apache.roller.presentation.weblog.formbeans.CommentFormEx;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.rendering.velocity.CommentAuthenticator;
+import org.apache.roller.ui.authoring.struts.formbeans.CommentFormEx;
import org.apache.roller.util.SpamChecker;
import org.apache.roller.util.MailUtil;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.cache.CacheManager;
-import org.apache.roller.presentation.velocity.DefaultCommentAuthenticator;
+import org.apache.roller.ui.rendering.velocity.DefaultCommentAuthenticator;
import org.apache.roller.util.Utilities;
import org.apache.roller.util.GenericThrottle;
import org.apache.roller.util.IPBanList;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/ResourceServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/servlets/ResourceServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/servlets/ResourceServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.servlets;
+package org.apache.roller.ui.rendering.servlets;
import java.io.File;
import java.io.FileInputStream;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java Tue May 16 15:54:47 2006
@@ -18,7 +18,7 @@
/*
* Created on Apr 13, 2003
*/
-package org.apache.roller.presentation.servlets;
+package org.apache.roller.ui.rendering.servlets;
import java.io.IOException;
import java.io.PrintWriter;
@@ -41,8 +41,8 @@
import org.apache.roller.model.WeblogManager;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.cache.CacheManager;
import org.apache.roller.util.LinkbackExtractor;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentAuthenticator.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentAuthenticator.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentAuthenticator.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentAuthenticator.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentAuthenticator.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentAuthenticator.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentAuthenticator.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/CommentServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/CommentServlet.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.IOException;
import javax.servlet.RequestDispatcher;
@@ -27,7 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ContextLoader.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ContextLoader.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ContextLoader.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ContextLoader.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.net.MalformedURLException;
import java.net.URL;
@@ -51,12 +51,12 @@
import org.apache.roller.pojos.wrapper.TemplateWrapper;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
-import org.apache.roller.presentation.LanguageUtil;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.newsfeeds.NewsfeedCache;
-import org.apache.roller.presentation.weblog.formbeans.CommentFormEx;
+import org.apache.roller.ui.core.LanguageUtil;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.rendering.newsfeeds.NewsfeedCache;
+import org.apache.roller.ui.authoring.struts.formbeans.CommentFormEx;
import org.apache.roller.util.RegexUtil;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.Utilities;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/DefaultCommentAuthenticator.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/DefaultCommentAuthenticator.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/DefaultCommentAuthenticator.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/DefaultCommentAuthenticator.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/DefaultCommentAuthenticator.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/DefaultCommentAuthenticator.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/DefaultCommentAuthenticator.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ExportRss.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ExportRss.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ExportRss.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ExportRss.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ExportRss.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ExportRss.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ExportRss.java Tue May 16 15:54:47 2006
@@ -1,21 +1,21 @@
-/*
-* 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.presentation.velocity;
+/*
+* 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.ui.rendering.velocity;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -26,7 +26,7 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.util.RegexUtil;
import org.apache.roller.util.StringUtils;
import org.apache.roller.util.Utilities;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FlavorServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FlavorServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FlavorServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FlavorServlet.java Tue May 16 15:54:47 2006
@@ -1,21 +1,21 @@
-/*
-* 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.presentation.velocity;
+/*
+* 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.ui.rendering.velocity;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -24,7 +24,7 @@
import org.apache.velocity.context.Context;
import org.apache.velocity.servlet.VelocityServlet;
import org.apache.roller.RollerException;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
import java.io.IOException;
import java.util.Date;
import javax.servlet.ServletException;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FoafServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FoafServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FoafServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FoafServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FoafServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/FoafServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/FoafServlet.java Tue May 16 15:54:47 2006
@@ -1,21 +1,21 @@
-/*
-* 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.presentation.velocity;
+/*
+* 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.ui.rendering.velocity;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -26,8 +26,8 @@
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.Utilities;
import java.io.IOException;
import javax.servlet.ServletException;
@@ -35,7 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerSession;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/LanguageServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/LanguageServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/LanguageServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/LanguageServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/LanguageServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/LanguageServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/LanguageServlet.java Tue May 16 15:54:47 2006
@@ -20,7 +20,7 @@
*
* Created on 02-May-04
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.IOException;
import java.util.Locale;
@@ -37,8 +37,8 @@
import org.apache.struts.Globals;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.roller.presentation.LanguageUtil;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.LanguageUtil;
+import org.apache.roller.ui.core.RollerContext;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/MathCommentAuthenticator.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/MathCommentAuthenticator.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/MathCommentAuthenticator.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/MathCommentAuthenticator.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/MathCommentAuthenticator.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/MathCommentAuthenticator.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/MathCommentAuthenticator.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.util.ResourceBundle;
import javax.servlet.http.HttpServletRequest;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageHelper.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageHelper.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageHelper.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageHelper.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.net.MalformedURLException;
import java.util.Hashtable;
import java.util.Iterator;
@@ -43,16 +43,16 @@
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.RefererDataWrapper;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.presentation.LanguageUtil;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
-import org.apache.roller.presentation.tags.calendar.CalendarModel;
-import org.apache.roller.presentation.tags.calendar.CalendarTag;
-import org.apache.roller.presentation.tags.menu.EditorNavigationBarTag;
-import org.apache.roller.presentation.tags.menu.MenuTag;
-import org.apache.roller.presentation.weblog.tags.BigWeblogCalendarModel;
-import org.apache.roller.presentation.weblog.tags.WeblogCalendarModel;
+import org.apache.roller.ui.core.LanguageUtil;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
+import org.apache.roller.ui.core.tags.calendar.CalendarModel;
+import org.apache.roller.ui.core.tags.calendar.CalendarTag;
+import org.apache.roller.ui.core.tags.menu.EditorNavigationBarTag;
+import org.apache.roller.ui.core.tags.menu.MenuTag;
+import org.apache.roller.ui.authoring.tags.BigWeblogCalendarModel;
+import org.apache.roller.ui.authoring.tags.WeblogCalendarModel;
import org.apache.roller.util.StringUtils;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageModel.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.util.ArrayList;
import java.util.Calendar;
@@ -51,8 +51,8 @@
import org.apache.roller.pojos.wrapper.WeblogCategoryDataWrapper;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
-import org.apache.roller.presentation.RollerRequest;
-import org.apache.roller.presentation.RollerSession;
+import org.apache.roller.ui.core.RollerRequest;
+import org.apache.roller.ui.core.RollerSession;
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.StringUtils;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PageServlet.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.IOException;
import java.io.StringWriter;
@@ -38,8 +38,8 @@
import org.apache.roller.RollerException;
import org.apache.roller.pojos.WeblogTemplate;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.InvalidRequestException;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.InvalidRequestException;
+import org.apache.roller.ui.core.RollerRequest;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetFeedServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetFeedServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetFeedServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetFeedServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetFeedServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetFeedServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetFeedServlet.java Tue May 16 15:54:47 2006
@@ -1,21 +1,21 @@
-/*
-* 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.presentation.velocity;
+/*
+* 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.ui.rendering.velocity;
import java.io.IOException;
import java.util.Date;
@@ -31,7 +31,7 @@
import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.PlanetManager;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.Utilities;
/////////////////////////////////////////////////////////////////////////////
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetPageModel.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetPageModel.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PlanetPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PlanetPageModel.java Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +24,7 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.PlanetGroupData;
import org.apache.roller.pojos.PlanetSubscriptionData;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
/**
* Allow Roller page templates to get the main Planet aggregation (the 'all'
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PreviewServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PreviewServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PreviewServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PreviewServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PreviewServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PreviewServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/PreviewServlet.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.IOException;
import java.io.StringWriter;
@@ -37,7 +37,7 @@
import org.apache.roller.pojos.Theme;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerRequest;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RSDServlet.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RSDServlet.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RSDServlet.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RSDServlet.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RSDServlet.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RSDServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RSDServlet.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on December 14, 2005, 6:08 PM
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
@@ -36,9 +36,9 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.InvalidRequestException;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.WeblogRequest;
+import org.apache.roller.ui.core.InvalidRequestException;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.WeblogRequest;
/**
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RollerResourceLoader.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RollerResourceLoader.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RollerResourceLoader.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RollerResourceLoader.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RollerResourceLoader.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/RollerResourceLoader.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/RollerResourceLoader.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ThemeResourceLoader.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ThemeResourceLoader.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/ThemeResourceLoader.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
* Created on June 28, 2005, 12:25 PM
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
Copied: incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/WebappResourceLoader.java (from r407016, incubator/roller/trunk/src/org/apache/roller/presentation/velocity/WebappResourceLoader.java)
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/WebappResourceLoader.java?p2=incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/WebappResourceLoader.java&p1=incubator/roller/trunk/src/org/apache/roller/presentation/velocity/WebappResourceLoader.java&r1=407016&r2=407098&rev=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/WebappResourceLoader.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/WebappResourceLoader.java Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-package org.apache.roller.presentation.velocity;
+package org.apache.roller.ui.rendering.velocity;
import java.io.InputStream;
@@ -27,7 +27,7 @@
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.Resource;
import org.apache.velocity.runtime.resource.loader.ResourceLoader;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
/**
* Tries to load Velocity resources from the Webapp.
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java Tue May 16 15:54:47 2006
@@ -25,7 +25,7 @@
import org.apache.roller.config.RollerConfig;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.webservices.adminapi.sdk.EntrySet;
import java.util.regex.Pattern;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Tue May 16 15:54:47 2006
@@ -39,7 +39,7 @@
import org.apache.roller.pojos.WeblogCategoryData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
+import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.util.RollerMessages;
import org.apache.roller.util.Utilities;
import org.apache.roller.util.WSSEUtilities;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java Tue May 16 15:54:47 2006
@@ -30,8 +30,8 @@
import org.apache.roller.model.UserManager;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.cache.CacheManager;
import org.apache.roller.util.Utilities;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java Tue May 16 15:54:47 2006
@@ -41,8 +41,8 @@
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.Utilities;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java Tue May 16 15:54:47 2006
@@ -41,8 +41,8 @@
import org.apache.roller.pojos.WeblogCategoryData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.RollerContext;
-import org.apache.roller.presentation.RollerRequest;
+import org.apache.roller.ui.core.RollerContext;
+import org.apache.roller.ui.core.RollerRequest;
import org.apache.roller.util.RollerMessages;
import org.apache.roller.util.Utilities;
Modified: incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/log4j.properties?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/log4j.properties Tue May 16 15:54:47 2006
@@ -25,7 +25,6 @@
# Options are: DEBUG, INFO, WARN, ERROR, FATAL
log4j.category.org.apache.roller=INFO
-log4j.category.org.apache.roller.presentation.webservices.atomprotocol=DEBUG
log4j.category.com.ecyrd.jspwiki=ERROR
log4j.category.com.opensymphony.oscache=ERROR
log4j.category.org.hibernate=INFO
Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Tue May 16 15:54:47 2006
@@ -166,19 +166,19 @@
# scheduled tasks, each is comma separated list of classes
# Comma separated list of task classnames to be executed once per day
-tasks.daily=org.apache.roller.presentation.TurnoverReferersTask\
+tasks.daily=org.apache.roller.ui.core.tasks.TurnoverReferersTask\
# Needed to enable nightly fetching of blacklist
-#,org.apache.roller.presentation.BlacklistUpdateTask\
+#,org.apache.roller.ui.core.tasks.BlacklistUpdateTask\
# Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-#,org.apache.roller.presentation.planet.SyncWebsitesTask
+#,org.apache.roller.ui.admin.struts.actions.SyncWebsitesTask
# Comma separated list of task classnames to be executed hourly
tasks.hourly=\
# Hourly Planet task: refresh latest entry list from all weblogs in list
-#org.apache.roller.presentation.planet.RefreshEntriesTask
+#org.apache.roller.ui.admin.struts.actions.RefreshEntriesTask
#----------------------------------
# Velocity settings
@@ -187,7 +187,7 @@
velocity.toolbox.file=/WEB-INF/toolbox.xml
# Page model implementation
-velocity.pagemodel.classname=org.apache.roller.presentation.velocity.PageModel
+velocity.pagemodel.classname=org.apache.roller.ui.rendering.velocity.PageModel
# Experimental page model that allows user's access to Planet aggregations
#velocity.pagemodel.classname=org.apache.roller.presentation.velocity.planet.PlanetPageModel
@@ -198,12 +198,12 @@
persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
# authenticator settings (experimental)
-authenticator.classname=org.apache.roller.presentation.DefaultAuthenticator
+authenticator.classname=org.apache.roller.ui.core.DefaultAuthenticator
#----------------------------------
# comment, referrer and trackback settings
-comment.authenticator.classname=org.apache.roller.presentation.velocity.MathCommentAuthenticator
+comment.authenticator.classname=org.apache.roller.ui.rendering.velocity.MathCommentAuthenticator
comment.notification.separateOwnerMessage=false
comment.notification.hideCommenterAddresses=false
comment.throttle.enabled=false
Modified: incubator/roller/trunk/web/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/velocity.properties?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/velocity.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/velocity.properties Tue May 16 15:54:47 2006
@@ -20,14 +20,14 @@
# theme resource loader
theme.resource.loader.public.name=theme
theme.resource.loader.description=Roller Theme Resource Loader
-theme.resource.loader.class=org.apache.roller.presentation.velocity.ThemeResourceLoader
+theme.resource.loader.class=org.apache.roller.ui.rendering.velocity.ThemeResourceLoader
theme.resource.loader.cache=false
theme.resource.loader.modificationCheckInterval=2
# for the loader we call 'roller', use the RollerResourceLoader
roller.resource.loader.public.name=roller
roller.resource.loader.description=Roller Main Resource Loader
-roller.resource.loader.class=org.apache.roller.presentation.velocity.RollerResourceLoader
+roller.resource.loader.class=org.apache.roller.ui.rendering.velocity.RollerResourceLoader
roller.resource.loader.cache=false
roller.resource.loader.modificationCheckInterval=2
@@ -39,7 +39,7 @@
# for the loader we call 'webapp', use the WebappResourceLoader
webapp.resource.loader.description = Roller Webapp Resource Loader
-webapp.resource.loader.class = org.apache.roller.presentation.velocity.WebappResourceLoader
+webapp.resource.loader.class = org.apache.roller.ui.rendering.velocity.WebappResourceLoader
webapp.resource.loader.cache=true
webapp.resource.loader.modificationCheckInterval=60
Modified: incubator/roller/trunk/web/bookmarks/import.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/bookmarks/import.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/bookmarks/import.jsp (original)
+++ incubator/roller/trunk/web/bookmarks/import.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
<% BasePageModel model = (BasePageModel)request.getAttribute("model"); %>
<p class="subtitle">
Modified: incubator/roller/trunk/web/keepalive.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/keepalive.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/keepalive.jsp (original)
+++ incubator/roller/trunk/web/keepalive.jsp Tue May 16 15:54:47 2006
@@ -17,7 +17,7 @@
-->
<%@ page session="false"
import="org.apache.roller.pojos.WebsiteData,
- org.apache.roller.presentation.RollerRequest,
+ org.apache.roller.ui.core.RollerRequest,
org.apache.roller.util.DateUtil,
java.text.DateFormat,
java.util.Date,
Modified: incubator/roller/trunk/web/login-redirect.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/login-redirect.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/login-redirect.jsp (original)
+++ incubator/roller/trunk/web/login-redirect.jsp Tue May 16 15:54:47 2006
@@ -21,7 +21,7 @@
page import="org.apache.roller.model.*" %><%@
page import="org.apache.roller.pojos.*" %><%@
page import="org.apache.roller.config.RollerConfig" %><%@
-page import="org.apache.roller.presentation.RollerSession" %><%@
+page import="org.apache.roller.ui.core.RollerSession" %><%@
page import="java.util.List" %>
<%
Roller roller = RollerFactory.getRoller();
Modified: incubator/roller/trunk/web/logout-redirect.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/logout-redirect.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/logout-redirect.jsp (original)
+++ incubator/roller/trunk/web/logout-redirect.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
-<%@ page import="org.apache.roller.presentation.RollerSession" %>
+<%@ page import="org.apache.roller.ui.core.RollerSession" %>
<%@ page import="javax.servlet.http.Cookie" %>
<%@ page import="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices" %>
Modified: incubator/roller/trunk/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/main.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/main.jsp (original)
+++ incubator/roller/trunk/web/main.jsp Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.apache.roller.presentation.MainPageAction" %>
+<%@ page import="org.apache.roller.ui.core.MainPageAction" %>
<%@ page import="java.util.Locale" %>
<%@ include file="/taglibs.jsp" %>
<%
Modified: incubator/roller/trunk/web/planet/planet.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/planet/planet.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/planet/planet.jsp (original)
+++ incubator/roller/trunk/web/planet/planet.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.planet.PlanetAction" %>
+<%@ page import="org.apache.roller.ui.admin.struts.actions.PlanetAction" %>
<%@ page import="java.util.Locale" %>
<%
Modified: incubator/roller/trunk/web/taglibs.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/taglibs.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/taglibs.jsp (original)
+++ incubator/roller/trunk/web/taglibs.jsp Tue May 16 15:54:47 2006
@@ -39,11 +39,11 @@
<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
<%@ page import="org.apache.roller.config.RollerConfig" %>
-<%@ page import="org.apache.roller.presentation.RollerRequest" %>
-<%@ page import="org.apache.roller.presentation.BasePageModel" %>
-<%@ page import="org.apache.roller.presentation.RollerContext" %>
-<%@ page import="org.apache.roller.presentation.RollerSession" %>
-<%@ page import="org.apache.roller.presentation.LanguageUtil" %>
+<%@ page import="org.apache.roller.ui.core.RollerRequest" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerContext" %>
+<%@ page import="org.apache.roller.ui.core.RollerSession" %>
+<%@ page import="org.apache.roller.ui.core.LanguageUtil" %>
<%
// see if we have an authenticated user so we can set the display locale
Modified: incubator/roller/trunk/web/tags/date.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/tags/date.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/tags/date.jsp (original)
+++ incubator/roller/trunk/web/tags/date.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %><% {
-String prefix = org.apache.roller.presentation.tags.DateTag.KEY_PREFIX;
+String prefix = org.apache.roller.ui.core.tags.DateTag.KEY_PREFIX;
String formName = request.getAttribute(prefix+"_formName").toString();
String dateField = request.getAttribute(prefix+"_property").toString();
String dateFormat = request.getAttribute(prefix+"_dateFormat").toString();
Modified: incubator/roller/trunk/web/theme/searchResults.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/searchResults.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/searchResults.jsp (original)
+++ incubator/roller/trunk/web/theme/searchResults.jsp Tue May 16 15:54:47 2006
@@ -18,10 +18,10 @@
<%@ include file="/taglibs.jsp" %>
<%
-org.apache.roller.presentation.search.SearchAction.PageModel model =
- (org.apache.roller.presentation.search.SearchAction.PageModel)
+org.apache.roller.ui.rendering.search.SearchAction.PageModel model =
+ (org.apache.roller.ui.rendering.search.SearchAction.PageModel)
request.getAttribute("model");
-org.apache.roller.presentation.search.SearchResultsPageModel searchResults =
+org.apache.roller.ui.rendering.search.SearchResultsPageModel searchResults =
model.getSearchModel();
request.setAttribute("searchResults", searchResults);
%>
Modified: incubator/roller/trunk/web/weblog/CommentManagement.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CommentManagement.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CommentManagement.jsp (original)
+++ incubator/roller/trunk/web/weblog/CommentManagement.jsp Tue May 16 15:54:47 2006
@@ -16,8 +16,8 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.weblog.actions.CommentManagementAction" %>
-<%@ page import="org.apache.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.CommentManagementAction" %>
+<%@ page import="org.apache.roller.ui.core.RollerRequest" %>
<%
CommentManagementAction.CommentManagementPageModel model =
(CommentManagementAction.CommentManagementPageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.weblog.actions.CommentManagementAction" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.CommentManagementAction" %>
<%
CommentManagementAction.CommentManagementPageModel model =
(CommentManagementAction.CommentManagementPageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/CustomPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CustomPingTargets.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CustomPingTargets.jsp (original)
+++ incubator/roller/trunk/web/weblog/CustomPingTargets.jsp Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.apache.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.ui.core.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<%
BasePageModel pageModel = (BasePageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/PingResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/PingResult.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/PingResult.jsp (original)
+++ incubator/roller/trunk/web/weblog/PingResult.jsp Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.apache.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.ui.core.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<!-- This page consists only of result messages from the ping -->
Modified: incubator/roller/trunk/web/weblog/Pings.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/Pings.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/Pings.jsp (original)
+++ incubator/roller/trunk/web/weblog/Pings.jsp Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.apache.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.ui.core.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<%
BasePageModel pageModel = (BasePageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEdit.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEdit.jsp Tue May 16 15:54:47 2006
@@ -17,9 +17,9 @@
-->
<%@ include file="/taglibs.jsp" %>
<%@ page import="org.apache.roller.pojos.*" %>
-<%@ page import="org.apache.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %>
-<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
-<%@ page import="org.apache.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.WeblogEntryPageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerRequest" %>
<%
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
try {
Modified: incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp Tue May 16 15:54:47 2006
@@ -16,8 +16,8 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
-<%@ page import="org.apache.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.WeblogEntryPageModel" %>
+<%@ page import="org.apache.roller.ui.core.RollerRequest" %>
<%
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
%>
Modified: incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryManagementAction" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.WeblogEntryManagementAction" %>
<%
WeblogEntryManagementAction.PageModel model =
(WeblogEntryManagementAction.PageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp Tue May 16 15:54:47 2006
@@ -17,7 +17,7 @@
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryManagementAction" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.WeblogEntryManagementAction" %>
<%
WeblogEntryManagementAction.PageModel model =
(WeblogEntryManagementAction.PageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp Tue May 16 15:54:47 2006
@@ -19,7 +19,7 @@
<h2>
<jsp:useBean id="weblogEntryFormEx" scope="session"
- class="org.apache.roller.presentation.weblog.formbeans.WeblogEntryFormEx"/>
+ class="org.apache.roller.ui.authoring.struts.formbeans.WeblogEntryFormEx"/>
<fmt:message key="weblogEntryRemove.removeWeblogEntry" /> [<jsp:getProperty name="weblogEntryFormEx" property="title"/>]
</h2>
Modified: incubator/roller/trunk/web/weblog/export-entries.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/export-entries.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/export-entries.jsp (original)
+++ incubator/roller/trunk/web/weblog/export-entries.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.BasePageModel" %>
+<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
<%
BasePageModel model = (BasePageModel)request.getAttribute("model");
%>
Modified: incubator/roller/trunk/web/website/CommonPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/CommonPingTargets.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/CommonPingTargets.jsp (original)
+++ incubator/roller/trunk/web/website/CommonPingTargets.jsp Tue May 16 15:54:47 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.apache.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.ui.core.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<p class="subtitle">
Modified: incubator/roller/trunk/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/edit-website.jsp?rev=407098&r1=407097&r2=407098&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/edit-website.jsp (original)
+++ incubator/roller/trunk/web/website/edit-website.jsp Tue May 16 15:54:47 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.apache.roller.presentation.website.actions.WebsiteFormAction" %>
+<%@ page import="org.apache.roller.ui.authoring.struts.actions.WebsiteFormAction" %>
<%
WebsiteFormAction.WebsitePageModel model =
(WebsiteFormAction.WebsitePageModel)request.getAttribute("model");