diff options
| author | Scott Barta <sbarta@google.com> | 2013-07-01 16:33:44 -0700 |
|---|---|---|
| committer | Scott Barta <sbarta@google.com> | 2013-07-01 16:35:22 -0700 |
| commit | 474e48bbd2b45e3c40734ffa7f2f1b557ef4e5d5 (patch) | |
| tree | bb361e68a4fd5f20bf62fc56325789a157db4cab /templates/activities/MasterDetailFlow | |
| parent | f77612d75aa609a26a741b4b6b5cd62b4de2fd82 (diff) | |
| download | sdk-474e48bbd2b45e3c40734ffa7f2f1b557ef4e5d5.zip sdk-474e48bbd2b45e3c40734ffa7f2f1b557ef4e5d5.tar.gz sdk-474e48bbd2b45e3c40734ffa7f2f1b557ef4e5d5.tar.bz2 | |
Escaping for pathnames in template XML files
Does proper XML escaping in Freemarker XML templates to
avoid problems with pathnames that contain XML-sensitive
characters.
Change-Id: I1f191ccabd0c81af821c7bbdf88bbb23ba42ff9c
Diffstat (limited to 'templates/activities/MasterDetailFlow')
| -rw-r--r-- | templates/activities/MasterDetailFlow/recipe.xml.ftl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/templates/activities/MasterDetailFlow/recipe.xml.ftl b/templates/activities/MasterDetailFlow/recipe.xml.ftl index c06e517..4b39f74 100644 --- a/templates/activities/MasterDetailFlow/recipe.xml.ftl +++ b/templates/activities/MasterDetailFlow/recipe.xml.ftl @@ -1,32 +1,32 @@ <?xml version="1.0"?> <recipe> <merge from="AndroidManifest.xml.ftl" - to="${manifestOut}/AndroidManifest.xml" /> + to="${escapeXmlAttribute(manifestOut)}/AndroidManifest.xml" /> <merge from="res/values-large/refs.xml.ftl" - to="${resOut}/values-large/refs.xml" /> + to="${escapeXmlAttribute(resOut)}/values-large/refs.xml" /> <merge from="res/values-sw600dp/refs.xml.ftl" - to="${resOut}/values-sw600dp/refs.xml" /> + to="${escapeXmlAttribute(resOut)}/values-sw600dp/refs.xml" /> <merge from="res/values/strings.xml.ftl" - to="${resOut}/values/strings.xml" /> + to="${escapeXmlAttribute(resOut)}/values/strings.xml" /> <instantiate from="res/layout/activity_content_detail.xml.ftl" - to="${resOut}/layout/activity_${detail_name}.xml" /> + to="${escapeXmlAttribute(resOut)}/layout/activity_${detail_name}.xml" /> <instantiate from="res/layout/activity_content_list.xml.ftl" - to="${resOut}/layout/activity_${collection_name}.xml" /> + to="${escapeXmlAttribute(resOut)}/layout/activity_${collection_name}.xml" /> <instantiate from="res/layout/activity_content_twopane.xml.ftl" - to="${resOut}/layout/activity_${extractLetters(objectKind?lower_case)}_twopane.xml" /> + to="${escapeXmlAttribute(resOut)}/layout/activity_${extractLetters(objectKind?lower_case)}_twopane.xml" /> <instantiate from="res/layout/fragment_content_detail.xml.ftl" - to="${resOut}/layout/fragment_${detail_name}.xml" /> + to="${escapeXmlAttribute(resOut)}/layout/fragment_${detail_name}.xml" /> <instantiate from="src/app_package/ContentDetailActivity.java.ftl" - to="${srcOut}/${DetailName}Activity.java" /> + to="${escapeXmlAttribute(srcOut)}/${DetailName}Activity.java" /> <instantiate from="src/app_package/ContentDetailFragment.java.ftl" - to="${srcOut}/${DetailName}Fragment.java" /> + to="${escapeXmlAttribute(srcOut)}/${DetailName}Fragment.java" /> <instantiate from="src/app_package/ContentListActivity.java.ftl" - to="${srcOut}/${CollectionName}Activity.java" /> + to="${escapeXmlAttribute(srcOut)}/${CollectionName}Activity.java" /> <instantiate from="src/app_package/ContentListFragment.java.ftl" - to="${srcOut}/${CollectionName}Fragment.java" /> + to="${escapeXmlAttribute(srcOut)}/${CollectionName}Fragment.java" /> <instantiate from="src/app_package/dummy/DummyContent.java.ftl" - to="${srcOut}/dummy/DummyContent.java" /> + to="${escapeXmlAttribute(srcOut)}/dummy/DummyContent.java" /> </recipe> |