ktlili 2005/06/28 10:45:43 CEST
Modified files:
war/src/java/com/jahia/clipping/Bean UrlBean.java
war/src/java/com/jahia/clipping/XML ClipperParser.java
war/src/java/com/jahia/clipping/util URLUtilities.java
war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser
TransformBuilderVisitor.java
war/src/java/com/jahia/clipping/web/http/impl
HttpProcessor.java
war/src/java/org/apache/commons/httpclient/contrib/ssl
EasyX509TrustManager.java
Log:
- fix bug httpProcessor query
- disable checkvallidy certicate
- disbale rewiting javascrit:...
Revision Changes Path
1.12 +29 -22
webclip_builder/war/src/java/com/jahia/clipping/Bean/UrlBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/Bean/UrlBean.java.diff?r1=1.11&r2=1.12&f=h
1.9 +3 -1
webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperParser.java.diff?r1=1.8&r2=1.9&f=h
1.4 +10 -11
webclip_builder/war/src/java/com/jahia/clipping/util/URLUtilities.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/util/URLUtilities.java.diff?r1=1.3&r2=1.4&f=h
1.4 +0 -29
webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/TransformBuilderVisitor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/TransformBuilderVisitor.java.diff?r1=1.3&r2=1.4&f=h
1.10 +27 -5
webclip_builder/war/src/java/com/jahia/clipping/web/http/impl/HttpProcessor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/http/impl/HttpProcessor.java.diff?r1=1.9&r2=1.10&f=h
1.2 +2 -2
webclip_builder/war/src/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java.diff?r1=1.1&r2=1.2&f=h
Index: UrlBean.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/Bean/UrlBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UrlBean.java 27 Jun 2005 15:05:10 -0000 1.11
+++ UrlBean.java 28 Jun 2005 08:45:41 -0000 1.12
@@ -146,12 +146,13 @@
*
[EMAIL PROTECTED] formParentName The new MappingFormParam value
[EMAIL PROTECTED] formParentId The new MappingFormParam value
+ [EMAIL PROTECTED] formParentPos The new MappingFormParam value
[EMAIL PROTECTED] name The new MappingFormParam value
[EMAIL PROTECTED] mapping The new MappingFormParam value
[EMAIL PROTECTED] paramPosition The new MappingFormParam value
*/
- public void setMappingFormParam(String formParentName, String
formParentId,int formParentPos, String name, String mapping, int
paramPosition) {
-
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, name, paramPosition).setMapping(mapping);
+ public void setMappingFormParam(String formParentName, String
formParentId, int formParentPos, String name, String mapping, int
paramPosition) {
+
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, name, paramPosition).setMapping(mapping);
}
@@ -190,6 +191,7 @@
*
[EMAIL PROTECTED] formParentName The new FormParameterValue value
[EMAIL PROTECTED] formParentId The new FormParameterValue value
+ [EMAIL PROTECTED] formParentPos The new FormParameterValue value
[EMAIL PROTECTED] param The new FormParameterValue value
[EMAIL PROTECTED] possibleValue The new FormParameterValue value
[EMAIL PROTECTED] type The new FormParameterValue value
@@ -197,8 +199,8 @@
[EMAIL PROTECTED] paramPosition The new FormParameterValue value
[EMAIL PROTECTED] Description of the Returned Value
*/
- public FormParamBean setFormParameterValue(String formParentName,
String formParentId,int formParentPos, String param, String possibleValue,
String type, String visibility, int paramPosition) {
- FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, param, paramPosition);
+ public FormParamBean setFormParameterValue(String formParentName,
String formParentId, int formParentPos, String param, String possibleValue,
String type, String visibility, int paramPosition) {
+ FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, param, paramPosition);
if (bean != null) {
logger.debug("[ set used value for " + param + ": " +
possibleValue + "]");
bean.setUsedValue(possibleValue);
@@ -361,12 +363,13 @@
*
[EMAIL PROTECTED] formParentName Description of Parameter
[EMAIL PROTECTED] formParentId Description of Parameter
+ [EMAIL PROTECTED] formParentPos Description of Parameter
[EMAIL PROTECTED] paramName Description of Parameter
[EMAIL PROTECTED] paramPosition Description of Parameter
[EMAIL PROTECTED] The ParamAllowedValue value
*/
- public ArrayList getParamFormAllowedValueBeanList(String
formParentName, String formParentId,int formParentPos, String paramName, int
paramPosition) {
- return
this.getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, paramName,
paramPosition).getListPossibleBeanValue();
+ public ArrayList getParamFormAllowedValueBeanList(String
formParentName, String formParentId, int formParentPos, String paramName, int
paramPosition) {
+ return
this.getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, paramName,
paramPosition).getListPossibleBeanValue();
}
@@ -375,12 +378,13 @@
*
[EMAIL PROTECTED] formParentName Description of Parameter
[EMAIL PROTECTED] formParentId Description of Parameter
+ [EMAIL PROTECTED] formParentPos Description of Parameter
[EMAIL PROTECTED] paramName Description of Parameter
[EMAIL PROTECTED] paramPosition Description of Parameter
[EMAIL PROTECTED] The ParamFormAllowedValueStringList
value
*/
- public ArrayList getParamFormAllowedValueStringList(String
formParentName, String formParentId,int formParentPos, String paramName, int
paramPosition) {
- return
this.getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, paramName,
paramPosition).getListPossibleStringValue();
+ public ArrayList getParamFormAllowedValueStringList(String
formParentName, String formParentId, int formParentPos, String paramName, int
paramPosition) {
+ return
this.getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, paramName,
paramPosition).getListPossibleStringValue();
}
@@ -389,12 +393,13 @@
*
[EMAIL PROTECTED] formParentName Description of Parameter
[EMAIL PROTECTED] formParentId Description of Parameter
+ [EMAIL PROTECTED] formParentPos Description of Parameter
[EMAIL PROTECTED] paramName Description of Parameter
[EMAIL PROTECTED] paramPosition Description of Parameter
[EMAIL PROTECTED] The ParameterMapping value
*/
- public String getFormParameterMapping(String formParentName, String
formParentId,int formParentPos, String paramName, int paramPosition) {
- FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, paramName, paramPosition);
+ public String getFormParameterMapping(String formParentName, String
formParentId, int formParentPos, String paramName, int paramPosition) {
+ FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, paramName, paramPosition);
return bean.getMapping();
}
@@ -417,12 +422,13 @@
*
[EMAIL PROTECTED] formParentName Description of Parameter
[EMAIL PROTECTED] formParentId Description of Parameter
+ [EMAIL PROTECTED] formParentPos Description of Parameter
[EMAIL PROTECTED] paramName Description of Parameter
[EMAIL PROTECTED] paramPosition Description of Parameter
[EMAIL PROTECTED] The ParamType value
*/
- public String getFormParamType(String formParentName, String
formParentId,int formParentPos, String paramName, int paramPosition) {
- FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, paramName, paramPosition);
+ public String getFormParamType(String formParentName, String
formParentId, int formParentPos, String paramName, int paramPosition) {
+ FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, paramName, paramPosition);
return bean.getType();
}
@@ -480,13 +486,14 @@
*
[EMAIL PROTECTED] formParentName Description of Parameter
[EMAIL PROTECTED] formParentId Description of Parameter
+ [EMAIL PROTECTED] formParentPos Description of Parameter
[EMAIL PROTECTED] name Description of Parameter
[EMAIL PROTECTED] paramPosition Description of Parameter
[EMAIL PROTECTED] The FormParamBean value
*/
- public FormParamBean
getFormParamBeanByNameAndFormParentNameAndFormParentId(String formParentName,
String formParentId,int formParentPos, String name, int paramPosition) {
+ public FormParamBean
getFormParamBeanByNameAndFormParentNameAndFormParentId(String formParentName,
String formParentId, int formParentPos, String name, int paramPosition) {
// find the FormParamBean object
- String formHash = HashUtilities.buildFormHash(formParentName,
formParentId,formParentPos);
+ String formHash = HashUtilities.buildFormHash(formParentName,
formParentId, formParentPos);
return getFormParamByNameAndFormParentHash(name, paramPosition,
formHash);
}
@@ -508,8 +515,7 @@
for (int i = 0; i < a.size(); i++) {
currentFormParam = (FormParamBean) a.get(i);
if (currentFormParam.getPosition() == paramPosition) {
- if (currentFormParam.getName().equalsIgnoreCase(
- name)) {
+ if
(currentFormParam.getName().equalsIgnoreCase(name)) {
return currentFormParam;
}
}
@@ -596,10 +602,10 @@
[EMAIL PROTECTED] Description of the Returned Value
*/
public FormParamBean addFormParameter(String formParentName, String
formParentId, int formParentPosition, String paramName, String possibleValue,
String type, String visibility, boolean editable, int paramPosition) {
- String formParentHah =
HashUtilities.buildFormHash(formParentName, formParentId,formParentPosition);
- FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPosition, paramName, paramPosition);
+ String formParentHah =
HashUtilities.buildFormHash(formParentName, formParentId, formParentPosition);
+ FormParamBean bean =
getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPosition, paramName, paramPosition);
if (bean != null &&
type.equalsIgnoreCase(WebConstants.TYPE_RADIO)) {
- logger.debug("[ Add posiible value for " + paramName +
" ]");
+ logger.debug("[ Add possible value for " + paramName +
" ]");
if (!editable) {
logger.warn("[ Already recorded ]");
}
@@ -607,7 +613,7 @@
bean.addPossibleValue(possibleValue);
}
else {
- logger.debug("[ New form param: " + paramName + " ]");
+ logger.debug("[ New form param: " + paramName + ",
type: "+type+" ]");
bean = new FormParamBean(this, formParentName,
formParentId, formParentPosition, paramName, type, possibleValue, visibility,
paramPosition);
getFormParamBeanListByFormParentHash(formParentHah).add(bean);
}
@@ -664,12 +670,13 @@
*
[EMAIL PROTECTED] formParentName Description of Parameter
[EMAIL PROTECTED] formParentId Description of Parameter
+ [EMAIL PROTECTED] formParentPos Description of Parameter
[EMAIL PROTECTED] paramName Description of Parameter
[EMAIL PROTECTED] paramPosition Description of Parameter
[EMAIL PROTECTED] Description of the Returned Value
*/
- public boolean formParamExist(String formParentName, String
formParentId,int formParentPos, String paramName, int paramPosition) {
- return
(getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId,formParentPos, paramName, paramPosition) != null);
+ public boolean formParamExist(String formParentName, String
formParentId, int formParentPos, String paramName, int paramPosition) {
+ return
(getFormParamBeanByNameAndFormParentNameAndFormParentId(formParentName,
formParentId, formParentPos, paramName, paramPosition) != null);
}
Index: ClipperParser.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/XML/ClipperParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClipperParser.java 27 Jun 2005 08:51:01 -0000 1.8
+++ ClipperParser.java 28 Jun 2005 08:45:41 -0000 1.9
@@ -274,6 +274,8 @@
}
+
+
/**
* Gets the QueryParam attribute of the ClipperParser object
*
@@ -424,7 +426,7 @@
public String getQueryPosition(int posUrl, int posParam) {
Element queryEle = getQueryParam(posUrl, posParam);
- String pos =
queryEle.getAttributeValue(Label.PARAMETER_DEFAULT);
+ String pos =
queryEle.getAttributeValue(Label.PARAMETER_POSITION);
return pos;
}
Index: URLUtilities.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/util/URLUtilities.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URLUtilities.java 27 Jun 2005 15:05:11 -0000 1.3
+++ URLUtilities.java 28 Jun 2005 08:45:41 -0000 1.4
@@ -79,7 +79,12 @@
//logger.debug("[ Get absolute url of: " + url + " ]");
try {
- return getAbsolutURL(baseURL, url).toExternalForm();
+ if (isRelatif(url)) {
+ return getAbsolutURL(baseURL,
url).toExternalForm();
+ }
+ else {
+ return url;
+ }
}
catch (MalformedURLException ex) {
logger.error("[ Malformed url ]");
@@ -98,9 +103,10 @@
*/
public static String getHrefAbsoluteValue(String baseUrl, String url)
throws MalformedURLException {
logger.debug("[ Get absolute url of: " + url + " ]");
- logger.debug("[ Base url: " + baseUrl + " ]");
- String res = getAbsolutURL(getURL(baseUrl),
url).toExternalForm();;
- logger.debug("[ Result: " + res + " ]");
+ logger.debug("[ Base url: " + baseUrl + " ]");
+ String res = getAbsolutURL(getURL(baseUrl),
url).toExternalForm();
+
+ logger.debug("[ Result: " + res + " ]");
return res;
}
@@ -244,11 +250,4 @@
}
- /**
- * Description of the Method
- *
- [EMAIL PROTECTED] query Description of Parameter
- [EMAIL PROTECTED] Description of the Returned Value
- */
-
}
Index: TransformBuilderVisitor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/html/Impl/HTMLParser/TransformBuilderVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransformBuilderVisitor.java 27 Jun 2005 15:05:12 -0000 1.3
+++ TransformBuilderVisitor.java 28 Jun 2005 08:45:42 -0000 1.4
@@ -614,35 +614,6 @@
[EMAIL PROTECTED] tag Description of Parameter
[EMAIL PROTECTED] WebClippingException Description of Exception
*/
- private void processBodyTag(BodyTag tag) throws WebClippingException {
- try {
- /*
- * tag.setTagName(HTML.Tag.DIV.toString());
- * Div end = new Div();
- * end.setTagName("/div");
- * tag.setEndTag(end);
- * String classValue = CssUtilities.BODY_CLASS;
- * tag.setAttribute(HTML.Attribute.CLASS.toString(),
classValue);
- */
- // tag.removeAttribute("onload");
-
- }
- catch (Exception ex) {
- throw new WebClippingException("Body tag", ex);
- }
- finally {
- return;
- }
-
- }
-
-
- /**
- * Description of the Method
- *
- [EMAIL PROTECTED] tag Description of Parameter
- [EMAIL PROTECTED] WebClippingException Description of Exception
- */
private void processInputTag(InputTag tag) throws WebClippingException {
try {
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/http/impl/HttpProcessor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HttpProcessor.java 27 Jun 2005 15:05:13 -0000 1.9
+++ HttpProcessor.java 28 Jun 2005 08:45:42 -0000 1.10
@@ -99,14 +99,14 @@
logger.debug("[ Method is " + httpMethod + "]");
if (httpMethod.equalsIgnoreCase("GET")) {
GetMethod method = new GetMethod();
- method.setFollowRedirects(false);
+ method.setFollowRedirects(false);
method.addRequestHeader("User-Agent", "Mozilla/5.0
(Macintosh; U; PPC MacOS X; en)");
setObjectMethod(method);
}
else if (httpMethod.equalsIgnoreCase("POST")) {
PostMethod method = new PostMethod();
- method.setFollowRedirects(false);
+ method.setFollowRedirects(false);
method.addRequestHeader("User-Agent", "Mozilla/5.0
(Macintosh; U; PPC MacOS X; en)");
setObjectMethod(method);
((PostMethod)
getObjectMethod()).addParameters(getParamAndValue());
@@ -417,11 +417,27 @@
HttpMethod method = getObjectMethod();
if (method instanceof GetMethod) {
// set the query string
- method.setQueryString(getParamAndValue());
+ NameValuePair[] nvp = getParamAndValue();
+ String query = method.getQueryString();
+ if (query == null) {
+ query = "";
+ }
+ //add query param
+ for (int i = 0; i < nvp.length; i++) {
+ if (query.equalsIgnoreCase("")) {
+ query = nvp[i].getName() + "=" +
nvp[i].getValue();
+ }
+ else {
+ query = query + "&"+nvp[i].getName() +
"=" + nvp[i].getValue();
+ }
+ }
+ method.setQueryString(query);
+ //logger.debug("QueryString is: " +
method.getQueryString());
}
else {
if (method instanceof PostMethod) {
((PostMethod)
method).addParameters(getParamAndValue());
+ //logger.debug("QueryString is: ");
}
}
}
@@ -434,6 +450,7 @@
HttpMethod method = getObjectMethod();
URL processedUrl = getUrlBean().getRedirectUrl();
String path = processedUrl.getPath();
+ logger.debug("query string from redirectUrl: " +
processedUrl.getQuery());
method.setQueryString(processedUrl.getQuery());
method.setPath(path);
@@ -541,10 +558,15 @@
try {
// Execute the method.
+ logger.debug("[ Url bean att: " +
this.getUrlBean().getUrlValue() + " ]");
+ logger.debug("[ Url bean att: " +
this.getUrlBean().getRedirectUrl().toExternalForm() + " ]");
+ logger.debug("[ Url bean att: " +
this.getUrlBean().getURL().getQuery() + " ]");
+ logger.debug("[ Url bean att: " +
this.getUrlBean().getRedirectUrl().getQuery() + " ]");
+
+ logger.debug("[ Url bean att: " +
this.getUrlBean().getUrlValue() + " ]");
logger.debug("[ Client host: " +
client.getHostConfiguration().getHost() + " ]");
logger.debug("[ Requested file path: " +
method.getPath() + " ]");
logger.debug("[ Query is: " + method.getQueryString() +
" ]");
-
int statusCode = -1;
logger.debug("[ Execute with simple client]");
@@ -569,7 +591,7 @@
newuri = "/";
}
logger.debug("[ Redirect target: " +
newuri + "");
- String absoluteRedirect =
URLUtilities.getHrefAbsoluteValue(getUrlBean().getUrlValue(),newuri);
+ String absoluteRedirect =
URLUtilities.getHrefAbsoluteValue(getUrlBean().getUrlValue(), newuri);
redirect = new
GetMethod(absoluteRedirect);
client.executeMethod(redirect);
Index: EasyX509TrustManager.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EasyX509TrustManager.java 3 Mar 2005 18:04:03 -0000 1.1
+++ EasyX509TrustManager.java 28 Jun 2005 08:45:42 -0000 1.2
@@ -100,13 +100,13 @@
}
if ( (certificates != null) && (certificates.length == 1)) {
X509Certificate certificate = certificates[0];
- try {
+ /* try {
certificate.checkValidity();
}
catch (CertificateException e) {
LOG.error(e.toString());
return false;
- }
+ }*/
return true;
}
else {
