ktlili 2005/08/24 19:40:07 CEST
Modified files:
. MavenAutoUpdated.library
war/src/java/org/jahia/clipbuilder/html/database/hibernate
DatabaseManager.java
war/src/java/org/jahia/clipbuilder/html/struts
ManageAction.java
war/src/java/org/jahia/clipbuilder/html/struts/Util
AbstractWizardAction.java
war/src/java/org/jahia/clipbuilder/html/struts/webBrowser
WebBrowserAction.java
WebBrowserForm.java
war/src/java/org/jahia/clipbuilder/html/web
WebBrowserSimulator.java
war/src/java/org/jahia/clipbuilder/html/web/html/Impl/HTMLParser
UserBuilderVisitor.java
war/src/webapp/clippers/htmlpattern
htmlClipperPortletPattern.war
war/src/webapp/jsp/clipbuilder/html/templates webBrowser.jsp
Log:
- add nameSpace handler in order to have no conflict between 2 instance of
same portlet
Revision Changes Path
1.9 +1 -1 webclip_builder/MavenAutoUpdated.library
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/MavenAutoUpdated.library.diff?r1=1.8&r2=1.9&f=h
1.6 +8 -7
webclip_builder/war/src/java/org/jahia/clipbuilder/html/database/hibernate/DatabaseManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/database/hibernate/DatabaseManager.java.diff?r1=1.5&r2=1.6&f=h
1.9 +3 -0
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/ManageAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/ManageAction.java.diff?r1=1.8&r2=1.9&f=h
1.4 +1 -0
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/Util/AbstractWizardAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/Util/AbstractWizardAction.java.diff?r1=1.3&r2=1.4&f=h
1.5 +2 -7
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/webBrowser/WebBrowserAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/webBrowser/WebBrowserAction.java.diff?r1=1.4&r2=1.5&f=h
1.3 +1 -1
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/webBrowser/WebBrowserForm.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/webBrowser/WebBrowserForm.java.diff?r1=1.2&r2=1.3&f=h
1.5 +77 -28
webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/WebBrowserSimulator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/WebBrowserSimulator.java.diff?r1=1.4&r2=1.5&f=h
1.5 +97 -103
webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/html/Impl/HTMLParser/UserBuilderVisitor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/html/Impl/HTMLParser/UserBuilderVisitor.java.diff?r1=1.4&r2=1.5&f=h
1.5 +8004 -8289
webclip_builder/war/src/webapp/clippers/htmlpattern/htmlClipperPortletPattern.war
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/clippers/htmlpattern/htmlClipperPortletPattern.war.diff?r1=1.4&r2=1.5&f=h
1.4 +1 -0
webclip_builder/war/src/webapp/jsp/clipbuilder/html/templates/webBrowser.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/clipbuilder/html/templates/webBrowser.jsp.diff?r1=1.3&r2=1.4&f=h
Index: MavenAutoUpdated.library
===================================================================
RCS file: /home/cvs/repository/webclip_builder/MavenAutoUpdated.library,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MavenAutoUpdated.library 23 Aug 2005 12:24:16 -0000 1.8
+++ MavenAutoUpdated.library 24 Aug 2005 17:39:59 -0000 1.9
@@ -44,5 +44,5 @@
<path>../../Documents and
Settings/jahia/.maven/repository/nekohtml/jars/nekohtml-0.9.4.jar</path>
<path>../../Documents and
Settings/jahia/.maven/repository/commons-io/jars/commons-io-1.0.jar</path>
</class>
- <lastmodsaved>1124795845228</lastmodsaved>
+ <lastmodsaved>1124892991156</lastmodsaved>
</library>
Index: DatabaseManager.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/database/hibernate/DatabaseManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseManager.java 23 Aug 2005 07:07:58 -0000 1.5
+++ DatabaseManager.java 24 Aug 2005 17:40:00 -0000 1.6
@@ -32,7 +32,7 @@
private DatabaseManager() {
try {
logger.debug("[ Initializing Hibernate ]");
- sessionFactory = new
Configuration().configure().buildSessionFactory();
+ // sessionFactory = new
Configuration().configure().buildSessionFactory();
logger.debug("[ Finished Initializing Hibernate ]");
}
catch (Exception e) {
@@ -128,12 +128,13 @@
*/
public ConfigureBean getDefaultConfiguration() {
// test if there exist at least one configuration.
- List allConfiguration = this.listConfiguration();
+ /* List allConfiguration = this.listConfiguration();
if (allConfiguration == null || allConfiguration.isEmpty()) {
return null;
- }
+ }*/
// By convention, the first configuration is the default
configuration
- return (ConfigureBean) allConfiguration.get(0);
+ //return (ConfigureBean) allConfiguration.get(0);
+ return new ConfigureBean();
}
@@ -283,13 +284,13 @@
*/
public void saveDefaultConfiguration(ConfigureBean cBean) {
logger.debug("[ Save default configuration in database ]");
- try {
- saveBean(cBean);
+ /*try {
+ // saveBean(cBean);
}
catch (HibernateException e) {
logger.error("[ Error during process" + e + " ]");
e.printStackTrace();
- }
+ }*/
}
Index: ManageAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/ManageAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ManageAction.java 23 Aug 2005 14:15:52 -0000 1.8
+++ ManageAction.java 24 Aug 2005 17:40:00 -0000 1.9
@@ -253,6 +253,9 @@
public ActionForward init(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request, HttpServletResponse
httpServletResponse) {
super.init(actionMapping, actionForm, request,
httpServletResponse);
+ // remove Test bean form from session
+
removeBeanForm(request,org.jahia.clipbuilder.html.struts.Util.Constants.TEST);
+
ManageClippersForm form = (ManageClippersForm) actionForm;
form.setTemplateView(false);
Index: AbstractWizardAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/Util/AbstractWizardAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractWizardAction.java 23 Aug 2005 07:07:59 -0000 1.3
+++ AbstractWizardAction.java 24 Aug 2005 17:40:00 -0000 1.4
@@ -164,6 +164,7 @@
[EMAIL PROTECTED] formId Description of Parameter
*/
public void removeAllBeanForm(HttpServletRequest request, int formId) {
+ // remove test
//init the formId
for (int i = formId; i <= Constants.PREVIEW; i++) {
Index: WebBrowserAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/webBrowser/WebBrowserAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebBrowserAction.java 23 Aug 2005 14:15:52 -0000 1.4
+++ WebBrowserAction.java 24 Aug 2005 17:40:00 -0000 1.5
@@ -83,7 +83,7 @@
else {
// synchronize urlEncoder
HTMLDocumentBuilder builder =
SessionManager.getHTMLDocumentBuilder(request);
-
builder.setUrlEncoder(UrlEncoderFactory.getServletUrlEncoder(request,response));
+
builder.setUrlEncoder(UrlEncoderFactory.getServletUrlEncoder(request,
response));
SessionManager.setHTMLDocumentBuilder(request,
builder);
}
//process only if it'st a new action (does'nt load from
wizard)
@@ -330,7 +330,7 @@
WebBrowserSimulator wbs =
SessionManager.getWebBrowserSimulator(request);
if (wbs == null) {
logger.debug("WebBrowserSimulator is null");
- wbs = new WebBrowserSimulator(request,
httpServletResponse, getClipperBean(request));
+ wbs = new WebBrowserSimulator(request,
httpServletResponse, getClipperBean(request), form.getNameSpace());
SessionManager.setWebBrowserSimulator(request, wbs);
}
else {
@@ -352,11 +352,6 @@
logger.debug("[Set Session Attributes]");
SessionManager.setRecorderBean(request, rc);
SessionManager.removeWebBrowserSimulator(request);
- SessionManager.removeHTMLDocumentBuilder(request);
-
- //update sesion object
- //ClipperBean cBean =
SessionManager.getClipperBean(request);
- //SessionManager.setLastBuildedUrlBean(request,
cBean.getLastRecordedUrlBean());
}
else {
Index: WebBrowserForm.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/webBrowser/WebBrowserForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebBrowserForm.java 17 Aug 2005 08:54:37 -0000 1.2
+++ WebBrowserForm.java 24 Aug 2005 17:40:01 -0000 1.3
@@ -18,7 +18,7 @@
private String webBrowserSimulatorMode;
private List frameUrlList;
private ActionErrors errors;
- private String nameSpace;
+ private String nameSpace = "clipBuilder";
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(WebBrowserForm.class);
Index: WebBrowserSimulator.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/WebBrowserSimulator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebBrowserSimulator.java 23 Aug 2005 14:15:53 -0000 1.4
+++ WebBrowserSimulator.java 24 Aug 2005 17:40:01 -0000 1.5
@@ -3,15 +3,15 @@
import javax.servlet.http.*;
+import org.htmlparser.*;
+import org.htmlparser.tags.*;
+import org.htmlparser.util.*;
+import org.jahia.clipbuilder.html.*;
import org.jahia.clipbuilder.html.bean.*;
import org.jahia.clipbuilder.html.util.*;
import org.jahia.clipbuilder.html.web.Constant.*;
import org.jahia.clipbuilder.html.web.Url.*;
import org.jahia.clipbuilder.html.web.html.*;
-import org.htmlparser.*;
-import org.htmlparser.tags.*;
-import org.htmlparser.util.*;
-import org.jahia.clipbuilder.html.SessionManager;
/**
* Description of the Class
@@ -22,6 +22,7 @@
private int urlPosition = 0;
private HttpServletRequest request;
private HttpServletResponse response;
+ private String nameSpace = "toot";
private ClipperBean clipperBean;
private HTMLDocument finalDocument;
private boolean finished;
@@ -35,18 +36,20 @@
public static final int MODE_REFRESH_ONLOAD = 1;
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(WebBrowserSimulator.class);
- /**
+ /**
* Constructor for the WebBrowserSimulator object
*
- [EMAIL PROTECTED] request Description of Parameter
- [EMAIL PROTECTED] response Description of Parameter
- [EMAIL PROTECTED] cBean Description of Parameter
+ [EMAIL PROTECTED] request Description of Parameter
+ [EMAIL PROTECTED] response Description of Parameter
+ [EMAIL PROTECTED] cBean Description of Parameter
+ [EMAIL PROTECTED] nameSpace Description of Parameter
*/
- public WebBrowserSimulator(HttpServletRequest request,
HttpServletResponse response, ClipperBean cBean) {
+ public WebBrowserSimulator(HttpServletRequest request,
HttpServletResponse response, ClipperBean cBean, String nameSpace) {
setRequest(request);
setResponse(response);
setClipperBean(cBean);
+ //setNameSpace(nameSpace);
}
@@ -120,6 +123,15 @@
}
+ /**
+ * Sets the NameSpace attribute of the WebBrowserSimulator object
+ *
+ [EMAIL PROTECTED] nameSpace The new NameSpace value
+ */
+ public void setNameSpace(String nameSpace) {
+ this.nameSpace = nameSpace;
+ }
+
/**
* Gets the HTMLPart attribute of the WebBrowserSimulator object
@@ -130,21 +142,21 @@
logger.debug(" Extract html part");
//Get Filter
String selectedPart = null;
- try {
- ClipperBean bean = getClipperBean();
- if (bean == null) {
- logger.error("[ClipperBean not found]");
- }
- FilterBean filterBean = bean.getFilterBean();
- logger.debug("[Filter class: " +
filterBean.getClass().toString() + " ]");
-
- //Get the selected part
- ExtractorFilter filter =
ExtractorFilterFactory.getInstance().getFilterImplementation(filterBean.getName());
- Map keyMap = filterBean.getKeyMap();
- filter.setKeyMap(keyMap);
- int mode = filterBean.getMode();
- filter.setMode(mode);
+ ClipperBean bean = getClipperBean();
+ if (bean == null) {
+ logger.error("[ClipperBean not found]");
+ }
+ FilterBean filterBean = bean.getFilterBean();
+ logger.debug("[Filter class: " +
filterBean.getClass().toString() + " ]");
+
+ //Get the selected part
+ ExtractorFilter filter =
ExtractorFilterFactory.getInstance().getFilterImplementation(filterBean.getName());
+ Map keyMap = filterBean.getKeyMap();
+ filter.setKeyMap(keyMap);
+ int mode = filterBean.getMode();
+ filter.setMode(mode);
+ try {
selectedPart =
filter.getSelectedPart(getFinalDocument());
}
@@ -155,7 +167,8 @@
finally {
//logger.debug("[Selected part is] --> " +
selectedPart);
- return selectedPart;
+ return embedHtml(selectedPart);
+ //return selectedPart;
}
}
@@ -221,6 +234,15 @@
}
+ /**
+ * Gets the NameSpace attribute of the WebBrowserSimulator object
+ *
+ [EMAIL PROTECTED] The NameSpace value
+ */
+ public String getNameSpace() {
+ return nameSpace;
+ }
+
/**
* Gets the HtmlResponse attribute of the WebBrowserSimulator object
@@ -276,8 +298,8 @@
/**
* Gets the URLMap attribute of the WebBrowserSimulator object
*
- [EMAIL PROTECTED] request Description of Parameter
- [EMAIL PROTECTED] The URLMap value
+ [EMAIL PROTECTED] request Description of Parameter
+ [EMAIL PROTECTED] The URLMap value
*/
public URLMap getURLMap(HttpServletRequest request) {
return
SessionManager.getHTMLDocumentBuilder(request).getUrlMap();
@@ -287,8 +309,8 @@
/**
* Gets the Param attribute of the WebBrowserSimulator object
*
- [EMAIL PROTECTED] httpServletRequest Description of Parameter
- [EMAIL PROTECTED] The Param value
+ [EMAIL PROTECTED] request Description of Parameter
+ [EMAIL PROTECTED] The Param value
*/
public Map getParam(HttpServletRequest request) {
return
org.jahia.clipbuilder.html.struts.webBrowser.WebBrowserAction.getParam(request);
@@ -342,6 +364,33 @@
}
+ /**
+ * Description of the Method
+ *
+ [EMAIL PROTECTED] htmlPart Description of Parameter
+ [EMAIL PROTECTED] Description of the Returned Value
+ */
+ private String embedHtml(String htmlPart) {
+ // init parameter
+ String id = getNameSpace();
+ String iframeJavascriptPath = getRequest().getContextPath() +
"/js/iframeJavascript.js";
+ String waitImgPath = getRequest().getContextPath() +
"/resources/work_in_progress.gif";
+
+ String embedHtml = " <html>";
+ embedHtml = embedHtml + "\n" + "<head>";
+ embedHtml = embedHtml + "\n" + "<script type=\"javascript\"
src=\"" + iframeJavascriptPath + "\"></script>";
+ embedHtml = embedHtml + "\n" + "</head>";
+ embedHtml = embedHtml + "\n" + "<body
onload=\"javascript:resizeIframe(\'" + id + "');\">";
+ //embedHtml = embedHtml + "\n" + " <img align=\"middle\"
id=\"wait\" style=\"visibility:visible;\" src=\""+waitImgPath+"\"/>";
+ embedHtml = embedHtml + "\n" + "<div id=\"content\">";
+ embedHtml = embedHtml + "\n" + htmlPart;
+ embedHtml = embedHtml + "\n" + "</div>";
+ embedHtml = embedHtml + "\n" + "</body>";
+ embedHtml = embedHtml + "\n" + "</html>";
+
+ return embedHtml;
+ }
+
/**
* Description of the Method
Index: UserBuilderVisitor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/html/Impl/HTMLParser/UserBuilderVisitor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserBuilderVisitor.java 17 Aug 2005 16:29:17 -0000 1.4
+++ UserBuilderVisitor.java 24 Aug 2005 17:40:01 -0000 1.5
@@ -51,7 +51,7 @@
public void visitTag(Tag tag) {
if (tag instanceof Html) {
- setFirstNode(tag);
+ processHtmlTag(tag);
}
@@ -95,12 +95,14 @@
// process body tag
if (tag instanceof BodyTag) {
- /*try {
- processBodyTag((BodyTag) tag);
- }
- catch (WebClippingException ex) {
-
getTransformer().addParsingErrors(ex.getMessage());
- }*/
+ /*
+ * try {
+ * processBodyTag((BodyTag) tag);
+ * }
+ * catch (WebClippingException ex) {
+ * getTransformer().addParsingErrors(ex.getMessage());
+ * }
+ */
}
// process ele whith attribut href
else if (tag.getAttribute("href") != null) {
@@ -181,110 +183,102 @@
/**
* Description of the Method
*
- [EMAIL PROTECTED] tag Description of Parameter
- [EMAIL PROTECTED] position Description of Parameter
- [EMAIL PROTECTED] webBrowserAction Description of Parameter
- [EMAIL PROTECTED] Description of the
Returned Value
- [EMAIL PROTECTED] WebClippingException Description of Exception
+ [EMAIL PROTECTED] tag Description of Parameter
*/
- /*protected int processHrefAttribute(Tag tag, int position, String
webBrowserAction) throws WebClippingException {
- if (!tag.getTagName().equalsIgnoreCase("meta") &&
!tag.getTagName().equalsIgnoreCase("link")) {
- String continualClipping =
getTransformer().getUrlBean().
- getClipperBean().
- getConfigurationBean().
- getPortletContinualClipping();
-
- // get the type of Continual clipping
- int ccInt = Integer.parseInt(continualClipping);
- String href = tag.getAttribute("href");
- String absoluteHref = href;
- try {
- absoluteHref =
getTransformer().relatifToAbsolute(href);
- }
- catch (Exception ex) {
- logger.debug("error has occured: " +
ex.toString());
- ex.printStackTrace();
- }
- finally {
- // refactor
- switch (ccInt) {
- case
-
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_FALSE:
-
- // remove link
- tag.removeAttribute("href");
- break;
- case
-
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_ACTIF_POPUP:
-
- // open in popup
- tag.setAttribute("target",
"_blank");
-
- //refactor in order to redirect
to clipbuilder
- return
super.processHrefAttribute(tag, position,
-
webBrowserAction);
- case
-
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_PASSIF_POPUP:
-
- // open in popup
- tag.setAttribute("target",
"_blank");
-
- // do'nt redirect to clipbuilder
- tag.setAttribute("href",
absoluteHref);
- return position;
- case
-
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_ACTIF_IFRAME:
- return
super.processHrefAttribute(tag, position,
-
webBrowserAction);
- case
-
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_PASSIF_IFRAME:
-
- // do'nt redirect to clipbuilder
- tag.setAttribute("href",
absoluteHref);
- break;
- default:
- return
super.processHrefAttribute(tag, position,
-
webBrowserAction);
- }
-
- // process position to return in order to
respect the API
- String id = tag.getAttribute("id");
- String pos = "" + position;
- if (tag.getTagName().equalsIgnoreCase("a")) {
- if (id == null) {
- tag.setAttribute("id",
-
HashUtilities.buildLinkHash(href,
- id, pos));
- }
- //remove target att
- tag.removeAttribute("target");
- position++;
- }
-
- return position;
- }
- }
- else {
- return super.processHrefAttribute(tag, position,
webBrowserAction);
- }
- }*/
-
+ private void processHtmlTag(Tag tag) {
+ setFirstNode(tag);
+ }
/**
* Description of the Method
*
- [EMAIL PROTECTED] tag Description of Parameter
- [EMAIL PROTECTED] WebClippingException Description of Exception
*/
- /*protected void processBodyTag(BodyTag tag) throws
WebClippingException {
- logger.debug(" body tag found");
- String onload = tag.getAttribute("onload");
-
-
- }*/
-
+ /*
+ * protected int processHrefAttribute(Tag tag, int position, String
webBrowserAction) throws WebClippingException {
+ * if (!tag.getTagName().equalsIgnoreCase("meta") &&
!tag.getTagName().equalsIgnoreCase("link")) {
+ * String continualClipping = getTransformer().getUrlBean().
+ * getClipperBean().
+ * getConfigurationBean().
+ * getPortletContinualClipping();
+ * // get the type of Continual clipping
+ * int ccInt = Integer.parseInt(continualClipping);
+ * String href = tag.getAttribute("href");
+ * String absoluteHref = href;
+ * try {
+ * absoluteHref = getTransformer().relatifToAbsolute(href);
+ * }
+ * catch (Exception ex) {
+ * logger.debug("error has occured: " + ex.toString());
+ * ex.printStackTrace();
+ * }
+ * finally {
+ * // refactor
+ * switch (ccInt) {
+ * case
+ * org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_FALSE:
+ * // remove link
+ * tag.removeAttribute("href");
+ * break;
+ * case
+ *
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_ACTIF_POPUP:
+ * // open in popup
+ * tag.setAttribute("target", "_blank");
+ * //refactor in order to redirect to clipbuilder
+ * return super.processHrefAttribute(tag, position,
+ * webBrowserAction);
+ * case
+ *
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_PASSIF_POPUP:
+ * // open in popup
+ * tag.setAttribute("target", "_blank");
+ * // do'nt redirect to clipbuilder
+ * tag.setAttribute("href", absoluteHref);
+ * return position;
+ * case
+ *
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_ACTIF_IFRAME:
+ * return super.processHrefAttribute(tag, position,
+ * webBrowserAction);
+ * case
+ *
org.jahia.clipbuilder.html.util.Constants.PORTLET_CONTINUAL_PASSIF_IFRAME:
+ * // do'nt redirect to clipbuilder
+ * tag.setAttribute("href", absoluteHref);
+ * break;
+ * default:
+ * return super.processHrefAttribute(tag, position,
+ * webBrowserAction);
+ * }
+ * // process position to return in order to respect the API
+ * String id = tag.getAttribute("id");
+ * String pos = "" + position;
+ * if (tag.getTagName().equalsIgnoreCase("a")) {
+ * if (id == null) {
+ * tag.setAttribute("id",
+ * HashUtilities.buildLinkHash(href,
+ * id, pos));
+ * }
+ * //remove target att
+ * tag.removeAttribute("target");
+ * position++;
+ * }
+ * return position;
+ * }
+ * }
+ * else {
+ * return super.processHrefAttribute(tag, position, webBrowserAction);
+ * }
+ * }
+ */
+ /**
+ * Description of the Method
+ *
+ */
+ /*
+ * protected void processBodyTag(BodyTag tag) throws
WebClippingException {
+ * logger.debug(" body tag found");
+ * String onload = tag.getAttribute("onload");
+ * }
+ */
/**
* Description of the Method
Index: htmlClipperPortletPattern.war
===================================================================
<<Binary file>>
Index: webBrowser.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/clipbuilder/html/templates/webBrowser.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- webBrowser.jsp 17 Aug 2005 08:54:42 -0000 1.3
+++ webBrowser.jsp 24 Aug 2005 17:40:06 -0000 1.4
@@ -1,3 +1,4 @@
<[EMAIL PROTECTED] uri="/WEB-INF/etc/struts/struts-bean" prefix="bean"%>
<bean:write name="webBrowserForm" property="content" filter="false"/>
+
