LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some identifiers which illegal for Oracle DBs in ExternalLink.pdl 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3716 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-11-04 17:44:01 +00:00
parent a4bb0eb959
commit 0f75a5b17a
2 changed files with 214 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-cms-types-externallink/pdl/com/arsdigita/cms/contenttypes/ExternalLink.pdl
View File

@ -21,10 +21,10 @@ model com.arsdigita.cms.contenttypes;
import com.arsdigita.cms.ContentPage;
object type ExternalLink extends ContentPage {
String [0..1] url = ct_extLinks.url VARCHAR(2000);
String [0..1] comment = ct_extLinks.comment VARCHAR(4000);
Boolean [0..1] showComment = ct_extLinks.show_comment;
Boolean [0..1] targetNewWindow = ct_extLinks.target_new_window;
String [0..1] url = ct_extlinks.url VARCHAR(2000);
String [0..1] comment = ct_extlinks.link_comment VARCHAR(4000);
Boolean [0..1] showComment = ct_extlinks.show_comment;
Boolean [0..1] targetNewWindow = ct_extlinks.target_new_window;
reference key (ct_extLinks.extLink_id);
reference key (ct_extlinks.extlink_id);
}

199
ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java
View File

@ -61,14 +61,14 @@ import org.apache.log4j.Logger;
/**
* A class for managing and obtaining a Stylesheet based on the current
* request's location in the site map.
* First, we try to find a stylesheet specific to this site node. If we can't
* find one, then we walk up the site map until we find a parent of this site
* node that has a stylesheet associated with it.
* request's location in the site map. First, we try to find a stylesheet
* specific to this site node. If we can't find one, then we walk up the site
* map until we find a parent of this site node that has a stylesheet associated
* with it.
*
* If we haven't found one by the time we reach the root, then we'll
* do the same tree walk except we'll look for the stylesheet
* associated with the <em>package</em> mounted on each site node.
* If we haven't found one by the time we reach the root, then we'll do the same
* tree walk except we'll look for the stylesheet associated with the
* <em>package</em> mounted on each site node.
*
* @author Bill Schneider
* @version $Id: PageTransformer.java 2071 2010-01-28 18:24:06Z pboy $
@ -86,36 +86,50 @@ public class PageTransformer implements PresentationManager {
registerXSLParameterGenerator("contextPath",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return request.getContextPath();
public String generateValue(
HttpServletRequest request) {
return request
.getContextPath();
}
});
registerXSLParameterGenerator("root-context-prefix",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return Web.getConfig().getDispatcherContextPath();
public String generateValue(
HttpServletRequest request) {
return Web.getConfig()
.getDispatcherContextPath();
}
});
registerXSLParameterGenerator("context-prefix",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return Web.getWebContext().getRequestURL().getContextPath();
public String generateValue(
HttpServletRequest request) {
return Web.getWebContext()
.getRequestURL()
.getContextPath();
}
});
registerXSLParameterGenerator("internal-theme",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return Web.getWebContext().getRequestURL().getContextPath()
public String generateValue(
HttpServletRequest request) {
return Web.getWebContext()
.getRequestURL()
.getContextPath()
+ com.arsdigita.web.URL.INTERNAL_THEME_DIR;
}
@ -123,18 +137,24 @@ public class PageTransformer implements PresentationManager {
registerXSLParameterGenerator("dispatcher-prefix",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return com.arsdigita.web.URL.getDispatcherPath();
public String generateValue(
HttpServletRequest request) {
return com.arsdigita.web.URL
.getDispatcherPath();
}
});
registerXSLParameterGenerator("dcp-on-buttons",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
if (Bebop.getConfig().doubleClickProtectionOnButtons()) {
public String generateValue(
HttpServletRequest request) {
if (Bebop.getConfig()
.doubleClickProtectionOnButtons()) {
return "true";
} else {
return null;
@ -146,51 +166,68 @@ public class PageTransformer implements PresentationManager {
registerXSLParameterGenerator("dcp-on-links",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
if (Bebop.getConfig().doubleClickProtectionOnLinks()) {
public String generateValue(
HttpServletRequest request) {
if (Bebop.getConfig()
.doubleClickProtectionOnLinks()) {
return "true";
} else {
return null;
}
}
});
registerXSLParameterGenerator("user-agent",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return request.getHeader("User-Agent");
public String generateValue(
HttpServletRequest request) {
return request.getHeader(
"User-Agent");
}
});
registerXSLParameterGenerator("negotiated-language",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return GlobalizationHelper.getNegotiatedLocale().getLanguage();
public String generateValue(
HttpServletRequest request) {
return GlobalizationHelper
.getNegotiatedLocale()
.getLanguage();
}
});
registerXSLParameterGenerator("selected-language",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
Locale selectedLocale = com.arsdigita.globalization.GlobalizationHelper.getSelectedLocale(request);
return (selectedLocale != null) ? selectedLocale.toString() : "";
public String generateValue(
HttpServletRequest request) {
Locale selectedLocale
= com.arsdigita.globalization.GlobalizationHelper
.getSelectedLocale(request);
return (selectedLocale != null)
? selectedLocale
.toString() : "";
}
});
registerXSLParameterGenerator("request-scheme",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
public String generateValue(
HttpServletRequest request) {
return request.getScheme();
}
@ -198,8 +235,10 @@ public class PageTransformer implements PresentationManager {
registerXSLParameterGenerator("server-name",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
public String generateValue(
HttpServletRequest request) {
return request.getServerName();
}
@ -207,24 +246,36 @@ public class PageTransformer implements PresentationManager {
registerXSLParameterGenerator("server-port",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
return Integer.toString(request.getServerPort());
public String generateValue(
HttpServletRequest request) {
return Integer.toString(
request.getServerPort());
}
});
registerXSLParameterGenerator("host",
new XSLParameterGenerator() {
@Override
public String generateValue(HttpServletRequest request) {
if (request.getServerPort() == 80) {
return String.format("%s://%s", request.getScheme(), request.getServerName());
public String generateValue(
HttpServletRequest request) {
if (request.getServerPort()
== 80) {
return String.format(
"%s://%s", request
.getScheme(), request
.getServerName());
} else {
return String.format("%s://%s:%d",
return String.format(
"%s://%s:%d",
request.getScheme(),
request.getServerName(),
request.getServerPort());
request
.getServerName(),
request
.getServerPort());
}
}
@ -235,17 +286,17 @@ public class PageTransformer implements PresentationManager {
// XXX These need to move somewhere else.
/**
* This is used to indicate that all xsl templates used should
* be pulled from the disk and not from the cache. If this
* is in the request with a value of Boolean.TRUE then
* all XSL Stylesheets are pulled from the disk, not the cache
* This is used to indicate that all xsl templates used should be pulled
* from the disk and not from the cache. If this is in the request with a
* value of Boolean.TRUE then all XSL Stylesheets are pulled from the disk,
* not the cache
*/
public static final String CACHE_XSL_NONE = "cacheXSLNone";
/**
* This is used to indicate that the "fancy errors" should be
* used and that the errors should be placed in the request
* for later use. To use this, have the code place an attribute
* with this name in the request with the value of Boolean.TRUE
* This is used to indicate that the "fancy errors" should be used and that
* the errors should be placed in the request for later use. To use this,
* have the code place an attribute with this name in the request with the
* value of Boolean.TRUE
*/
public static final String FANCY_ERRORS = "fancyErrors";
/**
@ -318,17 +369,17 @@ public class PageTransformer implements PresentationManager {
}
/**
* Serves an XML Document, getting and applying the appropriate XSLT.
* Also allows for parameters to be set for the transformer. These will
* become top-level xsl:params in the stylesheet.
* The "contextPath" parameter will always be passed to XSLT, which is the
* value of <code>req.getWebContextPath()</code>.
* Serves an XML Document, getting and applying the appropriate XSLT. Also
* allows for parameters to be set for the transformer. These will become
* top-level xsl:params in the stylesheet. The "contextPath" parameter will
* always be passed to XSLT, which is the value of
* <code>req.getWebContextPath()</code>.
*
* @param doc the Bebop page to serve
* @param req the servlet request
* @param resp the servlet response
* @param params a set of name-value pairs to pass as parameters
* to the Transformer
* @param params a set of name-value pairs to pass as parameters to the
* Transformer
*/
public void servePage(final Document doc,
final HttpServletRequest req,
@ -343,7 +394,6 @@ public class PageTransformer implements PresentationManager {
Assert.exists(resp, HttpServletResponse.class);
}
Profiler.startOp("XSLT");
try {
final String charset = Globalization.getDefaultCharset(
@ -356,7 +406,8 @@ public class PageTransformer implements PresentationManager {
DeveloperSupport.startStage("PresMgr get stylesheet");
boolean fancyErrors = Bebop.getConfig().wantFancyXSLErrors()
|| Boolean.TRUE.equals(req.getAttribute(
|| Boolean.TRUE.equals(req
.getAttribute(
FANCY_ERRORS));
// Get the stylesheet transformer object corresponding to the
@ -435,7 +486,10 @@ public class PageTransformer implements PresentationManager {
DispatcherHelper.forceCacheDisable(resp);
final long start = System.currentTimeMillis();
writer.println(doc.toString(true));
s_log.debug(String.format("Generated XML output in %d ms.",
System.currentTimeMillis() - start));
} else if (output.equals("xsl")) {
DeveloperSupport.startStage("PresMgr get stylesheet");
@ -488,8 +542,8 @@ public class PageTransformer implements PresentationManager {
}
/**
* Ends the current transaction. Is a performance optimization to end
* ASAP before serving the page.
* Ends the current transaction. Is a performance optimization to end ASAP
* before serving the page.
*
* @param req HTTP request.
*/
@ -504,9 +558,10 @@ public class PageTransformer implements PresentationManager {
/**
* This adds a generator to the list of parameters available to
* XSLStylesheets. If this is called a second time with the same
* parameter name then all previous calls are overwritten and
* only the last registered generator is used.
* XSLStylesheets. If this is called a second time with the same parameter
* name then all previous calls are overwritten and only the last registered
* generator is used.
*
* @param parameterName
* @param parameterGenerator
*/
@ -516,8 +571,9 @@ public class PageTransformer implements PresentationManager {
}
/**
* This removes the parameter from the list of parameters that
* will be added to stylesheets
* This removes the parameter from the list of parameters that will be added
* to stylesheets
*
* @param parameterName
*/
public static void removeXSLParameterGenerator(String parameterName) {
@ -527,6 +583,7 @@ public class PageTransformer implements PresentationManager {
/**
* This is a Collection of all names of XSL Parameters that have been
* registered
*
* @return
*/
public static Collection getXSLParameterNames() {
@ -534,16 +591,19 @@ public class PageTransformer implements PresentationManager {
}
/**
* This takes a name and request and returns the value that should
* be used in the XSL for the given name
* This takes a name and request and returns the value that should be used
* in the XSL for the given name
*
* @param name
* @param request
*
* @return
*/
public static String getXSLParameterValue(String name,
HttpServletRequest request) {
XSLParameterGenerator generator =
(XSLParameterGenerator) s_XSLParameters.get(name);
XSLParameterGenerator generator
= (XSLParameterGenerator) s_XSLParameters
.get(name);
if (generator != null) {
return generator.generateValue(request);
} else {
@ -552,8 +612,9 @@ public class PageTransformer implements PresentationManager {
}
/**
* This takes in a transformer and adds all of the registered
* xsl paraemters.
* This takes in a transformer and adds all of the registered xsl
* paraemters.
*
* @param transformer
* @param request
*/