Author: ktlili
Date: Wed Oct 3 16:34:18 2007
New Revision: 18741
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18741&repname=
=3Djahia
Log:
- fix PORTAL-55: upate struts-config.xml : add do=3Dclipbuilder in clipbuil=
der struts action. "do" allows to select admin action to perform. It's an o=
ld jahiaAdministration parameter
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/struts-=
config.xml
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/s=
truts-config.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/struts/struts-config.xml&rev=3D18741&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/struts-=
config.xml (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/struts/struts-=
config.xml Wed Oct 3 16:34:18 2007
@@ -64,16 +64,17 @@
<forward name=3D"sayHello" path=3D"/jsp/sayHello.faces"/>
=
<!-- clip builder forward -->
- <forward name=3D"menuBuilder" path=3D"/menuBuilder.clipping"/>
- <forward name=3D"testClipper" path=3D"/testClipper.clipping?webCli=
ppingAction=3Dinit"/>
- <forward name=3D"validateDescription" path=3D"/beginExtractWizard.=
clipping?webClippingAction=3Dinit"/>
- <forward name=3D"browse" path=3D"/browse.clipping?webClippingActio=
n=3Dinit"/>
- <forward name=3D"manage" path=3D"/manageAction.clipping?webClippin=
gAction=3Dinit"/>
- <forward name=3D"editParams" path=3D"/edit.clipping?webClippingAct=
ion=3Dinit"/>
- <forward name=3D"preview" path=3D"/saveClipper.clipping?webClippin=
gAction=3Dinit"/>
- <forward name=3D"selectPart" path=3D"/selectPart.clipping?webClipp=
ingAction=3Dinit"/>
- <forward name=3D"webBrowser" path=3D"/webBrowser.clipping"/>
- <forward name=3D"buildSqlPortlet" path=3D"/buildSqlPortlet.clippin=
g?webClippingAction=3Dinit"/>
+ <forward name=3D"menuBuilder" path=3D"/administration/menuBuilder?=
do=3Dclipbuilder"/>
+ <forward name=3D"configure" path=3D"/administration/configure?do=
=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"testClipper" path=3D"/administration/testClipper?=
do=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"validateDescription" path=3D"/administration/begi=
nExtractWizard?do=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"browse" path=3D"/administration/browse?do=3Dclipb=
uilder&webClippingAction=3Dinit"/>
+ <forward name=3D"manage" path=3D"/administration/manageAction?do=
=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"editParams" path=3D"/administration/edit?do=3Dcli=
pbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"preview" path=3D"/administration/saveClipper?do=
=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"selectPart" path=3D"/administration/selectPart?do=
=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"webBrowser" path=3D"/administration/webBrowser?do=
=3Dclipbuilder"/>
+ <forward name=3D"buildSqlPortlet" path=3D"/administration/buildSql=
Portlet?do=3Dclipbuilder&webClippingAction=3Dinit"/>
=
=
</global-forwards>
@@ -391,64 +392,103 @@
</action>
=
<!-- Clip builder action -->
- <action input=3D"/jsp/jahia/administration/menuBuilder.jsp" name=
=3D"menuBuilderForm" path=3D"/menuBuilder"
- scope=3D"request" type=3D"org.jahia.clipbuilder.MenuBuilde=
rAction" validate=3D"true"/>
- <action input=3D"/jsp/clipbuilder/html/manageClippers.jsp" name=3D=
"manageClippersForm" parameter=3D"webClippingAction"
- path=3D"/manageAction" scope=3D"request" type=3D"org.jahia=
.clipbuilder.html.struts.ManageAction"
+ <action input=3D"/jsp/jahia/administration/menuBuilder.jsp"
+ name=3D"menuBuilderForm"
+ path=3D"/menuBuilder"
+ scope=3D"request"
+ type=3D"org.jahia.clipbuilder.MenuBuilderAction"
+ validate=3D"true"/>
+ <action input=3D"/jsp/clipbuilder/html/manageClippers.jsp"
+ name=3D"manageClippersForm"
+ parameter=3D"webClippingAction"
+ path=3D"/manageAction"
+ scope=3D"request"
+ type=3D"org.jahia.clipbuilder.html.struts.ManageAction"
validate=3D"true">
- <forward name=3D"description" path=3D"/jsp/clipbuilder/html/de=
scriptionClipper.jsp"/>
- <forward name=3D"descriptionLoaded" path=3D"/beginExtractWizar=
d.clipping?webClippingAction=3Dwizard"/>
- <forward name=3D"configure" path=3D"/configure.clipping?webCli=
ppingAction=3DinitManager"/>
- </action>
- <action input=3D"/jsp/clipbuilder/html/configuration.jsp" name=3D"=
configureForm" parameter=3D"webClippingAction"
- path=3D"/configure" scope=3D"request" type=3D"org.jahia.cl=
ipbuilder.html.struts.ConfigureAction"
+ <forward name=3D"description" path=3D"/jsp/clipbuilder/html/de=
scriptionClipper.jsp?do=3Dclipbuilder"/>
+ <forward name=3D"descriptionLoaded" path=3D"/administration/be=
ginExtractWizard?do=3Dclipbuilder&webClippingAction=3Dwizard"/>
+ <forward name=3D"configure" path=3D"/administration/configure?=
do=3Dclipbuilder&webClippingAction=3DinitManager"/>
+ </action>
+ <action input=3D"/jsp/clipbuilder/html/configuration.jsp"
+ name=3D"configureForm"
+ parameter=3D"webClippingAction"
+ path=3D"/configure"
+ scope=3D"request"
+ type=3D"org.jahia.clipbuilder.html.struts.ConfigureAction"
validate=3D"true">
- <forward name=3D"description" path=3D"/jsp/clipbuilder/html/de=
scriptionClipper.jsp"/>
+ <forward name=3D"description" path=3D"/jsp/clipbuilder/html/de=
scriptionClipper.jsp?do=3Dclipbuilder"/>
</action>
- <action input=3D"/jsp/clipbuilder/html/manageClippers.jsp" name=3D=
"manageClippersForm" parameter=3D"webClippingAction"
- path=3D"/manageAction" scope=3D"session" type=3D"org.jahia=
.clipbuilder.html.struts.ManageAction"
+ <action input=3D"/jsp/clipbuilder/html/descriptionClipper.jsp"
+ name=3D"descriptionClipperForm"
+ parameter=3D"webClippingAction"
+ path=3D"/beginExtractWizard"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.DescriptionClipp=
erAction"
validate=3D"true">
- <forward name=3D"description" path=3D"/jsp/clipbuilder/html/de=
scriptionClipper.jsp"/>
- <forward name=3D"descriptionLoaded" path=3D"/beginExtractWizar=
d.clipping?webClippingAction=3Dwizard"/>
- <forward name=3D"configure" path=3D"/configure.clipping?webCli=
ppingAction=3DinitManager"/>
- </action>
- <action input=3D"/jsp/clipbuilder/html/descriptionClipper.jsp" nam=
e=3D"descriptionClipperForm"
- parameter=3D"webClippingAction" path=3D"/beginExtractWizar=
d" scope=3D"session"
- type=3D"org.jahia.clipbuilder.html.struts.DescriptionClipp=
erAction" validate=3D"true">
- <forward name=3D"browseInit" path=3D"/browse.clipping?webClipp=
ingAction=3Dinit"/>
- <forward name=3D"reset" path=3D"/beginExtractWizard.clipping?w=
ebClippingAction=3DresetBrowse"/>
- <forward name=3D"configure" path=3D"/configure.clipping?webCli=
ppingAction=3DinitDescription"/>
- </action>
- <action input=3D"/jsp/clipbuilder/html/browse.jsp" name=3D"browseF=
orm" parameter=3D"webClippingAction" path=3D"/browse"
- scope=3D"session" type=3D"org.jahia.clipbuilder.html.strut=
s.BrowseAction" validate=3D"true"/>
- <action input=3D"/jsp/clipbuilder/html/selectPart.jsp" name=3D"sel=
ectPartForm" parameter=3D"webClippingAction"
- path=3D"/selectPart" scope=3D"session" type=3D"org.jahia.c=
lipbuilder.html.struts.SelectPartAction"
+ <forward name=3D"browseInit" path=3D"/administration/browse?do=
=3Dclipbuilder&webClippingAction=3Dinit"/>
+ <forward name=3D"reset" path=3D"/administration/beginExtractWi=
zard?do=3Dclipbuilder&webClippingAction=3DresetBrowse"/>
+ <forward name=3D"configure" path=3D"/administration/configure?=
do=3Dclipbuilder&webClippingAction=3DinitDescription"/>
+ </action>
+ <action input=3D"/jsp/clipbuilder/html/browse.jsp"
+ name=3D"browseForm"
+ parameter=3D"webClippingAction"
+ path=3D"/browse"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.BrowseAction"
+ validate=3D"true"/>
+ <action input=3D"/jsp/clipbuilder/html/selectPart.jsp"
+ name=3D"selectPartForm"
+ parameter=3D"webClippingAction"
+ path=3D"/selectPart"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.SelectPartAction"
validate=3D"true"/>
- <action input=3D"/jsp/clipbuilder/html/editParams.jsp" name=3D"edi=
tParamForm" parameter=3D"webClippingAction"
- path=3D"/edit" scope=3D"session" type=3D"org.jahia.clipbui=
lder.html.struts.EditAction" validate=3D"true">
- <forward name=3D"viewSelectPart" path=3D"/selectPart.clipping?=
webClippingAction=3Dwizard"/>
+ <action input=3D"/jsp/clipbuilder/html/editParams.jsp"
+ name=3D"editParamForm"
+ parameter=3D"webClippingAction"
+ path=3D"/edit"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.EditAction"
+ validate=3D"true">
+ <forward name=3D"viewSelectPart" path=3D"/administration/selec=
tPart?do=3Dclipbuilder&webClippingAction=3Dwizard"/>
</action>
- <action input=3D"/jsp/clipbuilder/html/previewClipper.jsp" name=3D=
"previewForm" parameter=3D"webClippingAction"
- path=3D"/saveClipper" scope=3D"session" type=3D"org.jahia.=
clipbuilder.html.struts.PreviewAction"
+ <action input=3D"/jsp/clipbuilder/html/previewClipper.jsp"
+ name=3D"previewForm"
+ parameter=3D"webClippingAction"
+ path=3D"/saveClipper"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.PreviewAction"
validate=3D"true">
- <forward name=3D"manage" path=3D"/manageAction.clipping?webCli=
ppingAction=3Dinit"/>
+ <forward name=3D"manage" path=3D"/administration/manageAction?=
do=3Dclipbuilder&webClippingAction=3Dinit"/>
</action>
<!-- Testing the clipper -->
- <action input=3D"/jsp/clipbuilder/html/testClipper.jsp" name=3D"te=
stClipperForm" parameter=3D"webClippingAction"
- path=3D"/testClipper" scope=3D"session" type=3D"org.jahia.=
clipbuilder.html.struts.TestClipperAction"
+ <action input=3D"/jsp/clipbuilder/html/testClipper.jsp"
+ name=3D"testClipperForm"
+ parameter=3D"webClippingAction"
+ path=3D"/testClipper"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.TestClipperActio=
n"
validate=3D"true">
- <forward name=3D"previewTest" path=3D"/saveClipper.clipping?we=
bClippingAction=3Dtest"/>
+ <forward name=3D"previewTest" path=3D"/administration/saveClip=
per?do=3Dclipbuilder&webClippingAction=3Dtest"/>
</action>
<!-- web Browser -->
- <action input=3D"/jsp/clipbuilder/html/templates/webBrowser.jsp" n=
ame=3D"webBrowserForm" parameter=3D"show"
- path=3D"/webBrowser" scope=3D"session" type=3D"org.jahia.c=
lipbuilder.html.struts.webBrowser.WebBrowserAction"
+ <action input=3D"/jsp/clipbuilder/html/templates/webBrowser.jsp"
+ name=3D"webBrowserForm"
+ parameter=3D"show"
+ path=3D"/webBrowser"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.html.struts.webBrowser.WebBr=
owserAction"
validate=3D"true">
- <forward name=3D"showError" path=3D"/jsp/clipbuilder/html/defa=
ultError.jsp"/>
- <forward name=3D"showFrameSelection" path=3D"/jsp/clipbuilder/=
html/frameSelection.jsp"/>
+ <forward name=3D"showError" path=3D"/jsp/clipbuilder/html/defa=
ultError.jsp?do=3Dclipbuilder"/>
+ <forward name=3D"showFrameSelection" path=3D"/jsp/clipbuilder/=
html/frameSelection.jsp?do=3Dclipbuilder"/>
</action>
<!-- sql portlet-->
- <action input=3D"/jsp/clipbuilder/sql/editQueryForm.jsp" name=3D"e=
ditQueryForm" parameter=3D"webClippingAction"
- path=3D"/buildSqlPortlet" scope=3D"session" type=3D"org.ja=
hia.clipbuilder.sql.struts.EditQueryAction"
+ <action input=3D"/jsp/clipbuilder/sql/editQueryForm.jsp"
+ name=3D"editQueryForm"
+ parameter=3D"webClippingAction"
+ path=3D"/buildSqlPortlet"
+ scope=3D"session"
+ type=3D"org.jahia.clipbuilder.sql.struts.EditQueryAction"
validate=3D"true"/>
=
<!-- End Jahia Actions -->
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
