ktlili 2005/07/29 17:19:06 CEST
Modified files:
. jahiaMerge.txt
war project.properties project.xml
war/src/java/org/jahia/clipbuilder/html SessionManager.java
war/src/java/org/jahia/clipbuilder/html/struts
BrowseAction.java
war/src/java/org/jahia/clipbuilder/html/struts/Util
AbstractWizardAction.java
war/src/java/org/jahia/clipbuilder/html/web/html/Impl/ExtractorFilter
ChewExtractorFilter.java
war/src/java/org/jahia/clipbuilder/html/web/http/impl
HttpProcessor.java
war/src/webapp/WEB-INF struts-config.xml
war/src/webapp/jsp/clipbuilder/html/actions
testClipperAction.jsp
Removed files:
war/src/java/org/jahia/clipbuilder/html/struts
WebBrowserAction.java
WebBrowserForm.java
Log:
- add build jar witout wizard struts class. From Now, new lib:
clipbuilder-1.0.jar that will be user by Jahia, webclip_builder and
webclip_portlet.
Revision Changes Path
1.2 +3 -1 webclip_builder/jahiaMerge.txt
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/jahiaMerge.txt.diff?r1=1.1&r2=1.2&f=h
1.6 +3 -1 webclip_builder/war/project.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/project.properties.diff?r1=1.5&r2=1.6&f=h
1.6 +3 -3 webclip_builder/war/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/project.xml.diff?r1=1.5&r2=1.6&f=h
1.2 +20 -8
webclip_builder/war/src/java/org/jahia/clipbuilder/html/SessionManager.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/SessionManager.java.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/BrowseAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/BrowseAction.java.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -32
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.1&r2=1.2&f=h
1.3 +0 -659
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/WebBrowserAction.java
(dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/WebBrowserAction.java?rev=1.2&content-type=text/plain
1.2 +0 -184
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/WebBrowserForm.java
(dead)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/WebBrowserForm.java?rev=1.1&content-type=text/plain
1.2 +2 -2
webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/html/Impl/ExtractorFilter/ChewExtractorFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/html/Impl/ExtractorFilter/ChewExtractorFilter.java.diff?r1=1.1&r2=1.2&f=h
1.2 +9 -5
webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/http/impl/HttpProcessor.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/http/impl/HttpProcessor.java.diff?r1=1.1&r2=1.2&f=h
1.11 +2 -2 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.10&r2=1.11&f=h
1.4 +0 -6
webclip_builder/war/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp.diff?r1=1.3&r2=1.4&f=h
Index: jahiaMerge.txt
===================================================================
RCS file: /home/cvs/repository/webclip_builder/jahiaMerge.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jahiaMerge.txt 29 Jul 2005 09:42:54 -0000 1.1
+++ jahiaMerge.txt 29 Jul 2005 15:19:03 -0000 1.2
@@ -7,4 +7,6 @@
* changer web.xml
- ajouter mapping vers *.do
* JSP + CSS
- - copier le repertoir webapps (l'arborescence est la même)
\ No newline at end of file
+ - copier le repertoir webapps (l'arborescence est la même)
+ * Ajouter les mapping hibernates
+ * Mis à jour du fichier de configuration de log4j
\ No newline at end of file
Index: project.properties
===================================================================
RCS file: /home/cvs/repository/webclip_builder/war/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 27 Jul 2005 09:52:08 -0000 1.5
+++ project.properties 29 Jul 2005 15:19:03 -0000 1.6
@@ -1,4 +1,6 @@
-maven.jahiapackage.deploy.context.name=webclipBuilder
+maven.jahiapackage.deploy.context.name=clipBuilder
+
+maven.jar.excludes = **/struts/*
maven.multiproject.type=war
maven.repo.remote = http://maven.jahia.org,
http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,
http://www.codeczar.com/maven
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/webclip_builder/war/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jul 2005 09:52:08 -0000 1.5
+++ project.xml 29 Jul 2005 15:19:04 -0000 1.6
@@ -5,8 +5,8 @@
<project>
<extend>${basedir}/../project.xml</extend>
<pomVersion>3</pomVersion>
- <artifactId>webraptor</artifactId>
- <name>WebRaptor WAR module</name>
+ <artifactId>clipBuilder</artifactId>
+ <name>ClipBuilder WAR module</name>
&common-warsite;
@@ -391,7 +391,7 @@
</dependencies>
<build>
- <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<!--
Index: SessionManager.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/SessionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionManager.java 28 Jul 2005 09:26:48 -0000 1.1
+++ SessionManager.java 29 Jul 2005 15:19:04 -0000 1.2
@@ -1,14 +1,13 @@
package org.jahia.clipbuilder.html;
+import javax.servlet.http.*;
+
+import org.apache.commons.httpclient.*;
import org.jahia.clipbuilder.html.bean.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.jahia.clipbuilder.html.struts.Util.Constants;
-import org.jahia.clipbuilder.html.web.Url.URLMap;
-import org.apache.commons.httpclient.HttpState;
-import org.jahia.clipbuilder.html.web.http.impl.HTMLUnitProcessor;
-import org.jahia.clipbuilder.html.struts.WebBrowserForm;
-import java.util.*;
+import org.jahia.clipbuilder.html.struts.Util.*;
+import org.jahia.clipbuilder.html.struts.webBrowser.*;
+import org.jahia.clipbuilder.html.web.Url.*;
+import org.jahia.clipbuilder.html.web.http.impl.*;
/**
* Access to sesion object
@@ -30,6 +29,19 @@
session.setAttribute(Constants.CLIPPER_BEAN, cBean);
}
+ /**
+ * Sets the WebBrowserForm attribute of the AbstractWizardAction
object
+ *
+ [EMAIL PROTECTED] request The new WebBrowserForm value
+ [EMAIL PROTECTED] w The new WebBrowserForm value
+ */
+ public static void setWebBrowserForm(HttpServletRequest request,
WebBrowserForm w) {
+ HttpSession session = request.getSession();
+ session.setAttribute(Constants.WEB_BROWSER_FORM, w);
+
+ }
+
+
/**
* Sets the HttpState attribute of the SessionManager object
Index: BrowseAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/BrowseAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BrowseAction.java 28 Jul 2005 09:26:51 -0000 1.1
+++ BrowseAction.java 29 Jul 2005 15:19:04 -0000 1.2
@@ -323,7 +323,7 @@
}
finally {
- addErrors(httpServletRequest, errors);
+ saveMessages(httpServletRequest, errors);
return actionMapping.getInputForward();
}
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractWizardAction.java 28 Jul 2005 09:26:52 -0000 1.1
+++ AbstractWizardAction.java 29 Jul 2005 15:19:05 -0000 1.2
@@ -7,10 +7,10 @@
import org.jahia.clipbuilder.html.*;
import org.jahia.clipbuilder.html.bean.*;
import org.jahia.clipbuilder.html.struts.*;
+import org.jahia.clipbuilder.html.struts.webBrowser.*;
import org.jahia.clipbuilder.html.web.Url.*;
import org.apache.struts.action.*;
import org.apache.struts.actions.*;
-import org.jahia.clipbuilder.html.bean.ClippersManagerBean;
/**
* Description of the Class
@@ -21,36 +21,6 @@
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(AbstractWizardAction.class);
-
- /**
- * Sets the WebBrowserForm attribute of the AbstractWizardAction object
- *
- [EMAIL PROTECTED] request The new WebBrowserForm value
- [EMAIL PROTECTED] w The new WebBrowserForm value
- */
- public void setWebBrowserForm(HttpServletRequest request,
WebBrowserForm w) {
- HttpSession session = request.getSession();
- session.setAttribute(Constants.WEB_BROWSER_FORM, w);
-
- }
-
-
-
- /**
- * Gets the WebBrowserForm attribute of the AbstractWizardAction object
- *
- [EMAIL PROTECTED] httpServletRequest Description of Parameter
- [EMAIL PROTECTED] The WebBrowserForm value
- */
- public WebBrowserForm getWebBrowserForm(HttpServletRequest
httpServletRequest) {
- HttpSession session = httpServletRequest.getSession();
- WebBrowserForm w = (WebBrowserForm)
session.getAttribute(Constants.WEB_BROWSER_FORM);
- return w;
- }
-
-
-
-
/**
* Gets the HeaderParams attribute of the BrowseAction object
*
@@ -154,7 +124,7 @@
logger.debug("[ clear url param config ]");
WebBrowserForm w = new WebBrowserForm();
w.setShow(Constants.WEB_BROWSER_SHOW_BROWSE);
- setWebBrowserForm(httpServletRequest, w);
+
SessionManager.setWebBrowserForm(httpServletRequest, w);
logger.debug("[ Remove Web Client ]");
SessionManager.removeWebClient(httpServletRequest);
Index: ChewExtractorFilter.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/html/Impl/ExtractorFilter/ChewExtractorFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChewExtractorFilter.java 28 Jul 2005 09:26:55 -0000 1.1
+++ ChewExtractorFilter.java 29 Jul 2005 15:19:05 -0000 1.2
@@ -22,8 +22,8 @@
* Description of the Field
*/
private final String NAME = "ChewExtractorFilter";
- private final String CHEW_HASH = "chewId";
- private final String CHEW_TAG_NAME = "chewTagName";
+ public static final String CHEW_HASH = "chewId";
+ public static final String CHEW_TAG_NAME = "chewTagName";
/**
* Description of the Field
*/
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/web/http/impl/HttpProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpProcessor.java 28 Jul 2005 09:26:58 -0000 1.1
+++ HttpProcessor.java 29 Jul 2005 15:19:05 -0000 1.2
@@ -114,7 +114,9 @@
}
// Provide custom retry handler is necessary
+ logger.debug("[ before get parameters ]");
getObjectMethod().getParams().setParameter(HttpMethodParams.RETRY_HANDLER, new
DefaultHttpMethodRetryHandler(3, false));
+ logger.debug("[ after get parameters ]");
}
@@ -127,6 +129,10 @@
public void setMethodParameters(String httpMethod) {
// Create a method instance.
logger.debug("[ Method is " + httpMethod + "]");
+ if (httpMethod == null) {
+ logger.error("Http Method is null !!");
+ logger.debug("Http Method is null !!");
+ }
if (httpMethod.equalsIgnoreCase("GET")) {
method = new GetMethod();
@@ -227,8 +233,7 @@
-
- /**
+ /**
* Gets the JavascriptEnable attribute of the HTMLClient object
*
[EMAIL PROTECTED] The JavascriptEnable value
@@ -345,8 +350,7 @@
-
- /**
+ /**
* Gets the Headers attribute of the HttpProcessor object
*
[EMAIL PROTECTED] The Headers value
@@ -529,7 +533,7 @@
List queryParamBeanList = getUrlBean().getQueryParamBeanList();
logger.debug("[ Url: " + getUrlBean().getAbsoluteUrlValue() + "
]");
logger.debug("[ queryParamBeanList.size(): " +
queryParamBeanList.size() + " ]");
- //build array
+ //build array
NameValuePair[] paramAndValue = new
NameValuePair[queryParamBeanList.size()];
for (int i = 0; i < queryParamBeanList.size(); i++) {
QueryParamBean qBean = (QueryParamBean)
queryParamBeanList.get(i);
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/WEB-INF/struts-config.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- struts-config.xml 28 Jul 2005 15:35:03 -0000 1.10
+++ struts-config.xml 29 Jul 2005 15:19:05 -0000 1.11
@@ -10,7 +10,7 @@
<form-bean name="selectPartForm"
type="org.jahia.clipbuilder.html.struts.SelectPartForm"/>
<form-bean name="editParamForm"
type="org.jahia.clipbuilder.html.struts.EditParamForm"/>
<form-bean name="previewForm"
type="org.jahia.clipbuilder.html.struts.PreviewForm"/>
- <form-bean name="webBrowserForm"
type="org.jahia.clipbuilder.html.struts.WebBrowserForm"/>
+ <form-bean name="webBrowserForm"
type="org.jahia.clipbuilder.html.struts.webBrowser.WebBrowserForm"/>
</form-beans>
<global-forwards>
<forward name="testClipper"
path="/testClipper.do?webClippingAction=init"/>
@@ -55,7 +55,7 @@
<forward name="previewTest"
path="/saveClipper.do?webClippingAction=test"/>
</action>
<!-- web Browser -->
- <action input="/jsp/clipbuilder/html/templates/webBrowser.jsp"
name="webBrowserForm" parameter="show" path="/webBrowser" scope="session"
type="org.jahia.clipbuilder.html.struts.WebBrowserAction" validate="true">
+ <action input="/jsp/clipbuilder/html/templates/webBrowser.jsp"
name="webBrowserForm" parameter="show" path="/webBrowser" scope="session"
type="org.jahia.clipbuilder.html.struts.webBrowser.WebBrowserAction"
validate="true">
<forward name="showError"
path="/jsp/clipbuilder/html/defaultError.jsp"/>
<forward name="showFrameSelection"
path="/jsp/clipbuilder/html/frameSelection.jsp"/>
</action>
Index: testClipperAction.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testClipperAction.jsp 29 Jul 2005 09:33:20 -0000 1.3
+++ testClipperAction.jsp 29 Jul 2005 15:19:06 -0000 1.4
@@ -55,12 +55,6 @@
<tr class="topmenubuttons">
<td class="topmenubuttons">
<html:submit property="webClippingAction">
- <bean:message key="testClipper.button.reset"/>
- </html:submit>
- <html:submit property="webClippingAction">
- <bean:message key="testClipper.button.resetAll"/>
- </html:submit>
- <html:submit property="webClippingAction">
<bean:message key="testClipper.button.go"/>
</html:submit>
</td>
