Author: tdraier
Date: Mon Aug 6 16:24:03 2007
New Revision: 18137
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18137&repname=
=3Djahia
Log:
added import selection screen - allows sitekey, name, and template set modi=
fication before import ( JAHIA-2109 , 2110 )
Added:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/i=
mport_choose.jsp
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ites_management.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=3D18=
137&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces.properties Mon Aug 6 16:24:03 2007
@@ -478,6 +478,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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&rev=
=3D18137&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_en.properties Mon Aug 6 16:24:03 2007
@@ -478,6 +478,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: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrati=
onResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&rev=
=3D18137&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaAdministrationReso=
urces_fr.properties Mon Aug 6 16:24:03 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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/=
ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D18137&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/java/org/jahia/admin/sites/Manage=
Sites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java Mon Aug 6 16:24:03 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;
@@ -195,8 +194,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
=
@@ -868,9 +869,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();
=
@@ -1108,6 +1106,7 @@
dav.commitTransaction();
jobDataMap.put(ImportJob.URI, path+"/"+uploadname);
jobDataMap.put(ImportJob.FILENAME, initialZip.getN=
ame());
+ jobDataMap.put(ImportJob.FILENAME, initialZip.getN=
ame());
jobDataMap.put(ImportJob.CONTENT_TYPE, "applicatio=
n/zip");
Set locks =3D new HashSet();
LockKey lock =3D LockKey.composeLockKey(LockKey.IM=
PORT_ACTION + "_SITE", site.getID(), site.getID());
@@ -2021,7 +2020,7 @@
}
=
=
- private void processSiteImport(HttpServletRequest request,
+ private void prepareMultipleImport(HttpServletRequest request,
HttpServletResponse response,
HttpSession session) throws IOException=
, ServletException {
FileUpload fileUpload =3D ((ParamBean) jParams).getFileUpload();
@@ -2030,7 +2029,7 @@
Iterator iterator =3D filesName.iterator();
if (iterator.hasNext()) {
File f =3D fileUpload.getFile((String) iterator.next());
- processFileImport(f, request);
+ prepareFileImports(f, request);
}
=
}
@@ -2038,33 +2037,26 @@
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");
- 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);
}
+
+ 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;
@@ -2083,13 +2075,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
@@ -2099,7 +2092,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);
@@ -2107,39 +2103,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);
+ }
+ }
+ if (!importInfos.containsKey("sitekey")) {
+ logger.warn("Cannot create site - missing site.properties");
+ return null;
}
- Properties p =3D new Properties();
- p.load(zis2);
- zis2.closeEntry();
+
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);
+
+ }
+ }
+ 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());
}
- } catch (Throwable e) {
- logger.error("Cannot create site " + p.getProperty("sitetitle"=
), e);
+ 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 --------------------------
=
/**
@@ -2203,7 +2296,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: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/ImportExportBaseServi=
ce.java&rev=3D18137&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportExportBaseService.java Mon Aug 6 16:24:03 2007
@@ -210,7 +210,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();
Added: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administratio=
n/import_choose.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/import_choose.jsp&r=
ev=3D18137&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/i=
mport_choose.jsp (added)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/i=
mport_choose.jsp Mon Aug 6 16:24:03 2007
@@ -0,0 +1,174 @@
+<%--
+Copyright 2002-2006 Jahia Ltd
+
+Licensed under the JAHIA SUSTAINABLE SOFTWARE LICENSE (JSSL),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
+
+ http://www.jahia.org/license/
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%><[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.bin.JahiaAdministration"%>
+<%@ page import=3D"org.jahia.params.ProcessingContext"%>
+<%@ page import=3D"org.jahia.services.pages.ContentPage"%>
+<%@ page import=3D"java.text.DateFormat" %>
+<%@ page import=3D"java.text.SimpleDateFormat" %>
+<%@ page import=3D"java.io.File" %>
+<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"org.jahia.data.templates.JahiaTemplatesPackage" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
+<%@ taglib prefix=3D"c" uri=3D"/WEB-INF/etc/taglibs/jstl/c.tld" %>
+
+<%
+ Map importsInfos =3D (Map) session.getAttribute("importsInfos");
+ List tpls =3D (List) request.getAttribute("tmplSets");
+ JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.data.J=
ahiaData");
+ ProcessingContext jParams =3D null;
+ if (jData !=3D null) {
+ jParams =3D jData.params();
+ }
+%>
+
+<div id=3D"topTitle">
+ <div id=3D"topTitleLogo">
+ <img name=3D"virtual_sites" src=3D"<%=3DURL%>images/icons/admin/envi=
ronment.gif" width=3D"48" height=3D"48" border=3D"0" />
+ </div>
+ <h1 id=3D"topTitleLabel"><jahia:adminResourceBundle resourceName=3D"org.=
jahia.admin.site.ManageSites.manageVirtualSites.label"/></h1>
+</div>
+
+<div id=3D"adminMainContent">
+
+ <h2><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Ma=
nageSites.multipleimport.list"/> :</h2>
+ <table class=3D"evenOddTable" border=3D"0" cellpadding=3D"5" cellspaci=
ng=3D"0" width=3D"100%">
+ <thead>
+ <tr>
+ <th width=3D"5%"> </th>
+ <th width=3D"95%"><jahia:adminResourceBundle resourceN=
ame=3D"org.jahia.admin.name.label"/></th>
+ <!--<th width=3D"15%"><jahia:adminResourceBundle resou=
rceName=3D"org.jahia.admin.edit.label"/></th>-->
+ <!--<th width=3D"15%"><jahia:adminResourceBundle resou=
rceName=3D"org.jahia.admin.site.ManageSites.export.label"/></th>-->
+ </tr>
+ </thead>
+ <form name=3D"main">
+ <input type=3D"hidden" name=3D"do" value=3D"sites"/>
+ <input type=3D"hidden" name=3D"sub" value=3D"processimport"/>
+ <tbody>
+ <%
+ int lineCounter =3D 0;
+ for (Iterator iterator =3D importsInfos.keySet().ite=
rator(); iterator.hasNext();) {
+ File file =3D (File) iterator.next();
+ Map infos =3D (Map) importsInfos.get(file);
+ String siteKey =3D file.getName();
+ String lineClass =3D "oddLine";
+ if (lineCounter % 2 =3D=3D 0) {
+ lineClass =3D "evenLine";
+ }
+ lineCounter++; %>
+ <tr class=3D"<%=3DlineClass%>">
+ <td><input type=3D"checkbox" name=3D"<%=3D=
file.getName()%>selected" value=3D"on" <% if (infos.get("selected")!=3Dnull=
) {%>checked<% } %>></td>
+ <td>
+ <table border=3D"0" cellpadding=3D"0" width=3D"100%">
+ <tr>
+ <td>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.a=
dmin.site.ManageSites.siteTitle.label"/>*
+ </td>
+ <td>
+ <input class=3D"input" type=3D"text" name=3D"<%=3Dsite=
Key+"siteTitle"%>" value=3D"<%=3Dinfos.get("sitetitle")%>" size=3D"<%=3Dinp=
utSize%>">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.a=
dmin.site.ManageSites.siteServerName.label"/>*
+ <% if (Boolean.TRUE.equals(infos.get("siteServerNameEx=
ists"))) { %>
+ <div class=3D"error"><jahia:adminResourceBundle resour=
ceName=3D"org.jahia.admin.warningMsg.chooseAnotherServerName.label"/></div>
+ <% } %>
+ </td>
+ <td>
+ <input class=3D"input" type=3D"text" name=3D"<%=3Dsite=
Key+"siteServerName"%>" value=3D"<%=3D infos.get("siteservername") %>" size=
=3D"<%=3DinputSize%>">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.a=
dmin.site.ManageSites.siteKey.label"/>*
+ <% if (Boolean.TRUE.equals(infos.get("siteKeyExists"))=
) { %>
+ <div class=3D"error"><jahia:adminResourceBundle resour=
ceName=3D"org.jahia.admin.warningMsg.chooseAnotherSiteKey.label"/></div>
+ <% } %>
+ </td>
+ <td>
+ <input class=3D"input" type=3D"text" name=3D"<%=3Dsite=
Key+"siteKey"%>" value=3D"<%=3D infos.get("sitekey") %>" size=3D"<%=3Dinput=
Size%>">
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <jahia:adminResourceBundle resourceName=3D"org.jah=
ia.admin.site.ManageSites.pleaseChooseTemplateSet.label"/>
+ </td>
+ <td>
+ <select name=3D"<%=3DsiteKey + "templates"%>">
+ <% if (infos.get("templatesAvailable")!=3D null) {=
%>
+ <option value=3D"" <% if ("".equals(infos.get("tem=
plates"))) {%>selected<% } %>><jahia:adminResourceBundle resourceName=3D"or=
g.jahia.admin.site.ManageSites.multipleimport.defaultTemplate"/></option>
+ <%}
+ for (Iterator iterator1 =3D tpls.iterator(); i=
terator1.hasNext();) {
+ JahiaTemplatesPackage pack =3D (JahiaTempl=
atesPackage) iterator1.next();
+ %> <option value=3D"<%=3Dpack.getFileName(=
)%>" <% if (pack.getFileName().equals(infos.get("templates"))) {%>selected<=
% } %>><%=3Dpack.getName()%></option>
+ <%
+ }
+ %>
+ </select>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <%
+ } %>
+ </tbody>
+ </form>
+</table>
+
+ <br />
+
+ <div class=3D"buttonList" style=3D"text-align:right">
+ <!--<div class=3D"button">-->
+<%----%>
+ <!--<a href=3D"javascript:siteImport.submit()">-->
+ <!--<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s=
ite.ManageSites.fileImport.label"/>-->
+ <!--</a>-->
+ <!--</div>-->
+ <div class=3D"button">
+ <a href=3D'javascript:document.main.submit()'>
+ <jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.=
ManageSites.fileImport.label"/>
+ </a>
+ </div>
+ </div>
+<br/><br/>
+
+<%
+ if (session.getAttribute(JahiaAdministration.CLASS_NAME + "redirectToJ=
ahia") =3D=3D null) {
+%>
+
+ <div id=3D"operationMenu">
+ <div id=3D"operationMenuLabel">
+ <jahia:adminResourceBundle
resourceName=3D"org.jahia.admin.otherOperati=
ons.label"/> :
+ </div>
+ <ul id=3D"operationList">
+ <li class=3D"operationEntry">
+ <a class=3D"operationLink" href=3D'<%=3DJahiaAdministratio=
n.composeActionURL(request,response,"sites","&sub=3Dlist")%>'><jahia:adminR=
esourceBundle resourceName=3D"org.jahia.admin.site.ManageSites.backToSitesL=
ist.label"/></a>
+ </li>
+ <li class=3D"operationEntry">
+ <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle =
resourceName=3D"org.jahia.admin.backToMenu.label"/></a>
+ </li>
+ </ul>
+ </div>
+<%
+ }
+%>
+
+</div>
+
+<[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/footer.inc"%>
\ No newline at end of file
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administra=
tion/sites_management.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/administration/sites_management.jsp&rev=
=3D18137&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
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ites_management.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/administration/s=
ites_management.jsp Mon Aug 6 16:24:03 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
