svn commit: r526929 - in /roller/branches/roller_3.1: build.xml properties.xmlf
Author: snoopdave
Date: Mon Apr 9 14:45:23 2007
New Revision: 526929
URL: http://svn.apache.org/viewvc?view=revrev=526929
Log:
Ant 1.6.2 jar in test path causes problems when running against Ant 1.7
Modified:
roller/branches/roller_3.1/build.xml
roller/branches/roller_3.1/properties.xmlf
Modified: roller/branches/roller_3.1/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/build.xml?view=diffrev=526929r1=526928r2=526929
==
--- roller/branches/roller_3.1/build.xml (original)
+++ roller/branches/roller_3.1/build.xml Mon Apr 9 14:45:23 2007
@@ -890,6 +890,7 @@
classpath
path refid=tests.path/
+pathelement location=${ro.tools}/buildtime/ant-1.6.2/ant.jar/
custom-jars;
/classpath
/javac
Modified: roller/branches/roller_3.1/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/properties.xmlf?view=diffrev=526929r1=526928r2=526929
==
--- roller/branches/roller_3.1/properties.xmlf (original)
+++ roller/branches/roller_3.1/properties.xmlf Mon Apr 9 14:45:23 2007
@@ -195,7 +195,6 @@
include name=*.jar/
/fileset
fileset refid=commons-httpclient.jar/
-pathelement location=${ro.tools}/buildtime/ant-1.6.2/ant.jar/
pathelement location=${ro.tools}/buildtime/strutstest-2.0.0.jar/
pathelement location=${ro.tools}/buildtime/junit-3.8.1.jar/
pathelement location=${ro.tools}/buildtime/hsqldb.jar/
svn commit: r527005 - in /roller/branches/roller_4.0_newbackend: ./ apps/planet/ apps/planet/src/java/org/apache/roller/planet/business/hibernate/ apps/planet/src/java/org/apache/roller/planet/tasks/
Author: snoopdave
Date: Mon Apr 9 20:19:05 2007
New Revision: 527005
URL: http://svn.apache.org/viewvc?view=revrev=527005
Log:
Merging latest from trunk
Added:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/RefreshRollerPlanetTask.java
- copied unchanged from r526991,
roller/trunk/src/org/apache/roller/planet/tasks/RefreshRollerPlanetTask.java
Removed:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/package.html
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/build.xml
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/tasks/PlanetTask.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet.properties
roller/branches/roller_4.0_newbackend/build.xml
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
roller/branches/roller_4.0_newbackend/properties.xmlf
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.java
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp
Modified: roller/branches/roller_4.0_newbackend/apps/planet/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/build.xml?view=diffrev=527005r1=527004r2=527005
==
--- roller/branches/roller_4.0_newbackend/apps/planet/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/apps/planet/build.xml Mon Apr 9
20:19:05 2007
@@ -133,7 +133,6 @@
fileset dir=${tools}/buildtime/mockrunner-0.35/lib
include name=*.jar/
/fileset
-pathelement location=${tools}/buildtime/ant-1.6.2/ant.jar/
pathelement location=${tools}/buildtime/junit-3.8.1.jar/
pathelement location=${tools}/buildtime/derby.jar/
pathelement location=${tools}/buildtime/derbyclient.jar/
@@ -366,6 +365,7 @@
classpath
path refid=test.path/
+pathelement location=${tools}/buildtime/ant-1.6.2/ant.jar/
/classpath
/javac
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java?view=diffrev=527005r1=527004r2=527005
==
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
Mon Apr 9 20:19:05 2007
@@ -76,10 +76,27 @@
PlanetConfig.getProperty(hibernate.configResource),
PlanetConfig.getProperty(hibernate.dialect
svn commit: r528512 - /roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm
Author: snoopdave Date: Fri Apr 13 08:00:34 2007 New Revision: 528512 URL: http://svn.apache.org/viewvc?view=revrev=528512 Log: Use utils.escapeHTML() not utilities.escapeHTML() Modified: roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Modified: roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm?view=diffrev=528512r1=528511r2=528512 == --- roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm (original) +++ roller/branches/roller_3.0/web/WEB-INF/velocity/weblog.vm Fri Apr 13 08:00:34 2007 @@ -221,16 +221,16 @@ ul li label class=desc$text.get( macro.weblog.name )/label -input type=text name=name class=text large value=$utilities.escapeHTML($cform.name) size=50 maxlength=255 / +input type=text name=name class=text large value=$utils.escapeHTML($cform.name) size=50 maxlength=255 / /li lilabel class=desc$text.get( macro.weblog.email )/label -input type=text name=email class=text large value=$utilities.escapeHTML($cform.email) size=50 maxlength=255 / +input type=text name=email class=text large value=$utils.escapeHTML($cform.email) size=50 maxlength=255 / /li lilabel class=desc$text.get( macro.weblog.url )/label -input type=text name=url class=text large value=$utilities.escapeHTML($cform.url) size=50 maxlength=255 / +input type=text name=url class=text large value=$utils.escapeHTML($cform.url) size=50 maxlength=255 / /li #if ($config.commentEmailNotify)
svn commit: r528513 - /roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/head.jsp
Author: snoopdave
Date: Fri Apr 13 08:00:43 2007
New Revision: 528513
URL: http://svn.apache.org/viewvc?view=revrev=528513
Log:
Removing 'look' request param
Modified:
roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/head.jsp
Modified: roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/head.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/head.jsp?view=diffrev=528513r1=528512r2=528513
==
--- roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/branches/roller_3.1/web/WEB-INF/jsps/tiles/head.jsp Fri Apr 13
08:00:43 2007
@@ -13,18 +13,7 @@
link rel=stylesheet type=text/css media=all
href='c:url value=/roller-ui/styles/calendar.css/'
-%
-//String theme = theme = RollerConfig.getProperty(editor.theme);
-
-String theme = request.getParameter(look);
-if (theme == null session != null) {
-theme = (String)session.getAttribute(look);
-}
-if (theme == null) {
-theme = RollerConfig.getProperty(editor.theme);
-}
-if (session !=null) session.setAttribute(look, theme);
-%
+% String theme = RollerConfig.getProperty(editor.theme); %
link rel=stylesheet type=text/css media=all
href=%= request.getContextPath() %/roller-ui/theme/%= theme
%/colors.css /
svn commit: r528514 - /roller/branches/roller_2.3/web/WEB-INF/classes/comments.vm
Author: snoopdave Date: Fri Apr 13 08:00:52 2007 New Revision: 528514 URL: http://svn.apache.org/viewvc?view=revrev=528514 Log: Adding HTML escape for comment textarea Modified: roller/branches/roller_2.3/web/WEB-INF/classes/comments.vm Modified: roller/branches/roller_2.3/web/WEB-INF/classes/comments.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_2.3/web/WEB-INF/classes/comments.vm?view=diffrev=528514r1=528513r2=528514 == --- roller/branches/roller_2.3/web/WEB-INF/classes/comments.vm (original) +++ roller/branches/roller_2.3/web/WEB-INF/classes/comments.vm Fri Apr 13 08:00:52 2007 @@ -232,7 +232,7 @@ trth style=text-align: left$text.get( macro.weblog.yourcomment )/th/tr tr td -textarea name=content cols=50 rows=10$commentForm.content/textareabr / +textarea name=content cols=50 rows=10$utilities.escapeHTML($commentForm.content)/textareabr / span class=comments-syntax-indicator $text.get( macro.weblog.htmlsyntax ) #if( $escapeHtml )
svn commit: r528648 - /roller/tags/roller_3.1_rc8/
Author: snoopdave Date: Fri Apr 13 13:29:42 2007 New Revision: 528648 URL: http://svn.apache.org/viewvc?view=revrev=528648 Log: 3.1 rc8 ready for release Added: roller/tags/roller_3.1_rc8/ - copied from r528647, roller/branches/roller_3.1/
svn commit: r529497 - in /roller/trunk/src/org/apache/roller/webservices/atomprotocol: Collection.java RollerAtomHandler.java Workspace.java
Author: snoopdave
Date: Mon Apr 16 23:11:04 2007
New Revision: 529497
URL: http://svn.apache.org/viewvc?view=revrev=529497
Log:
- Removing namespaces from APP service doc elements
- Fixing resource collections
Modified:
roller/trunk/src/org/apache/roller/webservices/atomprotocol/Collection.java
roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
roller/trunk/src/org/apache/roller/webservices/atomprotocol/Workspace.java
Modified:
roller/trunk/src/org/apache/roller/webservices/atomprotocol/Collection.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/atomprotocol/Collection.java?view=diffrev=529497r1=529496r2=529497
==
--- roller/trunk/src/org/apache/roller/webservices/atomprotocol/Collection.java
(original)
+++ roller/trunk/src/org/apache/roller/webservices/atomprotocol/Collection.java
Mon Apr 16 23:11:04 2007
@@ -141,27 +141,27 @@
title.setText(collection.getTitle());
element.addContent(title);
if (collection.getTitleType() != null
!collection.getTitleType().equals(TEXT)) {
-element.setAttribute(type, collection.getTitleType(),
AtomService.ATOM_FORMAT);
+element.setAttribute(type, collection.getTitleType()); //,
AtomService.ATOM_FORMAT);
}
// Loop to create app:categories elements
for (Iterator it = collection.getCategories().iterator();
it.hasNext();) {
Categories cats = (Categories)it.next();
Element catsElem = new Element(categories,
AtomService.ATOM_PROTOCOL);
-catsElem.setAttribute(fixed, cats.isFixed() ? yes : no,
AtomService.ATOM_PROTOCOL);
+catsElem.setAttribute(fixed, cats.isFixed() ? yes : no); //,
AtomService.ATOM_PROTOCOL);
if (cats.getScheme() != null) {
-catsElem.setAttribute(scheme, cats.getScheme(),
AtomService.ATOM_PROTOCOL);
+catsElem.setAttribute(scheme, cats.getScheme()); //,
AtomService.ATOM_PROTOCOL);
}
// Loop to create atom:category elements
for (Iterator catIter = cats.getCategories().iterator();
catIter.hasNext();) {
Category cat = (Category) catIter.next();
Element catElem = new Element(category,
AtomService.ATOM_FORMAT);
-catElem.setAttribute(term, cat.getTerm(),
AtomService.ATOM_FORMAT);
+catElem.setAttribute(term, cat.getTerm()); //,
AtomService.ATOM_FORMAT);
if (cat.getScheme() != null) { // optional
-catElem.setAttribute(scheme, cat.getScheme(),
AtomService.ATOM_FORMAT);
+catElem.setAttribute(scheme, cat.getScheme()); //,
AtomService.ATOM_FORMAT);
}
if (cat.getLabel() != null) { // optional
-catElem.setAttribute(label, cat.getLabel(),
AtomService.ATOM_FORMAT);
+catElem.setAttribute(label, cat.getLabel()); //,
AtomService.ATOM_FORMAT);
}
catsElem.addContent(catElem);
}
Modified:
roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=529497r1=529496r2=529497
==
---
roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
Mon Apr 16 23:11:04 2007
@@ -406,8 +406,6 @@
if (!canView(website)) {
throw new AtomNotAuthorizedException(Not authorized to access
website);
}
-FileManager fmgr = roller.getFileManager();
-ThemeResource[] files = fmgr.getFiles(website, path);
Feed feed = new Feed();
feed.setId(URLUtilities.getAtomProtocolURL(true)
@@ -420,6 +418,9 @@
link.setType(text/html);
feed.setAlternateLinks(Collections.singletonList(link));
+FileManager fmgr = roller.getFileManager();
+ThemeResource[] files = fmgr.getFiles(website, path);
+
SortedSet sortedSet = new TreeSet(new Comparator() {
public int compare(Object o1, Object o2) {
ThemeResource f1 = (ThemeResource)o1;
@@ -433,12 +434,14 @@
}
});
-List atomEntries = new ArrayList();
-if (files != null start files.length) {
+if (files != null start files.length) {
+for (int j=0; jfiles.length; j++) {
+sortedSet.add(files[j
svn commit: r529861 - in /roller/trunk/sandbox/scripting: bsf/README.txt groovy/README.txt
Author: snoopdave Date: Tue Apr 17 21:39:17 2007 New Revision: 529861 URL: http://svn.apache.org/viewvc?view=revrev=529861 Log: Updating to mention new content-type field in page/template editor Modified: roller/trunk/sandbox/scripting/bsf/README.txt roller/trunk/sandbox/scripting/groovy/README.txt Modified: roller/trunk/sandbox/scripting/bsf/README.txt URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/bsf/README.txt?view=diffrev=529861r1=529860r2=529861 == --- roller/trunk/sandbox/scripting/bsf/README.txt (original) +++ roller/trunk/sandbox/scripting/bsf/README.txt Tue Apr 17 21:39:17 2007 @@ -16,8 +16,8 @@ 4) Restart Roller -5) Create a page template and set Template Language to either groovy, jruby - or javascript -- right now you'll have to do that via SQL. +5) Create a new Weblog Template and set the Template Language to either + groovy, jruby or javascript 6) In your page template you'll have access to all normal Roller models plus the name out will be bound to a Writer that you can use for output. Modified: roller/trunk/sandbox/scripting/groovy/README.txt URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/groovy/README.txt?view=diffrev=529861r1=529860r2=529861 == --- roller/trunk/sandbox/scripting/groovy/README.txt (original) +++ roller/trunk/sandbox/scripting/groovy/README.txt Tue Apr 17 21:39:17 2007 @@ -98,13 +98,12 @@ 4) Restart Roller -5) Create a page template and set Template Language to either groovlet or - gsp. Currently you'll have to do that via SQL. +5) Create a new Weblog Page Template and set Template Language to either + groovlet or gsp. 6) In your page template you'll have access to all normal Roller models plus the name out will be bound to a Writer that you can use for output. - Also, the name html will be bound to a markup builder. Here's an - example Groovy Roller page: + Also, the name html will be bound to a markup builder.
svn commit: r531025 - /roller/branches/roller_3.0/ant.properties
Author: snoopdave Date: Sat Apr 21 06:39:14 2007 New Revision: 531025 URL: http://svn.apache.org/viewvc?view=revrev=531025 Log: Version 3.0.1-incubating Modified: roller/branches/roller_3.0/ant.properties Modified: roller/branches/roller_3.0/ant.properties URL: http://svn.apache.org/viewvc/roller/branches/roller_3.0/ant.properties?view=diffrev=531025r1=531024r2=531025 == --- roller/branches/roller_3.0/ant.properties (original) +++ roller/branches/roller_3.0/ant.properties Sat Apr 21 06:39:14 2007 @@ -3,7 +3,7 @@ basedir=. # what version is this? -ro.version=3.0-incubating +ro.version=3.0.1-incubating # compile time settings build.debug=true
svn commit: r531174 - /roller/trunk/web/WEB-INF/velocity/weblog.vm
Author: snoopdave Date: Sun Apr 22 06:28:32 2007 New Revision: 531174 URL: http://svn.apache.org/viewvc?view=revrev=531174 Log: I18N fix Modified: roller/trunk/web/WEB-INF/velocity/weblog.vm Modified: roller/trunk/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/velocity/weblog.vm?view=diffrev=531174r1=531173r2=531174 == --- roller/trunk/web/WEB-INF/velocity/weblog.vm (original) +++ roller/trunk/web/WEB-INF/velocity/weblog.vm Sun Apr 22 06:28:32 2007 @@ -665,7 +665,7 @@ #if( $showCatChooser ) #set( $cats = $model.weblog.getWeblogCategories(nil) ) select name=cat -option value=- In Category -/option +option value=- $text.get(mainPage.category) -/option #foreach( $cat in $cats ) option #if($cat.name == $model.term)selected=selected#end$cat.name/option #end
svn commit: r534895 - /roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
Author: snoopdave
Date: Thu May 3 07:51:14 2007
New Revision: 534895
URL: http://svn.apache.org/viewvc?view=revrev=534895
Log:
Fixing compile warning
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java?view=diffrev=534895r1=534894r2=534895
==
---
roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
Thu May 3 07:51:14 2007
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-package org.apache.roller.ui.rendering.servlets;
+package org.apache.roller.ui.rendering.servlets;
import java.io.IOException;
import java.sql.Timestamp;
@@ -500,7 +500,7 @@
for (Iterator it = messages.getMessages(); it.hasNext();) {
RollerMessage rollerMessage = (RollerMessage)it.next();
ownermsg.append((escapeHtml) ? : li);
-
ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()),
rollerMessage.getArgs()) );
+
ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()),
(Object[])rollerMessage.getArgs()) );
ownermsg.append((escapeHtml) ? \n\n : /li);
}
if (messages.getMessageCount() 0) {
@@ -517,7 +517,7 @@
for (Iterator it = messages.getErrors(); it.hasNext();) {
RollerMessage rollerMessage = (RollerMessage)it.next();
ownermsg.append((escapeHtml) ? : li);
-
ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()),
rollerMessage.getArgs()) );
+
ownermsg.append(MessageFormat.format(resources.getString(rollerMessage.getKey()),
(Object[])rollerMessage.getArgs()) );
ownermsg.append((escapeHtml) ? \n\n : /li);
}
if (messages.getErrorCount() 0) {
svn commit: r536924 [1/2] - /roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties
Author: snoopdave Date: Thu May 10 09:24:00 2007 New Revision: 536924 URL: http://svn.apache.org/viewvc?view=revrev=536924 Log: New Japanese translation by: Yuichi Takahashi Ph.D. Student Fondation of Computer Science Laboratory Department of Imfomation Systems Graduate School of Computer Science and Engeenering The University of Aizu, Fukushima, Japan Modified: roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties
svn commit: r538167 - in /roller/trunk/metadata/xdoclet: filter-mappings.xml filters.xml servlet-mappings.xml servlets.xml web-resource-env-refs.xml web-security.xml web-settings.xml welcomefiles.xml
Author: snoopdave Date: Tue May 15 06:08:27 2007 New Revision: 538167 URL: http://svn.apache.org/viewvc?view=revrev=538167 Log: Now that we are doing our own web.xml file, we can remove these longer needed XDoclet merge files. Removed: roller/trunk/metadata/xdoclet/filter-mappings.xml roller/trunk/metadata/xdoclet/filters.xml roller/trunk/metadata/xdoclet/servlet-mappings.xml roller/trunk/metadata/xdoclet/servlets.xml roller/trunk/metadata/xdoclet/web-resource-env-refs.xml roller/trunk/metadata/xdoclet/web-security.xml roller/trunk/metadata/xdoclet/web-settings.xml roller/trunk/metadata/xdoclet/welcomefiles.xml
svn commit: r538177 - /roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
Author: snoopdave Date: Tue May 15 06:21:50 2007 New Revision: 538177 URL: http://svn.apache.org/viewvc?view=revrev=538177 Log: Screenname is now required Modified: roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy Modified: roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy?view=diffrev=538177r1=538176r2=538177 == --- roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy (original) +++ roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy Tue May 15 06:21:50 2007 @@ -31,6 +31,7 @@ user = new org.apache.roller.pojos.UserData(); user.setUserName(username); +user.setScreenName(username); user.setPassword(password); user.setFullName(fullName); user.setEmailAddress(email);
svn commit: r538261 - /roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.orm.xml
Author: snoopdave Date: Tue May 15 10:44:07 2007 New Revision: 538261 URL: http://svn.apache.org/viewvc?view=revrev=538261 Log: Added missing UserData.screenName field Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.orm.xml Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.orm.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.orm.xml?view=diffrev=538261r1=538260r2=538261 == --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.orm.xml (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/UserData.orm.xml Tue May 15 10:44:07 2007 @@ -81,6 +81,9 @@ basic name=userName column name=username insertable=true updatable=true unique=true/ /basic +basic name=screenName +column name=screenname insertable=true updatable=true unique=true/ +/basic basic name=activationCode column name=activationcode insertable=true updatable=true unique=true/ /basic
svn commit: r538395 - /roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
Author: snoopdave
Date: Tue May 15 18:19:46 2007
New Revision: 538395
URL: http://svn.apache.org/viewvc?view=revrev=538395
Log:
Collections returned by backend are not writeable
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java?view=diffrev=538395r1=538394r2=538395
==
--- roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
Tue May 15 18:19:46 2007
@@ -142,12 +142,15 @@
try {
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
-List weblogs = null;
+List rawWeblogs = null;
if (letter == null) {
-weblogs = umgr.getWebsites(null, Boolean.TRUE,
Boolean.TRUE, startDate, null, offset, length + 1);
+rawWeblogs = umgr.getWebsites(null, Boolean.TRUE,
Boolean.TRUE, startDate, null, offset, length + 1);
} else {
-weblogs = umgr.getWeblogsByLetter(letter.charAt(0),
offset, length + 1);
+rawWeblogs = umgr.getWeblogsByLetter(letter.charAt(0),
offset, length + 1);
}
+// Collections returned by backend are not writeable, so
create copy
+List weblogs = new ArrayList();
+weblogs.addAll(rawWeblogs);
// check if there are more results for paging
if(weblogs.size() length) {
svn commit: r538408 - in /roller/branches/roller_4.0_newbackend: ./ apps/planet/ tools/openjpa-0.9.6/ tools/openjpa-0.9.7/
Author: snoopdave
Date: Tue May 15 19:23:28 2007
New Revision: 538408
URL: http://svn.apache.org/viewvc?view=revrev=538408
Log:
Upgrading to OpenJPA 0.9.7
Added:
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar
(with props)
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar
(with props)
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar
(with props)
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar
(with props)
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/serp-1.11.0.jar
(with props)
Removed:
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.6/
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/build.xml
roller/branches/roller_4.0_newbackend/properties.xmlf
Modified: roller/branches/roller_4.0_newbackend/apps/planet/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/build.xml?view=diffrev=538408r1=538407r2=538408
==
--- roller/branches/roller_4.0_newbackend/apps/planet/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/apps/planet/build.xml Tue May 15
19:23:28 2007
@@ -73,10 +73,10 @@
include name=hibernate-3.1/lib/jdbc2_0-stdext.jar/
!-- needed for JPA/OpenJPA --
-include name=openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar/
-include name=openjpa-0.9.6/persistence-api-1.0.jar/
-include name=openjpa-0.9.6/serp-1.11.0.jar/
-include name=openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar/
+include name=openjpa-0.9.7/openjpa-0.9.7-incubating.jar/
+include name=openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar/
+include name=openjpa-0.9.7/serp-1.11.0.jar/
+include
name=openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar/
!-- Needed for JPA/Toplink
include name=toplink-essentials-9.1/toplink-essentials.jar/ --
@@ -211,12 +211,12 @@
/fileset
/copy
mkdir dir=${build.compile.business}/META-INF /
-copy todir=${build.compile.business}/META-INF
file=testdata/META-INF/persistence.xml /
+copy todir=${build.compile.business}/META-INF
file=src/java/META-INF/persistence.xml /
!-- OpenJPA bytecode enhancement --
taskdef name=openjpac
classname=org.apache.openjpa.ant.PCEnhancerTask
classpathref=planet.business.path /
openjpac
-config
propertiesFile=web/WEB-INF/classes/META-INF/persistence.xml /
+config propertiesFile=src/java/META-INF/persistence.xml /
classpath
path refid=planet.business.path/
pathelement location=${build.compile.business} /
Modified: roller/branches/roller_4.0_newbackend/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/properties.xmlf?view=diffrev=538408r1=538407r2=538408
==
--- roller/branches/roller_4.0_newbackend/properties.xmlf (original)
+++ roller/branches/roller_4.0_newbackend/properties.xmlf Tue May 15 19:23:28
2007
@@ -43,7 +43,7 @@
property name=build.dist.apache value=${build.dist}/apache/
property name=build.dist.binary
value=${build.dist}/apache-roller-${ro.version}/
property name=build.dist.sources
value=${build.dist}/apache-roller-src-${ro.version}/
-property name=build.dbscripts value=${ro.build}/dbscripts/
+property name=build.dbscripts
value=${build.webapp}/WEB-INF/dbscripts/
property name=build.tests value=${ro.build}/tests/
property name=build.reports value=${build.tests}/reports/
property name=build.docs value=${ro.build}/docs/
@@ -56,7 +56,7 @@
property name=tools.strutsvalue=${ro.tools}/struts-1.2.4 /
property name=tools.struts2 value=${ro.tools}/struts-2.0.5 /
property name=tools.hibernate value=${ro.tools}/hibernate-3.1 /
-property name=tools.jpa value=${ro.tools}/openjpa-0.9.6 /
+property name=tools.jpa value=${ro.tools}/openjpa-0.9.7 /
!--
property name=tools.jpa
value=${ro.tools}/toplink-essentials-9.1 /
--
Added:
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar?view=autorev=538408
==
Binary file - no diff available.
Propchange:
roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar
svn commit: r538409 - in /roller/branches/roller_4.0_newbackend: apps/planet/src/java/META-INF/ apps/planet/testdata/META-INF/ apps/planet/web/WEB-INF/classes/META-INF/ components/core/src/java/org/ap
Author: snoopdave
Date: Tue May 15 19:36:54 2007
New Revision: 538409
URL: http://svn.apache.org/viewvc?view=revrev=538409
Log:
Fixing some problems found in testing today
Added:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/META-INF/
roller/branches/roller_4.0_newbackend/apps/planet/src/java/META-INF/persistence.xml
- copied unchanged from r538258,
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml
roller/branches/roller_4.0_newbackend/src/META-INF/
roller/branches/roller_4.0_newbackend/src/META-INF/persistence.xml
- copied unchanged from r538258,
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/META-INF/persistence.xml
Removed:
roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/META-INF/persistence.xml
Modified:
roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java
roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar
roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar
Modified:
roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java?view=diffrev=538409r1=538408r2=538409
==
---
roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
(original)
+++
roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
Tue May 15 19:36:54 2007
@@ -44,7 +44,7 @@
/**
* The thread local EntityManager.
*/
-private static final ThreadLocal threadLocalEntityManager = new
ThreadLocal();
+private final ThreadLocal threadLocalEntityManager = new ThreadLocal();
/**
* The EntityManagerFactory for this Roller instance.
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java?view=diffrev=538409r1=538408r2=538409
==
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
Tue May 15 19:36:54 2007
@@ -1058,7 +1058,7 @@
public List getWeblogsByLetter(char letter, int offset, int length)
throws RollerException {
Query query = strategy.getNamedQuery(
-WebsiteData.getByHandleOrderByHandle);
+WebsiteData.getByLetterOrderByHandle);
query.setParameter(1, letter + %);
if (offset != 0) {
query.setFirstResult(offset);
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml?view=diffrev=538409r1=538408r2=538409
==
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml
Tue May 15 19:36:54 2007
@@ -17,6 +17,9 @@
named-query name=WebsiteData.getByHandleOrderByHandle
querySELECT w FROM WebsiteData w WHERE w.handle = ?1
ORDER BY w.handle/query
/named-query
+ named-query name=WebsiteData.getByLetterOrderByHandle
+ querySELECT w FROM WebsiteData w WHERE
UPPER(w.handle) like ?1 ORDER BY w.handle/query
+ /named-query
named-query
name=WebsiteData.getByEndDateamp;StartDateamp;Enabledamp;Activeamp;Permissions.useramp;Permissions.pendingOrderByDateCreatedDesc
querySELECT w FROM WebsiteData w WHERE w.dateCreated
lt; ?1 AND w.dateCreated gt; ?2
AND w.enabled = ?3 AND
w.active = ?4
Modified:
roller/branches/roller_4.0_newbackend/src/org
svn commit: r539569 - /roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
Author: snoopdave
Date: Fri May 18 12:21:25 2007
New Revision: 539569
URL: http://svn.apache.org/viewvc?view=revrev=539569
Log:
Fixing ROL-1410, cast to Number rather than Integer
Modified:
roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
Modified:
roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?view=diffrev=539569r1=539568r2=539569
==
---
roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
(original)
+++
roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
Fri May 18 12:21:25 2007
@@ -840,7 +840,7 @@
Query query = session.createQuery(
select count(user) from UserData user where
upper(user.userName) like '+lc.charAt(i)+%');
List row = query.list();
-Integer count = (Integer)row.get(0);
+Number count = (Number)row.get(0);
results.put(new String(new char[]{lc.charAt(i)}), count);
}
return results;
@@ -882,7 +882,7 @@
Query query = session.createQuery(
select count(website) from WebsiteData website where
upper(website.handle) like '+lc.charAt(i)+%');
List row = query.list();
-Integer count = (Integer)row.get(0);
+Number count = (Number)row.get(0);
results.put(new String(new char[]{lc.charAt(i)}), count);
}
return results;
svn commit: r539581 - in /roller/trunk/src/org/apache/roller: ui/rendering/velocity/deprecated/OldUtilities.java util/Utilities.java
Author: snoopdave
Date: Fri May 18 13:03:55 2007
New Revision: 539581
URL: http://svn.apache.org/viewvc?view=revrev=539581
Log:
Use Commons Codec for Base64, not Sun internal classes
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java
roller/trunk/src/org/apache/roller/util/Utilities.java
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java?view=diffrev=539581r1=539580r2=539581
==
---
roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java
(original)
+++
roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldUtilities.java
Fri May 18 13:03:55 2007
@@ -32,7 +32,7 @@
import org.apache.roller.util.DateUtil;
import org.apache.roller.util.RegexUtil;
import org.apache.roller.util.Utilities;
-
+import org.apache.commons.codec.binary.Base64;
/**
* Utility methods needed by old Roller 2.X macros/templates.
@@ -487,9 +487,8 @@
* @throws IOException
*/
public static String encodeString(String str) throws IOException {
-sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder();
-String encodedStr = encoder.encodeBuffer(str.getBytes());
-
+Base64 base64 = new Base64();
+String encodedStr = new String(base64.encodeBase64(str.getBytes()));
return (encodedStr.trim());
}
@@ -501,9 +500,8 @@
* @throws IOException
*/
public static String decodeString(String str) throws IOException {
-sun.misc.BASE64Decoder dec = new sun.misc.BASE64Decoder();
-String value = new String(dec.decodeBuffer(str));
-
+Base64 base64 = new Base64();
+String value = new String(base64.decodeBase64(str.getBytes()));
return (value);
}
Modified: roller/trunk/src/org/apache/roller/util/Utilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/util/Utilities.java?view=diffrev=539581r1=539580r2=539581
==
--- roller/trunk/src/org/apache/roller/util/Utilities.java (original)
+++ roller/trunk/src/org/apache/roller/util/Utilities.java Fri May 18 13:03:55
2007
@@ -23,10 +23,9 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.codec.binary.Base64;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
+
/**
* General purpose utilities, not for use in templates.
*/
@@ -433,9 +432,8 @@
* @throws IOException
*/
public static String encodeString(String str) throws IOException {
-BASE64Encoder encoder = new BASE64Encoder();
-String encodedStr = encoder.encodeBuffer(str.getBytes());
-
+Base64 base64 = new Base64();
+String encodedStr = new String(base64.encodeBase64(str.getBytes()));
return (encodedStr.trim());
}
@@ -447,9 +445,8 @@
* @throws IOException
*/
public static String decodeString(String str) throws IOException {
-BASE64Decoder dec = new BASE64Decoder();
-String value = new String(dec.decodeBuffer(str));
-
+Base64 base64 = new Base64();
+String value = new String(base64.decodeBase64(str.getBytes()));
return (value);
}
svn commit: r539584 - /roller/trunk/web/WEB-INF/velocity/weblog.vm
Author: snoopdave Date: Fri May 18 13:08:18 2007 New Revision: 539584 URL: http://svn.apache.org/viewvc?view=revrev=539584 Log: Oops, we missed this comment field when we added XSS preventing escapeing Modified: roller/trunk/web/WEB-INF/velocity/weblog.vm Modified: roller/trunk/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/velocity/weblog.vm?view=diffrev=539584r1=539583r2=539584 == --- roller/trunk/web/WEB-INF/velocity/weblog.vm (original) +++ roller/trunk/web/WEB-INF/velocity/weblog.vm Fri May 18 13:08:18 2007 @@ -196,7 +196,7 @@ p class=comment-details $text.get(macro.weblog.postedby) #if (!$utils.isEmpty($comment.name) !$utils.isEmpty($comment.url)) -a rel=nofollow href=$comment.urlb$utils.escapeHTML($comment.name)/b/a +a rel=nofollow href=$utils.escapeHTML($comment.url)b$utils.escapeHTML($comment.name)/b/a #elseif (!$utils.isEmpty($comment.name)) b$utils.escapeHTML($comment.name)/b #elseif ($comment.remoteHost)
svn commit: r539585 - /roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm
Author: snoopdave Date: Fri May 18 13:08:33 2007 New Revision: 539585 URL: http://svn.apache.org/viewvc?view=revrev=539585 Log: Oops, we missed this comment field when we added XSS preventing escapeing Modified: roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm Modified: roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm?view=diffrev=539585r1=539584r2=539585 == --- roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm (original) +++ roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm Fri May 18 13:08:33 2007 @@ -176,7 +176,7 @@ p class=comment-details $text.get(macro.weblog.postedby) #if (!$utils.isEmpty($comment.name) !$utils.isEmpty($comment.url)) -a rel=nofollow href=$comment.urlb$utils.escapeHTML($comment.name)/b/a +a rel=nofollow href=$utils.escapeHTML($comment.url)b$utils.escapeHTML($comment.name)/b/a #elseif (!$utils.isEmpty($comment.name)) b$utils.escapeHTML($comment.name)/b #elseif ($comment.remoteHost)
svn commit: r539587 - /roller/branches/roller_3.1/metadata/xdoclet/web-resource-env-refs.xml
Author: snoopdave Date: Fri May 18 13:09:37 2007 New Revision: 539587 URL: http://svn.apache.org/viewvc?view=revrev=539587 Log: Uncomment mail session ref, fixes ROL-1412 Modified: roller/branches/roller_3.1/metadata/xdoclet/web-resource-env-refs.xml Modified: roller/branches/roller_3.1/metadata/xdoclet/web-resource-env-refs.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_3.1/metadata/xdoclet/web-resource-env-refs.xml?view=diffrev=539587r1=539586r2=539587 == --- roller/branches/roller_3.1/metadata/xdoclet/web-resource-env-refs.xml (original) +++ roller/branches/roller_3.1/metadata/xdoclet/web-resource-env-refs.xml Fri May 18 13:09:37 2007 @@ -5,10 +5,9 @@ res-authContainer/res-auth /resource-ref -!-- Uncomment this for email notification of comments +!-- Uncomment this for email notification of comments -- resource-ref res-ref-namemail/Session/res-ref-name res-typejavax.mail.Session/res-type res-authContainer/res-auth /resource-ref --- \ No newline at end of file
svn commit: r539595 - /roller/trunk/web/WEB-INF/velocity/weblog.vm
Author: snoopdave Date: Fri May 18 13:39:08 2007 New Revision: 539595 URL: http://svn.apache.org/viewvc?view=revrev=539595 Log: Comment fields no longer need escaping; that's done by the wrapper Modified: roller/trunk/web/WEB-INF/velocity/weblog.vm Modified: roller/trunk/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/velocity/weblog.vm?view=diffrev=539595r1=539594r2=539595 == --- roller/trunk/web/WEB-INF/velocity/weblog.vm (original) +++ roller/trunk/web/WEB-INF/velocity/weblog.vm Fri May 18 13:39:08 2007 @@ -180,9 +180,9 @@ #foreach( $comment in $comments ) #if($comment.approved || $model.commentForm.preview) #if($config.commentEscapeHtml) -#set($content = $utils.escapeHTML($comment.content)) +#set($content = $comment.content)) #else -#set($content = $utils.transformToHTMLSubset($utils.escapeHTML($comment.content))) +#set($content = $utils.transformToHTMLSubset($comment.content)) #end #if($config.commentAutoFormat) #set($content = $utils.autoformat($content)) @@ -196,11 +196,11 @@ p class=comment-details $text.get(macro.weblog.postedby) #if (!$utils.isEmpty($comment.name) !$utils.isEmpty($comment.url)) -a rel=nofollow href=$utils.escapeHTML($comment.url)b$utils.escapeHTML($comment.name)/b/a +a rel=nofollow href=$comment.urlb$comment.name/b/a #elseif (!$utils.isEmpty($comment.name)) -b$utils.escapeHTML($comment.name)/b +b$comment.name/b #elseif ($comment.remoteHost) -b$utils.escapeHTML($comment.remoteHost)/b +b$comment.remoteHost/b #else b$text.get(macro.weblog.comment.unknown)/b #end
svn commit: r539670 - /roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java
Author: snoopdave
Date: Fri May 18 18:48:39 2007
New Revision: 539670
URL: http://svn.apache.org/viewvc?view=revrev=539670
Log:
Fixing broken build
Modified:
roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java
Modified: roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java?view=diffrev=539670r1=539669r2=539670
==
--- roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java
(original)
+++ roller/trunk/src/org/apache/roller/ui/authoring/struts2/ThemeEdit.java Fri
May 18 18:48:39 2007
@@ -97,7 +97,7 @@
try {
// set theme to current value
setThemeId(getActionWeblog().getTheme().getId());
-} catch (RollerException ex) {
+} catch (Exception ex) {
log.error(Error getting theme for weblog -
+getActionWeblog().getHandle(), ex);
}
svn commit: r539673 [2/2] - in /roller/branches/roller_4.0_newbackend: ./ apps/planet/ metadata/database/tmpls/ nbproject/ sandbox/scripting/groovy/examples/rollerapi/ src/org/apache/roller/pojos/ src
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp?view=diffrev=539673r1=539672r2=539673
==
---
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp
(original)
+++
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/TemplateEdit.jsp
Fri May 18 19:02:48 2007
@@ -24,19 +24,17 @@
/s:text
/p
-s:if test=bean.required
+s:if test=template.required
p class=pagetips:text name=pageForm.tip.required //p
/s:if
s:else
p class=pagetips:text name=pageForm.tip //p
/s:else
-s:form action=template!save id=template
+s:form action=templateEdit!save id=template
+s:hidden name=weblog /
s:hidden name=bean.id/
-s:hidden name=bean.decoratorName /
-s:hidden name=bean.required /
s:hidden name=bean.action /
-s:hidden name=weblog value=%{actionWeblog.handle} /
%-- ==
--%
%-- Name, link and desription: disabled when page is a required page --%
@@ -45,7 +43,7 @@
tr
td class=labels:text name=pageForm.name /nbsp;/td
td class=field
-s:if test=bean.required
+s:if test=template.required
span class=fixedAttrs:property
value=bean.name//span
s:hidden name=bean.name /
/s:if
@@ -92,11 +90,11 @@
--
/script
-s:if test=!bean.required
+s:if test=!template.required
tr
td class=label valign=tops:text name=pageForm.link
/nbsp;/td
td class=field
-s:if test=bean.required
+s:if test=template.required
span class=fixedAttrs:property
value=bean.link//span
s:hidden name=bean.link /
/s:if
@@ -115,7 +113,7 @@
tr
td class=label valign=top style=padding-top: 4pxs:text
name=pageForm.description /nbsp;/td
td class=field
-s:if test=bean.required
+s:if test=template.required
span class=fixedAttrs:property
value=bean.description//span
s:hidden name=bean.description /
/s:if
@@ -136,7 +134,7 @@
script type=text/javascript!--
if (getCookie(editorSize1) != null) {
-document.weblogTemplateFormEx.contents.rows =
getCookie(editorSize1);
+document.getElementById('template_bean_contents').rows =
getCookie(editorSize1);
}
function changeSize(e, num) {
a = e.rows + num;
@@ -162,9 +160,9 @@
td align=right
!-- Add buttons to make this textarea taller or shorter --
input type=button name=taller value= darr;
-
onclick=changeSize1(document.template.template_bean_contents, 5) /
+
onclick=changeSize1(document.getElementById('template_bean_contents'), 5) /
input type=button name=shorter value= uarr;
-
onclick=changeSize1(document.template.template_bean_contents, -5) /
+
onclick=changeSize1(document.getElementById('template_bean_contents'), -5) /
/td
/tr
/table
@@ -187,12 +185,12 @@
tr
script type=text/javascript!--
function showContentTypeField() {
-if
(document.weblogTemplateFormEx.autoContentType[0].checked) {
-
document.weblogTemplateFormEx.manualContentType.readOnly = true;
-
document.weblogTemplateFormEx.manualContentType.style.background = '#e5e5e5';
+if
(document.getElementById('template_bean_autoContentType1').checked) {
+
document.getElementById('template_bean_manualContentType').readOnly = true;
+
document.getElementById('template_bean_manualContentType').style.background =
'#e5e5e5';
} else {
-
document.weblogTemplateFormEx.manualContentType.readOnly = false;
-
document.weblogTemplateFormEx.manualContentType.style.background = '#ff';
+
document.getElementById('template_bean_manualContentType').readOnly = false;
+
document.getElementById('template_bean_manualContentType').style.background =
'#ff';
}
}
// --/script
@@ -200,13 +198,22 @@
tr
td class=label
svn commit: r539679 - /roller/trunk/metadata/database/tmpls/createdb.vm
Author: snoopdave Date: Fri May 18 19:55:03 2007 New Revision: 539679 URL: http://svn.apache.org/viewvc?view=revrev=539679 Log: Added missing website.about and website.icon fields Modified: roller/trunk/metadata/database/tmpls/createdb.vm Modified: roller/trunk/metadata/database/tmpls/createdb.vm URL: http://svn.apache.org/viewvc/roller/trunk/metadata/database/tmpls/createdb.vm?view=diffrev=539679r1=539678r2=539679 == --- roller/trunk/metadata/database/tmpls/createdb.vm (original) +++ roller/trunk/metadata/database/tmpls/createdb.vm Fri May 18 19:55:03 2007 @@ -120,7 +120,10 @@ pagemodels varchar(255) default null, enablemultilang $db.BOOLEAN_SQL_TYPE_FALSE not null, showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null, -customstylesheet varchar(128) +customstylesheet varchar(128), +about varchar(255), +icon varchar(255) + ); create index ws_userid_idxon website(userid); create index ws_isenabled_idx on website(isenabled);
svn commit: r539680 - in /roller/branches/roller_4.0_newbackend: merges.txt metadata/database/tmpls/createdb.vm
Author: snoopdave Date: Fri May 18 19:58:13 2007 New Revision: 539680 URL: http://svn.apache.org/viewvc?view=revrev=539680 Log: Merging createdb.sql fixes from trunk Modified: roller/branches/roller_4.0_newbackend/merges.txt roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm Modified: roller/branches/roller_4.0_newbackend/merges.txt URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diffrev=539680r1=539679r2=539680 == --- roller/branches/roller_4.0_newbackend/merges.txt (original) +++ roller/branches/roller_4.0_newbackend/merges.txt Fri May 18 19:58:13 2007 @@ -4,6 +4,7 @@ Temporary file to track merges from trunk into the roller_4.0_newbackend branch. May 18, 2007: merging latest from trunk +svn merge -r 539671:539679 https://svn.apache.org/repos/asf/roller/trunk svn merge -r 539636:539671 https://svn.apache.org/repos/asf/roller/trunk svn merge -r 539068:539636 https://svn.apache.org/repos/asf/roller/trunk Modified: roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm?view=diffrev=539680r1=539679r2=539680 == --- roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm (original) +++ roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm Fri May 18 19:58:13 2007 @@ -120,7 +120,10 @@ pagemodels varchar(255) default null, enablemultilang $db.BOOLEAN_SQL_TYPE_FALSE not null, showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null, -customstylesheet varchar(128) +customstylesheet varchar(128), +about varchar(255), +icon varchar(255) + ); create index ws_userid_idxon website(userid); create index ws_isenabled_idx on website(isenabled);
svn commit: r539683 - /roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml
Author: snoopdave Date: Fri May 18 20:09:35 2007 New Revision: 539683 URL: http://svn.apache.org/viewvc?view=revrev=539683 Log: Adding new columns to JPA setup Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml?view=diffrev=539683r1=539682r2=539683 == --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml Fri May 18 20:09:35 2007 @@ -141,6 +141,12 @@ basic name=handle column name=handle insertable=true updatable=true unique=true/ /basic + basic name=about + column name=about insertable=true updatable=true unique=false/ + /basic + basic name=iconPath + column name=icon insertable=true updatable=true unique=false/ + /basic basic name=name column name=name insertable=true updatable=true unique=false/ /basic @@ -239,7 +245,6 @@ transient name=adminUserCount/ transient name=commentCount/ transient name=commentModerationRequired/ -transient name=customStylesheet / transient name=todaysHits/ transient name=todaysReferrers/ transient name=uRL/
svn commit: r539778 - /roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm
Author: snoopdave Date: Sat May 19 10:07:53 2007 New Revision: 539778 URL: http://svn.apache.org/viewvc?view=revrev=539778 Log: Correcting comments for new website.about and website.icon fields Modified: roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm Modified: roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm URL: http://svn.apache.org/viewvc/roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm?view=diffrev=539778r1=539777r2=539778 == --- roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm (original) +++ roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm Sat May 19 10:07:53 2007 @@ -37,10 +37,10 @@ #addColumnNotNull(rolleruser screenname varchar(255) 'unspecified') update rolleruser set screenname = username; --- new column to allow setting of page template content-type +-- new column to allow setting of path to icon for website #addColumnNull(website icon varchar(255)) --- new column to allow setting of page template content-type +-- new column to allow setting of short website about text #addColumnNull(website about varchar(255)) -- new column to allow setting of page template content-type
svn commit: r539779 - /roller/branches/roller_guice/
Author: snoopdave Date: Sat May 19 10:12:39 2007 New Revision: 539779 URL: http://svn.apache.org/viewvc?view=revrev=539779 Log: Branch to dev and share experimental Guice code Added: roller/branches/roller_guice/ - copied from r539778, roller/trunk/
svn commit: r539786 - /roller/branches/roller_guice/readme-guice.txt
Author: snoopdave Date: Sat May 19 11:10:53 2007 New Revision: 539786 URL: http://svn.apache.org/viewvc?view=revrev=539786 Log: Notes on Roller/Guice implementation Added: roller/branches/roller_guice/readme-guice.txt Added: roller/branches/roller_guice/readme-guice.txt URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/readme-guice.txt?view=autorev=539786 == --- roller/branches/roller_guice/readme-guice.txt (added) +++ roller/branches/roller_guice/readme-guice.txt Sat May 19 11:10:53 2007 @@ -0,0 +1,75 @@ +*** Guice Dependency Inject (DI) in Roller, an experiment + +** Goals + +- Get started using DI in Roller so we can simplify Roller bootstrapping +- Don't change the public Roller API i.e. RollerFactory and Roller stay +- Maintain same level of back-end pluggability via roller-custom.properties + + +** Status of the branches/roller_guice + +- Roller backend can now starts-up via Guice +- Still need to eliminate RollerFactory from backend +- Still would like to create Manager interface to standardize manager lifecycle + + +** Advantages + +- Easy to define alternative backend modules for testing +- Gives us a way to get rid of the various factories around around +- Less code in RollerFactory + + +** Implementation notes + +- RollerFactory +The factory is now resposible for instantiating the Guice module specified in +roller.properties like so: + + guice.backend.module=org.apache.roller.business.hibernate.HibernateModule + + And here's the new RollerFactory: http://tinyurl.com/ypmeeg + +- HibernateModule +A backend module is responsible for binding interface classnames (e.g. Roller) +to interface implementations (e.g. HibernateRollerImpl). The Hibernate module: + + http://tinyurl.com/2bffkt + +- RollerImpl +The Roller implementation doesn't create managers anymore, all managers are +injected by Guice. It's a Guice @Singleton. Here's the new RollerImpl: + + http://tinyurl.com/ynu2me + +- HibernateRollerImpl +The HibernateRollerImpl no longer creates managers either, instead it relies +on the fact that it's parent class RollerImpl is injected. + + http://tinyurl.com/yrb4rm + +- HibernatePersistenceStrategy +The HibernatePersistenceStrategy takes care of it's own initialization using +RollerConfig (someday with a DatabaseProvider). It's a Guice @Singleton too. + +- Managers: +The managers all use constructor injection now. The Hibernate managers expect +to get their strategy and Roller instance (if required) via injection. I kept +RollerFactory in the public API so there is zero impact on front-end code, +but all references to RollerFactory should be eliminated in the back-end +(that's work still to be done). + +- Added Roller.init() method due to circular dependencies +Some managers need access to a Roller object as part of their implemenation, +so I've added a Roller.init() method. I'd like create a Manager interface as +we have in Planet to standardize manager lifecycle. + + +Notes on Guice + +- Simple small API that is very easy to understand +- Documentation is short and to the point +- Error messages are very good +- No horrible XML files to write +
svn commit: r540611 - in /roller/trunk: apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java tests/org/apache/roller/ui/StrutsActionTestBase.java
Author: snoopdave
Date: Tue May 22 08:44:48 2007
New Revision: 540611
URL: http://svn.apache.org/viewvc?view=revrev=540611
Log:
Removing unnecessary reference to InitialContext
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java?view=diffrev=540611r1=540610r2=540611
==
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
Tue May 22 08:44:48 2007
@@ -133,9 +133,7 @@
private void upgradeDatabaseIfNeeded() throws RollerException {
//try {
-//InitialContext ic = new InitialContext();
-//DataSource ds =
(DataSource)ic.lookup(java:comp/env/jdbc/rollerdb);
-//Connection con = ds.getConnection();
+//Connection con = // get connection somehow
//UpgradeDatabase.upgradeDatabase(con,
RollerFactory.getRoller().getVersion());
//con.close();
//} catch (NamingException e) {
Modified: roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java?view=diffrev=540611r1=540610r2=540611
==
--- roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java (original)
+++ roller/trunk/tests/org/apache/roller/ui/StrutsActionTestBase.java Tue May
22 08:44:48 2007
@@ -29,7 +29,6 @@
import com.mockrunner.struts.MapMessageResources;
import java.io.File;
import java.io.FileInputStream;
-import javax.naming.InitialContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
svn commit: r540675 - in /roller/trunk/web/WEB-INF: classes/struts-config.xml classes/validation.xml classes/validator-rules.xml struts-config.xml validation.xml validator-rules.xml
Author: snoopdave Date: Tue May 22 11:12:07 2007 New Revision: 540675 URL: http://svn.apache.org/viewvc?view=revrev=540675 Log: Correct location and ready to be deleted ;-) Added: roller/trunk/web/WEB-INF/struts-config.xml - copied unchanged from r540664, roller/trunk/web/WEB-INF/classes/struts-config.xml roller/trunk/web/WEB-INF/validation.xml - copied unchanged from r540664, roller/trunk/web/WEB-INF/classes/validation.xml roller/trunk/web/WEB-INF/validator-rules.xml - copied unchanged from r540664, roller/trunk/web/WEB-INF/classes/validator-rules.xml Removed: roller/trunk/web/WEB-INF/classes/struts-config.xml roller/trunk/web/WEB-INF/classes/validation.xml roller/trunk/web/WEB-INF/classes/validator-rules.xml
svn commit: r540677 - /roller/trunk/build.xml
Author: snoopdave Date: Tue May 22 11:23:28 2007 New Revision: 540677 URL: http://svn.apache.org/viewvc?view=revrev=540677 Log: Ensure dbscripts are generated on 'rebuild' Modified: roller/trunk/build.xml Modified: roller/trunk/build.xml URL: http://svn.apache.org/viewvc/roller/trunk/build.xml?view=diffrev=540677r1=540676r2=540677 == --- roller/trunk/build.xml (original) +++ roller/trunk/build.xml Tue May 22 11:23:28 2007 @@ -37,8 +37,8 @@ !-- * -- project name=roller default=usage -available file=./build/webapp/WEB-INF/dbscripts/derby/createdb.sql -property=dbscripts-exist / +!-- Only gen dbscripts if they do not already exist -- +available file=./build/webapp/WEB-INF/dbscripts/derby/createdb.sql property=dbscripts-exist / !-- Bring in properties.xml -- properties; @@ -84,6 +84,7 @@ /target target name=rebuild depends=clean,all description=Clean and build all +antcall target=gen-dbscripts / /target target name=clean description=Clean out build and dist directory
svn commit: r540679 - in /roller/trunk: src/org/apache/roller/business/ src/org/apache/roller/business/hibernate/ web/WEB-INF/classes/ web/roller-ui/tools/
Author: snoopdave
Date: Tue May 22 11:25:36 2007
New Revision: 540679
URL: http://svn.apache.org/viewvc?view=revrev=540679
Log:
DatabaseProvider for JNDI and JDBC properties based config
Added:
roller/trunk/src/org/apache/roller/business/DatabaseProvider.java
roller/trunk/src/org/apache/roller/business/hibernate/HibernateConnectionProvider.java
Modified:
roller/trunk/src/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java
roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
roller/trunk/web/WEB-INF/classes/hibernate.cfg.xml
roller/trunk/web/WEB-INF/classes/roller.properties
roller/trunk/web/roller-ui/tools/dstest.jsp
Added: roller/trunk/src/org/apache/roller/business/DatabaseProvider.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/DatabaseProvider.java?view=autorev=540679
==
--- roller/trunk/src/org/apache/roller/business/DatabaseProvider.java (added)
+++ roller/trunk/src/org/apache/roller/business/DatabaseProvider.java Tue May
22 11:25:36 2007
@@ -0,0 +1,121 @@
+package org.apache.roller.business;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerConfig;
+
+/**
+ * Encapsulates Roller database configuration via JDBC properties or JNDI.
+ *
+ * pReads configuration properties from RollerConfig:/p
+ * pre
+ * # Specify database configuration type of 'jndi' or 'jdbc'
+ * database.configurationType=jndi
+ *
+ * # For database configuration type 'jndi',this will be used
+ * database.jndi.name=jdbc/rollerdb
+ *
+ * # For database configuration type of 'jdbc', you MUST override these
+ * database.jdbc.driverClass=
+ * database.jdbc.connectionURL=
+ * database.jdbc.username=
+ * database.jdbc.password=
+ * /pre
+ */
+public class DatabaseProvider {
+private static Log log = LogFactory.getLog(DatabaseProvider.class);
+private enum ConfigurationType {JNDI_NAME, JDBC_PROPERTIES;}
+
+private static DatabaseProvider singletonInstance = null;
+
+private DataSource dataSource = null;
+
+private ConfigurationType type = ConfigurationType.JNDI_NAME;
+
+private String jndiName = null;
+
+private String jdbcDriverClass = null;
+private String jdbcConnectionURL = null;
+private String jdbcPassword = null;
+private String jdbcUsername = null;
+private Properties props = null;
+
+/**
+ * Reads configuraiton, loads driver or locates data-source and attempts
+ * to get test connecton so that we can fail early.
+ */
+private DatabaseProvider() throws RollerException {
+String connectionTypeString =
+RollerConfig.getProperty(database.configurationType);
+if (jdbc.equals(connectionTypeString)) {
+type = ConfigurationType.JDBC_PROPERTIES;
+}
+jndiName = RollerConfig.getProperty(database.jndi.name);
+jdbcDriverClass =
RollerConfig.getProperty(database.jdbc.driverClass);
+jdbcConnectionURL =
RollerConfig.getProperty(database.jdbc.connectionURL);
+jdbcUsername = RollerConfig.getProperty(database.jdbc.username);
+jdbcPassword = RollerConfig.getProperty(database.jdbc.password);
+
+// init now so we fail early
+if (type == ConfigurationType.JDBC_PROPERTIES) {
+log.info(Using 'jdbc' properties based configuration);
+try {
+Class.forName(jdbcDriverClass);
+} catch (ClassNotFoundException ex) {
+throw new RollerException(
+ Cannot load specified JDBC driver class [
+jdbcDriverClass+ ], ex);
+}
+if (jdbcUsername != null || jdbcPassword != null) {
+props = new Properties();
+if (jdbcUsername != null) props.put(user, jdbcUsername);
+if (jdbcPassword != null) props.put(password, jdbcPassword);
+}
+} else {
+log.info(Using 'jndi' based configuration);
+String name = java:comp/env/ + jndiName;
+try {
+InitialContext ic = new InitialContext();
+dataSource = (DataSource)ic.lookup(name);
+} catch (NamingException ex) {
+throw new RollerException(
+ERROR looking up data-source with JNDI name: + name,
ex);
+}
+}
+try {
+Connection testcon = getConnection();
+testcon.close();
+} catch (Throwable t) {
+throw new
svn commit: r540719 - /roller/trunk/testdata/roller-custom.properties
Author: snoopdave Date: Tue May 22 12:44:16 2007 New Revision: 540719 URL: http://svn.apache.org/viewvc?view=revrev=540719 Log: Use new database confg property names Modified: roller/trunk/testdata/roller-custom.properties Modified: roller/trunk/testdata/roller-custom.properties URL: http://svn.apache.org/viewvc/roller/trunk/testdata/roller-custom.properties?view=diffrev=540719r1=540718r2=540719 == --- roller/trunk/testdata/roller-custom.properties (original) +++ roller/trunk/testdata/roller-custom.properties Tue May 22 12:44:16 2007 @@ -11,11 +11,14 @@ search.index.dir=search-index -jdbc.driverClass=org.apache.derby.jdbc.ClientDriver -jdbc.connectionURL=jdbc:derby://localhost:3219/roller -jdbc.username=APP -jdbc.password=APP +database.configurationType=jdbc + +database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver +database.jdbc.connectionURL=jdbc:derby://localhost:3219/roller +database.jdbc.username=APP +database.jdbc.password=APP hibernate.dialect=org.hibernate.dialect.DerbyDialect + #jdbc.driverClass=org.hsqldb.jdbcDriver #jdbc.connectionURL=jdbc:hsqldb:hsql://localhost:3219
svn commit: r541090 - /roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
Author: snoopdave
Date: Wed May 23 14:19:02 2007
New Revision: 541090
URL: http://svn.apache.org/viewvc?view=revrev=541090
Log:
We're using DatabaseProvider everywhere now.
Modified:
roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
Modified: roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java?view=diffrev=541090r1=541089r2=541090
==
--- roller/trunk/src/org/apache/roller/ui/core/RollerContext.java (original)
+++ roller/trunk/src/org/apache/roller/ui/core/RollerContext.java Wed May 23
14:19:02 2007
@@ -21,15 +21,11 @@
import java.io.File;
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.SQLException;
import java.util.Date;
import java.util.Properties;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.sql.DataSource;
import org.acegisecurity.providers.ProviderManager;
import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
import org.acegisecurity.providers.encoding.Md5PasswordEncoder;
@@ -40,6 +36,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
+import org.apache.roller.business.DatabaseProvider;
import org.apache.roller.business.runnable.RollerTask;
import org.apache.roller.business.utils.UpgradeDatabase;
import org.apache.roller.config.PingConfig;
@@ -186,19 +183,10 @@
/**
* Trigger any database upgrade work that needs to be done.
*/
-private void upgradeDatabaseIfNeeded() throws Exception {
-
-try {
-InitialContext ic = new InitialContext();
-DataSource ds =
(DataSource)ic.lookup(java:comp/env/jdbc/rollerdb);
-Connection con = ds.getConnection();
-UpgradeDatabase.upgradeDatabase(con,
RollerFactory.getRoller().getVersion());
-con.close();
-} catch (NamingException e) {
-log.warn(Unable to access DataSource, e);
-} catch (SQLException e) {
-log.warn(e);
-}
+private void upgradeDatabaseIfNeeded() throws Exception {
+Connection con =
DatabaseProvider.getDatabaseProvider().getConnection();
+UpgradeDatabase.upgradeDatabase(con,
RollerFactory.getRoller().getVersion());
+con.close();
}
svn commit: r541330 - /roller/trunk/apps/planet/build.properties
Author: snoopdave Date: Thu May 24 08:40:14 2007 New Revision: 541330 URL: http://svn.apache.org/viewvc?view=revrev=541330 Log: We're all on 1.5 now, no? Modified: roller/trunk/apps/planet/build.properties Modified: roller/trunk/apps/planet/build.properties URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.properties?view=diffrev=541330r1=541329r2=541330 == --- roller/trunk/apps/planet/build.properties (original) +++ roller/trunk/apps/planet/build.properties Thu May 24 08:40:14 2007 @@ -1,7 +1,7 @@ # compile properties build.debug=true -build.sourcelevel=1.4 +build.sourcelevel=1.5 build.deprecation=false
svn commit: r541328 - in /roller/trunk/apps/planet: build.xml testdata/hibernate.cfg.xml testdata/planet-custom.properties testdata/planet.properties testdata/planetRuntimeConfigDefs.xml testdata/rome
Author: snoopdave
Date: Thu May 24 08:39:17 2007
New Revision: 541328
URL: http://svn.apache.org/viewvc?view=revrev=541328
Log:
Having two copies of planet.properties and hibernate.cfg.xml in Planet was
driving me bonkers, so now the build-test target creates a testcontext with
WEB-INF/classes and such. Also, Planet now uses DatabaseProvider to allow
properties based config, just like Roller.
Removed:
roller/trunk/apps/planet/testdata/hibernate.cfg.xml
roller/trunk/apps/planet/testdata/planet.properties
roller/trunk/apps/planet/testdata/planetRuntimeConfigDefs.xml
roller/trunk/apps/planet/testdata/rome.properties
Modified:
roller/trunk/apps/planet/build.xml
roller/trunk/apps/planet/testdata/planet-custom.properties
Modified: roller/trunk/apps/planet/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.xml?view=diffrev=541328r1=541327r2=541328
==
--- roller/trunk/apps/planet/build.xml (original)
+++ roller/trunk/apps/planet/build.xml Thu May 24 08:39:17 2007
@@ -33,6 +33,7 @@
property name=src value=${basedir}/src/java /
property name=toolsvalue=${basedir}/../../tools /
property name=test value=${basedir}/test/java /
+property name=testcontext
value=${basedir}/build/test/testcontext /
property name=web value=${basedir}/web /
!-- build properties --
@@ -332,7 +333,13 @@
pathelement location=${tools}/buildtime/ant-1.6.2/ant.jar/
/classpath
/javac
-
+
+mkdir dir=${testcontext} /
+copy todir=${testcontext}
+fileset dir=${web} excludes=**/jsps/**,**/velocity/** /
+fileset dir=${basedir}/testdata /
+/copy
+
!-- Copy test resources --
copy todir=${build.compile.test}
fileset dir=${test} excludes=**/*.java, **/*.html, **/*.png /
@@ -368,8 +375,9 @@
!-- plus our compiled test classes --
pathelement location=${build.compile.test}/
-!-- testdata. the equivalent of /WEB-INF/classes in a webapp
--
-pathelement location=${basedir}/testdata /
+!-- testdata. the equivalent of /WEB-INF/classes in a webapp
--
+pathelement location=${basedir}/build/test/testcontext /
+pathelement
location=${basedir}/build/test/testcontext/WEB-INF/classes /
!-- plus the classpath for jars needed to talk to the test db
--
pathelement path=${test.db.cpath} /
Modified: roller/trunk/apps/planet/testdata/planet-custom.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/testdata/planet-custom.properties?view=diffrev=541328r1=541327r2=541328
==
--- roller/trunk/apps/planet/testdata/planet-custom.properties (original)
+++ roller/trunk/apps/planet/testdata/planet-custom.properties Thu May 24
08:39:17 2007
@@ -1,8 +1,11 @@
-jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
-jdbc.connectionURL=jdbc:derby://localhost:3219/planet
-jdbc.username=app
-jdbc.password=app
+database.configurationType=jdbc
+
+database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
+database.jdbc.connectionURL=jdbc:derby://localhost:3219/planet
+database.jdbc.username=app
+database.jdbc.password=app
+
hibernate.dialect=org.hibernate.dialect.DerbyDialect
#jdbc.driverClass=com.mysql.jdbc.Driver
svn commit: r541353 - in /roller/branches/roller_4.0_newbackend/src/org/apache/roller: planet/ui/admin/ ui/admin/ ui/authoring/ ui/common/ ui/core/filters/ ui/core/struts/ ui/core/struts2/ ui/core/tag
Author: snoopdave Date: Thu May 24 09:56:45 2007 New Revision: 541353 URL: http://svn.apache.org/viewvc?view=revrev=541353 Log: Merging from trunk Removed: roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/common/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/filters/RequestFilter.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/filters/StrutsCharEncodingFilter.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/LinkParamTag.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/LinkTag.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/RowTag.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/StatusMessageTag.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/MessageUtilities.java
svn commit: r541354 - in /roller/branches/roller_4.0_newbackend/src/org/apache/roller: business/ business/hibernate/ planet/business/hibernate/ ui/core/security/ ui/struts2/ ui/struts2/admin/ ui/strut
Author: snoopdave Date: Thu May 24 09:59:11 2007 New Revision: 541354 URL: http://svn.apache.org/viewvc?view=revrev=541354 Log: Merging from trunk Added: roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/DatabaseProvider.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/business/DatabaseProvider.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateConnectionProvider.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/business/hibernate/HibernateConnectionProvider.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/ - copied from r541345, roller/trunk/src/org/apache/roller/planet/business/hibernate/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/security/RollerUserDetailsService.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/core/security/RollerUserDetailsService.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/ - copied from r541345, roller/trunk/src/org/apache/roller/ui/struts2/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/ - copied from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/CacheInfo.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/CacheInfo.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/CommonPingTargetAdd.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/CommonPingTargetAdd.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/CommonPingTargetEdit.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/CommonPingTargetEdit.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/CommonPingTargets.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/CommonPingTargets.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/CreateUser.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/CreateUserBean.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUserBean.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagement.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagement.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagementBean.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagementBean.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/GlobalConfig.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/GlobalConfig.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/ModifyUser.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/ModifyUser.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/UserAdmin.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/UserAdmin.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/admin/admin-menu.xml - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/admin/admin-menu.xml roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/ajax/ - copied from r541345, roller/trunk/src/org/apache/roller/ui/struts2/ajax/ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/ajax/CommentDataServlet.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/ajax/CommentDataServlet.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/ajax/UserDataServlet.java - copied unchanged from r541345, roller/trunk/src/org/apache/roller/ui/struts2/ajax/UserDataServlet.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/struts2/common/ - copied from r541345, roller/trunk/src/org/apache/roller/ui/struts2/common/ roller/branches/roller_4.0_newbackend/src/org
svn commit: r541357 - in /roller/branches/roller_4.0_newbackend/src/org/apache/roller: business/hibernate/ pojos/ pojos/wrapper/ ui/core/ ui/core/filters/ ui/core/plugins/ ui/core/tags/calendar/ ui/co
Author: snoopdave
Date: Thu May 24 10:00:35 2007
New Revision: 541357
URL: http://svn.apache.org/viewvc?view=revrev=541357
Log:
Merging latest from trunk
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/BookmarkData.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/FolderData.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogEntryData.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogTemplate.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerContext.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/plugins/TextEditor.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/plugins/XinhaEditor.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/menu/MenuTag.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/menu/MenuHelper.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/MessageModel.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/AbstractWeblogEntriesPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/MailUtil.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diffrev=541357r1=541356r2=541357
==
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
Thu May 24 10:00:35 2007
@@ -18,7 +18,6 @@
package org.apache.roller.business.hibernate;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
@@ -52,34 +51,25 @@
private HibernatePersistenceStrategy strategy = null;
// references to the managers we maintain
-private BookmarkManager bookmarkManager = null;
+private BookmarkManager bookmarkManager = null;
private PropertiesManager propertiesManager = null;
-private RefererManager refererManager = null;
-private UserManager userManager = null;
-private WeblogManager weblogManager = null;
-private PingQueueManager pingQueueManager = null;
-private AutoPingManager autoPingManager = null;
+private RefererManagerrefererManager = null;
+private UserManager userManager = null;
+private WeblogManager weblogManager = null;
+private PingQueueManager pingQueueManager = null;
+private AutoPingManager autoPingManager = null;
private PingTargetManager pingTargetManager = null;
-private ThreadManager threadManager = null;
+private ThreadManager threadManager = null;
protected HibernateRollerImpl() throws RollerException {
try {
-if
(StringUtils.isNotEmpty(RollerConfig.getProperty(jdbc.driverClass))) {
-// create and configure for JDBC access
-strategy = new HibernatePersistenceStrategy
svn commit: r541384 - in /roller/branches/roller_4.0_newbackend: tests/org/apache/roller/ui/ tests/org/apache/roller/ui/authoring/ tests/org/apache/roller/ui/rendering/plugins/ web/WEB-INF/jsps/admin/
Author: snoopdave Date: Thu May 24 11:50:56 2007 New Revision: 541384 URL: http://svn.apache.org/viewvc?view=revrev=541384 Log: merging latest from trunk Added: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/CreateWeblog.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/CreateWeblog.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Login.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Login.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/MainMenu.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/MainMenu.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/MainMenuSidebar.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/MainMenuSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Profile.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Profile.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Register.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Register.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Setup.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Setup.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/Welcome.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/core/Welcome.jsp Removed: roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/ServletTestBase.java roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/StrutsActionTestBase.java roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/UITestSuite.java roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/authoring/ roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/rendering/plugins/ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/struts2/ roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/BookmarkForm.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/BookmarksForm.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/BookmarksSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoriesForm.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoriesSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoryDeleteOK.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CategoryForm.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CommentManagement.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CustomPingTargetDeleteOK.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CustomPingTargetEdit.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/CustomPingTargets.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/FolderForm.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/Invitations.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/InviteMember.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/Maintenance.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/MemberPermissions.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/MemberPermissionsSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/PingResult.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/Pings.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/UploadFile.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEdit.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/WebsiteRemove.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/bake-weblog.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-page.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-pages.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-website.jsp roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/export-entries.jsp roller
svn commit: r541385 [2/2] - in /roller/branches/roller_4.0_newbackend: docs/testing/ metadata/database/tmpls/ testdata/ web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/classes/META-INF/tlds/ web/WEB-INF
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml?view=diffrev=541385r1=541384r2=541385
==
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml Thu
May 24 11:53:17 2007
@@ -14,11 +14,11 @@
!-- define our own interceptors and a custom interceptor stack --
interceptors
interceptor name=UIActionInterceptor
-
class=org.apache.roller.ui.core.util.struts2.UIActionInterceptor /
+
class=org.apache.roller.ui.struts2.util.UIActionInterceptor /
interceptor name=UISecurityInterceptor
-
class=org.apache.roller.ui.core.util.struts2.UISecurityInterceptor /
+
class=org.apache.roller.ui.struts2.util.UISecurityInterceptor /
interceptor name=UIActionPrepareInterceptor
-
class=org.apache.roller.ui.core.util.struts2.UIActionPrepareInterceptor /
+
class=org.apache.roller.ui.struts2.util.UIActionPrepareInterceptor /
!-- Define a custom interceptor stack for Roller so that we can
add in our own custom interceptors. We basically copy the
@@ -98,38 +98,38 @@
/action
action name=setup
-class=org.apache.roller.ui.core.struts2.Setup
+class=org.apache.roller.ui.struts2.core.Setup
result name=success type=tiles.Setup/result
/action
action name=login
-class=org.apache.roller.ui.core.struts2.Login
+class=org.apache.roller.ui.struts2.core.Login
result type=tiles.Login/result
/action
action name=register!* method={1}
-class=org.apache.roller.ui.core.struts2.Register
+class=org.apache.roller.ui.struts2.core.Register
result name=input type=tiles.Register/result
result name=cancel type=redirect//result
result name=success type=tiles.Welcome/result
/action
action name=profile!* method={1}
-class=org.apache.roller.ui.core.struts2.Profile
+class=org.apache.roller.ui.struts2.core.Profile
result name=input type=tiles.Profile/result
result name=cancel type=redirect-actionmenu/result
result name=success type=tiles.Profile/result
/action
action name=createWeblog!* method={1}
-class=org.apache.roller.ui.core.struts2.CreateWeblog
+class=org.apache.roller.ui.struts2.core.CreateWeblog
result name=input type=tiles.CreateWeblog/result
result name=cancel type=redirect-actionmenu/result
result name=success type=chainmenu/result
/action
action name=menu!* method={1}
-class=org.apache.roller.ui.core.struts2.MainMenu
+class=org.apache.roller.ui.struts2.core.MainMenu
result type=tiles.MainMenu/result
/action
@@ -140,69 +140,69 @@
package name=weblogger-admin namespace=/roller-ui/admin
extends=weblogger
action name=globalConfig!* method={1}
-class=org.apache.roller.ui.admin.struts2.GlobalConfig
+class=org.apache.roller.ui.struts2.admin.GlobalConfig
result name=success type=tiles.GlobalConfig/result
/action
action name=userAdmin
-class=org.apache.roller.ui.admin.struts2.UserAdmin
+class=org.apache.roller.ui.struts2.admin.UserAdmin
result name=success type=tiles.UserAdmin/result
/action
action name=createUser!* method={1}
-class=org.apache.roller.ui.admin.struts2.CreateUser
+class=org.apache.roller.ui.struts2.admin.CreateUser
result name=input type=tiles.CreateUser/result
result name=cancel type=redirect-actionuserAdmin/result
/action
action name=modifyUser!* method={1}
-class=org.apache.roller.ui.admin.struts2.ModifyUser
+class=org.apache.roller.ui.struts2.admin.ModifyUser
result name=input type=tiles.ModifyUser/result
result name=cancel type=redirect-actionuserAdmin/result
/action
action name=globalCommentManagement!* method={1}
-
class=org.apache.roller.ui.admin.struts2.GlobalCommentManagement
+
class=org.apache.roller.ui.struts2.admin.GlobalCommentManagement
result name=list
svn commit: r541387 - in /roller/branches/roller_4.0_newbackend: tools/roller-planet/roller-planet-business.jar web/WEB-INF/classes/planet-hibernate.cfg.xml web/WEB-INF/classes/planet.properties web/W
Author: snoopdave Date: Thu May 24 12:00:26 2007 New Revision: 541387 URL: http://svn.apache.org/viewvc?view=revrev=541387 Log: Latest from trunk Added: roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/menu.jsp - copied unchanged from r541345, roller/trunk/web/WEB-INF/jsps/tiles/menu.jsp Modified: roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties Modified: roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar?view=diffrev=541387r1=541386r2=541387 == Binary files - no diff available. Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml?view=diffrev=541387r1=541386r2=541387 == --- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml Thu May 24 12:00:26 2007 @@ -22,11 +22,10 @@ hibernate-configuration session-factory -!-- You can override this via the jdbc.XXX properties in planet-custom.properties -- -property name=connection.datasourcejava:comp/env/jdbc/rollerdb/property - -!-- You can override this via the hibernate.dialect property in roller-custom.properties -- -property name=dialectorg.hibernate.dialect.MySQLDialect/property +!-- +Specify your Roller database configuration parameters +in your roller-custom.properties override file, not here. + -- property name=show_sqlfalse/property Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties?view=diffrev=541387r1=541386r2=541387 == --- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties (original) +++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties Thu May 24 12:00:26 2007 @@ -41,7 +41,6 @@ #PlanetConfig.getProperty(propname); persistence.planet.classname=org.apache.roller.planet.business.jpa.JPAPlanetImpl -#persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl # You MUST override and set these three properties correctly: cache.dir=/var/planet/cache @@ -55,19 +54,4 @@ feedfetcher.classname=\ org.apache.roller.planet.business.RollerRomeFeedFetcher -# How the hibernate config is built -hibernate.dialect=org.hibernate.dialect.MySQLDialect -# Hibernate config for Roller Planet (a classpath-based path) -# NO NEED TO OVERRIDE this unless you are customizing Roller -hibernate.configResource=/planet-hibernate.cfg.xml - -# JDBC configuration parameters for standalone tasks -# Don't override these in the roller-custom.properties file you use with the -# Roller webapp, but for the standalone tasks that you run outside of Roller -# (e.g. refresh entries) you'll need to override these properties. Do it in a -# separate planet-custom.properties file. -jdbc.driverClass= -jdbc.connectionURL= -jdbc.username= -jdbc.password=
svn commit: r541452 [2/2] - in /roller/trunk: apps/planet/test/java/org/apache/roller/planet/business/ tests/org/apache/roller/business/
Modified: roller/trunk/tests/org/apache/roller/business/WeblogTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/tests/org/apache/roller/business/WeblogTest.java?view=diffrev=541452r1=541451r2=541452
==
--- roller/trunk/tests/org/apache/roller/business/WeblogTest.java (original)
+++ roller/trunk/tests/org/apache/roller/business/WeblogTest.java Thu May 24
15:16:19 2007
@@ -94,58 +94,65 @@
log.info(BEGIN);
-UserManager mgr = RollerFactory.getRoller().getUserManager();
-WebsiteData weblog = null;
-
-WebsiteData testWeblog = new WebsiteData();
-testWeblog.setName(Test Weblog);
-testWeblog.setDescription(Test Weblog);
-testWeblog.setHandle(testweblog);
-testWeblog.setEmailAddress([EMAIL PROTECTED]);
-testWeblog.setEditorPage(editor-text.jsp);
-testWeblog.setBlacklist();
-testWeblog.setEmailFromAddress();
-testWeblog.setEditorTheme(basic);
-testWeblog.setLocale(en_US);
-testWeblog.setTimeZone(America/Los_Angeles);
-testWeblog.setDateCreated(new java.util.Date());
-testWeblog.setCreator(testUser);
-
-// make sure test weblog does not exist
-weblog = mgr.getWebsiteByHandle(testWeblog.getHandle());
-assertNull(weblog);
-
-// add test weblog
-mgr.addWebsite(testWeblog);
-String id = testWeblog.getId();
-TestUtils.endSession(true);
-
-// make sure test weblog exists
-weblog = null;
-weblog = mgr.getWebsite(id);
-assertNotNull(weblog);
-assertEquals(testWeblog, weblog);
-
-// modify weblog and save
-weblog.setName(testtesttest);
-mgr.saveWebsite(weblog);
-TestUtils.endSession(true);
-
-// make sure changes were saved
-weblog = null;
-weblog = mgr.getWebsite(id);
-assertNotNull(weblog);
-assertEquals(testtesttest, weblog.getName());
-
-// remove test weblog
-mgr.removeWebsite(weblog);
-TestUtils.endSession(true);
+try {
-// make sure weblog no longer exists
-weblog = null;
-weblog = mgr.getWebsite(id);
-assertNull(weblog);
+UserManager mgr = RollerFactory.getRoller().getUserManager();
+WebsiteData weblog = null;
+
+WebsiteData testWeblog = new WebsiteData();
+testUser = TestUtils.getManagedUser(testUser);
+testWeblog.setName(Test Weblog);
+testWeblog.setDescription(Test Weblog);
+testWeblog.setHandle(testweblog);
+testWeblog.setEmailAddress([EMAIL PROTECTED]);
+testWeblog.setEditorPage(editor-text.jsp);
+testWeblog.setBlacklist();
+testWeblog.setEmailFromAddress();
+testWeblog.setEditorTheme(basic);
+testWeblog.setLocale(en_US);
+testWeblog.setTimeZone(America/Los_Angeles);
+testWeblog.setDateCreated(new java.util.Date());
+testWeblog.setCreator(testUser);
+
+// make sure test weblog does not exist
+weblog = mgr.getWebsiteByHandle(testWeblog.getHandle());
+assertNull(weblog);
+
+// add test weblog
+mgr.addWebsite(testWeblog);
+String id = testWeblog.getId();
+TestUtils.endSession(true);
+
+// make sure test weblog exists
+weblog = null;
+weblog = mgr.getWebsite(id);
+assertNotNull(weblog);
+assertEquals(testWeblog, weblog);
+
+// modify weblog and save
+weblog.setName(testtesttest);
+mgr.saveWebsite(weblog);
+TestUtils.endSession(true);
+
+// make sure changes were saved
+weblog = null;
+weblog = mgr.getWebsite(id);
+assertNotNull(weblog);
+assertEquals(testtesttest, weblog.getName());
+
+// remove test weblog
+mgr.removeWebsite(weblog);
+TestUtils.endSession(true);
+
+// make sure weblog no longer exists
+weblog = null;
+weblog = mgr.getWebsite(id);
+assertNull(weblog);
+} catch(Throwable t) {
+log.error(Exception running test, t);
+throw (Exception) t;
+}
log.info(END);
}
@@ -156,14 +163,15 @@
public void testWeblogLookups() throws Exception {
log.info(BEGIN);
-
+WebsiteData testWeblog1 = null;
+WebsiteData testWeblog2 = null;
try {
UserManager mgr = RollerFactory.getRoller().getUserManager();
WebsiteData weblog = null;
// add test weblogs
-WebsiteData testWeblog1 =
svn commit: r541458 [4/7] - in /roller/trunk: ./ apps/planet/ apps/planet/nbproject/ apps/planet/src/java/META-INF/ apps/planet/src/java/org/apache/roller/planet/business/ apps/planet/src/java/org/apa
Added: roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java?view=autorev=541458
==
--- roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
(added)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java Thu
May 24 15:25:10 2007
@@ -0,0 +1,1156 @@
+
+/*
+ * 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.business.jpa;
+
+import java.sql.Timestamp;
+import javax.persistence.NoResultException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.roller.RollerException;
+import org.apache.roller.business.BookmarkManager;
+import org.apache.roller.business.RollerFactory;
+import org.apache.roller.business.UserManager;
+import org.apache.roller.business.WeblogManager;
+import org.apache.roller.business.pings.AutoPingManager;
+import org.apache.roller.business.pings.PingTargetManager;
+import org.apache.roller.config.RollerConfig;
+import org.apache.roller.pojos.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.Collection;
+import java.util.Comparator;
+import javax.persistence.Query;
+
+/*
+ * JPAUserManagerImpl.java
+ *
+ * Created on May 29, 2006, 3:15 PM
+ *
+ */
+public class JPAUserManagerImpl implements UserManager {
+
+/** The logger instance for this class. */
+private static Log log = LogFactory.getLog(JPAUserManagerImpl.class);
+
+private static final Comparator statCountCountReverseComparator =
+Collections.reverseOrder(StatCountCountComparator.getInstance());
+
+protected JPAPersistenceStrategy strategy;
+
+// cached mapping of weblogHandles - weblogIds
+private Map weblogHandleToIdMap = new Hashtable();
+
+// cached mapping of userNames - userIds
+private Map userNameToIdMap = new Hashtable();
+
+public JPAUserManagerImpl(JPAPersistenceStrategy strat) {
+log.debug(Instantiating JPA User Manager);
+
+this.strategy = strat;
+}
+
+/**
+ * Update existing website.
+ */
+public void saveWebsite(WebsiteData website) throws RollerException {
+
+website.setLastModified(new java.util.Date());
+strategy.store(website);
+}
+
+public void removeWebsite(WebsiteData weblog) throws RollerException {
+
+// remove contents first, then remove website
+this.removeWebsiteContents(weblog);
+this.strategy.remove(weblog);
+
+// remove entry from cache mapping
+this.weblogHandleToIdMap.remove(weblog.getHandle());
+}
+
+/**
+ * convenience method for removing contents of a weblog.
+ * TODO BACKEND: use manager methods instead of queries here
+ */
+private void removeWebsiteContents(WebsiteData website)
+throws RollerException {
+
+BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
+WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+
+// remove tags
+Query tagQuery =
strategy.getNamedQuery(WeblogEntryTagData.getByWeblog);
+tagQuery.setParameter(1, website);
+List results = tagQuery.getResultList();
+
+for(Iterator iter = results.iterator(); iter.hasNext();) {
+WeblogEntryTagData tagData = (WeblogEntryTagData) iter.next();
+this.strategy.remove(tagData);
+}
+
+// remove site tag aggregates
+List tags = wmgr.getTags(website, null, null, -1);
+updateTagAggregates(tags);
+
+// delete all weblog tag aggregates
+Query removeAggs= strategy.getNamedUpdate(
+WeblogEntryTagAggregateData.removeByWeblog);
+removeAggs.setParameter(1, website);
+removeAggs.executeUpdate();
+
svn commit: r541750 - /roller/branches/roller_4.0_newbackend/merges.txt
Author: snoopdave Date: Fri May 25 12:08:42 2007 New Revision: 541750 URL: http://svn.apache.org/viewvc?view=revrev=541750 Log: Added note about merge to trunk Modified: roller/branches/roller_4.0_newbackend/merges.txt Modified: roller/branches/roller_4.0_newbackend/merges.txt URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diffrev=541750r1=541749r2=541750 == --- roller/branches/roller_4.0_newbackend/merges.txt (original) +++ roller/branches/roller_4.0_newbackend/merges.txt Fri May 25 12:08:42 2007 @@ -1,6 +1,11 @@ merges.txt == +This branch has been merged back into Roller trunk and no further development +will be done here. We'll keep it around for easy reference/archival purposes +for a month or so and then remove it. + + Temporary file to track merges from trunk into the roller_4.0_newbackend branch. May 24, 2007: final merge from trunk before merge back to trunk
svn commit: r541767 - in /roller/branches/roller_guice/web/WEB-INF/jsps: authoring/ authoring/struts2/ core/ core/struts2/ editor/
Author: snoopdave Date: Fri May 25 13:06:54 2007 New Revision: 541767 URL: http://svn.apache.org/viewvc?view=revrev=541767 Log: Latest from trunk Added: roller/branches/roller_guice/web/WEB-INF/jsps/core/CreateWeblog.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/CreateWeblog.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/Login.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/Login.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/MainMenu.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/MainMenu.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/MainMenuSidebar.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/MainMenuSidebar.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/Profile.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/Profile.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/Register.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/Register.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/Setup.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/Setup.jsp roller/branches/roller_guice/web/WEB-INF/jsps/core/Welcome.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/core/Welcome.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/ - copied from r541742, roller/trunk/web/WEB-INF/jsps/editor/ roller/branches/roller_guice/web/WEB-INF/jsps/editor/BookmarkAdd.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/BookmarkAdd.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/BookmarkEdit.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/BookmarkEdit.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/Bookmarks.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/Bookmarks.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/BookmarksImport.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/BookmarksImport.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/BookmarksSidebar.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/BookmarksSidebar.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/Categories.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/Categories.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CategoriesSidebar.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CategoriesSidebar.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CategoryAdd.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CategoryAdd.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CategoryEdit.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CategoryEdit.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CategoryRemove.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CategoryRemove.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/Comments.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/Comments.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CommentsSidebar.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CommentsSidebar.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargetAdd.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargetConfirm.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargetEdit.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/CustomPingTargets.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/CustomPingTargets.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/Entries.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/Entries.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/EntriesSidebar.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/EntriesSidebar.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/EntryAdd.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/EntryAdd.jsp roller/branches/roller_guice/web/WEB-INF/jsps/editor/EntryEdit.jsp - copied unchanged from r541742, roller/trunk/web/WEB-INF/jsps/editor/EntryEdit.jsp roller/branches/roller_guice/web/WEB-INF
svn commit: r541771 [2/2] - in /roller/branches/roller_guice: ./ web/WEB-INF/ web/WEB-INF/jsps/ web/WEB-INF/jsps/admin/ web/WEB-INF/jsps/admin/struts2/ web/WEB-INF/jsps/core/ web/WEB-INF/jsps/tiles/ w
Modified: roller/branches/roller_guice/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/properties.xmlf?view=diffrev=541771r1=541770r2=541771
==
--- roller/branches/roller_guice/properties.xmlf (original)
+++ roller/branches/roller_guice/properties.xmlf Fri May 25 13:24:21 2007
@@ -54,7 +54,12 @@
!-- various libraries used by Roller --
property name=tools.strutsvalue=${ro.tools}/struts-1.2.4 /
+property name=tools.struts2 value=${ro.tools}/struts-2.0.5 /
property name=tools.hibernate value=${ro.tools}/hibernate-3.1 /
+property name=tools.jpa value=${ro.tools}/openjpa-0.9.7 /
+!--
+property name=tools.jpa
value=${ro.tools}/toplink-essentials-9.1 /
+--
property name=tools.springvalue=${ro.tools}/spring-1.2 /
property name=tools.jstl
value=${ro.tools}/jakarta-taglibs-standard-1.1.2 /
property name=tools.xdoclet
value=${ro.tools}/buildtime/xdoclet-1.2.3 /
@@ -81,12 +86,13 @@
!-- --
fileset id=base.jars dir=${ro.tools}/lib
+include name=commons-id-0.1-SNAPSHOT.jar/
include name=commons-betwixt-1.0-beta-1.jar /
include name=commons-cache.jar /
+include name=commons-collections-3.2.jar /
include name=commons-codec-1.3.jar /
include name=commons-logging-1.0.4.jar /
include name=commons-lang-2.1.jar /
-include name=commons-collections-3.1.jar /
include name=concurrent-1.3.2.jar/
include name=jaxen-full.jar /
include name=saxpath.jar /
@@ -103,10 +109,6 @@
include name=taglibs-string.jar/
/fileset
-fileset id=commons.jars dir=${tools.struts}/lib
-include name=commons-*.jar/
-/fileset
-
fileset id=commons-httpclient.jar dir=${ro.tools}/lib
include name=commons-httpclient*.jar/
/fileset
@@ -148,6 +150,10 @@
include name=*.jar/
/fileset
+fileset id=jpa.jars dir=${tools.jpa}
+include name=*.jar/
+/fileset
+
fileset id=spring.jars dir=${tools.spring}
include name=*.jar/
/fileset
@@ -159,6 +165,10 @@
include name=xmlrpc-server-3.0.jar/
/fileset
+fileset id=roller-core.jars dir=${ro.tools}/roller-core
+include name=*.jar/
+/fileset
+
fileset id=roller-planet.jars dir=${ro.tools}/roller-planet
include name=*.jar/
/fileset
@@ -171,9 +181,11 @@
path id=base.path
fileset refid=base.jars/
fileset refid=mail.jars/
-fileset refid=commons.jars/
+fileset refid=roller-core.jars /
fileset refid=roller-planet.jars /
fileset refid=xmlrpc.jars/
+!-- JPA bytecode enhancement apparently wants JPA classes everywhere --
+fileset refid=jpa.jars /
/path
path id=business.path
Modified: roller/branches/roller_guice/readme-guice.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/readme-guice.txt?view=diffrev=541771r1=541770r2=541771
==
--- roller/branches/roller_guice/readme-guice.txt (original)
+++ roller/branches/roller_guice/readme-guice.txt Fri May 25 13:24:21 2007
@@ -66,7 +66,7 @@
we have in Planet to standardize manager lifecycle.
-Notes on Guice
+** Notes on Guice
- Simple small API that is very easy to understand
- Documentation is short and to the point
Modified: roller/branches/roller_guice/web/roller-ui/login-redirect.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/web/roller-ui/login-redirect.jsp?view=diffrev=541771r1=541770r2=541771
==
--- roller/branches/roller_guice/web/roller-ui/login-redirect.jsp (original)
+++ roller/branches/roller_guice/web/roller-ui/login-redirect.jsp Fri May 25
13:24:21 2007
@@ -26,7 +26,7 @@
if (websites.size() == 1) {
WebsiteData website = (WebsiteData) websites.get(0);
-
response.sendRedirect(request.getContextPath()+/roller-ui/authoring/entryAdd.rolweblog=+website.getHandle());
+
response.sendRedirect(request.getContextPath()+/roller-ui/authoring/entryAdd.rol?weblog=+website.getHandle());
} else {
response.sendRedirect(request.getContextPath()+/roller-ui/menu.rol);
}
Modified: roller/branches/roller_guice/web/roller-ui/styles/roller.css
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/web/roller-ui/styles/roller.css?view=diffrev=541771r1=541770r2=541771
==
--- roller/branches/roller_guice/web/roller-ui/styles/roller.css (original)
+++ roller/branches/roller_guice/web/roller-ui/styles/roller.css Fri May 25
13:24:21 2007
@@ -711,3 +711,16 @@
cursor:pointer;
}
+
+.chooser {
+ margin: 10px;
+ padding: 10px 20px 20px 20px;
+}
+
+.chooser h2 {
+ letter-spacing: 0.0em;
+}
+
+.optioner {
+ margin: 0px 30px 30px 30px;
+}
Modified: roller/branches/roller_guice/web/roller-ui/tools/dstest.jsp
URL:
svn commit: r542610 - in /roller/trunk/src/org/apache/roller: business/MailProvider.java ui/rendering/servlets/CommentServlet.java util/MailUtil.java
Author: snoopdave
Date: Tue May 29 11:25:48 2007
New Revision: 542610
URL: http://svn.apache.org/viewvc?view=revrev=542610
Log:
MailProvider class described in Easy Install proposal:
http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Easy+Install
Added:
roller/trunk/src/org/apache/roller/business/MailProvider.java
Modified:
roller/trunk/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java
roller/trunk/src/org/apache/roller/util/MailUtil.java
Added: roller/trunk/src/org/apache/roller/business/MailProvider.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/MailProvider.java?view=autorev=542610
==
--- roller/trunk/src/org/apache/roller/business/MailProvider.java (added)
+++ roller/trunk/src/org/apache/roller/business/MailProvider.java Tue May 29
11:25:48 2007
@@ -0,0 +1,112 @@
+package org.apache.roller.business;
+
+import java.util.Properties;
+import javax.mail.MessagingException;
+import javax.mail.NoSuchProviderException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
+import org.apache.roller.config.RollerConfig;
+
+/**
+ * Encapsulates Roller mail configuration, returns mail sessions.
+ */
+public class MailProvider {
+private static Log log = LogFactory.getLog(MailProvider.class);
+private enum ConfigurationType {JNDI_NAME, MAIL_PROPERTIES; }
+
+private static MailProvider singletonInstance = null;
+
+private Session session = null;
+
+private ConfigurationType type = ConfigurationType.JNDI_NAME;
+
+private String jndiName = null;
+private String mailHostname = null;
+private intmailPort = -1;
+private String mailUsername = null;
+private String mailPassword = null;
+
+
+/** Creates a new instance of MailProvider */
+public MailProvider() throws RollerException {
+String connectionTypeString =
RollerConfig.getProperty(mail.configurationType);
+if (properties.equals(connectionTypeString)) {
+type = ConfigurationType.MAIL_PROPERTIES;
+}
+jndiName = RollerConfig.getProperty(mail.jndiName);
+mailHostname = RollerConfig.getProperty(mail.hostname);
+mailUsername = RollerConfig.getProperty(mail.username);
+mailPassword = RollerConfig.getProperty(mail.password);
+try {
+mailPort = Integer.parseInt(RollerConfig.getProperty(mail.port));
+} catch (Throwable t) {
+log.error(ERROR mail server port not a valid integer, ignoring);
+}
+
+// init and connect now so we fail early
+if (type == ConfigurationType.JNDI_NAME) {
+String name = java:comp/env/ + jndiName;
+try {
+Context ctx = (Context) new InitialContext().lookup(name);
+session = (Session)ctx.lookup(name);
+} catch (NamingException ex) {
+throw new RollerException(ERROR looking up mail-session with
JNDI name: + name);
+}
+} else {
+Properties props = new Properties();
+props.put(mail.smtp.host, mailHostname);
+props.put(mail.smtp.auth, true);
+if (mailPort != -1) props.put(mail.smtp.port, +mailPort);
+session = Session.getDefaultInstance(props, null);
+}
+try {
+Transport transport = getTransport();
+transport.close();
+} catch (Throwable t) {
+throw new RollerException(ERROR connecting to mail server, t);
+}
+
+}
+
+public static MailProvider getMailProvider() throws RollerException {
+if (singletonInstance == null) {
+singletonInstance = new MailProvider();
+}
+return singletonInstance;
+}
+
+public static boolean isMailConfigured() {
+return singletonInstance != null;
+}
+
+public Session getSession() {
+return session;
+}
+
+/**
+ * Create and connect to transport, caller is responsible for closing
transport.
+ */
+public Transport getTransport() throws NoSuchProviderException,
MessagingException {
+Transport transport = null;
+if (type == ConfigurationType.MAIL_PROPERTIES) {
+// Configure transport ourselves using mail properties
+transport = session.getTransport(smtp);
+if (mailUsername != null mailPassword != null mailPort !=
-1) {
+transport.connect(mailHostname, mailPort, mailUsername,
mailPassword);
+} else if (mailUsername != null mailPassword != null) {
+transport.connect
svn commit: r542611 - in /roller/trunk/src/org/apache/roller: business/hibernate/ business/jpa/ business/runnable/ config/ ui/core/
Author: snoopdave
Date: Tue May 29 11:29:36 2007
New Revision: 542611
URL: http://svn.apache.org/viewvc?view=revrev=542611
Log:
Changes to RollerContext described in Easy Install proposal:
http://cwiki.apache.org/confluence/display/ROLLER/Proposal+Easy+Install
* Change contextInitialized() so that it initializes only the UI portions of
Roller
** Move RollerImpl initialization into RollerImpl classes
* Change contextInitialized() so that it does not throw exceptions
** So context will load regardless of Roller configuration
Modified:
roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
roller/trunk/src/org/apache/roller/business/jpa/JPARollerImpl.java
roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java
roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java
roller/trunk/src/org/apache/roller/config/PingConfig.java
roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
Modified:
roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diffrev=542611r1=542610r2=542611
==
---
roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
(original)
+++
roller/trunk/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
Tue May 29 11:29:36 2007
@@ -42,10 +42,7 @@
static final long serialVersionUID = 5256135928578074652L;
-private static Log mLogger = LogFactory.getLog(HibernateRollerImpl.class);
-
-// our singleton instance
-private static HibernateRollerImpl me = null;
+private static Log mLogger = LogFactory.getLog(HibernateRollerImpl.class);
// a persistence utility class
private HibernatePersistenceStrategy strategy = null;
@@ -82,17 +79,14 @@
* Instantiates and returns an instance of HibernateRollerImpl.
*/
public static Roller instantiate() throws RollerException {
-if (me == null) {
-mLogger.debug(Instantiating HibernateRollerImpl);
-me = new HibernateRollerImpl();
-
-// Now that Roller has been instantiated, initialize individual
managers
-me.getPropertiesManager();
-me.getIndexManager();
-me.getThemeManager();
-}
-
-return me;
+mLogger.debug(Instantiating HibernateRollerImpl);
+Roller roller = new HibernateRollerImpl();
+
+// Now that Roller has been instantiated, initialize individual
managers
+roller.getPropertiesManager();
+roller.getIndexManager();
+roller.getThemeManager();
+return roller;
}
Modified: roller/trunk/src/org/apache/roller/business/jpa/JPARollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/jpa/JPARollerImpl.java?view=diffrev=542611r1=542610r2=542611
==
--- roller/trunk/src/org/apache/roller/business/jpa/JPARollerImpl.java
(original)
+++ roller/trunk/src/org/apache/roller/business/jpa/JPARollerImpl.java Tue May
29 11:29:36 2007
@@ -126,7 +126,13 @@
*/
public static Roller instantiate() throws RollerException {
logger.debug(Instantiating JPARollerImpl);
-return new JPARollerImpl();
+Roller roller = new JPARollerImpl();
+
+// Now that Roller has been instantiated, initialize individual
managers
+roller.getPropertiesManager();
+roller.getIndexManager();
+roller.getThemeManager();
+return roller;
}
public void flush() throws RollerException {
Modified:
roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java?view=diffrev=542611r1=542610r2=542611
==
--- roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java
(original)
+++ roller/trunk/src/org/apache/roller/business/runnable/ThreadManager.java Tue
May 29 11:29:36 2007
@@ -30,6 +30,12 @@
/**
+ * Schedule execution of all configured tasks.
+ */
+public void startTasks();
+
+
+/**
* Execute runnable in background (asynchronously).
* @param runnable
* @throws java.lang.InterruptedException
Modified:
roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/business/runnable/ThreadManagerImpl.java?view=diffrev=542611r1=542610r2=542611
svn commit: r542612 - in /roller/trunk: apps/planet/nbproject/project.xml nbproject/project.xml
Author: snoopdave Date: Tue May 29 11:30:59 2007 New Revision: 542612 URL: http://svn.apache.org/viewvc?view=revrev=542612 Log: Latest project files, with core component and single-file debugging targets Modified: roller/trunk/apps/planet/nbproject/project.xml roller/trunk/nbproject/project.xml Modified: roller/trunk/apps/planet/nbproject/project.xml URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/nbproject/project.xml?view=diffrev=542612r1=542611r2=542612 == --- roller/trunk/apps/planet/nbproject/project.xml (original) +++ roller/trunk/apps/planet/nbproject/project.xml Tue May 29 11:30:59 2007 @@ -43,6 +43,30 @@ targetclean/target targetbuild/target /action +action name=debug.single +targetdebug-selected-files/target +context +propertyclassname/property +folder./src/java/folder +pattern\.java$/pattern +formatjava-name/format +arity +one-file-only/ +/arity +/context +/action +action name=debug.test.single +targettest-selected-files/target +context +propertyclassname/property +folder./test/java/folder +pattern\.java$/pattern +formatjava-name/format +arity +one-file-only/ +/arity +/context +/action /ide-actions view items @@ -85,6 +109,7 @@ web-data xmlns=http://www.netbeans.org/ns/freeform-project-web/1; web-module doc-rootweb/doc-root +classpath/ context-path/planet/context-path j2ee-spec-level1.5/j2ee-spec-level /web-module Modified: roller/trunk/nbproject/project.xml URL: http://svn.apache.org/viewvc/roller/trunk/nbproject/project.xml?view=diffrev=542612r1=542611r2=542612 == --- roller/trunk/nbproject/project.xml (original) +++ roller/trunk/nbproject/project.xml Tue May 29 11:30:59 2007 @@ -4,7 +4,7 @@ configuration general-data xmlns=http://www.netbeans.org/ns/freeform-project/1; !--Do not use Project Properties customizer when editing this file manually.-- -nameroller_trunk/name +nameroller_newinstaller/name folders source-folder labelweb/label @@ -22,6 +22,11 @@ locationtests/location /source-folder source-folder +labelcomponents/core/src/java/label +typejava/type +locationcomponents/core/src/java/location +/source-folder +source-folder labelapps/planet/src/java/label typejava/type locationapps/planet/src/java/location @@ -115,6 +120,10 @@ locationtests/location /source-folder source-folder style=packages +labelcomponents/core/src/java/label +locationcomponents/core/src/java/location +/source-folder +source-folder style=packages labelapps/planet/src/java/label locationapps/planet/src/java/location /source-folder @@ -164,9 +173,9 @@ package-rootapps/planet/test/java/package-root package-rootsandbox/jdobackend/src/package-root package-rootsandbox/scripting/bsf/src/package-root -package-rootcustom/src/package-root package-rootsandbox/scripting/jruby/src/package-root -classpath mode=compiletools/buildtime/junit-3.8.1.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib
svn commit: r542748 - /roller/trunk/nbproject/project.xml
Author: snoopdave Date: Tue May 29 21:28:47 2007 New Revision: 542748 URL: http://svn.apache.org/viewvc?view=revrev=542748 Log: Correct source paths for Roller, Planet and Core Modified: roller/trunk/nbproject/project.xml Modified: roller/trunk/nbproject/project.xml URL: http://svn.apache.org/viewvc/roller/trunk/nbproject/project.xml?view=diffrev=542748r1=542747r2=542748 == --- roller/trunk/nbproject/project.xml (original) +++ roller/trunk/nbproject/project.xml Tue May 29 21:28:47 2007 @@ -4,7 +4,7 @@ configuration general-data xmlns=http://www.netbeans.org/ns/freeform-project/1; !--Do not use Project Properties customizer when editing this file manually.-- -nameroller_newinstaller/name +nameroller_trunk/name folders source-folder labelweb/label @@ -12,19 +12,14 @@ locationweb/location /source-folder source-folder -labelsrc/label +labelapps/weblogger/src/java/label typejava/type -locationsrc/location +locationapps/weblogger/src/java/location /source-folder source-folder -labeltests/label +labelapps/weblogger/test/java/label typejava/type -locationtests/location -/source-folder -source-folder -labelcomponents/core/src/java/label -typejava/type -locationcomponents/core/src/java/location +locationapps/weblogger/test/java/location /source-folder source-folder labelapps/planet/src/java/label @@ -36,26 +31,6 @@ typejava/type locationcomponents/core/src/java/location /source-folder -source-folder -labelsandbox/scripting/bsf/src/label -typejava/type -locationsandbox/scripting/bsf/src/location -/source-folder -source-folder -labelsandbox/scripting/groovy/src/label -typejava/type -locationsandbox/scripting/groovy/src/location -/source-folder -source-folder -labelbuild/generated/business/label -typejava/type -locationbuild/generated/business/location -/source-folder -source-folder -labelbuild/generated/web/label -typejava/type -locationbuild/generated/web/location -/source-folder /folders ide-actions action name=build @@ -112,16 +87,12 @@ locationweb/location /source-folder source-folder style=packages -labelsrc/label -locationsrc/location -/source-folder -source-folder style=packages -labeltests/label -locationtests/location +labelapps/weblogger/src/java/label +locationapps/weblogger/src/java/location /source-folder source-folder style=packages -labelcomponents/core/src/java/label -locationcomponents/core/src/java/location +labelapps/weblogger/test/java/label +locationapps/weblogger/test/java/location /source-folder source-folder style=packages labelapps/planet/src/java/label @@ -131,22 +102,6 @@ labelcomponents/core/src/java/label locationcomponents/core/src/java/location /source-folder -source-folder style=packages -labelsandbox/scripting/bsf/src/label -locationsandbox/scripting/bsf/src/location -/source-folder -source-folder style=packages -labelsandbox/scripting/groovy/src/label -locationsandbox/scripting/groovy/src/location -/source-folder -source-folder style=packages -labelbuild/generated/business/label -locationbuild/generated/business/location -/source-folder -source-folder style=packages -labelbuild/generated/web
svn commit: r542905 - /roller/trunk/apps/weblogger/nbproject/project.xml
Author: snoopdave Date: Wed May 30 11:46:07 2007 New Revision: 542905 URL: http://svn.apache.org/viewvc?view=revrev=542905 Log: Use same jars for all source Modified: roller/trunk/apps/weblogger/nbproject/project.xml Modified: roller/trunk/apps/weblogger/nbproject/project.xml URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/nbproject/project.xml?view=diffrev=542905r1=542904r2=542905 == --- roller/trunk/apps/weblogger/nbproject/project.xml (original) +++ roller/trunk/apps/weblogger/nbproject/project.xml Wed May 30 11:46:07 2007 @@ -102,17 +102,15 @@ java-data xmlns=http://www.netbeans.org/ns/freeform-project-java/2; compilation-unit package-rootsrc/java/package-root -classpath mode=compile../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/velocity-1.5.jar:../../tools/lib/taglibs-string.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/struts-2.0.6/lib/antlr-2.7.2.jar:.. /../tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.6/lib/commons-chain-1.1.jar:../../tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.6/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.6/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.6/lib/ognl-2.6.11.jar:../../tools/struts-2.0.6/lib/oro-2.0.8.jar:../../tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/xwork-2.0.1.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools /jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/hibernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/asm.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0.9.7/serp-1.11.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/xml rpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar/classpath -source-level1.5/source-level -/compilation-unit -compilation-unit package-roottest/java/package-root +classpath mode=compile../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/velocity-1.5.jar:../../tools/lib/taglibs-string.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar
svn commit: r543137 - /roller/trunk/components/core/
Author: snoopdave Date: Thu May 31 06:59:59 2007 New Revision: 543137 URL: http://svn.apache.org/viewvc?view=revrev=543137 Log: Ignore build and dist dirs Modified: roller/trunk/components/core/ (props changed) Propchange: roller/trunk/components/core/ -- --- svn:ignore (added) +++ svn:ignore Thu May 31 06:59:59 2007 @@ -0,0 +1,2 @@ +build +dist
svn commit: r543355 - /roller/trunk/apps/weblogger/build.xml
Author: snoopdave
Date: Thu May 31 18:56:21 2007
New Revision: 543355
URL: http://svn.apache.org/viewvc?view=revrev=543355
Log:
Should fix the duplicate meta-data warnings mentioned in ROL-1436, we had the
same persistence.xml file in two jars.
Modified:
roller/trunk/apps/weblogger/build.xml
Modified: roller/trunk/apps/weblogger/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diffrev=543355r1=543354r2=543355
==
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Thu May 31 18:56:21 2007
@@ -220,6 +220,7 @@
!-- Copy in resources --
copy todir=${build.compile.web}
fileset dir=${ro.src}
+exclude name=**/META-INF/**/ !-- don't copy
persistence.xml --
exclude name=**/*.java/
exclude name=**/*.html/
exclude name=**/*.png/
svn commit: r543580 - in /roller/branches/roller_guice: src/ web/
Author: snoopdave Date: Fri Jun 1 12:18:29 2007 New Revision: 543580 URL: http://svn.apache.org/viewvc?view=revrev=543580 Log: Merging from trunk, still recovering from big re-org Removed: roller/branches/roller_guice/src/ roller/branches/roller_guice/web/
svn commit: r544674 [3/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/webl
Modified:
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp?view=diffrev=544674r1=544673r2=544674
==
---
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
Tue Jun 5 16:15:47 2007
@@ -28,25 +28,19 @@
window.open('s:url
value=/roller-ui/authoring/preview/%{actionWeblog.handle}/?theme='+selector.options[selected].value,
'_preview', '');
}
-function toggleThemeOptioner() {
-// just call toggle on both theme optioner choices
-new Effect.toggle('sharedThemeOptioner', 'appear');
-new Effect.toggle('customThemeOptioner', 'appear');
-}
-
function updateThemeChooser(selected) {
if(selected.value == 'shared') {
-selectedChooser = document.getElementById('sharedChooser');
-selectedOptioner = document.getElementById('sharedOptioner');
+selectedChooser = $('sharedChooser');
+selectedOptioner = $('sharedOptioner');
-otherChooser = document.getElementById('customChooser');
-otherOptioner = document.getElementById('customOptioner');
+otherChooser = $('customChooser');
+otherOptioner = $('customOptioner');
} else {
-selectedChooser = document.getElementById('customChooser');
-selectedOptioner = document.getElementById('customOptioner');
+selectedChooser = $('customChooser');
+selectedOptioner = $('customOptioner');
-otherChooser = document.getElementById('sharedChooser');
-otherOptioner = document.getElementById('sharedOptioner');
+otherChooser = $('sharedChooser');
+otherOptioner = $('sharedOptioner');
}
// update styling on chooser
@@ -56,8 +50,8 @@
otherChooser.style.border=1px solid grey;
// update display of selected optioner
-otherOptioner.style.display=none;
-selectedOptioner.style.display=block;
+otherOptioner.hide();
+selectedOptioner.show();
}
--
/script
@@ -92,22 +86,22 @@
ps:text name=themeEditor.yourCurrentTheme /: bs:property
value=actionWeblog.theme.name//b/p
p
-s:select id=sharedSelector name=themeId list=themes
listKey=id listValue=name size=1
onchange=previewImage(document.getElementById('sharedPreviewImg'),
this[selectedIndex].value)/
+s:select id=sharedSelector name=themeId list=themes
listKey=id listValue=name size=1
onchange=previewImage($('sharedPreviewImg'), this[selectedIndex].value)/
/p
p
img id=sharedPreviewImg src= /
!-- initialize preview image at page load --
script type=text/javascript
s:if test=customTheme
-previewImage(document.getElementById('sharedPreviewImg'),
's:property value=themes[0].id/');
+previewImage($('sharedPreviewImg'), 's:property
value=themes[0].id/');
/s:if
s:else
-previewImage(document.getElementById('sharedPreviewImg'),
's:property value=themeId/');
+previewImage($('sharedPreviewImg'), 's:property
value=themeId/');
/s:else
/script
/p
p
-raquo; a href=#
onclick=fullPreview(document.getElementById('sharedSelector'))s:text
name=themeEditor.previewLink //abr/
+raquo; a href=#
onclick=fullPreview($('sharedSelector'))s:text
name=themeEditor.previewLink //abr/
s:text name=themeEditor.previewDescription /
/p
@@ -129,17 +123,17 @@
span class=warnings:text name=themeEditor.importWarning
//span
/p
p
-s:select id=customSelector name=importThemeId list=themes
listKey=id listValue=name size=1
onchange=previewImage(document.getElementById('customPreviewImg'),
this[selectedIndex].value)/
+s:select id=customSelector name=importThemeId list=themes
listKey=id listValue=name size=1
onchange=previewImage($('customPreviewImg'), this[selectedIndex].value)/
/p
p
img id=customPreviewImg src= /
!-- initialize preview image at page load --
script type=text/javascript
-previewImage(document.getElementById('customPreviewImg'),
's:property value=themes[0].id/');
+previewImage($('customPreviewImg'), 's:property
value=themes[0].id/');
/script
/p
p
-raquo; a href=#
onclick=fullPreview(document.getElementById('customSelector'))s:text
name=themeEditor.previewLink //abr/
+raquo; a href=#
onclick=fullPreview($('customSelector'))s:text
name=themeEditor.previewLink //abr/
svn commit: r546003 - in /roller/branches/roller_guice/apps/weblogger: src/java/org/apache/roller/weblogger/business/hibernate/ src/java/org/apache/roller/weblogger/business/jpa/ src/java/org/apache/r
Author: snoopdave
Date: Sun Jun 10 21:54:59 2007
New Revision: 546003
URL: http://svn.apache.org/viewvc?view=revrev=546003
Log:
Fixes to get tests running; Planet now at 100%, but one Roller test is still
failing.
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
roller/branches/roller_guice/apps/weblogger/testdata/roller-custom.properties
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java?view=diffrev=546003r1=546002r2=546003
==
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
Sun Jun 10 21:54:59 2007
@@ -24,7 +24,6 @@
import org.apache.roller.weblogger.business.RollerImpl;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.FileManager;
-import org.apache.roller.weblogger.business.PluginManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
@@ -33,6 +32,7 @@
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.runnable.ThreadManager;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.themes.ThemeManager;
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java?view=diffrev=546003r1=546002r2=546003
==
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
Sun Jun 10 21:54:59 2007
@@ -24,8 +24,6 @@
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.FileManagerImpl;
-import org.apache.roller.weblogger.business.PluginManager;
-import org.apache.roller.weblogger.business.PluginManagerImpl;
import org.apache.roller.weblogger.business.PropertiesManager;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerDatabaseProvider;
@@ -34,6 +32,8 @@
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
+import org.apache.roller.weblogger.business.plugins.PluginManagerImpl;
import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManagerImpl;
@@ -48,32 +48,32 @@
* Guice module for configuring Hibernate as Roller-backend.
*/
public class RollerModule implements Module {
-
+
public void configure(Binder binder) {
binder.bind(DatabaseProvider.class).to(RollerDatabaseProvider.class);
-
+
binder.bind(Roller.class).to(HibernateRollerImpl.class);
-binder.bind(HibernatePersistenceStrategy.class);
-
binder.bind
svn commit: r546152 - in /roller/branches/roller_guice: apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/ apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/ tools/
Author: snoopdave Date: Mon Jun 11 06:54:24 2007 New Revision: 546152 URL: http://svn.apache.org/viewvc?view=revrev=546152 Log: Fixes. Roller Guice now passes 100% of unit tests Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java roller/branches/roller_guice/tools/roller-core/roller-core.jar roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java?view=diffrev=546152r1=546151r2=546152 == --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java Mon Jun 11 06:54:24 2007 @@ -64,16 +64,15 @@ binder.bind(PingTargetManager.class).to( HibernatePingTargetManagerImpl.class); binder.bind(PropertiesManager.class).to( HibernatePropertiesManagerImpl.class); binder.bind(RefererManager.class).to( HibernateRefererManagerImpl.class); +binder.bind(ThreadManager.class).to( HibernateThreadManagerImpl.class); binder.bind(UserManager.class).to( HibernateUserManagerImpl.class); binder.bind(WeblogManager.class).to( HibernateWeblogManagerImpl.class); - - + binder.bind(ReferrerQueueManager.class).to(ReferrerQueueManagerImpl.class); binder.bind(FileManager.class).to( FileManagerImpl.class); binder.bind(IndexManager.class).to(IndexManagerImpl.class); binder.bind(PluginManager.class).to( PluginManagerImpl.class); binder.bind(ThemeManager.class).to(ThemeManagerImpl.class); -binder.bind(ThreadManager.class).to( ThreadManagerImpl.class); } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java?view=diffrev=546152r1=546151r2=546152 == --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java Mon Jun 11 06:54:24 2007 @@ -35,7 +35,6 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.Roller; -import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.business.referrers.RefererManager; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java?view=diffrev=546152r1=546151r2=546152 == --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java Mon Jun 11 06:54:24 2007 @@ -38,7 +38,6 @@ import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManagerImpl; import org.apache.roller.weblogger.business.runnable.ThreadManager; -import org.apache.roller.weblogger.business.runnable.ThreadManagerImpl; import org.apache.roller.weblogger.business.search.IndexManager; import org.apache.roller.weblogger.business.search.IndexManagerImpl; import org.apache.roller.weblogger.business.themes.ThemeManager; @@ -64,16 +63,15 @@ binder.bind(PingTargetManager.class).to( JPAPingTargetManagerImpl.class); binder.bind(PropertiesManager.class).to( JPAPropertiesManagerImpl.class); binder.bind(RefererManager.class).to( JPARefererManagerImpl.class
svn commit: r548830 [2/2] - in /roller/branches/roller_guice: ./ apps/planet/src/java/org/apache/roller/planet/business/jpa/ apps/weblogger/ apps/weblogger/nbproject/ apps/weblogger/src/java/org/apach
Copied: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.java (from r548758, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.java) URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.java?view=diffrev=548830p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.javar1=548758p2=roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.javar2=548830 == --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateDatabase.java Tue Jun 19 12:29:52 2007 @@ -22,8 +22,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.roller.util.DatabaseProvider; import org.apache.roller.weblogger.WebloggerException; -import org.apache.roller.weblogger.business.DatabaseProvider; import org.apache.roller.weblogger.business.utils.DatabaseCreator; import org.apache.roller.weblogger.config.RollerConfig; import org.apache.roller.weblogger.ui.struts2.util.UIAction; Copied: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.java (from r548758, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.java) URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.java?view=diffrev=548830p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.javar1=548758p2=roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.javar2=548830 == --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/DatabaseError.java Tue Jun 19 12:29:52 2007 @@ -21,7 +21,7 @@ import java.io.StringWriter; import java.util.List; import org.apache.roller.RollerException; -import org.apache.roller.weblogger.business.DatabaseProvider; +import org.apache.roller.util.DatabaseProvider; import org.apache.roller.weblogger.config.RollerConfig; import org.apache.roller.weblogger.ui.struts2.util.UIAction; Copied: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java (from r548758, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java) URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diffrev=548830p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.javar1=548758p2=roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.javar2=548830 == --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java Tue Jun 19 12:29:52 2007 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; -import org.apache.roller.weblogger.business.DatabaseProvider; +import org.apache.roller.util.DatabaseProvider; import org.apache.roller.weblogger.business.RollerFactory; import org.apache.roller.weblogger.business.utils.DatabaseCreator; import org.apache.roller.weblogger.business.utils.DatabaseUpgrader; Copied: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/UpgradeDatabase.java (from r548758, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/UpgradeDatabase.java) URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/UpgradeDatabase.java?view=diffrev=548830p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/UpgradeDatabase.javar1=548758p2=roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/UpgradeDatabase.javar2=548830 == ---
svn commit: r549081 - in /roller/branches/roller_guice/apps/weblogger: src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java test/java/org/apache/roller/weblogger/busi
Author: snoopdave Date: Wed Jun 20 05:18:40 2007 New Revision: 549081 URL: http://svn.apache.org/viewvc?view=revrev=549081 Log: Couple more fixes to get tests running Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java?view=diffrev=549081r1=549080r2=549081 == --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java Wed Jun 20 05:18:40 2007 @@ -26,6 +26,8 @@ import org.apache.roller.planet.business.hibernate.HibernatePlanetImpl; import org.apache.roller.planet.business.hibernate.HibernatePlanetManagerImpl; import org.apache.roller.planet.business.hibernate.HibernatePropertiesManagerImpl; +import org.apache.roller.util.DatabaseProvider; +import org.apache.roller.weblogger.business.RollerDatabaseProvider; /** @@ -42,6 +44,7 @@ binder.bind(PlanetManager.class).to( HibernatePlanetManagerImpl.class); binder.bind(PropertiesManager.class).to( HibernatePropertiesManagerImpl.class); +binder.bind(DatabaseProvider.class).to( RollerDatabaseProvider.class); } } Modified: roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java?view=diffrev=549081r1=549080r2=549081 == --- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java (original) +++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java Wed Jun 20 05:18:40 2007 @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import junit.framework.TestCase; +import org.apache.roller.util.DatabaseProvider; import org.apache.roller.weblogger.business.utils.SQLScriptRunner; /**
svn commit: r549367 - in /roller/branches/roller_guice: apps/planet/src/java/org/apache/roller/planet/business/ apps/planet/src/java/org/apache/roller/planet/ui/core/ apps/planet/src/java/org/apache/r
Author: snoopdave
Date: Wed Jun 20 21:55:30 2007
New Revision: 549367
URL: http://svn.apache.org/viewvc?view=revrev=549367
Log:
Tests passing, apps running. New install/bootstrap stuff now implemented in
roller_guice branch. Got drawn into implementing probably more Planet
bootstrapping than necessary to prove the concept.
Added:
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/InitializationException.java
Modified:
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/filters/PersistenceSessionFilter.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.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/filters/PersistenceSessionFilter.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/branches/roller_guice/tools/roller-core/roller-core.jar
roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar
Added:
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/InitializationException.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/InitializationException.java?view=autorev=549367
==
---
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/InitializationException.java
(added)
+++
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/InitializationException.java
Wed Jun 20 21:55:30 2007
@@ -0,0 +1,37 @@
+/*
+ * 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.planet.business;
+
+import org.apache.roller.planet.PlanetException;
+
+
+/**
+ * Exception generated from Weblogger initialization process.
+ */
+public class InitializationException extends PlanetException {
+
+public InitializationException(String msg) {
+super(msg);
+}
+
+public InitializationException(String msg, Throwable t) {
+super(msg, t);
+}
+
+}
Modified:
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java?view=diffrev=549367r1=549366r2=549367
==
---
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
(original)
+++
roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
Wed Jun 20 21:55:30 2007
@@ -81,7 +81,7 @@
return bootstrapped;
}
-/**
+/**
* Bootstrap the Roller Planet business tier.
*
* Bootstrapping the application effectively instantiates all the necessary
@@ -107,5 +107,44 @@
bootstrapped = true
svn commit: r549994 - in /roller/branches/roller_guice: ./ apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/ apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/cor
Author: snoopdave
Date: Fri Jun 22 18:27:08 2007
New Revision: 549994
URL: http://svn.apache.org/viewvc?view=revrev=549994
Log:
Latest from trunk
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/branches/roller_guice/apps/weblogger/src/sql/320-to-400-migration.vm
roller/branches/roller_guice/merges.txt
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diffrev=549994r1=549993r2=549994
==
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Fri Jun 22 18:27:08 2007
@@ -171,11 +171,6 @@
}
-// do we need to force a specific locale for the request?
-if(feedRequest.getLocale() == null !weblog.isShowAllLangs()) {
-feedRequest.setLocale(weblog.getLocale());
-}
-
// validation. make sure that request input makes sense.
boolean invalid = false;
if(feedRequest.getLocale() != null) {
@@ -210,6 +205,11 @@
return;
}
+
+// do we need to force a specific locale for the request?
+if(feedRequest.getLocale() == null !weblog.isShowAllLangs()) {
+feedRequest.setLocale(weblog.getLocale());
+}
// looks like we need to render content
HashMap model = new HashMap();
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diffrev=549994r1=549993r2=549994
==
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Fri Jun 22 18:27:08 2007
@@ -219,6 +219,7 @@
}
}
+log.debug(Looking for template to use for rendering);
// figure out what template to use
ThemeTemplate page = null;
@@ -287,11 +288,6 @@
log.debug(page found, dealing with it);
-// do we need to force a specific locale for the request?
-if(pageRequest.getLocale() == null !weblog.isShowAllLangs()) {
-pageRequest.setLocale(weblog.getLocale());
-}
-
// validation. make sure that request input makes sense.
boolean invalid = false;
if(pageRequest.getWeblogPageName() != null page.isHidden()) {
@@ -341,9 +337,16 @@
if(invalid) {
+log.debug(page failed validation, bailing out);
if(!response.isCommitted()) response.reset();
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
+}
+
+
+// do we need to force a specific locale for the request?
+if(pageRequest.getLocale() == null !weblog.isShowAllLangs()) {
+pageRequest.setLocale(weblog.getLocale());
}
Modified:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java?view=diffrev=549994r1=549993r2=549994
==
---
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
(original)
+++
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
Fri Jun 22 18:27:08 2007
@@ -62,7 +62,11 @@
public String execute() {
-
+
+if(RollerFactory.isBootstrapped()) {
+return SUCCESS
svn commit: r550059 - in /roller/trunk/tools: lib/guice-1.0.jar roller-core/roller-core.jar roller-planet/roller-planet-business.jar
Author: snoopdave Date: Sat Jun 23 08:45:51 2007 New Revision: 550059 URL: http://svn.apache.org/viewvc?view=revrev=550059 Log: Oops, forgot the most important bits Added: roller/trunk/tools/lib/guice-1.0.jar (with props) Modified: roller/trunk/tools/roller-core/roller-core.jar roller/trunk/tools/roller-planet/roller-planet-business.jar Added: roller/trunk/tools/lib/guice-1.0.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/lib/guice-1.0.jar?view=autorev=550059 == Binary file - no diff available. Propchange: roller/trunk/tools/lib/guice-1.0.jar -- svn:mime-type = application/octet-stream Modified: roller/trunk/tools/roller-core/roller-core.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/roller-core/roller-core.jar?view=diffrev=550059r1=550058r2=550059 == Binary files - no diff available. Modified: roller/trunk/tools/roller-planet/roller-planet-business.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/roller-planet/roller-planet-business.jar?view=diffrev=550059r1=550058r2=550059 == Binary files - no diff available.
svn commit: r550062 - in /roller/trunk/apps/planet/src/java/org/apache/roller: planet/util/Utilities.java util/OldUtilities.java
Author: snoopdave
Date: Sat Jun 23 09:02:33 2007
New Revision: 550062
URL: http://svn.apache.org/viewvc?view=revrev=550062
Log:
Don't use those Sun-internal Base64 calls
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java
roller/trunk/apps/planet/src/java/org/apache/roller/util/OldUtilities.java
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java?view=diffrev=550062r1=550061r2=550062
==
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/util/Utilities.java
Sat Jun 23 09:02:33 2007
@@ -18,15 +18,13 @@
import java.util.Locale;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
/**
* General purpose utilities, not for use in templates.
*/
@@ -433,9 +431,7 @@
* @throws IOException
*/
public static String encodeString(String str) throws IOException {
-BASE64Encoder encoder = new BASE64Encoder();
-String encodedStr = encoder.encodeBuffer(str.getBytes());
-
+String encodedStr = new String(Base64.encodeBase64(str.getBytes()));
return (encodedStr.trim());
}
@@ -447,10 +443,8 @@
* @throws IOException
*/
public static String decodeString(String str) throws IOException {
-BASE64Decoder dec = new BASE64Decoder();
-String value = new String(dec.decodeBuffer(str));
-
-return (value);
+String value = new String(Base64.decodeBase64(str.getBytes()));
+return (value);
}
/**
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/util/OldUtilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/util/OldUtilities.java?view=diffrev=550062r1=550061r2=550062
==
--- roller/trunk/apps/planet/src/java/org/apache/roller/util/OldUtilities.java
(original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/util/OldUtilities.java
Sat Jun 23 09:02:33 2007
@@ -25,11 +25,11 @@
import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.util.DateUtil;
import org.apache.roller.planet.util.RegexUtil;
import org.apache.roller.planet.util.Utilities;
@@ -487,9 +487,7 @@
* @throws IOException
*/
public static String encodeString(String str) throws IOException {
-sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder();
-String encodedStr = encoder.encodeBuffer(str.getBytes());
-
+String encodedStr = new String(Base64.encodeBase64(str.getBytes()));
return (encodedStr.trim());
}
@@ -501,10 +499,8 @@
* @throws IOException
*/
public static String decodeString(String str) throws IOException {
-sun.misc.BASE64Decoder dec = new sun.misc.BASE64Decoder();
-String value = new String(dec.decodeBuffer(str));
-
-return (value);
+String value = new String(Base64.decodeBase64(str.getBytes()));
+return (value);
}
/**
svn commit: r550235 [1/3] - in /roller/branches/roller_3.1/web/WEB-INF/classes: ApplicationResources.properties ApplicationResources_ja_JP.properties
Author: snoopdave Date: Sun Jun 24 07:17:53 2007 New Revision: 550235 URL: http://svn.apache.org/viewvc?view=revrev=550235 Log: Moving new Japanese translation to correct file Modified: roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources.properties roller/branches/roller_3.1/web/WEB-INF/classes/ApplicationResources_ja_JP.properties
svn commit: r550629 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor: Comments.java Entries.java
Author: snoopdave
Date: Mon Jun 25 15:20:54 2007
New Revision: 550629
URL: http://svn.apache.org/viewvc?view=revrev=550629
Log:
Couple of JPA related fixes; don't modify collections returned by queries
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java?view=diffrev=550629r1=550628r2=550629
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
Mon Jun 25 15:20:54 2007
@@ -95,7 +95,7 @@
}
// query for comments
-comments = wmgr.getComments(
+List rawComments = wmgr.getComments(
getActionWeblog(),
queryEntry,
getBean().getSearchString(),
@@ -105,7 +105,8 @@
true, // reverse chrono order
getBean().getPage() * COUNT,
COUNT + 1);
-
+comments = new ArrayList();
+comments.addAll(rawComments);
if(comments != null comments.size() 0) {
if(comments.size() COUNT) {
comments.remove(comments.size()-1);
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diffrev=550629r1=550628r2=550629
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Mon Jun 25 15:20:54 2007
@@ -75,7 +75,7 @@
public String execute() {
-if(log.isDebugEnabled()) {
+if (log.isDebugEnabled()) {
log.debug(entries bean is ...\n+getBean().toString());
}
@@ -85,7 +85,7 @@
String status = getBean().getStatus();
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
-entries = wmgr.getWeblogEntries(
+ListWeblogEntry rawEntries = wmgr.getWeblogEntries(
getActionWeblog(),
null,
getBean().getStartDate(),
@@ -99,11 +99,12 @@
null,
getBean().getPage() * COUNT,
COUNT + 1);
-
-if(entries != null entries.size() 0) {
-log.debug(query found +entries.size()+ results);
+entries = new ArrayListWeblogEntry();
+entries.addAll(rawEntries);
+if (entries != null entries.size() 0) {
+log.debug(query found +rawEntries.size()+ results);
-if(entries.size() COUNT) {
+if(rawEntries.size() COUNT) {
entries.remove(entries.size()-1);
hasMore = true;
}
svn commit: r550799 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
Author: snoopdave
Date: Tue Jun 26 06:08:24 2007
New Revision: 550799
URL: http://svn.apache.org/viewvc?view=revrev=550799
Log:
Fixing broken bootstrap filter, using redirect without context name only works
if roller is installed at root
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java?view=diffrev=550799r1=550798r2=550799
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
Tue Jun 26 06:08:24 2007
@@ -23,6 +23,7 @@
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -39,7 +40,7 @@
* type is auto, otherwise does nothing.
*/
public class BootstrapFilter implements Filter {
-
+private ServletContext context = null;
private static Log log = LogFactory.getLog(BootstrapFilter.class);
@@ -55,8 +56,10 @@
auto.equals(RollerConfig.getProperty(installation.type))
!isInstallUrl(request.getServletPath())) {
-// just redirect to install action
-response.sendRedirect(/roller-ui/install/install.rol);
+// we doing an install, so forward to installer
+RequestDispatcher rd = context.getRequestDispatcher(
+/roller-ui/install/install.rol);
+rd.forward(req, res);
} else {
chain.doFilter(request, response);
@@ -72,8 +75,9 @@
}
-public void init(FilterConfig filterConfig) throws ServletException {}
-
-public void destroy() {}
+public void init(FilterConfig filterConfig) throws ServletException {
+context = filterConfig.getServletContext();
+}
+public void destroy() {}
}
svn commit: r551982 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol: RollerAtomHandler.java package.html
Author: snoopdave
Date: Fri Jun 29 11:07:41 2007
New Revision: 551982
URL: http://svn.apache.org/viewvc?view=revrev=551982
Log:
Fixed a bug in delete-entry. Now passes the latest Ape tests with no errors.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/package.html
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=551982r1=551981r2=551982
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Fri Jun 29 11:07:41 2007
@@ -608,12 +608,12 @@
throw new AtomNotFoundException(cannot find specified
entry/resource);
}
if (canEdit(rollerEntry)) {
-WeblogManager mgr = roller.getWeblogManager();
+WeblogManager mgr = roller.getWeblogManager();
+CacheManager.invalidate(rollerEntry.getWebsite());
+reindexEntry(rollerEntry);
mgr.removeWeblogEntry(rollerEntry);
log.debug(Deleted entry: + rollerEntry.getAnchor());
roller.flush();
-CacheManager.invalidate(rollerEntry.getWebsite());
-reindexEntry(rollerEntry);
return;
}
} else if (pathInfo[1].equals(resource)) {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/package.html
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/package.html?view=diffrev=551982r1=551981r2=551982
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/package.html
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/package.html
Fri Jun 29 11:07:41 2007
@@ -21,6 +21,8 @@
title/title
/head
body
-(Experimental) Atom Publising Protocol implementation using ROME.
+p(Experimental) Atom Publising Protocol (APP) implementation using
ROME./p
+pUpdated for APP draft #15, passes the Atom Protocol Exerciser (Ape)
tests as of June 29, 2007./p
+pEnd-point is at [context]/roller-services/app/p
/body
/html
svn commit: r552238 - in /roller/branches/roller_3.1/web: WEB-INF/velocity/weblog.vm themes/basic/Weblog.vm
Author: snoopdave Date: Sat Jun 30 20:28:50 2007 New Revision: 552238 URL: http://svn.apache.org/viewvc?view=revrev=552238 Log: Adding missing argument to #showReferrersList() macro to fix ROL-1458 Modified: roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm roller/branches/roller_3.1/web/themes/basic/Weblog.vm Modified: roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm?view=diffrev=552238r1=552237r2=552238 == --- roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm (original) +++ roller/branches/roller_3.1/web/WEB-INF/velocity/weblog.vm Sat Jun 30 20:28:50 2007 @@ -488,7 +488,7 @@ #** * Display list of referrers. *# -#macro(showReferrersList $refs $max $maxWidth) +#macro(showReferrersList $refs $max $maxWidth $includeHits) ul class=rReferersList #foreach( $ref in $refs ) #if ($velocityCount = $max) Modified: roller/branches/roller_3.1/web/themes/basic/Weblog.vm URL: http://svn.apache.org/viewvc/roller/branches/roller_3.1/web/themes/basic/Weblog.vm?view=diffrev=552238r1=552237r2=552238 == --- roller/branches/roller_3.1/web/themes/basic/Weblog.vm (original) +++ roller/branches/roller_3.1/web/themes/basic/Weblog.vm Sat Jun 30 20:28:50 2007 @@ -69,7 +69,7 @@ h2Referers/h2 div class=sidebar #set($refs = $model.weblog.getTodaysReferrers()) -#showReferrersList($refs 30 20) +#showReferrersList($refs 30 20 true) /div /div /div
svn commit: r552240 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol: AtomService.java RollerAtomHandler.java
Author: snoopdave
Date: Sat Jun 30 20:36:41 2007
New Revision: 552240
URL: http://svn.apache.org/viewvc?view=revrev=552240
Log:
Couple of APP fixes found while doing 3.1 fixes
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java?view=diffrev=552240r1=552239r2=552240
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AtomService.java
Sat Jun 30 20:36:41 2007
@@ -28,7 +28,7 @@
/**
* This class models an Atom Publishing Protocol AtomService Document.
- * Based on: draft-ietf-atompub-protocol-10.txt.
+ * Based on: draft-ietf-atompub-protocol-15.txt.
* Designed to be Roller independent.
*/
public class AtomService {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=552240r1=552239r2=552240
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Sat Jun 30 20:36:41 2007
@@ -508,11 +508,18 @@
mgr.saveWeblogEntry(rollerEntry);
roller.flush();
-// Throttle one entry per second
-try { Thread.sleep(1000); } catch (Exception ignored) {}
+// Throttle one entry per second per weblog because time-
+// stamp in MySQL and other DBs has only 1 sec resolution
+try {
+synchronized (getClass()) {
+Thread.sleep(1000);
+}
+} catch (Exception ignored) {}
CacheManager.invalidate(website);
-reindexEntry(rollerEntry);
+if (rollerEntry.isPublished()) {
+roller.getIndexManager().addEntryReIndexOperation(rollerEntry);
+}
log.debug(Exiting);
return createAtomEntry(rollerEntry);
@@ -580,8 +587,18 @@
mgr.saveWeblogEntry(rollerEntry);
roller.flush();
+// Throttle one entry per second per weblog because time-
+// stamp in MySQL and other DBs has only 1 sec resolution
+try {
+synchronized (getClass()) {
+Thread.sleep(1000);
+}
+} catch (Exception ignored) {}
+
CacheManager.invalidate(rollerEntry.getWebsite());
-reindexEntry(rollerEntry);
+if (rollerEntry.isPublished()) {
+
roller.getIndexManager().addEntryReIndexOperation(rollerEntry);
+}
log.debug(Exiting);
return createAtomEntry(rollerEntry);
}
@@ -670,7 +687,8 @@
}
if (pathInfo.length 1) {
// Save to temp file
-String fileName = createFileName(website, (slug != null) ?
slug : title, contentType);
+String fileName = createFileName(website,
+(slug != null) ? slug :
Utilities.replaceNonAlphanumeric(title,' '), contentType);
try {
tempFile = File.createTempFile(fileName, tmp);
FileOutputStream fos = new FileOutputStream(tempFile);
@@ -687,11 +705,6 @@
ThemeResource resource = fmgr.getFile(website, path +
fileName);
-// Throttle one entry per second because blog entry dates
-// are represented by timpstamps in MySQL and therefore
-// have only have 1 second resolution
-try { Thread.sleep(1000); } catch (Exception ignored) {}
-
log.debug(Exiting);
return createAtomResourceEntry(website, resource);
@@ -741,7 +754,7 @@
*content-type = image/jpg
* Might result in daveblog
svn commit: r552331 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
Author: snoopdave
Date: Sun Jul 1 09:06:11 2007
New Revision: 552331
URL: http://svn.apache.org/viewvc?view=revrev=552331
Log:
Fixes ROL-1465 PreviewServlet broken due to OpenJPA detached object
limitations but only for entry preview where these is no need for a dummy
weblog ojbect. Theme preview is still broken.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?view=diffrev=552331r1=552330r2=552331
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
Sun Jul 1 09:06:11 2007
@@ -95,23 +95,30 @@
return;
}
-// try getting the preview theme
-log.debug(preview theme = +previewRequest.getThemeName());
-Theme previewTheme = previewRequest.getTheme();
+Weblog tmpWebsite = weblog;
-// construct a temporary Website object for this request
-// and set the EditorTheme to our previewTheme
-Weblog tmpWebsite = new Weblog();
-tmpWebsite.setData(weblog);
-if(previewTheme != null previewTheme.isEnabled()) {
-tmpWebsite.setEditorTheme(previewTheme.getId());
-} else if(WeblogTheme.CUSTOM.equals(previewRequest.getThemeName())) {
-tmpWebsite.setEditorTheme(WeblogTheme.CUSTOM);
+if (previewRequest.getThemeName() != null) {
+// only create temporary weblog object if theme name was specified
+// in request, which indicates we're doing a theme preview
+
+// try getting the preview theme
+log.debug(preview theme = +previewRequest.getThemeName());
+Theme previewTheme = previewRequest.getTheme();
+
+// construct a temporary Website object for this request
+// and set the EditorTheme to our previewTheme
+tmpWebsite = new Weblog();
+tmpWebsite.setData(weblog);
+if(previewTheme != null previewTheme.isEnabled()) {
+tmpWebsite.setEditorTheme(previewTheme.getId());
+} else
if(WeblogTheme.CUSTOM.equals(previewRequest.getThemeName())) {
+tmpWebsite.setEditorTheme(WeblogTheme.CUSTOM);
+}
+
+// we've got to set the weblog in our previewRequest because that's
+// the object that gets referenced during rendering operations
+previewRequest.setWeblog(tmpWebsite);
}
-
-// we've got to set the weblog in our previewRequest because that's
-// the object that gets referenced during rendering operations
-previewRequest.setWeblog(tmpWebsite);
// do we need to force a specific locale for the request?
if(previewRequest.getLocale() == null !weblog.isShowAllLangs()) {
svn commit: r552341 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Author: snoopdave
Date: Sun Jul 1 10:40:08 2007
New Revision: 552341
URL: http://svn.apache.org/viewvc?view=revrev=552341
Log:
Accept for entries is now application/atom+xml;type=entry instead of entry
as of APP draft #15.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=552341r1=552340r2=552341
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Sun Jul 1 10:40:08 2007
@@ -184,7 +184,7 @@
// Create collection for entries within that workspace
Collection entryCol = new Collection(Weblog Entries, text,
URLUtilities.getAtomProtocolURL(true)+/+handle+/entries);
-entryCol.setAccept(entry);
+entryCol.setAccept(application/atom+xml;type=entry);
try {
// Add fixed categories using scheme that points to
// weblog because categories are weblog specific
svn commit: r552354 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger: config/roller.properties webservices/atomprotocol/RollerAtomHandler.java
Author: snoopdave
Date: Sun Jul 1 12:04:54 2007
New Revision: 552354
URL: http://svn.apache.org/viewvc?view=revrev=552354
Log:
Ridiculously lame throttle crap won't work unless it's before post/put of
entry. Also, made it optional in case there are databases with reasonable
timestamp support. rollerweblogger.org now passes online Ape testing
(http://tbray.org/ape).
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?view=diffrev=552354r1=552353r2=552354
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Sun Jul 1 12:04:54 2007
@@ -614,6 +614,9 @@
# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
webservices.atomprotocol.enabled=false
+# For databases with one sec timestamp resolution, we need a one sec throttle
+webservices.atomprotocol.oneSecondThrottle=true
+
# Atom-like Admin Publishing Protocol (AAPP) - this is an experimental admin
# protocol based on ideas from the Atom protocol.
# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=552354r1=552353r2=552354
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Sun Jul 1 12:04:54 2007
@@ -110,13 +110,19 @@
* @author David M Johnson
*/
public class RollerAtomHandler implements AtomHandler {
-private Weblogger roller;
-private User user;
-private int maxEntries = 20;
+private Weblogger roller;
+private User user;
+private int maxEntries = 20;
+
+private static boolean throttle = true;
private static Log log =
LogFactory.getFactory().getInstance(RollerAtomHandler.class);
+static {
+throttle =
WebloggerConfig.getBooleanProperty(webservices.atomprotocol.oneSecondThrottle);
+}
+
//
construction
/**
@@ -482,6 +488,15 @@
}
//-
entries
+private void oneSecondThrottle() {
+// Throttle one entry per second per weblog because time-
+// stamp in MySQL and other DBs has only 1 sec resolution
+try {
+synchronized (getClass()) {
+Thread.sleep(1000);
+}
+} catch (Exception ignored) {}
+}
/**
* Create entry in the entry collection (a Weblogger blog has only one).
@@ -499,6 +514,9 @@
if (!canEdit(website)) {
throw new AtomNotAuthorizedException(Not authorized to access
website: + handle);
}
+
+if (throttle) oneSecondThrottle();
+
// Save it and commit it
WeblogManager mgr = roller.getWeblogManager();
WeblogEntry rollerEntry = new WeblogEntry();
@@ -508,14 +526,6 @@
mgr.saveWeblogEntry(rollerEntry);
roller.flush();
-// Throttle one entry per second per weblog because time-
-// stamp in MySQL and other DBs has only 1 sec resolution
-try {
-synchronized (getClass()) {
-Thread.sleep(1000);
-}
-} catch (Exception ignored) {}
-
CacheManager.invalidate(website);
if (rollerEntry.isPublished()) {
roller.getIndexManager().addEntryReIndexOperation(rollerEntry);
@@ -582,18 +592,13 @@
Cannot find specified entry/resource);
}
if (canEdit(rollerEntry)) {
+
+if (throttle) oneSecondThrottle();
+
WeblogManager mgr = roller.getWeblogManager();
copyToRollerEntry(entry, rollerEntry);
mgr.saveWeblogEntry(rollerEntry
svn commit: r552357 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Author: snoopdave
Date: Sun Jul 1 12:30:26 2007
New Revision: 552357
URL: http://svn.apache.org/viewvc?view=revrev=552357
Log:
minor cleanup. moved throttle method to end of file.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=552357r1=552356r2=552357
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomHandler.java
Sun Jul 1 12:30:26 2007
@@ -120,7 +120,8 @@
LogFactory.getFactory().getInstance(RollerAtomHandler.class);
static {
-throttle =
WebloggerConfig.getBooleanProperty(webservices.atomprotocol.oneSecondThrottle);
+throttle = WebloggerConfig
+.getBooleanProperty(webservices.atomprotocol.oneSecondThrottle);
}
//
construction
@@ -488,16 +489,7 @@
}
//-
entries
-private void oneSecondThrottle() {
-// Throttle one entry per second per weblog because time-
-// stamp in MySQL and other DBs has only 1 sec resolution
-try {
-synchronized (getClass()) {
-Thread.sleep(1000);
-}
-} catch (Exception ignored) {}
-}
-
+
/**
* Create entry in the entry collection (a Weblogger blog has only one).
*/
@@ -1218,6 +1210,16 @@
if (entry.isPublished()) {
manager.addEntryReIndexOperation(entry);
}
+}
+
+private void oneSecondThrottle() {
+// Throttle one entry per second per weblog because time-
+// stamp in MySQL and other DBs has only 1 sec resolution
+try {
+synchronized (getClass()) {
+Thread.sleep(1000);
+}
+} catch (Exception ignored) {}
}
}
svn commit: r552536 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui: core/ rendering/model/ rendering/velocity/deprecated/
Author: snoopdave
Date: Mon Jul 2 09:39:53 2007
New Revision: 552536
URL: http://svn.apache.org/viewvc?view=revrev=552536
Log:
Removing redundant and rarely used authorization methods from RollerSession
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?view=diffrev=552536r1=552535r2=552536
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
Mon Jul 2 09:39:53 2007
@@ -172,54 +172,6 @@
}
-/**
- * Is session's authenticated user authorized to work in current website?
- */
-public boolean isUserAuthorized(Weblog website)
-throws WebloggerException {
-
-User user = getAuthenticatedUser();
-if (user != null user.getEnabled().booleanValue())
-return hasPermissions(website,WeblogPermission.LIMITED);
-return false;
-}
-
-
-/**
- * Is session's authenticated user authorized to post in current weblog?
- */
-public boolean isUserAuthorizedToAuthor(Weblog website)
-throws WebloggerException {
-
-User user = getAuthenticatedUser();
-if (user != null user.getEnabled().booleanValue())
-return hasPermissions(website,WeblogPermission.AUTHOR);
-return false;
-}
-
-
-/**
- * Is session's authenticated user authorized to admin current weblog?
- */
-public boolean isUserAuthorizedToAdmin(Weblog website)
-throws WebloggerException {
-
-User user = getAuthenticatedUser();
-if (user != null user.getEnabled().booleanValue())
-return hasPermissions(website,WeblogPermission.ADMIN);
-return false;
-}
-
-
-private boolean hasPermissions(Weblog website, short mask) {
-
-User user = getAuthenticatedUser();
-if (website != null user != null) {
-return website.hasUserPermissions(user, mask);
-}
-return false;
-}
-
private void clearSession(HttpSessionEvent se) {
HttpSession session = se.getSession();
try {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diffrev=552536r1=552535r2=552536
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
Mon Jul 2 09:39:53 2007
@@ -33,6 +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.WeblogPermission;
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;
@@ -120,7 +121,8 @@
try {
RollerSession rses = RollerSession.getRollerSession(request);
if (rses != null rses.getAuthenticatedUser() != null) {
-return rses.isUserAuthorizedToAuthor(weblog.getPojo());
+return weblog.getPojo().hasUserPermissions(
+rses.getAuthenticatedUser(), WeblogPermission.AUTHOR);
}
} catch (Exception e) {
log.warn(ERROR: checking user authorization, e);
@@ -132,7 +134,8 @@
try {
RollerSession rses = RollerSession.getRollerSession(request);
if (rses != null rses.getAuthenticatedUser() != null) {
-return rses.isUserAuthorizedToAdmin(weblog.getPojo());
+return weblog.getPojo().hasUserPermissions(
+rses.getAuthenticatedUser(), WeblogPermission.ADMIN);
}
} catch (Exception e) {
log.warn(ERROR: checking user authorization, e
svn commit: r553619 - /roller/trunk/build.xml
Author: snoopdave Date: Thu Jul 5 12:41:38 2007 New Revision: 553619 URL: http://svn.apache.org/viewvc?view=revrev=553619 Log: Fixing top-level build to account for removal of all target Modified: roller/trunk/build.xml Modified: roller/trunk/build.xml URL: http://svn.apache.org/viewvc/roller/trunk/build.xml?view=diffrev=553619r1=553618r2=553619 == --- roller/trunk/build.xml (original) +++ roller/trunk/build.xml Thu Jul 5 12:41:38 2007 @@ -21,7 +21,7 @@ ant dir=apps/planet target=dist / copy file=apps/planet/dist/lib/roller-planet-business.jar todir=tools/roller-planet / -ant dir=apps/weblogger target=all / +ant dir=apps/weblogger target=dist / ant dir=apps/weblogger target=apache-release / /target @@ -30,7 +30,7 @@ description=Build Core, Planet and Roller separately (i.e. uses Core and Planet jars from Subversion) ant dir=components/core target=dist / ant dir=apps/planet target=dist / -ant dir=apps/weblogger target=all / +ant dir=apps/weblogger target=dist / ant dir=apps/weblogger target=apache-release / /target
svn commit: r553953 - in /roller/trunk: CHANGES.txt NOTICE.txt README.txt apps/weblogger/CHANGES.txt apps/weblogger/NOTICE.txt apps/weblogger/README.txt apps/weblogger/build.xml
Author: snoopdave
Date: Fri Jul 6 09:58:02 2007
New Revision: 553953
URL: http://svn.apache.org/viewvc?view=revrev=553953
Log:
Moving release docs to correction locations in release dir structure and release
Added:
roller/trunk/apps/weblogger/CHANGES.txt
- copied unchanged from r553939, roller/trunk/CHANGES.txt
roller/trunk/apps/weblogger/NOTICE.txt
- copied unchanged from r553939, roller/trunk/NOTICE.txt
roller/trunk/apps/weblogger/README.txt
- copied unchanged from r553939, roller/trunk/README.txt
Removed:
roller/trunk/CHANGES.txt
roller/trunk/NOTICE.txt
roller/trunk/README.txt
Modified:
roller/trunk/apps/weblogger/build.xml
Modified: roller/trunk/apps/weblogger/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diffrev=553953r1=553952r2=553953
==
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Fri Jul 6 09:58:02 2007
@@ -390,26 +390,21 @@
!-- copy in release documents --
copy todir=${build.dist.binary}
fileset dir=${basedir}
-include name=docs/** /
-include name=CHANGES.txt /
include name=LICENSE.txt /
include name=NOTICE.txt /
include name=README.txt /
-
-exclude name=**/codewright*/**/
-exclude name=docs/installguide/old/**/
-exclude name=docs/userguide/old/**/
-exclude name=docs/testing/**/
-exclude name=**/CVS/**/
-exclude name=**/*.bak/
-exclude name=**/*-hide/
-exclude name=**/*.diff/
-exclude name=**/*.patch/
-exclude name=**/*~/
-exclude name=**/*.#*/
-exclude name=**/WS_FTP.LOG/
-exclude name=**/.nbattrs/
-/fileset
+/fileset
+fileset dir=${basedir}/../.. includes=LICENSE.txt /
+/copy
+
+mkdir dir=${build.dist.binary}/docs/
+copy todir=${build.dist.binary}/docs
+fileset dir=${basedir}/docs/installguide
includes=roller-install-guide.odt /
+fileset dir=${basedir}/docs/installguide/generated
includes=roller-install-guide.pdf /
+fileset dir=${basedir}/docs/userguide
includes=roller-user-guide.odt /
+fileset dir=${basedir}/docs/userguide/generated
includes=roller-user-guide.pdf /
+fileset dir=${basedir}/docs/templateguide
includes=roller-template-guide.odt /
+fileset dir=${basedir}/docs/templateguide/generated
includes=roller-template-guide.pdf /
/copy
!-- and of course we'll want the webapp too --
@@ -474,7 +469,7 @@
/zip
!-- Tar and GZip the apache binary unshippables --
-tar destfile=${ro.dist}/required-jars-roller-${ro.version}.tar.gz
+tar destfile=${ro.dist}/hibernate-jars-roller-${ro.version}.tar.gz
longfile=gnu
compression=gzip
svn commit: r553975 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Author: snoopdave
Date: Fri Jul 6 10:59:31 2007
New Revision: 553975
URL: http://svn.apache.org/viewvc?view=revrev=553975
Log:
Reorganized into sections with important settings first, then directories, then
feature specifics then all the rest. Nice and tidy and ready for the new
installation guide.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?view=diffrev=553975r1=553974r2=553975
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Fri Jul 6 10:59:31 2007
@@ -40,6 +40,28 @@
# properties in this file are accessed like this ...
#WebloggerConfig.getProperty(propname);
+
+#-
+# Table of contents
+#-
+
+# -- Required configuration settings
+# -- Directory settings
+# -- Feature specific settings
+# -- Scheduled tasks configuration
+# -- Cache configuratation
+# -- Security settings
+# -- Rendering system
+# -- Weblog ping system
+# -- Pluggable backend, page and editor plugins
+# -- Other settings
+# -- Experimental, deprecated and undocumented settings
+
+
+#-
+# Required configuration settings
+#-
+
# Installation type 'auto' or 'manual'
# - Set to 'auto' if you'd like tables to be auto-created if they are not found
# on startup and auto-upgraded if they need it.
@@ -72,152 +94,191 @@
# For database configuration type of 'properties', you MUST override these
mail.hostname=
-mail.username
-mail.password
+mail.username=
+mail.password=
-#-
-# Hibernate dialect: You MUST override this to use a database other than MySQL4
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
+#-
+# Directory settings
+#-
-#-
-# Pluggable backend
+# The directory in which Roller will upload files
+uploads.dir=${user.home}/roller_data/uploads
-# No need to touch these two settings unless you are customizing Roller
-guice.backend.module=org.apache.roller.weblogger.business.jpa.JPAWebloggerModule
+# The context path under which resoures will be made available
+uploads.url=/resources
+
+# The directory in which Roller will look for themes
+themes.dir=${webapp.context}
+
+# Directory in which search index is to be created
+# (delete this directory to force Roller to recreate the entire search index)
+search.index.dir=${user.home}/roller_data/search-index
+# If you enable Planet (see below), then you must specify the path to a cache
+# directory that exists and is writable by the Roller process
+planet.aggregator.cache.dir=${user.home}/roller_data/planetcache
-#-
-# User management settings
+
+#-
+# Feature specific settings
+#-
# True to enable group blogging. False to prevent users from creating more
# than one weblog and from joining other weblogs.
groupblogging.enabled=true
-#-
-# Property expansion settings
+#--
+# search
-# Values of the properties in this list get system property expansion
-# applied to them when loaded.
-config.expandedProperties=uploads.dir,search.index.dir
+# Enables indexing of weblog entries and comments and enables search servlet
+search.enabled=true
+
+# Whether or not to include comments in the search index. If this
+# is false, comments are not included in the index.
+search.index.comments=true
#--
-# Upload settings
+# comments and trackbacks
-# The directory in which Roller will upload files
-uploads.dir=${user.home}/roller_data/uploads
+comment.notification.hideCommenterAddresses=false
-# The context path under which resoures will be made available
-uploads.url=/resources
+# comment throttleing
+comment.throttle.enabled=false
+comment.throttle.threshold=25
+comment.throttle.interval=60
+comment.throttle.maxentries=250
-#--
-# Themes settings
+# Plugable comment authentication
+comment.authenticator.classname
svn commit: r554222 [5/5] - in /roller/trunk/apps/weblogger/docs: ./ installguide/ installguide/generated/
Added: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m3d0892e2.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m3d0892e2.png?view=autorev=554222 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m3d0892e2.png -- svn:mime-type = application/octet-stream Added: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m74822c69.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m74822c69.png?view=autorev=554222 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m74822c69.png -- svn:mime-type = application/octet-stream Modified: roller/trunk/apps/weblogger/docs/installguide/roller-install-guide.odt URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/roller-install-guide.odt?view=diffrev=554222r1=554221r2=554222 == Binary files - no diff available. Modified: roller/trunk/apps/weblogger/docs/roller-doc-template.ott URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/roller-doc-template.ott?view=diffrev=554222r1=554221r2=554222 == Binary files - no diff available.
svn commit: r554222 [1/5] - in /roller/trunk/apps/weblogger/docs: ./ installguide/ installguide/generated/
Author: snoopdave Date: Sat Jul 7 08:40:06 2007 New Revision: 554222 URL: http://svn.apache.org/viewvc?view=revrev=554222 Log: First draft of all new install guide, still a couple of todos remain Added: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m3d0892e2.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m74822c69.png (with props) Modified: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.html roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.txt roller/trunk/apps/weblogger/docs/installguide/roller-install-guide.odt roller/trunk/apps/weblogger/docs/roller-doc-template.ott
svn commit: r554222 [3/5] - in /roller/trunk/apps/weblogger/docs: ./ installguide/ installguide/generated/
Modified: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf?view=diffrev=554222r1=554221r2=554222 == Binary files - no diff available.
svn commit: r554293 - /roller/branches/roller_3.1/src/org/apache/roller/pojos/Theme.java
Author: snoopdave
Date: Sat Jul 7 18:50:05 2007
New Revision: 554293
URL: http://svn.apache.org/viewvc?view=revrev=554293
Log:
Fix for ROL-1471
Modified:
roller/branches/roller_3.1/src/org/apache/roller/pojos/Theme.java
Modified: roller/branches/roller_3.1/src/org/apache/roller/pojos/Theme.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/src/org/apache/roller/pojos/Theme.java?view=diffrev=554293r1=554292r2=554293
==
--- roller/branches/roller_3.1/src/org/apache/roller/pojos/Theme.java (original)
+++ roller/branches/roller_3.1/src/org/apache/roller/pojos/Theme.java Sat Jul
7 18:50:05 2007
@@ -28,7 +28,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
+import org.apache.commons.lang.StringUtils;
/**
* The Theme object encapsulates all elements of a single weblog theme. It
@@ -146,7 +146,9 @@
* Set the value for a given resource path.
*/
public void setResource(String path, File resource) {
-this.resources.put(path, resource);
+// normalize to use web-style separators
+String normalizedPath = StringUtils.replace(path, \\, /);
+this.resources.put(normalizedPath, resource);
}
svn commit: r554310 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Author: snoopdave
Date: Sat Jul 7 20:21:25 2007
New Revision: 554310
URL: http://svn.apache.org/viewvc?view=revrev=554310
Log:
formatting change
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?view=diffrev=554310r1=554309r2=554310
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
Sat Jul 7 20:21:25 2007
@@ -108,12 +108,12 @@
# The context path under which resoures will be made available
uploads.url=/resources
-# The directory in which Roller will look for themes
-themes.dir=${webapp.context}
-
# Directory in which search index is to be created
# (delete this directory to force Roller to recreate the entire search index)
search.index.dir=${user.home}/roller_data/search-index
+
+# The directory in which Roller will look for themes
+themes.dir=${webapp.context}
# If you enable Planet (see below), then you must specify the path to a cache
# directory that exists and is writable by the Roller process
svn commit: r554311 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java
Author: snoopdave Date: Sat Jul 7 20:22:29 2007 New Revision: 554311 URL: http://svn.apache.org/viewvc?view=revrev=554311 Log: Removing unused imports Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java?view=diffrev=554311r1=554310r2=554311 == --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerSession.java Sat Jul 7 20:22:29 2007 @@ -32,9 +32,7 @@ import org.apache.roller.weblogger.config.WebloggerConfig; import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; -import org.apache.roller.weblogger.pojos.WeblogPermission; import org.apache.roller.weblogger.pojos.User; -import org.apache.roller.weblogger.pojos.Weblog; import org.apache.roller.weblogger.ui.core.security.AutoProvision;
svn commit: r554347 - in /roller/trunk/tools: hibernate-3.1/lib/ehcache-1.1.jar spring-1.2/ehcache-1.1.jar
Author: snoopdave Date: Sun Jul 8 04:37:01 2007 New Revision: 554347 URL: http://svn.apache.org/viewvc?view=revrev=554347 Log: Ehcache is a Spring dependency Added: roller/trunk/tools/spring-1.2/ehcache-1.1.jar - copied unchanged from r554298, roller/trunk/tools/hibernate-3.1/lib/ehcache-1.1.jar Removed: roller/trunk/tools/hibernate-3.1/lib/ehcache-1.1.jar
svn commit: r554348 [1/3] - in /roller/trunk/apps/weblogger: docs/installguide/ docs/installguide/generated/ docs/installguide/generated/html/ web/META-INF/
Author: snoopdave Date: Sun Jul 8 04:38:27 2007 New Revision: 554348 URL: http://svn.apache.org/viewvc?view=revrev=554348 Log: New install guide is complete and ready for review Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/ roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide.html roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_3cb2f8b3.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_56ece5ab.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_aeabd6d.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m32408f25.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3d0892e2.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m6315ba1e.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m74822c69.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m755bd4bb.png (with props) roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_mc5f2767.png (with props) roller/trunk/apps/weblogger/web/META-INF/ roller/trunk/apps/weblogger/web/META-INF/context.xml-example Removed: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.html roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m3d0892e2.png roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide_html_m74822c69.png Modified: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.txt roller/trunk/apps/weblogger/docs/installguide/roller-install-guide.odt
svn commit: r554348 [3/3] - in /roller/trunk/apps/weblogger: docs/installguide/ docs/installguide/generated/ docs/installguide/generated/html/ web/META-INF/
Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m32408f25.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m32408f25.png?view=autorev=554348 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m32408f25.png -- svn:mime-type = application/octet-stream Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3d0892e2.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3d0892e2.png?view=autorev=554348 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m3d0892e2.png -- svn:mime-type = application/octet-stream Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m6315ba1e.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m6315ba1e.png?view=autorev=554348 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m6315ba1e.png -- svn:mime-type = application/octet-stream Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m74822c69.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m74822c69.png?view=autorev=554348 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m74822c69.png -- svn:mime-type = application/octet-stream Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m755bd4bb.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m755bd4bb.png?view=autorev=554348 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_m755bd4bb.png -- svn:mime-type = application/octet-stream Added: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_mc5f2767.png URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_mc5f2767.png?view=autorev=554348 == Binary file - no diff available. Propchange: roller/trunk/apps/weblogger/docs/installguide/generated/html/roller-install-guide_html_mc5f2767.png -- svn:mime-type = application/octet-stream Modified: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.pdf?view=diffrev=554348r1=554347r2=554348 == Binary files - no diff available. Modified: roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.txt URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.txt?view=diffrev=554348r1=554347r2=554348 == --- roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.txt (original) +++ roller/trunk/apps/weblogger/docs/installguide/generated/roller-install-guide.txt Sun Jul 8 04:38:27 2007 @@ -8,9 +8,8 @@ + Installation Guide -Installation Guide -DRAFT 20070707 @@ -59,19 +58,19 @@ 7 Deploy Roller 9 7.1 Put roller-custom.properties in classpath9 7.2 Deploy Roller via administration console 9 -8 Getting started with Roller10 -8.1 Navigate to Roller and finish the install10 -8.2 Register a user and create a weblog 10 -9
svn commit: r554357 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Author: snoopdave
Date: Sun Jul 8 05:25:37 2007
New Revision: 554357
URL: http://svn.apache.org/viewvc?view=revrev=554357
Log:
Fix for ROL-1471 Resource servlet does not work properly on Windows
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?view=diffrev=554357r1=554356r2=554357
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Sun Jul 8 05:25:37 2007
@@ -29,6 +29,7 @@
import java.util.Iterator;
import java.util.List;
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.pojos.ThemeResource;
@@ -354,7 +355,9 @@
* Set the value for a given resource path.
*/
private void setResource(String path, SharedThemeResourceFromDir resource)
{
-this.resources.put(path, resource);
+// normalize to use web-style separators
+String normalizedPath = StringUtils.replace(path, \\, /);
+this.resources.put(normalizedPath, resource);
}
}
svn commit: r554373 - in /roller/branches/roller_3.1: src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java web/WEB-INF/classes/roller.properties
Author: snoopdave
Date: Sun Jul 8 07:24:54 2007
New Revision: 554373
URL: http://svn.apache.org/viewvc?view=revrev=554373
Log:
Couple of APP fixes that are in in 3.1.1 RC1
Modified:
roller/branches/roller_3.1/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
roller/branches/roller_3.1/web/WEB-INF/classes/roller.properties
Modified:
roller/branches/roller_3.1/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diffrev=554373r1=554372r2=554373
==
---
roller/branches/roller_3.1/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/branches/roller_3.1/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
Sun Jul 8 07:24:54 2007
@@ -118,10 +118,16 @@
//private MessageDigestmd5Helper = null;
//private MD5Encoder md5Encoder = new MD5Encoder();
+private static boolean throttle = true;
+
private static Log mLogger =
LogFactory.getFactory().getInstance(RollerAtomHandler.class);
+
+static {
+throttle =
RollerConfig.getBooleanProperty(webservices.atomprotocol.oneSecondThrottle);
+}
-//
construction
+ //
construction
/**
* Create Atom handler for a request and attempt to authenticate user.
@@ -1164,5 +1170,15 @@
}
}
return path;
+}
+
+private void oneSecondThrottle() {
+// Throttle one entry per second per weblog because time-
+// stamp in MySQL and other DBs has only 1 sec resolution
+try {
+synchronized (getClass()) {
+Thread.sleep(1000);
+}
+} catch (Exception ignored) {}
}
}
Modified: roller/branches/roller_3.1/web/WEB-INF/classes/roller.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_3.1/web/WEB-INF/classes/roller.properties?view=diffrev=554373r1=554372r2=554373
==
--- roller/branches/roller_3.1/web/WEB-INF/classes/roller.properties (original)
+++ roller/branches/roller_3.1/web/WEB-INF/classes/roller.properties Sun Jul 8
07:24:54 2007
@@ -545,6 +545,9 @@
# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
webservices.atomprotocol.enabled=false
+# For databases with one sec timestamp resolution, we need a one sec throttle
+webservices.atomprotocol.oneSecondThrottle=true
+
# Atom-like Admin Publishing Protocol (AAPP) - this is an experimental admin
# protocol based on ideas from the Atom protocol.
# Intended only for interoperability testing. DO NOT ENABLE IN PRODUCTION!
svn commit: r554818 - in /roller/trunk: apps/planet/nbproject/ apps/weblogger/nbproject/ components/core/nbproject/ nbproject/
Author: snoopdave
Date: Mon Jul 9 20:45:28 2007
New Revision: 554818
URL: http://svn.apache.org/viewvc?view=revrev=554818
Log:
Netbeans 6 project files, corrected classpaths, etc.
Added:
roller/trunk/apps/planet/nbproject/genfiles.properties
roller/trunk/apps/planet/nbproject/jdk.xml
roller/trunk/apps/planet/nbproject/nbjdk.properties
roller/trunk/apps/planet/nbproject/nbjdk.xml
Modified:
roller/trunk/apps/planet/nbproject/project.xml
roller/trunk/apps/weblogger/nbproject/project.xml
roller/trunk/components/core/nbproject/project.xml
roller/trunk/nbproject/project.xml
Added: roller/trunk/apps/planet/nbproject/genfiles.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/nbproject/genfiles.properties?view=autorev=554818
==
--- roller/trunk/apps/planet/nbproject/genfiles.properties (added)
+++ roller/trunk/apps/planet/nbproject/genfiles.properties Mon Jul 9 20:45:28
2007
@@ -0,0 +1,5 @@
+# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
+nbproject/jdk.xml.data.CRC32=9bcbf27c
+nbproject/jdk.xml.script.CRC32=5342cb35
+nbproject/jdk.xml.stylesheet.CRC32=c45af3dc
Added: roller/trunk/apps/planet/nbproject/jdk.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/nbproject/jdk.xml?view=autorev=554818
==
--- roller/trunk/apps/planet/nbproject/jdk.xml (added)
+++ roller/trunk/apps/planet/nbproject/jdk.xml Mon Jul 9 20:45:28 2007
@@ -0,0 +1,157 @@
+?xml version=1.0 encoding=UTF-8?project name=jdk basedir=.
+
+
+description
+Permits selection of a JDK to use when building and running project.
+See: http://www.netbeans.org/issues/show_bug.cgi?id=64160
+/description
+
+target name=-jdk-pre-preinit
+condition property=nbjdk.active-or-nbjdk.home
+or
+and
+isset property=nbjdk.active/
+not
+equals arg1=${nbjdk.active}
arg2=default_platform/
+/not
+/and
+and
+isset property=nbjdk.home/
+not
+isset property=nbjdk.home.defaulted/
+/not
+/and
+/or
+/condition
+/target
+
+target xmlns:common=http://java.netbeans.org/freeform/jdk.xml;
name=-jdk-preinit depends=-jdk-pre-preinit if=nbjdk.active-or-nbjdk.home
+macrodef name=property
uri=http://java.netbeans.org/freeform/jdk.xml;
+attribute name=name/
+attribute name=value/
+sequential
+property name=@{name} value=[EMAIL PROTECTED]/
+/sequential
+/macrodef
+common:property name=nbjdk.home
value=platforms.${nbjdk.active}.home/
+common:property name=nbjdk.javac.tmp
value=platforms.${nbjdk.active}.javac/
+condition property=.exe value=.exe
+os family=windows/
+/condition
+property name=.exe value=/
+condition property=nbjdk.javac
value=${nbjdk.home}/bin/javac${.exe}
+equals arg1=${nbjdk.javac.tmp}
arg2=$${platforms.${nbjdk.active}.javac}/
+/condition
+property name=nbjdk.javac value=${nbjdk.javac.tmp}/
+common:property name=nbjdk.java.tmp
value=platforms.${nbjdk.active}.java/
+condition property=nbjdk.java value=${nbjdk.home}/bin/java${.exe}
+equals arg1=${nbjdk.java.tmp}
arg2=$${platforms.${nbjdk.active}.java}/
+/condition
+property name=nbjdk.java value=${nbjdk.java.tmp}/
+common:property name=nbjdk.javadoc.tmp
value=platforms.${nbjdk.active}.javadoc/
+condition property=nbjdk.javadoc
value=${nbjdk.home}/bin/javadoc${.exe}
+equals arg1=${nbjdk.javadoc.tmp}
arg2=$${platforms.${nbjdk.active}.javadoc}/
+/condition
+property name=nbjdk.javadoc value=${nbjdk.javadoc.tmp}/
+common:property name=nbjdk.bootclasspath.tmp
value=platforms.${nbjdk.active}.bootclasspath/
+condition property=nbjdk.bootclasspath
value=${nbjdk.home}/jre/lib/rt.jar
+equals arg1=${nbjdk.bootclasspath.tmp}
arg2=$${platforms.${nbjdk.active}.bootclasspath}/
+/condition
+property name=nbjdk.bootclasspath
value=${nbjdk.bootclasspath.tmp}/
+condition property=nbjdk.valid
+and
+available file=${nbjdk.home} type=dir/
+available file=${nbjdk.javac} type=file/
+available file=${nbjdk.java} type=file/
+available file=${nbjdk.javadoc} type=file/
+
+/and
+/condition
+echo level=verbosenbjdk.active=${nbjdk.active
svn commit: r554822 - /roller/trunk/components/core/nbproject/project.xml
Author: snoopdave Date: Mon Jul 9 21:16:06 2007 New Revision: 554822 URL: http://svn.apache.org/viewvc?view=revrev=554822 Log: Classpath fix Modified: roller/trunk/components/core/nbproject/project.xml Modified: roller/trunk/components/core/nbproject/project.xml URL: http://svn.apache.org/viewvc/roller/trunk/components/core/nbproject/project.xml?view=diffrev=554822r1=554821r2=554822 == --- roller/trunk/components/core/nbproject/project.xml (original) +++ roller/trunk/components/core/nbproject/project.xml Mon Jul 9 21:16:06 2007 @@ -61,6 +61,7 @@ compilation-unit package-roottest/java/package-root unit-tests/ +classpath mode=compile../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/buildtime/junit-4.1.jar:src/java/classpath source-level1.5/source-level /compilation-unit /java-data
svn commit: r555621 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
Author: snoopdave
Date: Thu Jul 12 06:26:55 2007
New Revision: 555621
URL: http://svn.apache.org/viewvc?view=revrev=555621
Log:
Fixing typo bug in AppModule parser
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java?view=diffrev=555621r1=555620r2=555621
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
Thu Jul 12 06:26:55 2007
@@ -45,7 +45,7 @@
if (no.equals(draftElem.getText())) m.setDraft(false);
}
}
-Element edited = elem.getChild(editied, getContentNamespace());
+Element edited = elem.getChild(edited, getContentNamespace());
if (edited != null) {
try {
m.setEdited(DateUtil.parseIso8601(edited.getTextTrim()));
svn commit: r556710 - in /roller/trunk/apps/weblogger: ./ src/java/org/apache/roller/weblogger/business/
Author: snoopdave
Date: Mon Jul 16 12:56:38 2007
New Revision: 556710
URL: http://svn.apache.org/viewvc?view=revrev=556710
Log:
Roller now logs the Subversion last-changed revision number on startup (if
available at build-time)
Modified:
roller/trunk/apps/weblogger/build.xml
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
Modified: roller/trunk/apps/weblogger/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diffrev=556710r1=556709r2=556710
==
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Mon Jul 16 12:56:38 2007
@@ -99,10 +99,27 @@
format property=ro.buildTime pattern=MMddhhmmss /
/tstamp
+!-- Get the SVN last changed rev value w/o using the overly flakey
+ svnant task. This will fail if svn is not in your PATH but the
only
+ negative impact will be that the rev number that appears in your
+ log will be ${svn.LastChangedRev} instead of the correct value.
--
+delete file=${ro.build}/svn.properties /
+exec executable=svn output=${ro.build}/svn.properties
failifexecutionfails=false
+arg value=info /
+arg value=${root} /
+/exec
+replace dir=${ro.build}
+ include name=svn.properties /
+ replacetoken /replacetoken
+ replacevalue/replacevalue
+/replace
+property prefix=svn file=${ro.build}/svn.properties/
+
echo file=${build.compile.business}/version.properties
-ro.version=${ro.version}
-ro.buildTime=${ro.buildTime}
-ro.buildUser=${user.name}
+ro.version=${ro.version}
+ro.revision=${svn.LastChangedRev}
+ro.buildTime=${ro.buildTime}
+ro.buildUser=${user.name}
/echo
!-- compile roller business classes --
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java?view=diffrev=556710r1=556709r2=556710
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
Mon Jul 16 12:56:38 2007
@@ -163,6 +163,11 @@
public String getVersion();
/**
+ * Weblogger source code management revision
+ */
+public String getRevision();
+
+/**
* Weblogger build time
*/
public String getBuildTime();
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java?view=diffrev=556710r1=556709r2=556710
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerFactory.java
Mon Jul 16 12:56:38 2007
@@ -139,6 +139,8 @@
}
log.info(Roller Weblogger business tier successfully bootstrapped);
+log.info( Version: +
webloggerProvider.getWeblogger().getVersion());
+log.info( Revision: +
webloggerProvider.getWeblogger().getRevision());
}
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java?view=diffrev=556710r1=556709r2=556710
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
Mon Jul 16 12:56:38 2007
@@ -69,6 +69,7 @@
// some simple attributes
private final String version;
+private final String revision;
private final String buildTime;
private final String buildUser;
@@ -114,6 +115,7 @@
}
version = props.getProperty(ro.version, UNKNOWN);
+revision = props.getProperty(ro.revision, UNKNOWN);
buildTime = props.getProperty(ro.buildTime, UNKNOWN);
buildUser = props.getProperty(ro.buildUser
svn commit: r557116 - /roller/trunk/apps/weblogger/build.xml
Author: snoopdave Date: Tue Jul 17 19:13:24 2007 New Revision: 557116 URL: http://svn.apache.org/viewvc?view=revrev=557116 Log: We've got JUnit so let's make sure it works even if it's not installed in ant/lib Modified: roller/trunk/apps/weblogger/build.xml Modified: roller/trunk/apps/weblogger/build.xml URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diffrev=557116r1=557115r2=557116 == --- roller/trunk/apps/weblogger/build.xml (original) +++ roller/trunk/apps/weblogger/build.xml Tue Jul 17 19:13:24 2007 @@ -37,15 +37,21 @@ property file=build.properties / -!-- Only gen dbscripts if they do not already exist -- -available file=./build/webapp/WEB-INF/dbscripts/derby/createdb.sql property=dbscripts-exist / - !-- Bring in properties.xml -- properties; !-- Bring in custom properties and targets -- custom-ant; +!-- Only gen dbscripts if they do not already exist -- +available file=./build/webapp/WEB-INF/dbscripts/derby/createdb.sql +property=dbscripts-exist / + +!-- Ensure JUnit is defined even if not installed in Ant -- +taskdef name=junit classpathref=tests.path +classname=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask / + + target name=usage description=Print usage for key targets echo Key Targets:
svn commit: r557120 - /roller/trunk/apps/weblogger/build.xml
Author: snoopdave
Date: Tue Jul 17 19:38:37 2007
New Revision: 557120
URL: http://svn.apache.org/viewvc?view=revrev=557120
Log:
Doh! We've got JUnit so let's really make sure it works even if it's not
installed in ant/lib
Modified:
roller/trunk/apps/weblogger/build.xml
Modified: roller/trunk/apps/weblogger/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diffrev=557120r1=557119r2=557120
==
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Tue Jul 17 19:38:37 2007
@@ -48,7 +48,8 @@
property=dbscripts-exist /
!-- Ensure JUnit is defined even if not installed in Ant --
-taskdef name=junit classpathref=tests.path
+taskdef name=junit
+
classpath=${ro.tools}/buildtime/junit-4.1.jar,${ro.tools}/buildtime/ant-1.7.0/ant-junit.jar
classname=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask /
svn commit: r557129 - /roller/trunk/apps/weblogger/build.xml
Author: snoopdave
Date: Tue Jul 17 20:11:32 2007
New Revision: 557129
URL: http://svn.apache.org/viewvc?view=revrev=557129
Log:
Ok, one last try
Modified:
roller/trunk/apps/weblogger/build.xml
Modified: roller/trunk/apps/weblogger/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diffrev=557129r1=557128r2=557129
==
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Tue Jul 17 20:11:32 2007
@@ -49,7 +49,7 @@
!-- Ensure JUnit is defined even if not installed in Ant --
taskdef name=junit
-
classpath=${ro.tools}/buildtime/junit-4.1.jar,${ro.tools}/buildtime/ant-1.7.0/ant-junit.jar
+classpath=${ro.tools}/buildtime/junit-4.1.jar
classname=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask /
