You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/06/08 21:12:00 UTC
svn commit: r412838 - in /incubator/roller/branches/roller_3.0: nbproject/
src/org/apache/roller/pojos/ src/org/apache/roller/ui/rendering/velocity/
web/themes/atlas/
Author: snoopdave
Date: Thu Jun 8 12:12:00 2006
New Revision: 412838
URL: http://svn.apache.org/viewvc?rev=412838&view=rev
Log:
Fixed permalink problem and removed PermissionsData wrapper as suggested by AG
Modified:
incubator/roller/branches/roller_3.0/nbproject/project.xml
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
incubator/roller/branches/roller_3.0/web/themes/atlas/_macros.vm
Modified: incubator/roller/branches/roller_3.0/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/nbproject/project.xml?rev=412838&r1=412837&r2=412838&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_3.0/nbproject/project.xml Thu Jun 8 12:12:00 2006
@@ -14,6 +14,11 @@
-->
<folders>
<source-folder>
+ <label>web</label>
+ <type>doc_root</type>
+ <location>web</location>
+ </source-folder>
+ <source-folder>
<label>src</label>
<type>java</type>
<location>src</location>
@@ -43,11 +48,6 @@
<type>java</type>
<location>tests</location>
</source-folder>
- <source-folder>
- <label>web</label>
- <type>doc_root</type>
- <location>web</location>
- </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -99,6 +99,10 @@
</ide-actions>
<view>
<items>
+ <source-folder style="tree">
+ <label>Web Pages</label>
+ <location>web</location>
+ </source-folder>
<source-folder style="packages">
<label>src</label>
<location>src</location>
@@ -123,10 +127,6 @@
<label>tests</label>
<location>tests</location>
</source-folder>
- <source-folder style="tree">
- <label>Web Pages</label>
- <location>web</location>
- </source-folder>
<source-file>
<location>build.xml</location>
</source-file>
@@ -150,13 +150,13 @@
<package-root>build/generated/src.business</package-root>
<package-root>build/generated/src.presentation</package-root>
<classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/mail.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.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-collections.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-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.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-servl
et.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/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:sandbox/atomprotocol/lib/rome-0.8.jar:sandbox/atomprotocol/lib/rome-fetcher-0.8.jar:tools/lib/jdom.jar:contrib/lib/ecs.jar:contrib/lib/jrcs-diff.jar:contrib/lib/JSPWiki.jar:contrib/lib/jython.jar:contrib/lib/oscache.jar:contrib/lib/radeox.jar:contrib/lib/textile4j-1.20.jar:tools/spring-1.2/acegi-security-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar</classpath>
- <source-level>1.5</source-level>
+ <source-level>1.4</source-level>
</compilation-unit>
<compilation-unit>
<package-root>tests</package-root>
<unit-tests/>
<classpath mode="compile">tools/lib/activation.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-codec-1.3.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.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/mail.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/saxpath.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/buildtime/hsqldb.jar:tools/buildtime/junit-3.8.1.jar:tools/buildtime/strutstest-2.0.0.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-collections.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-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.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</classpath>
- <source-level>1.5</source-level>
+ <source-level>1.4</source-level>
</compilation-unit>
</java-data>
<web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/1">
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java?rev=412838&r1=412837&r2=412838&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/PermissionsData.java Thu Jun 8 12:12:00 2006
@@ -65,7 +65,6 @@
}
/**
* @hibernate.many-to-one column="website_id" cascade="none" not-null="false"
- * @roller.wrapPojoMethod type="pojo"
*/
public WebsiteData getWebsite()
{
@@ -77,7 +76,6 @@
}
/**
* @hibernate.many-to-one column="user_id" cascade="none" not-null="false"
- * @roller.wrapPojoMethod type="pojo"
*/
public UserData getUser()
{
@@ -106,7 +104,6 @@
* And false if user is member of website.
* @ejb:persistent-field
* @hibernate.property column="pending" non-null="true" unique="false"
- * @roller.wrapPojoMethod type="simple"
*/
public boolean isPending()
{
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java?rev=412838&r1=412837&r2=412838&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/pojos/WeblogEntryData.java Thu Jun 8 12:12:00 2006
@@ -704,11 +704,18 @@
//------------------------------------------------------------------------
/**
- * Convenience method for getPermalink(category)
- * where no category is necessary.
- *
+ * Returns absolute entry permalink.
+ * @roller.wrapPojoMethod type="simple"
+ */
+ public String getPermalink() {
+ String absContextUrl = RollerConfig.getProperty("context.absPath");
+ return absContextUrl + getPermaLink();
+ }
+
+ /**
+ * Returns entry permalink, relative to Roller context.
+ * @deprecated Use getPermalink() instead.
* @roller.wrapPojoMethod type="simple"
- * @return
*/
public String getPermaLink() {
// TODO: ATLAS reconcile entry.getPermaLink() with new URLs
@@ -719,10 +726,7 @@
// go with the "no encoding" version
}
WebsiteData website = this.getWebsite();
- String absContextUrl = RollerConfig.getProperty("context.absPath");
- String plink =
- absContextUrl + "/page/" + website.getHandle() + "?entry=" + lAnchor;
- return plink;
+ return "/page/" + website.getHandle() + "?entry=" + lAnchor;
}
/**
@@ -939,12 +943,14 @@
}
/**
- * A no-op.
- * TODO: fix formbean generation so this is not needed.
- * @param string
+ * A no-op. TODO: fix formbean generation so this is not needed.
*/
- public void setPermaLink(String string) {
- }
+ public void setPermalink(String string) {}
+
+ /**
+ * A no-op. TODO: fix formbean generation so this is not needed.
+ */
+ public void setPermaLink(String string) {}
/**
* A no-op.
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java?rev=412838&r1=412837&r2=412838&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/SitePageModel.java Thu Jun 8 12:12:00 2006
@@ -38,7 +38,6 @@
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.CommentDataWrapper;
-import org.apache.roller.pojos.wrapper.PermissionsDataWrapper;
import org.apache.roller.pojos.wrapper.UserDataWrapper;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
@@ -98,7 +97,7 @@
List perms = umgr.getAllPermissions(user);
for (Iterator it = perms.iterator(); it.hasNext();) {
PermissionsData perm = (PermissionsData) it.next();
- results.add(PermissionsDataWrapper.wrap(perm));
+ results.add(WebsiteDataWrapper.wrap(perm.getWebsite()));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);
@@ -118,7 +117,7 @@
List perms = umgr.getAllPermissions(website);
for (Iterator it = perms.iterator(); it.hasNext();) {
PermissionsData perm = (PermissionsData) it.next();
- results.add(PermissionsDataWrapper.wrap(perm));
+ results.add(UserDataWrapper.wrap(perm.getUser()));
}
} catch (Exception e) {
log.error("ERROR: fetching weblog list", e);
Modified: incubator/roller/branches/roller_3.0/web/themes/atlas/_macros.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/themes/atlas/_macros.vm?rev=412838&r1=412837&r2=412838&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/themes/atlas/_macros.vm (original)
+++ incubator/roller/branches/roller_3.0/web/themes/atlas/_macros.vm Thu Jun 8 12:12:00 2006
@@ -107,7 +107,7 @@
</table>
<h2 class="pageTitle">Weblog users</h2>
- #set($perms = $sitePageModel.getWeblogsUsers($weblog.handle))
+ #set($users = $sitePageModel.getWeblogsUsers($weblog.handle))
<table class="rollertable">
<thead>
<tr>
@@ -115,10 +115,10 @@
<th>Full name</th>
</tr>
</thead>
- #foreach($perm in $perms)
+ #foreach($user in $users)
<tr>
- <td>$perm.user.userName</td>
- <td>$perm.user.fullName</td>
+ <td>$user.userName</td>
+ <td>$user.fullName</td>
</tr>
#end
</table>
@@ -234,7 +234,7 @@
</table>
<h2 class="pageTitle">User's weblogs</h2>
- #set($perms = $sitePageModel.getUsersWeblogs($user.userName))
+ #set($weblogs = $sitePageModel.getUsersWeblogs($user.userName))
#if($perms.size() > 0)
<table class="rollertable">
<thead>
@@ -243,10 +243,10 @@
<th>Name</th>
</tr>
</thead>
- #foreach($perm in $perms)
+ #foreach($weblog in $weblogs)
<tr>
- <td><a href="$baseURL/page/$perm.website.handle">$perm.website.handle</a></td>
- <td>$perm.website.name</td>
+ <td><a href="$baseURL/page/$weblog.handle">$weblog.handle</a></td>
+ <td>$weblog.name</td>
</tr>
#end
</table>