ktlili 2005/06/10 18:43:27 CEST
Modified files:
war/JBuilderConf Clipper_Portlet.jpx
war/src/java/com/jahia/clipping/Bean ClipperBean.java
war/src/java/com/jahia/clipping/Bean/Util IdBuilder.java
war/src/java/com/jahia/clipping/web WebBrowserSimulator.java
war/src/webapp/WEB-INF log4j.xml
war/src/webapp/jsp editParams.jsp
Log:
Remove bad files
Revision Changes Path
1.4 +3 -1 webclip_portlet/war/JBuilderConf/Clipper_Portlet.jpx
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_portlet/war/JBuilderConf/Clipper_Portlet.jpx.diff?r1=1.3&r2=1.4&f=h
1.2 +0 -38
webclip_portlet/war/src/java/com/jahia/clipping/Bean/ClipperBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_portlet/war/src/java/com/jahia/clipping/Bean/ClipperBean.java.diff?r1=1.1&r2=1.2&f=h
1.2 +0 -1
webclip_portlet/war/src/java/com/jahia/clipping/Bean/Util/IdBuilder.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_portlet/war/src/java/com/jahia/clipping/Bean/Util/IdBuilder.java.diff?r1=1.1&r2=1.2&f=h
1.4 +0 -16
webclip_portlet/war/src/java/com/jahia/clipping/web/WebBrowserSimulator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_portlet/war/src/java/com/jahia/clipping/web/WebBrowserSimulator.java.diff?r1=1.3&r2=1.4&f=h
1.2 +10 -4 webclip_portlet/war/src/webapp/WEB-INF/log4j.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_portlet/war/src/webapp/WEB-INF/log4j.xml.diff?r1=1.1&r2=1.2&f=h
1.3 +32 -10 webclip_portlet/war/src/webapp/jsp/editParams.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_portlet/war/src/webapp/jsp/editParams.jsp.diff?r1=1.2&r2=1.3&f=h
Index: Clipper_Portlet.jpx
===================================================================
RCS file:
/home/cvs/repository/webclip_portlet/war/JBuilderConf/Clipper_Portlet.jpx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Clipper_Portlet.jpx 10 Jun 2005 08:31:04 -0000 1.3
+++ Clipper_Portlet.jpx 10 Jun 2005 16:43:26 -0000 1.4
@@ -119,7 +119,9 @@
<property category="external" name="phase" value="deploy"/>
<property category="external" name="rundir" value="../../"/>
</node>
- <file path="../src/webapp/jsp/editParams.jsp"/>
+ <file path="../src/webapp/jsp/editParams.jsp">
+ <property category="generated" name="Jspc.0"
value=".jsp/webapp/org/apache/jsp/jsp/editParams_jsp.java"/>
+ </file>
<file path="../project.properties"/>
<file path="../project.xml"/>
</project>
Index: ClipperBean.java
===================================================================
RCS file:
/home/cvs/repository/webclip_portlet/war/src/java/com/jahia/clipping/Bean/ClipperBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClipperBean.java 3 Jun 2005 17:03:23 -0000 1.1
+++ ClipperBean.java 10 Jun 2005 16:43:26 -0000 1.2
@@ -11,8 +11,6 @@
[EMAIL PROTECTED] Tlili Khaled
*/
public class ClipperBean extends Bean {
- private final String ID = "clipperBean";
- private String connectionTimeOut;
private String description;
private String method;
private String name;
@@ -56,19 +54,6 @@
}
-
-
-
- /**
- * Sets the ConnectionTimeOut attribute of the DescriptionClipperForm
object
- *
- [EMAIL PROTECTED] connectionTimeOut The new ConnectionTimeOut value
- */
- public void setConnectionTimeOut(String connectionTimeOut) {
- this.connectionTimeOut = connectionTimeOut;
- }
-
-
/**
* Sets the MappingFormParam attribute of the ClipperBean object
*
@@ -324,26 +309,6 @@
/**
- * Gets the Identifier attribute of the DescriptionBean object
- *
- [EMAIL PROTECTED] The Identifier value
- */
- public String getIdentifier() {
- return ID;
- }
-
-
- /**
- * Gets the ConnectionTimeOut attribute of the DescriptionClipperForm
object
- *
- [EMAIL PROTECTED] The ConnectionTimeOut value
- */
- public String getConnectionTimeOut() {
- return connectionTimeOut;
- }
-
-
- /**
* Gets the Description attribute of the DescriptionClipperForm object
*
[EMAIL PROTECTED] The Description value
@@ -611,10 +576,7 @@
// load the xml document
ClipperDocument document = new ClipperDocument(xmlPath);
ClipperParser parser = document.getParser();
-
- String connectionTimeOut = "5";
setDescription(parser.getDescription());
- String method;
setName(parser.getName());
setTargetUrl(parser.getTargetUrl());
Index: IdBuilder.java
===================================================================
RCS file:
/home/cvs/repository/webclip_portlet/war/src/java/com/jahia/clipping/Bean/Util/IdBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdBuilder.java 3 Jun 2005 17:03:24 -0000 1.1
+++ IdBuilder.java 10 Jun 2005 16:43:26 -0000 1.2
@@ -1,7 +1,6 @@
package com.jahia.clipping.Bean.Util;
import java.util.*;
-import org.apache.commons.httpclient.methods.*;
/**
* Builder of a unique id
Index: WebBrowserSimulator.java
===================================================================
RCS file:
/home/cvs/repository/webclip_portlet/war/src/java/com/jahia/clipping/web/WebBrowserSimulator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebBrowserSimulator.java 8 Jun 2005 15:44:22 -0000 1.3
+++ WebBrowserSimulator.java 10 Jun 2005 16:43:26 -0000 1.4
@@ -81,14 +81,11 @@
*/
public String getHTMLPart() {
logger.debug(" Extract html part");
- String html = getFinalHtmlResponse(request, response);
//Get Filter
String selectedPart = null;
- boolean errorHasOccured = false;
try {
ClipperBean bean =
SessionManager.getClipperBean(getRequest());
if (bean == null) {
- errorHasOccured = true;
logger.error("[ClipperBean not found]");
}
ExtractorFilter filter = bean.getFilter();
@@ -172,19 +169,6 @@
// for each url, rebuild the document whithe the new
value of the parameter
for (int i = 0; i < urlListBean.size(); i++) {
-
- //test web client
- PortletSession session =
request.getPortletSession();
- Object o =
session.getAttribute(com.jahia.clipping.web.Constant.WebConstants.WEBCLIENT);
- if (o == null) {
- logger.debug("WebClient not found, is
null");
- }
- else {
- logger.debug("WebClient found, is not
null");
- }
- //////////////////////
-
-
// get the url bean
UrlBean uBean = (UrlBean) urlListBean.get(i);
logger.debug("[WebBrowserSimulator] Current
url: " + uBean.getUrlValue());
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/repository/webclip_portlet/war/src/webapp/WEB-INF/log4j.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.xml 3 Jun 2005 17:03:42 -0000 1.1
+++ log4j.xml 10 Jun 2005 16:43:27 -0000 1.2
@@ -4,20 +4,26 @@
<appender name="ConsoleAppender" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.SimpleLayout"/>
</appender>
+ <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern"
+ value="%6r %5p %c.%M:%L - %m%n"/>
+ </layout>
+ </appender>
<category name="com.jahia.portlet">
<priority value="debug"/>
- <appender-ref ref="ConsoleAppender"/>
+ <appender-ref ref="STDOUT"/>
</category>
<category name="com.jahia.clipping">
<priority value="error"/>
- <appender-ref ref="ConsoleAppender"/>
+ <appender-ref ref="STDOUT"/>
</category>
<category name="com.jahia.clipping.web.WebBrowserSimulator">
<priority value="debug"/>
- <appender-ref ref="ConsoleAppender"/>
+ <appender-ref ref=""STDOUT"/>
</category>
<root>
<priority value="error"/>
- <appender-ref ref="ConsoleAppender"/>
+ <appender-ref ref="STDOUT"/>
</root>
</log4j:configuration>
Index: editParams.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_portlet/war/src/webapp/jsp/editParams.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- editParams.jsp 7 Jun 2005 17:44:40 -0000 1.2
+++ editParams.jsp 10 Jun 2005 16:43:27 -0000 1.3
@@ -3,11 +3,13 @@
<[EMAIL PROTECTED] import="com.jahia.portlet.SessionManager"%>
<[EMAIL PROTECTED] import="java.util.*"%>
<[EMAIL PROTECTED] import="javax.portlet.*"%>
+<[EMAIL PROTECTED] import="org.apache.ecs.html.*"%>
<script language="javascript" type="">
// change view
function changeView(f) {
f.action = '<p:actionURL><p:param name="changeView"
value="true"/></p:actionURL>';
f.submit();
+
return;
}
</script><p:defineObjects/>
@@ -25,7 +27,7 @@
String optionUrlHtml = "";
ClipperBean cb =
com.jahia.portlet.SessionManager.getClipperBean(renderRequest);
List urlBeanList = cb.getUrlListBean();
- for (int i = 0; i < urlBeanList.size()-1; i++) {
+ for (int i = 0; i < urlBeanList.size() - 1; i++) {
UrlBean ub = (UrlBean) urlBeanList.get(i);
String uValue = ub.getUrlValue();
optionUrlHtml = optionUrlHtml + "\n<option value=" + i;
@@ -44,14 +46,32 @@
FormParamBean fpb = (FormParamBean) formParamList.get(i);
String mapping = fpb.getMapping();
String usedValue = fpb.getUsedValue();
- formParamHtml = "\n<tr>" + formParamHtml + "<td class=\"leftlevel2
waInput\">" + mapping + "</td>";
- formParamHtml = "\n" + formParamHtml
- + "<td class=\"leftlevel2 waInput\">"
- + "<input name=\"usedValue\" type=\"text\" value=\"" + usedValue +
"\" />"
- + "</td></tr>";
+ //build tr
+ TR trTag = new TR();
+ // build td for Mapping
+ TD tdMapping = new TD();
+ tdMapping.setClass("leftlevel2 waInput");
+ tdMapping.setTagText(mapping);
+ trTag.addElement(tdMapping);
+ // build td for the used value
+ TD tdUsedValue = new TD();
+ tdUsedValue.setClass("leftlevel2 waInput");
+ String type = fpb.getType();
+ if (type.equalsIgnoreCase("password")) {
+ tdUsedValue.setTagText("password value");
+ }
+ else {
+ tdUsedValue.setTagText(usedValue);
+ }
+ Input inputNewValue = new Input();
+ inputNewValue.setName("usedValue");
+ inputNewValue.setType(type);
+ tdUsedValue.addElement(inputNewValue);
+ trTag.addElement(tdUsedValue);
+
+ formParamHtml = "\n"+formParamHtml+trTag.toString();
}
%>
-
<style type="text/css">
.leftlevel2 {
font-size: 10px;
@@ -84,7 +104,7 @@
<tr valign="middle">
<td> Select Url
<!-- Get all the recorded url-->
- <select name="selectedUrl"
onchange="javascript:changeView(this.form)"><%=optionUrlHtml %></option>
</select>
+ <select name="selectedUrl"
onchange="javascript:changeView(this.form)"><%=optionUrlHtml %></option>
</select>
</td>
</tr>
</table>
@@ -110,8 +130,10 @@
<tr>
<td class="topmenubuttons">
<input type="submit" value="validate"/>
- <!-- <input type="submit" value="reset"/>
- <input type="submit" value="resetAll"/>-->
+ <!--
+ <input type="submit" value="reset"/>
+ <input type="submit" value="resetAll"/>
+ -->
</td>
</tr>
</table>
