Author: tdraier
Date: Fri Sep 14 13:32:39 2007
New Revision: 18488
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18488&repname=
=3Djahia
Log:
allows old import file format (without site.properties) (JAHIA-2183) (port =
18340)
Modified:
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
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=3D18488&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=
3:32:39 2007
@@ -2080,12 +2080,13 @@
}
os.close();
=
- if (z.getName().equals("export.properties")) {
+ String n =3D z.getName();
+ if (n.equals("export.properties")) {
exportProps.load(new FileInputStream(i));
jParams.setAttribute("exportProps", exportProps);
i.delete();
=
- } else if (z.getName().equals("classes.jar")) {
+ } else if (n.equals("classes.jar")) {
// JahiaArchiveFileHandler h =3D new JahiaArchiveFi=
leHandler(i.getPath());
// try {
// h.unzip(Jahia.getSettings().getClassDiskPath=
(), false);
@@ -2093,7 +2094,7 @@
// logger.error("Cannot unzip classes",e);
// }
i.delete();
- } else if (z.getName().equals("site.properties")) {
+ } else if (n.equals("site.properties") || ((n.startsWi=
th("export_") && n.endsWith(".xml")))) {
// this is a single site import, stop everything a=
nd import
i.delete();
for (Iterator iterator =3D imports.iterator(); ite=
rator.hasNext();) {
@@ -2150,17 +2151,23 @@
}
}
if (!importInfos.containsKey("sitekey")) {
- logger.warn("Cannot create site - missing site.properties");
- return null;
- }
-
- try {
- 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.
+ importInfos.put("sitekey","");
+ importInfos.put("siteservername","");
+ importInfos.put("sitetitle","");
+ importInfos.put("description","");
+ importInfos.put("mixLanguage","false");
+ importInfos.put("selected", Boolean.TRUE);
+ importInfos.put("templates","");
+ importInfos.put("siteKeyExists", Boolean.TRUE);
+ importInfos.put("siteServerNameExists", Boolean.TRUE);
+ } else {
+ try {
+ importInfos.put("siteKeyExists", new Boolean(ServicesRegis=
try.getInstance().getJahiaSitesService().getSiteByKey((String) importInfos.=
get("sitekey")) !=3D null));
+ importInfos.put("siteServerNameExists", new Boolean(Servic=
esRegistry.getInstance().getJahiaSitesService().getSite((String) importInfo=
s.get("siteservername")) !=3D null));
+ } catch (JahiaException e) {
+ e.printStackTrace(); //To change body of catch statement =
use File | Settings | File Templates.
+ }
}
-
return importInfos;
}
=
@@ -2183,6 +2190,11 @@
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 ("".equals(infos.get("sitekey")) || "".equals(infos=
.get("siteservername")) || "".equals(infos.get("sitetitle"))) {
+ // todo display an error message
+ stillBad =3D true;
+ }
+
if (Boolean.TRUE.equals(infos.get("siteKeyExists")) ||
Boolean.TRUE.equals(infos.get("siteServerNameE=
xists"))) {
stillBad =3D true;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
