You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/08/17 11:32:30 UTC
svn commit: r233139 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/portal:
java/org/apache/cocoon/portal/ java/org/apache/cocoon/portal/impl/
samples/skins/common/images/
Author: cziegeler
Date: Wed Aug 17 02:32:20 2005
New Revision: 233139
URL: http://svn.apache.org/viewcvs?rev=233139&view=rev
Log:
Implement secure url handling
Fix javadocs
Add new icons
Removed:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/edit.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/help.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/view.gif
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java Wed Aug 17 02:32:20 2005
@@ -109,6 +109,13 @@
String getRefreshLinkURI();
/**
+ * Get a link that simply refreshs the portal
+ * @param secure true if a secure protocol is required, false otherwise.
+ * @return A URI
+ */
+ String getRefreshLinkURI(Boolean secure);
+
+ /**
* Determine whether the current url is using a secure protocol
* @return true if the current url is using a secure protocol
*/
@@ -117,7 +124,7 @@
/**
* @param url The url to encode.
* @return The enocoded URL.
- * @see javax.servlet.http.ServletResponse#encodeURL(String).
+ * @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String)
*/
String encodeURL(String url);
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PageLabelLinkService.java Wed Aug 17 02:32:20 2005
@@ -70,7 +70,7 @@
*/
public String getLinkURI(Event event, Boolean secure) {
if (event == null) {
- return this.getRefreshLinkURI();
+ return this.getRefreshLinkURI(secure);
}
if (this.labelManager == null) {
return super.getLinkURI(event);
@@ -134,7 +134,7 @@
*/
public String getLinkURI(List events, Boolean secure) {
if (events == null || events.size() == 0) {
- return this.getRefreshLinkURI();
+ return this.getRefreshLinkURI(secure);
}
if (this.labelManager == null) {
return super.getLinkURI(events);
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Wed Aug 17 02:32:20 2005
@@ -247,7 +247,7 @@
}
/**
- * @see org.apache.cocoon.portal.PortalService#setEntryLayout(org.apache.cocoon.portal.layout.Layout)
+ * @see org.apache.cocoon.portal.PortalService#setEntryLayout(java.lang.String, org.apache.cocoon.portal.layout.Layout)
*/
public void setEntryLayout(String layoutKey, Layout object) {
if ( layoutKey == null ) {
@@ -261,7 +261,7 @@
}
/**
- * @see org.apache.cocoon.portal.PortalService#getEntryLayout()
+ * @see org.apache.cocoon.portal.PortalService#getEntryLayout(java.lang.String)
*/
public Layout getEntryLayout(String layoutKey) {
if ( layoutKey == null ) {
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/edit.gif
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/edit.gif?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/help.gif
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/help.gif?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/view.gif
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/view.gif?rev=233139&r1=233138&r2=233139&view=diff
==============================================================================
Binary files - no diff available.