Author: rfelden
Date: Fri Jun 15 16:45:42 2007
New Revision: 59
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D59&repname=3D=
jahia_upgrade
Log:
apply : merge utils now working for .properties and .xml
Removed:
trunk/apply/utils/src/main/java/org/jahia/utils/configuration/
Modified:
trunk/apply/fixapplier/src/main/java/org/jahia/fixapplier/controller/My=
Controller.java
Modified: trunk/apply/fixapplier/src/main/java/org/jahia/fixapplier/control=
ler/MyController.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/apply/fixapplie=
r/src/main/java/org/jahia/fixapplier/controller/MyController.java&rev=3D59&=
repname=3Djahia_upgrade
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/apply/fixapplier/src/main/java/org/jahia/fixapplier/controller/My=
Controller.java (original)
+++ trunk/apply/fixapplier/src/main/java/org/jahia/fixapplier/controller/My=
Controller.java Fri Jun 15 16:45:42 2007
@@ -8,7 +8,7 @@
import org.jahia.fixapplier.views.ViewAdapter;
import org.jahia.fixapplier.views.gui.MainWindow;
import org.jahia.utils.StringUtils;
-import org.jahia.utils.configuration.Merger;
+import org.jahia.utils.merge.PropertiesMerger;
import org.jahia.utils.appcast.MyAppcastHandler;
import org.jahia.utils.appcast.Appcast;
import org.jahia.utils.appcast.AppcastItem;
@@ -544,7 +544,7 @@
}
=
/**
- * This concerns the configuration file merging. It checks a given upd=
ate file and its existing copy,
+ * This concerns the merge file merging. It checks a given update file=
and its existing copy,
* and modifies the processed file resulting from the smart merge betw=
een these two. To do so, it uses
* the .old file that should be included if merging has to be done.
* This method uses side-effect, changing the File update if necessary.
@@ -553,7 +553,7 @@
* @param existing the file to update (not always existing)
*/
private void checkConfiguration(File update, File existing) {
- // if this does not concern configuration, abort
+ // if this does not concern merge, abort
if (!(update.getName().endsWith(".properties") ||
update.getName().endsWith(".xml") ||
update.getName().endsWith(".plist"))) {
@@ -572,8 +572,8 @@
=
// now the hard part TODO OOO OOO
File old =3D new File(update.getParentFile(), update.getName()+".o=
ld") ;
- if (Merger.mergeConfiguration(update, old, existing)) {
- out("configuration merging for the file '"+update.getName()+"'=
encountered issues");
+ if (PropertiesMerger.merge(update, old, existing)) {
+ out("merge merging for the file '"+update.getName()+"' encount=
ered issues");
}
=
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
