Author: rfelden
Date: Wed Jun 20 16:29:26 2007
New Revision: 4
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D4&repname=3Df=
ix_apply
Log:
wrong commit, re-refactoring
Modified:
trunk/fixapplier/src/main/java/org/jahia/fixapplier/controller/MyContro=
ller.java
Modified: trunk/fixapplier/src/main/java/org/jahia/fixapplier/controller/My=
Controller.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixapplier/src/=
main/java/org/jahia/fixapplier/controller/MyController.java&rev=3D4&repname=
=3Dfix_apply
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/fixapplier/src/main/java/org/jahia/fixapplier/controller/MyContro=
ller.java (original)
+++ trunk/fixapplier/src/main/java/org/jahia/fixapplier/controller/MyContro=
ller.java Wed Jun 20 16:29:26 2007
@@ -544,11 +544,7 @@
=
// file processing
} else {
- // jahia specific treatment
- if (neu.getName().equals("jahia.skeleton")) {
- jahiaSkeletonTreatment(neu);
- }
- else if (neu.getName().endsWith(".old")) {
+ if (neu.getName().endsWith(".old")) {
return ;
}
String targetPath =3D StringUtils.replaceFirstToken(neu.getAbs=
olutePath(), dataModel.temp().getAbsolutePath() + File.separator + "output"=
, dataModel.getProject().getAbsolutePath()) ;
@@ -566,25 +562,6 @@
}
=
/**
- * Jahia-specific method to merge changes made to jahia.skeleton (-> j=
ahia.properties).
- * @param skeleton the jahia.skeleton file
- */
- private void jahiaSkeletonTreatment(File skeleton) {
- String targetPath =3D StringUtils.replaceFirstToken(skeleton.getAb=
solutePath(), dataModel.temp().getAbsolutePath() + File.separator + "output=
", dataModel.getProject().getAbsolutePath()) ;
- targetPath =3D StringUtils.replaceLastToken(targetPath, "jahia.ske=
leton", "jahia.properties") ;
- File destination =3D new File(targetPath) ;
-
- // this is the text merge
- checkConfiguration(skeleton, destination) ;
-
- File parentPath =3D destination.getParentFile() ;
- parentPath.mkdirs() ;
- Tools.copy(skeleton, destination) ;
- out(skeleton.getName() + " replaced (jahia.properties)");
- printUI(" " + skeleton.getName() + " replaced (jahia.properties)=
");
- }
-
- /**
* 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.
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
