summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-04-13 09:48:46 (EDT)
committerpelder2006-04-13 09:48:46 (EDT)
commit203876711deb9f70d340fc617d2b9142ee58b5a6 (patch)
tree3a68a1f514db26f7bd4ad26ffc06880fa869a1b2
parent34509ad48a6d483c8eddf88cd1c2e25c27b1e77f (diff)
downloadorg.eclipse.jet-203876711deb9f70d340fc617d2b9142ee58b5a6.zip
org.eclipse.jet-203876711deb9f70d340fc617d2b9142ee58b5a6.tar.gz
org.eclipse.jet-203876711deb9f70d340fc617d2b9142ee58b5a6.tar.bz2
[136392]Update JET transforms to reflect tag library changes
-rw-r--r--plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.newproject_1.0.0.jarbin31186 -> 31052 bytes
-rw-r--r--plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.taglibdoc_1.0.0.jarbin32815 -> 32960 bytes
-rw-r--r--transforms/org.eclipse.jet.transforms.newproject/templates/project/dump.jet.jet4
-rw-r--r--transforms/org.eclipse.jet.transforms.newproject/templates/project/manifest.mf.jet1
-rw-r--r--transforms/org.eclipse.jet.transforms.taglibdoc/templates/control.jet13
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.newproject_1.0.0.jar b/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.newproject_1.0.0.jar
index 0c08755..9377e16 100644
--- a/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.newproject_1.0.0.jar
+++ b/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.newproject_1.0.0.jar
Binary files differ
diff --git a/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.taglibdoc_1.0.0.jar b/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.taglibdoc_1.0.0.jar
index 3956abd..a421722 100644
--- a/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.taglibdoc_1.0.0.jar
+++ b/plugins/org.eclipse.jet/transforms/plugins/org.eclipse.jet.transforms.taglibdoc_1.0.0.jar
Binary files differ
diff --git a/transforms/org.eclipse.jet.transforms.newproject/templates/project/dump.jet.jet b/transforms/org.eclipse.jet.transforms.newproject/templates/project/dump.jet.jet
index a8b699e..5ced365 100644
--- a/transforms/org.eclipse.jet.transforms.newproject/templates/project/dump.jet.jet
+++ b/transforms/org.eclipse.jet.transforms.newproject/templates/project/dump.jet.jet
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<dump node="/*" format="true" entities="true"/>
+<?xml version="1.0" encoding="utf-8"?>
+<c:dump select="/*" format="true" entities="true"/>
diff --git a/transforms/org.eclipse.jet.transforms.newproject/templates/project/manifest.mf.jet b/transforms/org.eclipse.jet.transforms.newproject/templates/project/manifest.mf.jet
index ddbed31..2845a67 100644
--- a/transforms/org.eclipse.jet.transforms.newproject/templates/project/manifest.mf.jet
+++ b/transforms/org.eclipse.jet.transforms.newproject/templates/project/manifest.mf.jet
@@ -5,6 +5,5 @@ Bundle-SymbolicName: <c:get select="$project/@name" />;singleton:=true
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-Vendor:
-JET2-TransformClass: <c:get select="$project/@templateLoader" />
Require-Bundle: org.eclipse.jet
Bundle-ClassPath: .,<c:get select="$project/@binDir"/>/
diff --git a/transforms/org.eclipse.jet.transforms.taglibdoc/templates/control.jet b/transforms/org.eclipse.jet.transforms.taglibdoc/templates/control.jet
index 82bb835..c6c4ef5 100644
--- a/transforms/org.eclipse.jet.transforms.taglibdoc/templates/control.jet
+++ b/transforms/org.eclipse.jet.transforms.taglibdoc/templates/control.jet
@@ -12,7 +12,8 @@
2) the ability to discover the project containing the input (plugin.xml)
We're not there yet.
--%>
-<c:setVariable var="pluginNS" select="'org.eclipse.jet'"/>
+<c:setVariable var="pluginNS" select="$org.eclipse.jet.resource.project.name"/>
+<c:setVariable var="docPlugin" select="concat($org.eclipse.jet.resource.project.name, '.doc')"/>
--- Define additional attributes for the current plugin element
@@ -23,9 +24,9 @@
--- Iterate over each nested tagLibrary element
<c:iterate select="$extension/tagLibrary" var="tagLibrary">
--- Define additional attributes for the current tagLibrary element
- <c:set select="$tagLibrary" name="htmlDir">html/reference/<c:get select="$tagLibrary/@id"/><%-- TODO format=QC --%></c:set>
+ <c:set select="$tagLibrary" name="htmlDir">references/taglibs/<c:get select="$tagLibrary/@id"/><%-- TODO format=QC --%></c:set>
<c:set select="$tagLibrary" name="tocXmlFile">toc<c:get select="$tagLibrary/@id"/><%-- TODO format="QC" --%>.xml</c:set>
- <c:set select="$tagLibrary" name="tocXmlDir">.</c:set>
+ <c:set select="$tagLibrary" name="tocXmlDir"></c:set>
<c:set select="$tagLibrary" name="tagPrefix"></c:set>
<c:if test="$tagLibrary/@standardPrefix">
<c:set select="$tagLibrary" name="tagPrefix"><c:get select="$tagLibrary/@standardPrefix"/>:</c:set>
@@ -71,13 +72,13 @@
--- Iterate over each nested tagLibrary element
<c:iterate select="$extension/tagLibrary" var="tagLibrary">
--- Generate artifacts for the current tagLibrary element
- <ws:file template="templates/tagLibrary/overview.html.jet" path="{$tagLibrary/@htmlDir}/overview.html" />
- <ws:file template="templates/tagLibrary/toc.xml.jet" path="{$tagLibrary/@tocXmlDir}/{$tagLibrary/@tocXmlFile}" />
+ <ws:file template="templates/tagLibrary/overview.html.jet" path="{$docPlugin}/{$tagLibrary/@htmlDir}/overview.html" />
+ <ws:file template="templates/tagLibrary/toc.xml.jet" path="{$docPlugin}/{$tagLibrary/@tocXmlDir}/{$tagLibrary/@tocXmlFile}" />
--- Iterate over each nested conditionalTag element
<c:iterate select="$tagLibrary/*[local-name() != 'description']" var="tag">
--- Generate artifacts for the current conditionalTag element
- <ws:file template="templates/allTags/tag.html.jet" path="{$tagLibrary/@htmlDir}/{$tag/@tagHtmlFile}"/>
+ <ws:file template="templates/allTags/tag.html.jet" path="{$docPlugin}/{$tagLibrary/@htmlDir}/{$tag/@tagHtmlFile}"/>
</c:iterate>
</c:iterate>