Author: sshyrkov
Date: Mon Nov 12 10:19:32 2007
New Revision: 19119
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19119&repname=
=3Djahia
Log:
Automatically rename template set and change root folder, if already exist
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/TemplatePackageDeployer.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/templates/TemplatePackageDeployer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/templates/TemplatePackageDepl=
oyer.java&rev=3D19119&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-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/TemplatePackageDeployer.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates/TemplatePackageDeployer.java Mon Nov 12 10:19:32 2007
@@ -135,11 +135,11 @@
* @return the name of the deployed package
*/
public String deployTemplatePackage(File templateJar, boolean renameIf=
Exists) {
- String deployedPackageName =3D null;
+ JahiaTemplatesPackage pkg =3D null;
try {
JahiaTemplatesPackageHandler packageHandler =3D new JahiaTempl=
atesPackageHandler(
templateJar);
- JahiaTemplatesPackage pkg =3D packageHandler.getPackage();
+ pkg =3D packageHandler.getPackage();
validatePackage(pkg);
if (pkg !=3D null) {
logger.debug("Template package found: " + pkg.getName());
@@ -147,13 +147,12 @@
&& !templatesFolderAlreadyExists(pkg.getRootFolder=
())) {
deployPackage(packageHandler);
templatePackageRegistry.register(pkg);
- deployedPackageName =3D pkg.getName();
} else {
if (renameIfExists) {
String postfix =3D DATE_FORMAT.format(new Date());
String pkgNameBase =3D pkg.getName() + "-" + postf=
ix;
- String rootFolderBase =3D pkg.getRootFolder()
- + "-" + postfix;
+ String rootFolderBase =3D pkg.getRootFolder() + "-"
+ + postfix;
String pkgName =3D pkgNameBase;
String rootFolder =3D rootFolderBase;
int postfixCounter =3D 0;
@@ -161,15 +160,16 @@
|| templatesFolderAlreadyExists(rootFolder=
)) {
++postfixCounter;
pkgName =3D pkgNameBase + "_" + postfixCounter;
- rootFolder =3D rootFolderBase + "_"
- + postfixCounter;
+ rootFolder =3D rootFolderBase + "_" + postfixC=
ounter;
}
=
- deployedPackageName =3D pkgName;
-
- // TODO implement renaming
- throw new UnsupportedOperationException(
- "Implement renaming");
+ // change package name and folder
+ pkg.setName(pkgName);
+ pkg.setRootFolder(rootFolder);
+
+ // reploy and register
+ deployPackage(packageHandler);
+ templatePackageRegistry.register(pkg);
} else {
logger.debug("Template package '" + pkg.getName()
+ "' already exists. Skipping.");
@@ -185,7 +185,7 @@
+ templateJar.getPath(), ex);
}
=
- return deployedPackageName;
+ return pkg !=3D null ? pkg.getName() : null;
}
=
private void validatePackage(JahiaTemplatesPackage pkg) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
