Author: rfelden
Date: Thu Jul 19 11:10:42 2007
New Revision: 7
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D7&repname=3Df=
ix_create
Log:
fixed precompiled jsp name translation bug
Modified:
trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java
Modified: trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/My=
Controller.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/fixcreator/src/=
main/java/org/jahia/fixcreator/controller/MyController.java&rev=3D7&repname=
=3Dfix_create
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java (original)
+++ trunk/fixcreator/src/main/java/org/jahia/fixcreator/controller/MyContro=
ller.java Thu Jul 19 11:10:42 2007
@@ -1588,19 +1588,17 @@
fileNameWithoutExtension =3D StringUtils.replaceAllTokens(=
fileNameWithoutExtension, "-", "_002d") ;
fileNameWithoutExtension =3D fileNameWithoutExtension + "_=
jsp" ;
=
- bindedBuildPath =3D StringUtils.replaceAllTokens(bindedBui=
ldPath, "_", "_005f") ;
- bindedBuildPath =3D StringUtils.replaceAllTokens(bindedBui=
ldPath, "-", "_002d") ;
- bindedTargetPath =3D StringUtils.replaceAllTokens(bindedTa=
rgetPath, "_", "_005f") ;
- bindedTargetPath =3D StringUtils.replaceAllTokens(bindedTa=
rgetPath, "-", "_002d") ;
+ String lastBuildComp =3D StringUtils.cleanBeforeFirstToken=
(bindedBuildPath, currentBinding.getBuildPath(), false) ;
+ String lastTargetComp =3D StringUtils.cleanBeforeFirstToke=
n(bindedTargetPath, currentBinding.getTargetPath(), false) ;
=
- if (bindedBuildPath.contains("WEB_002dINF")) {
- bindedBuildPath =3D StringUtils.replaceAllTokens(binde=
dBuildPath, "WEB_002dINF", "WEB-INF") ;
- }
+ String lastBuildCompEdited =3D StringUtils.replaceAllToken=
s(lastBuildComp, "_", "_005f") ;
+ String lastTargetCompEdited =3D StringUtils.replaceAllToke=
ns(lastTargetComp, "_", "_005f") ;
=
- if (bindedTargetPath.contains("WEB_002dINF")) {
- bindedTargetPath =3D StringUtils.replaceAllTokens(bind=
edTargetPath, "WEB_002dINF", "WEB-INF") ;
- }
+ bindedBuildPath =3D StringUtils.replaceFirstToken(bindedBu=
ildPath, lastBuildComp, lastBuildCompEdited) ;
+ bindedTargetPath =3D StringUtils.replaceFirstToken(bindedT=
argetPath, lastTargetComp, lastTargetCompEdited) ;
}
+
+ // if there is a linked file (hibernate mapping) get it as well
String bindedLinkedPath =3D null ;
if (hbmName !=3D null) {
bindedLinkedPath =3D StringUtils.replaceFirstToken(parentP=
ath, currentBinding.getSourcePath(), currentBinding.getLinkedPath()) ;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
