Author: tdraier
Date: Fri Sep 14 12:27:24 2007
New Revision: 18444
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18444&repname=
=3Djahia
Log:
added import selection screen - allows sitekey, name, and template set modi=
fication before import ( JAHIA-2109 , 2110 ) (port 18137, 18138)
Added:
trunk/core/src/webapp/jsp/jahia/administration/import_choose.jsp
- copied unchanged from r18138, branches/JAHIA-5-0-SP-BRANCH/core/src=
/webapp/jsp/jahia/administration/import_choose.jsp
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/conf/java/JahiaAdministrationResources_en.properties
trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java
trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp
Modified: trunk/core/src/conf/java/JahiaAdministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources.properties&rev=3D18444&repname=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
--- trunk/core/src/conf/java/JahiaAdministrationResources.properties (origi=
nal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources.properties Fri Se=
p 14 12:27:24 2007
@@ -497,6 +497,9 @@
org.jahia.admin.site.ManageSites.multipleimport.label =3D Import one or mo=
re virtual sites
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Please sele=
ct the file to import
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Or give the =
path of an import file on the server
+org.jahia.admin.site.ManageSites.multipleimport.list =3D Virtual Sites ava=
ilable in the import file
+org.jahia.admin.site.ManageSites.multipleimport.noValidSite =3D No valid s=
ite found in import file
+org.jahia.admin.site.ManageSites.multipleimport.defaultTemplate =3D Templa=
te set from import file
org.jahia.admin.site.ManageSites.import.wait =3D Your data are now being p=
rocessed, this may take a while depending on the size of your content ..
org.jahia.admin.sitepermissions.mainMenu.label =3D Manage site permissions
org.jahia.admin.sitepermissions.title.label =3D Manage site permissions
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_en.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_en.properties&rev=3D18444&repname=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
--- trunk/core/src/conf/java/JahiaAdministrationResources_en.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_en.properties Fri=
Sep 14 12:27:24 2007
@@ -497,6 +497,9 @@
org.jahia.admin.site.ManageSites.multipleimport.label =3D Import one or mo=
re virtual sites
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Please sele=
ct the file to import
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Or give the =
path of an import file on the server
+org.jahia.admin.site.ManageSites.multipleimport.list =3D Virtual Sites ava=
ilable in the import file
+org.jahia.admin.site.ManageSites.multipleimport.noValidSite =3D No valid s=
ite found in import file
+org.jahia.admin.site.ManageSites.multipleimport.defaultTemplate =3D Templa=
te set from import file
org.jahia.admin.site.ManageSites.import.wait =3D Your data are now being p=
rocessed, this may take a while depending on the size of your content ..
org.jahia.admin.sitepermissions.mainMenu.label =3D Manage site permissions
org.jahia.admin.sitepermissions.title.label =3D Manage site permissions
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_fr.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_fr.properties&rev=3D18444&repname=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
--- trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties Fri=
Sep 14 12:27:24 2007
@@ -595,6 +595,9 @@
org.jahia.admin.site.ManageSites.manageVirtualSites.label =3D G=C3=A9rer =
les sites virtuels
org.jahia.admin.site.ManageSites.multipleimport.fileinput =3D Ou indiquez =
le chemin d'acc=C3=A8s d'un fichier sur le serveur
org.jahia.admin.site.ManageSites.multipleimport.fileselect =3D Veuillez s=
=C3=A9lectionner le fichier =C3=A0 importer
+org.jahia.admin.site.ManageSites.multipleimport.list =3D Liste des sites v=
irtuels dans le fichier d'import
+org.jahia.admin.site.ManageSites.multipleimport.noValidSite =3D Pas de sit=
e valide dans le fichier d'import
+org.jahia.admin.site.ManageSites.multipleimport.defaultTemplate =3D Jeu de=
mod=C3=A8les de l'import
org.jahia.admin.site.ManageSites.multipleimport.label =3D Importation simu=
ltan=C3=A9e de plusieurs sites virtuels
org.jahia.admin.site.ManageSites.noImport.label =3D Site vide
org.jahia.admin.site.ManageSites.noSiteSpecified.label =3D Aucun site virt=
uel sp=C3=A9cifi=C3=A9
Modified: trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D18444&repname=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
--- trunk/core/src/java/org/jahia/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Fri Sep 14 1=
2:27:24 2007
@@ -55,7 +55,6 @@
import org.jahia.services.files.JahiaTextFileService;
import org.jahia.services.importexport.ImportExportBaseService;
import org.jahia.services.importexport.ImportJob;
-import org.jahia.services.importexport.ImportResult;
import org.jahia.services.importexport.ExtendedImportResult;
import org.jahia.services.lock.LockKey;
import org.jahia.services.lock.LockRegistry;
@@ -198,8 +197,10 @@
displayMultipleDelete(req, res, sess);
} else if (op.equals("processmultipledelete")) {
processMultipleDelete(req, res, sess);
- } else if (op.equals("processsiteimport")) {
- processSiteImport(req, res, sess);
+ } else if (op.equals("prepareimport")) {
+ prepareMultipleImport(req, res, sess);
+ } else if (op.equals("processimport")) {
+ processFileImport(req, res, sess);
}
} // userRequestDispatcher
=
@@ -871,9 +872,6 @@
thumbnail =3D tmplSetReg.getTemplatePackageThumbnail(tmplPack.=
getFileName());
logger.debug("Thumbnail found : " + thumbnail);
}
- if (tmplPack.getInitialImport() !=3D null) {
- request.setAttribute("initImportExists", Boolean.TRUE);
- }
=
Enumeration tmplSets =3D tmplSetReg.getAllTemplatePackages();
=
@@ -2037,7 +2035,7 @@
}
=
=
- private void processSiteImport(HttpServletRequest request,
+ private void prepareMultipleImport(HttpServletRequest request,
HttpServletResponse response,
HttpSession session) throws IOException=
, ServletException {
FileUpload fileUpload =3D ((ParamBean) jParams).getFileUpload();
@@ -2046,7 +2044,7 @@
Iterator iterator =3D filesName.iterator();
if (iterator.hasNext()) {
File f =3D fileUpload.getFile((String) iterator.next());
- processFileImport(f, request);
+ prepareFileImports(f, request);
}
=
}
@@ -2054,34 +2052,24 @@
File f=3D new File(jParams.getParameter("importpath"));
=
if (f.exists()) {
- processFileImport(f, request);
+ prepareFileImports(f, request);
}
}
- redirectAfterAdd(request, response, session);
- }
-
- private void redirectAfterAdd(HttpServletRequest request, HttpServletR=
esponse response, HttpSession session) throws IOException, ServletException=
{
- if (session.getAttribute(CLASS_NAME + "redirectToJahia") !=3D null=
) {
- session.removeAttribute(CLASS_NAME + "redirectToJahia");
- session.setAttribute( ProcessingContext.SESSION_SITE, session.=
getAttribute(CLASS_NAME + "newJahiaSite") );
- try {
- List l =3D ServicesRegistry.getInstance().getSchedulerServ=
ice().getAllActiveJobsDetails();
- if (!l.isEmpty()) {
- JahiaAdministration.doRedirect(request, response, sess=
ion, JSP_PATH + "import_wait.jsp");
- } else {
- response.sendRedirect(request.getContextPath());
- }
- } catch (JahiaException e) {
- logger.error("Cannot get jobs",e);
+ if (jParams.getSessionState().getAttribute("importsInfos") !=3D nu=
ll) {
+ if (!((Map)jParams.getSessionState().getAttribute("importsInfo=
s")).isEmpty()) {
+ JahiaAdministration.doRedirect(request, response, session,=
JSP_PATH + "import_choose.jsp");
+ return;
+ } else {
+ request.setAttribute("warningMsg",JahiaResourceBundle.getA=
dminResource("org.jahia.admin.site.ManageSites.multipleimport.noValidSite",
+ jParams, jParams.getLocale()));
}
- } else {
- displayList(request, response, session);
}
}
=
- private void processFileImport(File f, HttpServletRequest request) {
+ private void prepareFileImports(File f, HttpServletRequest request) {
if (f !=3D null && f.exists()) {
try {
+ Map importsInfos =3D new HashMap();
Properties exportProps =3D new Properties();
ZipInputStream zis =3D new ZipInputStream(new FileInputStr=
eam(f));
ZipEntry z;
@@ -2100,13 +2088,14 @@
exportProps.load(new FileInputStream(i));
jParams.setAttribute("exportProps", exportProps);
i.delete();
+
} else if (z.getName().equals("classes.jar")) {
- JahiaArchiveFileHandler h =3D new JahiaArchiveFile=
Handler(i.getPath());
- try {
- h.unzip(Jahia.getSettings().getClassDiskPath()=
, false);
- } catch (JahiaException e) {
- logger.error("Cannot unzip classes",e);
- }
+// JahiaArchiveFileHandler h =3D new JahiaArchiveFi=
leHandler(i.getPath());
+// try {
+// h.unzip(Jahia.getSettings().getClassDiskPath=
(), false);
+// } catch (JahiaException e) {
+// logger.error("Cannot unzip classes",e);
+// }
i.delete();
} else if (z.getName().equals("site.properties")) {
// this is a single site import, stop everything a=
nd import
@@ -2116,7 +2105,10 @@
file.delete();
}
imports.clear();
- createAndImportSite(f, request);
+ Map value =3D prepareSiteImport(f);
+ if (value !=3D null) {
+ importsInfos.put(f, value);
+ }
break;
} else {
imports.add(i);
@@ -2124,39 +2116,136 @@
}
for (Iterator iterator =3D imports.iterator(); iterator.ha=
sNext();) {
File i =3D (File) iterator.next();
- createAndImportSite(i, request);
- i.delete();
+ Map value =3D prepareSiteImport(i);
+ if (value !=3D null) {
+ importsInfos.put(i, value);
+ }
+// i.delete();
}
+ jParams.getSessionState().setAttribute("importsInfos",impo=
rtsInfos);
} catch (IOException e) {
logger.error("Cannot read import file :"+e.getMessage());
}
}
+ SharedTemplatePackagesRegistry tmplSetReg =3D SharedTemplatePackag=
esRegistry.getInstance();
+ Enumeration en =3D tmplSetReg.getAllTemplatePackages();
+ List list =3D new ArrayList();
+ while (en.hasMoreElements()) {
+ list.add(en.nextElement());
+ }
+ request.setAttribute("tmplSets", list);
}
=
- private void createAndImportSite(File i, HttpServletRequest request) t=
hrows IOException {
+ private Map prepareSiteImport(File i) throws IOException {
+ Map importInfos =3D new HashMap();
+ importInfos.put("importFile", i);
ZipEntry z;
ZipInputStream zis2 =3D new ZipInputStream(new FileInputStream(i));
- while ( (z =3D zis2.getNextEntry())!=3Dnull && !"site.properties".=
equals(z.getName()));
- if (z =3D=3D null) {
- logger.error("Cannot create site - missing site.properties");
- return;
+ while ( (z =3D zis2.getNextEntry())!=3Dnull) {
+ if ("site.properties".equals(z.getName())) {
+ Properties p =3D new Properties();
+ p.load(zis2);
+ zis2.closeEntry();
+ importInfos.putAll(p);
+ importInfos.put("selected", Boolean.TRUE);
+ importInfos.put("templates","");
+ } else if ("templates.jar".equals(z.getName())) {
+ importInfos.put("templatesAvailable", Boolean.TRUE);
+ }
}
- Properties p =3D new Properties();
- p.load(zis2);
- zis2.closeEntry();
+ if (!importInfos.containsKey("sitekey")) {
+ logger.warn("Cannot create site - missing site.properties");
+ return null;
+ }
+
try {
- if ((ServicesRegistry.getInstance().getJahiaSitesService().get=
SiteByKey(p.getProperty("sitekey")) =3D=3D null) &&
- (ServicesRegistry.getInstance().getJahiaSitesService()=
.getSite(p.getProperty("siteservername")) =3D=3D null)) {
- createSite(request, jParams.getUser().getUsername(), p.get=
Property("sitetitle"),
- p.getProperty("siteservername"), p.getProperty("si=
tekey"), "", jParams.getLocale(), null, null, null, null, i, true);
+ importInfos.put("siteKeyExists", new Boolean(ServicesRegistry.=
getInstance().getJahiaSitesService().getSiteByKey((String) importInfos.get(=
"sitekey")) !=3D null));
+ importInfos.put("siteServerNameExists", new Boolean(ServicesRe=
gistry.getInstance().getJahiaSitesService().getSite((String) importInfos.ge=
t("siteservername")) !=3D null));
+ } catch (JahiaException e) {
+ e.printStackTrace(); //To change body of catch statement use =
File | Settings | File Templates.
+ }
+
+ return importInfos;
+ }
+
+ private void processFileImport(HttpServletRequest request,
+ HttpServletResponse response,
+ HttpSession session) throws IOException=
, ServletException {
+ Map importsInfos =3D (Map) session.getAttribute("importsInfos");
+ boolean stillBad =3D false;
+ for (Iterator iterator =3D importsInfos.keySet().iterator(); itera=
tor.hasNext();) {
+ File file =3D (File) iterator.next();
+ Map infos =3D (Map) importsInfos.get(file);
+ infos.put("sitekey", request.getParameter(file.getName()+"site=
Key"));
+ infos.put("siteservername", request.getParameter(file.getName(=
)+"siteServerName"));
+ infos.put("sitetitle", request.getParameter(file.getName()+"si=
teTitle"));
+ infos.put("selected", request.getParameter(file.getName()+"sel=
ected"));
+ infos.put("templates",request.getParameter(file.getName()+"tem=
plates"));
+
+ if (request.getParameter(file.getName()+"selected") !=3D null)=
{
+ try {
+ infos.put("siteKeyExists", new Boolean(ServicesRegistr=
y.getInstance().getJahiaSitesService().getSiteByKey((String) infos.get("sit=
ekey")) !=3D null));
+ infos.put("siteServerNameExists", new Boolean(Services=
Registry.getInstance().getJahiaSitesService().getSite((String) infos.get("s=
iteservername")) !=3D null));
+
+ if (Boolean.TRUE.equals(infos.get("siteKeyExists")) ||
+ Boolean.TRUE.equals(infos.get("siteServerNameE=
xists"))) {
+ stillBad =3D true;
+ }
+ } catch (JahiaException e) {
+ e.printStackTrace(); //To change body of catch statem=
ent use File | Settings | File Templates.
+ }
} else {
- logger.error("Site "+ p.getProperty("sitetitle") + " ("+p.=
getProperty("siteservername")+") already exists");
+ infos.put("siteKeyExists", Boolean.FALSE);
+ infos.put("siteServerNameExists", Boolean.FALSE);
+
}
- } catch (Throwable e) {
- logger.error("Cannot create site " + p.getProperty("sitetitle"=
), e);
+ }
+ if (stillBad) {
+ SharedTemplatePackagesRegistry tmplSetReg =3D SharedTemplatePa=
ckagesRegistry.getInstance();
+ Enumeration en =3D tmplSetReg.getAllTemplatePackages();
+ List list =3D new ArrayList();
+ while (en.hasMoreElements()) {
+ list.add(en.nextElement());
+ }
+ request.setAttribute("tmplSets", list);
+
+ JahiaAdministration.doRedirect(request, response, session, JSP=
_PATH + "import_choose.jsp");
+ } else {
+ for (Iterator iterator =3D importsInfos.keySet().iterator(); i=
terator.hasNext();) {
+ File file =3D (File) iterator.next();
+ if (request.getParameter(file.getName()+"selected") !=3D n=
ull) {
+ Map infos =3D (Map) importsInfos.get(file);
+ String tpl =3D (String) infos.get("templates");
+ if ("".equals(tpl)) tpl =3D null;
+ try {
+ createSite(request, jParams.getUser().getUsername(=
), (String) infos.get("sitetitle"),
+ (String) infos.get("siteservername"), (Str=
ing) infos.get("sitekey"), "", jParams.getLocale(), null, null, null, tpl, =
file, true);
+ } catch (Throwable e) {
+ logger.error("Cannot create site " + infos.get("si=
tetitle"), e);
+ }
+ }
+ }
+ redirectAfterAdd(request, response, session);
}
}
=
+ private void redirectAfterAdd(HttpServletRequest request, HttpServletR=
esponse response, HttpSession session) throws IOException, ServletException=
{
+ if (session.getAttribute(CLASS_NAME + "redirectToJahia") !=3D null=
) {
+ session.removeAttribute(CLASS_NAME + "redirectToJahia");
+ try {
+ List l =3D ServicesRegistry.getInstance().getSchedulerServ=
ice().getAllActiveJobsDetails();
+ if (!l.isEmpty()) {
+ JahiaAdministration.doRedirect(request, response, sess=
ion, JSP_PATH + "import_wait.jsp");
+ } else {
+ response.sendRedirect(request.getContextPath());
+ }
+ } catch (JahiaException e) {
+ logger.error("Cannot get jobs",e);
+ }
+ } else {
+ displayList(request, response, session);
+ }
+ }
// -------------------------- OTHER METHODS --------------------------
=
public void createSite(HttpServletRequest request, String root, String=
title, String serverName, String key,
@@ -2168,7 +2257,7 @@
site.setTemplatesAutoDeployMode(true);
site.setWebAppsAutoDeployMode(true);
session.setAttribute(CLASS_NAME + "newJahiaSite", site);
- session.setAttribute(CLASS_NAME + "defaultSite", Boolean.TRUE);
+ session.setAttribute(CLASS_NAME + "defaultSite", Boolean.FALSE);
session.setAttribute(CLASS_NAME + "existantAdminUser", null);
session.setAttribute(CLASS_NAME + "selectedLocale", locale);
session.setAttribute(CLASS_NAME + "jahiaLoginUsername", root);
@@ -2185,7 +2274,7 @@
=
if (templates !=3D null) {
SharedTemplatePackagesRegistry tmplSetReg =3D SharedTemplatePa=
ckagesRegistry.getInstance();
- JahiaTemplatesPackage pkg =3D tmplSetReg.getTemplatePackage(te=
mplates+".jar");
+ JahiaTemplatesPackage pkg =3D tmplSetReg.getTemplatePackage(te=
mplates);
String selectedTmplSet =3D "0";
if (pkg !=3D null) {
selectedTmplSet =3D ""+ pkg.getID();
Modified: trunk/core/src/java/org/jahia/services/importexport/ImportExportB=
aseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportExportBaseService.java&rev=3D18444&rep=
name=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
--- trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java (original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportExportBaseSer=
vice.java Fri Sep 14 12:27:24 2007
@@ -211,7 +211,7 @@
bw.write("JahiaRelease =3D " + JahiaInterface.RELEASE_NUMBER+"\n");
bw.write("Patch =3D " + JahiaInterface.PATCH_NUMBER+"\n");
bw.write("BuildNumber =3D " + JahiaInterface.BUILD_NUMBER+"\n");
- bw.write("ExportDate =3D " + new SimpleDateFormat("yyyy-MM-DD HH:m=
m:ss").format(new Date())+"\n");
+ bw.write("ExportDate =3D " + new SimpleDateFormat("yyyy-MM-dd HH:m=
m:ss").format(new Date())+"\n");
bw.flush();
=
JahiaSite s =3D processingContext.getSite();
Modified: trunk/core/src/webapp/jsp/jahia/administration/sites_management.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/sites_management.jsp&rev=3D18444&repname=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
--- trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp Fri=
Sep 14 12:27:24 2007
@@ -213,7 +213,7 @@
<br/><br/>
<fieldset>
<h4><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Ma=
nageSites.multipleimport.label"/></h4>
-<form name=3D"siteImport" action=3D'<%=3DJahiaAdministration.composeAction=
URL(request,response,"sites","&sub=3Dprocesssiteimport")%>' method=3D"post"=
enctype=3D"multipart/form-data">
+<form name=3D"siteImport" action=3D'<%=3DJahiaAdministration.composeAction=
URL(request,response,"sites","&sub=3Dprepareimport")%>' method=3D"post" enc=
type=3D"multipart/form-data">
=
<table border=3D"0" cellpadding=3D"5" cellspacing=3D"0" class=3D"topAl=
ignedTable">
<tr>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
