ktlili 2005/06/06 13:34:55 CEST
Modified files:
war/MavenWebClipping MavenAutoUpdated.library
MavenWebClipping.jpx
war/MavenWebClipping/Tomcat/webapps webraptor.xml
war/src/conf en_US.properties
war/src/java/com/jahia/clipping/struts PreviewAction.java
TestClipperAction.java
war/src/java/com/jahia/clipping/struts/Util
AbstractWizardForm.java
war/src/java/com/jahia/clipping/util ClassUtilities.java
DomUtilities.java
war/src/java/com/jahia/clipping/web/Url/Impl URLParser.java
war/src/java/com/steadystate/css/parser SACParser.java
war/src/webapp/WEB-INF struts-config.xml web.xml
war/src/webapp/jsp/actions browseAction.jsp
testClipperAction.jsp
Added files:
war/MavenWebClipping/Tomcat/webapps web_clipper.xml
Log:
Fix bug.
Css, Absolute position -> relative position
Revision Changes Path
1.3 +36 -36
webclip_builder/war/MavenWebClipping/MavenAutoUpdated.library
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/MavenWebClipping/MavenAutoUpdated.library.diff?r1=1.2&r2=1.3&f=h
1.5 +5 -8 webclip_builder/war/MavenWebClipping/MavenWebClipping.jpx
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/MavenWebClipping/MavenWebClipping.jpx.diff?r1=1.4&r2=1.5&f=h
1.1 +3 -0
webclip_builder/war/MavenWebClipping/Tomcat/webapps/web_clipper.xml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/MavenWebClipping/Tomcat/webapps/web_clipper.xml?rev=1.1&content-type=text/plain
1.3 +1 -1
webclip_builder/war/MavenWebClipping/Tomcat/webapps/webraptor.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/MavenWebClipping/Tomcat/webapps/webraptor.xml.diff?r1=1.2&r2=1.3&f=h
1.6 +1 -1 webclip_builder/war/src/conf/en_US.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/conf/en_US.properties.diff?r1=1.5&r2=1.6&f=h
1.3 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/PreviewAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/PreviewAction.java.diff?r1=1.2&r2=1.3&f=h
1.4 +4 -4
webclip_builder/war/src/java/com/jahia/clipping/struts/TestClipperAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/TestClipperAction.java.diff?r1=1.3&r2=1.4&f=h
1.2 +1 -1
webclip_builder/war/src/java/com/jahia/clipping/struts/Util/AbstractWizardForm.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/struts/Util/AbstractWizardForm.java.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3
webclip_builder/war/src/java/com/jahia/clipping/util/ClassUtilities.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/util/ClassUtilities.java.diff?r1=1.1&r2=1.2&f=h
1.4 +121 -114
webclip_builder/war/src/java/com/jahia/clipping/util/DomUtilities.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/util/DomUtilities.java.diff?r1=1.3&r2=1.4&f=h
1.2 +2 -4
webclip_builder/war/src/java/com/jahia/clipping/web/Url/Impl/URLParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/jahia/clipping/web/Url/Impl/URLParser.java.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
webclip_builder/war/src/java/com/steadystate/css/parser/SACParser.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/com/steadystate/css/parser/SACParser.java.diff?r1=1.1&r2=1.2&f=h
1.4 +6 -4 webclip_builder/war/src/webapp/WEB-INF/struts-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/WEB-INF/struts-config.xml.diff?r1=1.3&r2=1.4&f=h
1.2 +4 -1 webclip_builder/war/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/WEB-INF/web.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +114 -117
webclip_builder/war/src/webapp/jsp/actions/browseAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/actions/browseAction.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
webclip_builder/war/src/webapp/jsp/actions/testClipperAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/actions/testClipperAction.jsp.diff?r1=1.1&r2=1.2&f=h
Index: MavenAutoUpdated.library
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/MavenWebClipping/MavenAutoUpdated.library,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenAutoUpdated.library 7 Mar 2005 17:44:36 -0000 1.2
+++ MavenAutoUpdated.library 6 Jun 2005 11:34:52 -0000 1.3
@@ -3,41 +3,41 @@
<!--JBuilder Library Definition File-->
<fullname>MavenAutoUpdated</fullname>
<class>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/jdom/jars/jdom-1.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-beanutils/jars/commons-beanutils-1.7.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-collections/jars/commons-collections-3.1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-digester/jars/commons-digester-1.5.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/log4j/jars/log4j-1.2.8.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/mysql/jars/mysql-connector-java-3.0.10-stable-bin.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/hsqldb/jars/hsqldb-1.7.1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/servletapi/jars/servletapi-2.3.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/struts/jars/struts-1.2.2.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/sax/jars/sax-2.0.1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/hibernate/jars/hibernate-2.1.8.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/odmg/jars/odmg-3.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/ehcache/jars/ehcache-0.9.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/cglib/jars/cglib-full-2.0.2.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/junit/jars/junit-3.8.1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/junitperf/jars/junitperf-1.8.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-jelly/jars/commons-jelly-1.0-RC1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-jelly/jars/commons-jelly-tags-log-1.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-jelly/jars/commons-jelly-tags-xml-1.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-jexl/jars/commons-jexl-1.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-cli/jars/commons-cli-1.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/dom4j/jars/dom4j-1.5.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/jaxen/jars/jaxen-1.0-FCS-full.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/saxpath/jars/saxpath-1.0-FCS.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-lang/jars/commons-lang-2.0.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-httpclient/jars/commons-httpclient-3.0-beta1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/commons-codec/jars/commons-codec-1.3.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/gsbase/jars/gsbase-2.0.1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/rhino/jars/js-1.6R1.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/xerces/jars/xercesImpl-2.6.2.jar</path>
- <path>../../../../Documents and
Settings/jahia/.maven/repository/xml-apis/jars/xml-apis-2.0.2.jar</path>
- <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>
+ <path>../../../../.maven/repository/jdom/jars/jdom-1.0.jar</path>
+
<path>../../../../.maven/repository/commons-beanutils/jars/commons-beanutils-1.7.0.jar</path>
+
<path>../../../../.maven/repository/commons-collections/jars/commons-collections-3.1.jar</path>
+
<path>../../../../.maven/repository/commons-digester/jars/commons-digester-1.5.jar</path>
+ <path>../../../../.maven/repository/log4j/jars/log4j-1.2.8.jar</path>
+
<path>../../../../.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar</path>
+
<path>../../../../.maven/repository/mysql/jars/mysql-connector-java-3.0.10-stable-bin.jar</path>
+ <path>../../../../.maven/repository/hsqldb/jars/hsqldb-1.7.1.jar</path>
+
<path>../../../../.maven/repository/servletapi/jars/servletapi-2.3.jar</path>
+ <path>../../../../.maven/repository/struts/jars/struts-1.2.2.jar</path>
+ <path>../../../../.maven/repository/sax/jars/sax-2.0.1.jar</path>
+
<path>../../../../.maven/repository/hibernate/jars/hibernate-2.1.8.jar</path>
+ <path>../../../../.maven/repository/odmg/jars/odmg-3.0.jar</path>
+ <path>../../../../.maven/repository/ehcache/jars/ehcache-0.9.jar</path>
+
<path>../../../../.maven/repository/cglib/jars/cglib-full-2.0.2.jar</path>
+ <path>../../../../.maven/repository/junit/jars/junit-3.8.1.jar</path>
+
<path>../../../../.maven/repository/junitperf/jars/junitperf-1.8.jar</path>
+
<path>../../../../.maven/repository/commons-jelly/jars/commons-jelly-1.0-RC1.jar</path>
+
<path>../../../../.maven/repository/commons-jelly/jars/commons-jelly-tags-log-1.0.jar</path>
+
<path>../../../../.maven/repository/commons-jelly/jars/commons-jelly-tags-xml-1.0.jar</path>
+
<path>../../../../.maven/repository/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar</path>
+
<path>../../../../.maven/repository/commons-jexl/jars/commons-jexl-1.0.jar</path>
+
<path>../../../../.maven/repository/commons-cli/jars/commons-cli-1.0.jar</path>
+ <path>../../../../.maven/repository/dom4j/jars/dom4j-1.5.jar</path>
+
<path>../../../../.maven/repository/jaxen/jars/jaxen-1.0-FCS-full.jar</path>
+
<path>../../../../.maven/repository/saxpath/jars/saxpath-1.0-FCS.jar</path>
+
<path>../../../../.maven/repository/commons-lang/jars/commons-lang-2.0.jar</path>
+
<path>../../../../.maven/repository/commons-httpclient/jars/commons-httpclient-3.0-beta1.jar</path>
+
<path>../../../../.maven/repository/commons-codec/jars/commons-codec-1.3.jar</path>
+ <path>../../../../.maven/repository/gsbase/jars/gsbase-2.0.1.jar</path>
+ <path>../../../../.maven/repository/rhino/jars/js-1.6R1.jar</path>
+
<path>../../../../.maven/repository/xerces/jars/xercesImpl-2.6.2.jar</path>
+
<path>../../../../.maven/repository/xml-apis/jars/xml-apis-2.0.2.jar</path>
+
<path>../../../../.maven/repository/nekohtml/jars/nekohtml-0.9.4.jar</path>
+
<path>../../../../.maven/repository/commons-io/jars/commons-io-1.0.jar</path>
</class>
- <lastmodsaved>1110188131640</lastmodsaved>
+ <lastmodsaved>1117535145655</lastmodsaved>
</library>
Index: MavenWebClipping.jpx
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/MavenWebClipping/MavenWebClipping.jpx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenWebClipping.jpx 14 Mar 2005 16:29:32 -0000 1.4
+++ MavenWebClipping.jpx 6 Jun 2005 11:34:52 -0000 1.5
@@ -29,6 +29,7 @@
<property category="module"
name="ProjectConvertedToEnsureModulesHaveSupportedFeatures" value="1"/>
<property category="module"
name="ProjectConvertedToUseFilesAndDependenciesAsDefaultContent" value="1"/>
<property category="module"
name="ProjectConvertedToUseProperModuleDefaults" value="1"/>
+ <property category="module" name="last.wizard.module.name" value="webapp"/>
<property category="module"
name="projectConvertedFromModuleExtensionsToModuleFileTypes" value="1"/>
<property category="runtime" name="DefaultConfiguration" value="-1"/>
<property category="runtime.0" name="BuildTargetOnRun"
value="com.borland.jbuilder.build.ExternalTaskBuilder;MavenBuild"/>
@@ -61,7 +62,7 @@
<property category="sys" name="ExcludeClassEnabled" value="0"/>
<property category="sys" name="IncludeTestPath" value="1"/>
<property category="sys" name="InstanceVisibility" value="2"/>
- <property category="sys" name="JDK" value="java version 1.4.2_01-b06"/>
+ <property category="sys" name="JDK" value="java version 1.5.0_02-b09"/>
<property category="sys" name="JvmVersion" value="1.2"/>
<property category="sys" name="LastTag" value="0"/>
<property category="sys" name="Libraries"
value="MavenAutoUpdated;WebClipper;Tomcat 4.1 Servlet;Servlet;Struts"/>
@@ -76,18 +77,14 @@
<property category="sys" name="VersionLabel" value="@version"/>
<property category="sys" name="WorkingDirectory" value="."/>
<property category="team" name="ignorePath.0" value="Tomcat"/>
- <property category="webModule" name="last.wizard.module.name"
value="WebModule1"/>
- <node name="webapp" type="NavigationDirectory">
- <property category="directorynode" name="showSubdirectories" value="1"/>
- <property category="directorynode" name="url"
value="C%%|/MyWebRaptor/webraptor3/war/src/webapp"/>
- </node>
+ <property category="webModule" name="last.wizard.module.name"
value="webapp"/>
<node name="MavenBuild" type="ExternalTask">
- <property category="external" name="executable"
value="C:\MyWebRaptor\webraptor3\mavenBuild.bat"/>
+ <property category="external" name="executable" value="C:\Documents and
Settings\jahia\jbproject\webclip_builder\mavenBuild.bat"/>
<property category="external" name="phase" value="compile"/>
<property category="external" name="rundir" value="../../"/>
</node>
<node name="mavenClean" type="ExternalTask">
- <property category="external" name="executable"
value="C:\MyWebRaptor\webraptor3\mavenClean.bat"/>
+ <property category="external" name="executable" value="C:\Documents and
Settings\jahia\jbproject\webclip_builder\mavenClean.bat"/>
<property category="external" name="phase" value="clean"/>
<property category="external" name="rundir" value="../../"/>
</node>
Index: web_clipper.xml
====================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--This comment marks this file as generated, so it may be deleted and
regenerated at any time. To preserve manual changes to this file, delete this
comment.-->
<Context debug="0" docBase="C:\Documents and
Settings\jahia\jbproject\webclip_builder\war\target\webraptor"
path="/webraptor" reloadable="true" workDir="C:\Documents and
Settings\jahia\jbproject\webclip_builder\war\target\webraptor"/>
Index: webraptor.xml
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/MavenWebClipping/Tomcat/webapps/webraptor.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- webraptor.xml 4 Mar 2005 10:46:20 -0000 1.2
+++ webraptor.xml 6 Jun 2005 11:34:53 -0000 1.3
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--This comment marks this file as generated, so it may be deleted and
regenerated at any time. To preserve manual changes to this file, delete this
comment.-->
-<Context debug="0" docBase="C:\MyWebRaptor\webraptor3\war\target\webraptor"
path="/webraptor" reloadable="true"
workDir="C:\MyWebRaptor\webraptor3\war\target\webraptor"/>
+<Context debug="0" docBase="C:\Documents and
Settings\jahia\jbproject\webclip_builder\war\target\webraptor"
path="/webraptor" reloadable="true" workDir="C:\Documents and
Settings\jahia\jbproject\webclip_builder\war\target\webraptor"/>
Index: en_US.properties
===================================================================
RCS file: /home/cvs/repository/webclip_builder/war/src/conf/en_US.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- en_US.properties 14 Mar 2005 16:29:33 -0000 1.5
+++ en_US.properties 6 Jun 2005 11:34:53 -0000 1.6
@@ -27,7 +27,7 @@
image.logo = /jsp/images/webraptor-logo.jpg
image.manage = /jsp/images/manage.jpg
image.description = /jsp/images/description.jpg
-image.browse = /jsp/images/browse.jpg
+image.browse = /jsp/images/browse.JPG
image.selectPart = /jsp/images/selectPart.jpg
image.editParams = /jsp/images/editParams.jpg
image.preview = /jsp/images/preview.jpg
Index: PreviewAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/PreviewAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreviewAction.java 14 Mar 2005 16:29:34 -0000 1.2
+++ PreviewAction.java 6 Jun 2005 11:34:53 -0000 1.3
@@ -63,7 +63,7 @@
//Handle error
if (bean == null) {
- logger.error("[Clipper Bean not founded]");
+ logger.error("[Clipper Bean not found]");
return actionMapping.findForward("description");
}
// test that the clipper has url
Index: TestClipperAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/TestClipperAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestClipperAction.java 14 Mar 2005 16:29:34 -0000 1.3
+++ TestClipperAction.java 6 Jun 2005 11:34:53 -0000 1.4
@@ -102,7 +102,7 @@
logger.debug("[ Last url ]");
}
else {
- setQueryParamsValue(httpServletRequest, uBean);
+ updateQueryParamsValue(httpServletRequest,
uBean);
}
form.setOldSelectedUrl(form.getSelectedUrl());
@@ -139,7 +139,7 @@
//save the current values
int posUrl = Integer.parseInt(form.getSelectedUrl());
-
setQueryParamsValue(httpServletRequest,getClipperBean(httpServletRequest).getUrlBean(posUrl));
+
updateQueryParamsValue(httpServletRequest,getClipperBean(httpServletRequest).getUrlBean(posUrl));
//Get all the url
ClipperBean cBean = getClipperBean(httpServletRequest);
@@ -176,7 +176,7 @@
[EMAIL PROTECTED] request The new QueryParsmsValue value
[EMAIL PROTECTED] uBean The new QueryParsmsValue value
*/
- private void setQueryParamsValue(HttpServletRequest request, UrlBean
uBean) {
+ private void updateQueryParamsValue(HttpServletRequest request, UrlBean
uBean) {
logger.debug("[ Set query param ]");
Map queryParamDefaultValue = buildQueryMap(request, uBean);
@@ -195,7 +195,7 @@
logger.debug("[ Query param " +
qBean.getName() + " is set whith value " + value + " ]");
}
else {
- logger.debug("[ No value founded for
Query param " + qBean.getName() + ".]");
+ logger.error("[ No value founded for
Query param " + qBean.getName() + ".]");
}
}
}
Index: AbstractWizardForm.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/struts/Util/AbstractWizardForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractWizardForm.java 3 Mar 2005 18:03:54 -0000 1.1
+++ AbstractWizardForm.java 6 Jun 2005 11:34:53 -0000 1.2
@@ -36,7 +36,7 @@
String methodToCall = "set" +
label.substring(3);
String[] values = {null};
Class[] paramType =
{String.class};
-
this.getClass().getMethod(methodToCall, paramType).invoke(this, values);
+
this.getClass().getMethod(methodToCall, paramType).invoke((Object)this,
(Object[])values);
}
}
}
Index: ClassUtilities.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/util/ClassUtilities.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassUtilities.java 3 Mar 2005 18:03:55 -0000 1.1
+++ ClassUtilities.java 6 Jun 2005 11:34:54 -0000 1.2
@@ -40,13 +40,13 @@
logger.debug("[ Method " + label + " is
a getMthod: " + isGetMethod + " . ]");
if (isGetMethod) {
//execute the getMethod in
order to get parameter value
- String getResult = (String)
currentMethod.invoke(sourceObject, null);
+ String getResult = (String)
currentMethod.invoke((Object)sourceObject, (Object[])null);
- //execute the correponding set
method of the current object
+ //execute the correponding
set method of the current object
String setMethodToCall = "set"
+ label.substring(3);
String[] values = {getResult};
Class[] paramType =
{String.class};
-
targetClass.getMethod(setMethodToCall, paramType).invoke(targetObject, values);
+
targetClass.getMethod(setMethodToCall,
paramType).invoke((Object)targetObject,(Object[]) values);
}
}
}
Index: DomUtilities.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/util/DomUtilities.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DomUtilities.java 7 Mar 2005 17:44:37 -0000 1.3
+++ DomUtilities.java 6 Jun 2005 11:34:54 -0000 1.4
@@ -1,9 +1,10 @@
package com.jahia.clipping.util;
+
import javax.xml.transform.*;
import javax.xml.transform.dom.*;
import javax.xml.transform.stream.*;
-import org.apache.xpath.*;
+import javax.xml.xpath.*;
import org.w3c.dom.*;
import javax.xml.parsers.*;
import org.w3c.dom.*;
@@ -16,128 +17,134 @@
[EMAIL PROTECTED] Tlili Khaled
*/
public abstract class DomUtilities {
- private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(DomUtilities.class);
+ private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(DomUtilities.class);
- /**
- * Gets the NodeListByXPath attribute of the DomUtilities class
- *
- [EMAIL PROTECTED] doc Description of Parameter
- [EMAIL PROTECTED] xPath Description of Parameter
- [EMAIL PROTECTED] The NodeListByXPath value
- */
- public static NodeList getNodeListByXPath(Document doc, String xPath) {
- logger.debug("[ Process XPath: " + xPath + " ]");
- NodeList result = null;
- try {
- result = XPathAPI.selectNodeList(doc, xPath);
- if (result == null || result.getLength() == 0) {
- logger.debug("[ Result set is empty for xPath "
+ xPath + " ]");
- }
- else {
- logger.debug("[ Result set not empty. ]");
- }
- }
- catch (TransformerException ex) {
- ex.printStackTrace();
- }
-
- return result;
- }
-
-
- /**
- * Gets the DocumentAsString attribute of the DomUtilities class
- *
- [EMAIL PROTECTED] doc Description of Parameter
- [EMAIL PROTECTED] The DocumentAsString value
- */
- public static String getDocumentAsString(Document doc) {
- java.io.StringWriter s = new java.io.StringWriter();
- try {
- // Create de la source DOM
- Source source = new DOMSource(doc);
-
- // Create output string
- Result resultat = new StreamResult(s);
-
- // Configuration of transformer
- TransformerFactory factory =
TransformerFactory.newInstance();
- Transformer transformer = factory.newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- String encoding = "ISO-8859-1";
- transformer.setOutputProperty(OutputKeys.ENCODING,
encoding);
-
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-
- // Transformation
- transformer.transform(source, resultat);
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- s.flush();
- //logger.debug("[ Result: " + s + " ]");
+ /**
+ * Gets the NodeListByXPath attribute of the DomUtilities class
+ *
+ [EMAIL PROTECTED] doc Description of Parameter
+ [EMAIL PROTECTED] xPath Description of Parameter
+ [EMAIL PROTECTED] The NodeListByXPath value
+ */
+ public static NodeList getNodeListByXPath(Document doc, String
xPath) {
+ logger.debug("[ Process XPath: " + xPath + " ]");
+ NodeList result = null;
+
+ try {
+ XPathFactory fabrique = XPathFactory.newInstance();
+ XPath xpath = fabrique.newXPath();
+ XPathExpression exp = xpath.compile(xPath);
+
+ result = (NodeList)
exp.evaluate(doc,XPathConstants.NODESET);
+
+ if (result == null || result.getLength() == 0) {
+ logger.debug("[ Result set is empty for
xPath " +xPath + " ]");
+ }
+ else {
+ logger.debug("[ Result set not empty. ]");
+ }
+ }
+ catch (XPathExpressionException ex) {
+ ex.printStackTrace();
+ }
+
+ return result;
+ }
+
+
+ /**
+ * Gets the DocumentAsString attribute of the DomUtilities class
+ *
+ [EMAIL PROTECTED] doc Description of Parameter
+ [EMAIL PROTECTED] The DocumentAsString value
+ */
+ public static String getDocumentAsString(Document doc) {
+ java.io.StringWriter s = new java.io.StringWriter();
+ try {
+ // Create de la source DOM
+ Source source = new DOMSource(doc);
+
+ // Create output string
+ Result resultat = new StreamResult(s);
+
+ // Configuration of transformer
+ TransformerFactory factory =
TransformerFactory.newInstance();
+ Transformer transformer = factory.newTransformer();
+ transformer.setOutputProperty(OutputKeys.INDENT,
"yes");
+ String encoding = "ISO-8859-1";
+ transformer.setOutputProperty(OutputKeys.ENCODING,
encoding);
+
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+
+ // Transformation
+ transformer.transform(source, resultat);
+
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ finally {
+ s.flush();
+ //logger.debug("[ Result: " + s + " ]");
String res = s.toString();
- return res;
- }
+ return res;
+ }
- }
+ }
- /**
- * Gets the Document attribute of the DomUtilities class
- *
- [EMAIL PROTECTED] xmlContent Description of Parameter
- [EMAIL PROTECTED] The Document value
- */
- public static Document getDocument(String xmlContent) {
- Document document = null;
- try {
- // cr�ation d'une fabrique de documents
- DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
-
- // cr�ation d'un constructeur de documents
- DocumentBuilder builder = factory.newDocumentBuilder();
-
- // Read the string input
- java.io.InputStream in = new
java.io.StringBufferInputStream(xmlContent);
- document = builder.parse(new InputSource(in));
-
- }
- catch (ParserConfigurationException pce) {
- System.out.println("Erreur de configuration du parseur
DOM");
- System.out.println("lors de l'appel �
fabrique.newDocumentBuilder();");
- }
- catch (SAXException se) {
- System.out.println("Erreur lors du parsing du
document");
- System.out.println("lors de l'appel �
construteur.parse(xml)");
- }
- catch (IOException ioe) {
- System.out.println("Erreur d'entr�e/sortie");
- System.out.println("lors de l'appel �
construteur.parse(xml)");
-
- }
- finally {
- return document;
- }
-
- }
+ /**
+ * Gets the Document attribute of the DomUtilities class
+ *
+ [EMAIL PROTECTED] xmlContent Description of Parameter
+ [EMAIL PROTECTED] The Document value
+ */
+ public static Document getDocument(String xmlContent) {
+ Document document = null;
+ try {
+ // cr�ation d'une fabrique de documents
+ DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
+
+ // cr�ation d'un constructeur de documents
+ DocumentBuilder builder =
factory.newDocumentBuilder();
+
+ // Read the string input
+ java.io.InputStream in = new
java.io.StringBufferInputStream(xmlContent);
+ document = builder.parse(new InputSource(in));
+
+ }
+ catch (ParserConfigurationException pce) {
+ System.out.println("Erreur de configuration du
parseur DOM");
+ System.out.println("lors de l'appel �
fabrique.newDocumentBuilder();");
+ }
+ catch (SAXException se) {
+ System.out.println("Erreur lors du parsing du
document");
+ System.out.println("lors de l'appel �
construteur.parse(xml)");
+ }
+ catch (IOException ioe) {
+ System.out.println("Erreur d'entr�e/sortie");
+ System.out.println("lors de l'appel �
construteur.parse(xml)");
+
+ }
+ finally {
+ return document;
+ }
+
+ }
- /**
- * Remove node
- *
- [EMAIL PROTECTED] n reference of the node
- */
- public static void removeNode(Node n) {
- Node parent = n.getParentNode();
- if (parent != null) {
- parent.removeChild(n);
- }
+ /**
+ * Remove node
+ *
+ [EMAIL PROTECTED] n reference of the node
+ */
+ public static void removeNode(Node n) {
+ Node parent = n.getParentNode();
+ if (parent != null) {
+ parent.removeChild(n);
+ }
- }
+ }
}
Index: URLParser.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/jahia/clipping/web/Url/Impl/URLParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLParser.java 3 Mar 2005 18:03:56 -0000 1.1
+++ URLParser.java 6 Jun 2005 11:34:54 -0000 1.2
@@ -43,12 +43,10 @@
String nameAndValue = queryParam[i];
int indexEqual = nameAndValue.indexOf('=');
try {
- String name = URLDecoder.decode(nameAndValue.substring(0,
indexEqual),
- "UTF-8");
+ String name = URLDecoder.decode(nameAndValue.substring(0,
indexEqual), "UTF-8");
String value = URLDecoder.decode(nameAndValue.substring(indexEqual
+
1), "UTF-8");
- String[] p = {
- name, value};
+ String[] p = {name, value};
param.add(p);
}
catch (UnsupportedEncodingException exc) {
Index: SACParser.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/com/steadystate/css/parser/SACParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SACParser.java 3 Mar 2005 18:04:00 -0000 1.1
+++ SACParser.java 6 Jun 2005 11:34:54 -0000 1.2
@@ -2563,8 +2563,8 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements();
enum.hasMoreElements();) {
- int[] oldentry = (int[])(enum.nextElement());
+ for (java.util.Enumeration enume = jj_expentries.elements();
enume.hasMoreElements();) {
+ int[] oldentry = (int[])(enume.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/WEB-INF/struts-config.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- struts-config.xml 14 Mar 2005 16:29:36 -0000 1.3
+++ struts-config.xml 6 Jun 2005 11:34:54 -0000 1.4
@@ -13,7 +13,7 @@
<form-bean name="previewForm"
type="com.jahia.clipping.struts.PreviewForm" />
</form-beans>
<global-forwards>
- <forward name="defaultError" path="/defaultError.do"/>
+ <forward name="defaultError" path="/defaultError.do" />
<forward name="testClipper"
path="/testClipper.do?webClippingAction=init" />
<forward name="validateDescription"
path="/beginExtractWizard.do?webClippingAction=init" />
<forward name="browse" path="/browse.do?webClippingAction=init" />
@@ -24,7 +24,7 @@
</global-forwards>
<action-mappings>
<action input="/jsp/defaultError.jsp" name="defaultErrorForm"
path="/defaultError" scope="session"
type="com.jahia.clipping.struts.DefaultErrorAction" validate="true" />
- <action input="/jsp/configuration.jsp" name="configureForm"
parameter="webClippingAction" path="/configure" scope="request"
type="com.jahia.clipping.struts.ConfigureAction" validate="true" >
+ <action input="/jsp/configuration.jsp" name="configureForm"
parameter="webClippingAction" path="/configure" scope="request"
type="com.jahia.clipping.struts.ConfigureAction" validate="true">
<forward name="description" path="/jsp/descriptionClipper.jsp" />
</action>
<action input="/jsp/manageClippers.jsp" name="manageClippersForm"
parameter="webClippingAction" path="/manageAction" scope="session"
type="com.jahia.clipping.struts.ManageAction" validate="true">
@@ -50,6 +50,8 @@
</action>
</action-mappings>
<message-resources parameter="ApplicationResources" />
- <message-resources parameter="en_US"/>
-
+ <message-resources parameter="en_US" />
+ <plug-in className="org.apache.struts.tiles.TilesPlugin">
+ <set-property property="definitions-config"
value="/WEB-INF/tiles-defs.xml" />
+ </plug-in>
</struts-config>
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 3 Mar 2005 18:04:08 -0000 1.1
+++ web.xml 6 Jun 2005 11:34:54 -0000 1.2
@@ -27,7 +27,6 @@
<servlet-name>action</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
- <!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
@@ -44,6 +43,10 @@
<taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
</taglib>
<taglib>
+ <taglib-uri>/WEB-INF/struts-template.tld</taglib-uri>
+ <taglib-location>/WEB-INF/struts-template.tld</taglib-location>
+ </taglib>
+ <taglib>
<taglib-uri>/WEB-INF/struts-tiles.tld</taglib-uri>
<taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
</taglib>
Index: browseAction.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/actions/browseAction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- browseAction.jsp 3 Mar 2005 18:04:10 -0000 1.1
+++ browseAction.jsp 6 Jun 2005 11:34:55 -0000 1.2
@@ -1,129 +1,126 @@
-<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/struts-nested.tld" prefix="nested" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<%@ taglib uri="/WEB-INF/struts-template.tld" prefix="template" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<script language="javascript"></script>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-tiles.tld" prefix="tiles"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-nested.tld" prefix="nested"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-template.tld" prefix="template"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+<[EMAIL PROTECTED] uri="/WEB-INF/struts-html.tld" prefix="html"%>
<table align="center" class="principal" width="100%">
<html:form action="browse" method="post">
- <!-- Header -->
- <table align="center" class="principal" width="100%">
- <!-- Title -->
- <tr>
- <td class="boxtitleborder1">
- <bean:message key="browse.title"/>
- </td>
- </tr>
- <!-- Buttons -->
- <tr>
- <td class="topmenubuttons">
- <!-- Init-->
- <html:submit property="webClippingAction">
- <bean:message key="browse.resetRecord"/>
- </html:submit>
- <!-- Start recording/Remove-->
- <logic:equal name="recording" property="statut" value="0">
+ <!-- Header -->
+ <table align="center" class="principal" width="100%">
+ <!-- Title -->
+ <tr>
+ <td class="boxtitleborder1">
+ <bean:message key="browse.title"/>
+ </td>
+ </tr>
+ <!-- Buttons -->
+ <tr>
+ <td class="topmenubuttons">
+ <!-- Init-->
<html:submit property="webClippingAction">
- <bean:message key="browse.startRecord"/>
- </html:submit>
- <html:submit property="webClippingAction" disabled="true">
- <bean:message key="browse.removeLast"/>
+ <bean:message key="browse.resetRecord"/>
</html:submit>
- </logic:equal>
- <logic:equal name="recording" property="statut" value="1">
+ <!-- Start recording/Remove-->
+ <logic:equal name="recording" property="statut" value="0">
+ <html:submit property="webClippingAction">
+ <bean:message key="browse.startRecord"/>
+ </html:submit>
+ <html:submit property="webClippingAction" disabled="true">
+ <bean:message key="browse.removeLast"/>
+ </html:submit>
+ </logic:equal>
+ <logic:equal name="recording" property="statut" value="1">
+ <html:submit property="webClippingAction">
+ <bean:message key="browse.stopRecord"/>
+ </html:submit>
+ <html:submit property="webClippingAction" disabled="false">
+ <bean:message key="browse.removeLast"/>
+ </html:submit>
+ </logic:equal>
+ <!-- Replay sequence -->
+ <logic:equal name="recording" property="statut" value="0">
+ <html:submit property="webClippingAction" disabled="false">
+ <bean:message key="browse.replay"/>
+ </html:submit>
+ </logic:equal>
+ <logic:equal name="recording" property="statut" value="1">
+ <html:submit property="webClippingAction" disabled="false">
+ <bean:message key="browse.replay"/>
+ </html:submit>
+ </logic:equal>
+ <!-- Next -->
<html:submit property="webClippingAction">
- <bean:message key="browse.stopRecord"/>
+ <bean:message key="button.next"/>
</html:submit>
- <html:submit property="webClippingAction" disabled="false">
- <bean:message key="browse.removeLast"/>
- </html:submit>
- </logic:equal>
- <!-- Replay sequence -->
- <logic:equal name="recording" property="statut" value="0">
- <html:submit property="webClippingAction" disabled="false">
- <bean:message key="browse.replay"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="recording" property="statut" value="1">
- <html:submit property="webClippingAction" disabled="false">
- <bean:message key="browse.replay"/>
- </html:submit>
- </logic:equal>
- <!-- Next -->
- <html:submit property="webClippingAction">
- <bean:message key="button.next"/>
- </html:submit>
- </td>
- </tr>
- </table>
- <!-- Browse Information -->
- <table>
- <tr>
- <!-- Begin from/Source url-->
- <td>
- <logic:equal name="recording" property="statut" value="0">
- <bean:message key="browse.from"/>
- <a href="<bean:write name="clipperBean" property="targetUrl"/>">
- <bean:write name="clipperBean" property="targetUrl"/>
- </a>
- </logic:equal>
- <logic:equal name="recording" property="statut" value="1">
- <bean:message key="browse.sourceUrl"/>
- <a href="<bean:write name="clipperBean" property="targetUrl"/>">
- <bean:write name="clipperBean" property="targetUrl"/>
+ </td>
+ </tr>
+ </table>
+ <!-- Browse Information -->
+ <table>
+ <tr>
+ <!-- Begin from/Source url-->
+ <td>
+ <logic:equal name="recording" property="statut" value="0">
+ <bean:message key="browse.from"/>
+ <a href="<bean:write name="clipperBean" property="targetUrl"/>">
+ <bean:write name="clipperBean" property="targetUrl"/>
+ </a>
+ </logic:equal>
+ <logic:equal name="recording" property="statut" value="1">
+ <bean:message key="browse.sourceUrl"/>
+ <a href="<bean:write name="clipperBean" property="targetUrl"/>">
+ <bean:write name="clipperBean" property="targetUrl"/>
+ </a>
+ </logic:equal>
+ </td>
+ <!-- Current url-->
+ <td>
+ <bean:message key="browse.currentUrl"/>
+ <a href="<bean:write name="browseForm" property="sourceUrl"/>">
+ <bean:write name="browseForm" property="sourceUrl"/>
</a>
- </logic:equal>
- </td>
- <!-- Current url-->
+ </td>
+ </tr>
+ </table>
+ <!-- Errors-->
+ <logic:messagesPresent>
+ <table align="center" bgcolor="#800000" cellpadding="0"
cellspacing="1" width="100%">
+ <tbody>
+ <tr>
+ <td>
+ <table align="center" bgcolor="#ffffff" border="0"
width="100%">
+ <tbody>
+ <tr>
+ <td align="center" bgcolor="#dcdcdc">
+ <font color="#cc0000">
+ <bean:message key="error.warning"/>
+ </font>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <UL>
+ <html:messages id="error">
+ <LI> <bean:write name="error"/> </LI>
+ </html:messages>
+ </UL>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </logic:messagesPresent>
+ </html:form>
+ <!-- HTML page -->
+ <table class="webClipping" style="position: relative; ">
+ <tr>
<td>
- <bean:message key="browse.currentUrl"/>
- <a href="<bean:write name="browseForm" property="sourceUrl"/>">
- <bean:write name="browseForm" property="sourceUrl"/>
- </a>
+ <bean:write name="browseForm" property="bodyContent" filter="false"/>
</td>
</tr>
</table>
- <!-- Errors-->
- <logic:messagesPresent>
- <table align="center" bgcolor="#800000" cellpadding="0" cellspacing="1"
width="100%">
- <tbody>
- <tr>
- <td>
- <table align="center" bgcolor="#ffffff" border="0" width="100%">
- <tbody>
- <tr>
- <td align="center" bgcolor="#dcdcdc">
- <font color="#cc0000">
- <bean:message key="error.warning"/>
- </font>
- </td>
- </tr>
- <tr>
- <td>
- <UL>
- <html:messages id="error">
- <LI>
- <bean:write name="error"/>
- </LI>
- </html:messages>
- </UL>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </logic:messagesPresent>
-</html:form>
-<!-- HTML page -->
-<table>
- <tr>
- <td>
- <bean:write name="browseForm" property="bodyContent" filter="false"/>
- </td>
- </tr>
-</table>
</table>
Index: testClipperAction.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/actions/testClipperAction.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testClipperAction.jsp 3 Mar 2005 18:04:10 -0000 1.1
+++ testClipperAction.jsp 6 Jun 2005 11:34:55 -0000 1.2
@@ -11,7 +11,7 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<!-- javaScript-->
-<script language="javascript">
+<script language="javascript" type="">
// set the value of webClippinAction parameter
function setAction(f, value) {
if (value == "changeView") {
