Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-11-12 10:42:41 +0000
committerEike Stepper2013-11-12 10:42:41 +0000
commitb1628d46970ed3b80b37ebff6ff27f6d94767677 (patch)
treed6a051a1fb0ae0e37316eb7407669b9a6af0f791 /plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
parent953fed8152c7a0b5f1045f22ac7fabf7fc74d3e9 (diff)
downloadcdo-b1628d46970ed3b80b37ebff6ff27f6d94767677.tar.gz
cdo-b1628d46970ed3b80b37ebff6ff27f6d94767677.tar.xz
cdo-b1628d46970ed3b80b37ebff6ff27f6d94767677.zip
Adjust Javadocs to JDK 7
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant28
1 files changed, 21 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant b/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
index 5c0aded92b..840f0e0ea5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
@@ -13,12 +13,12 @@
<!-- GENERATION WARNING -->
- <property file="${user.home}/org.eclipse.emf.cdo.releng.doc_4.2.properties" />
+ <property file="${user.home}/org.eclipse.emf.cdo.releng.doc_4.3.properties" />
<property name="path.tp" value=".buckminster/tp" />
<property name="path.supplemental" value="${user.home}/git/local/org.eclipse.emf.cdo.releng.doc.supplemental" />
<property name="jdk.link" value="http://download.oracle.com/javase/1.5.0/docs/api" />
- <property name="emf.link" value="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0" />
+ <property name="emf.link" value="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0" />
<property name="platform.link" value="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api" />
<property name="platform.api" location="plugins/org.eclipse.emf.cdo.releng.doc/package-lists/platform" />
@@ -143,29 +143,43 @@
<replaceregexp match="&lt;!-- Generated by javadoc .*--&gt;" replace="">
<fileset refid="desthtml" />
</replaceregexp>
- <replaceregexp match="CONTENT=&quot;[^&quot;]+&quot;" replace="CONTENT=&quot;&quot;">
+ <replaceregexp match="content=&quot;[^&quot;]+&quot;" replace="content=&quot;&quot;">
<fileset refid="desthtml" />
</replaceregexp>
<!-- Add book.css -->
- <replaceregexp match="(&lt;LINK REL =&quot;stylesheet&quot; TYPE=&quot;text/css&quot; HREF=&quot;([\./]*)stylesheet.css&quot; TITLE=&quot;Style&quot;&gt;)"
- replace="&lt;LINK REL =&quot;stylesheet&quot; TYPE=&quot;text/css&quot; HREF=&quot;\2../html/book.css&quot; TITLE=&quot;Style&quot;&gt;${line.separator}\1">
- <fileset refid="desthtml" />
+ <replaceregexp match="(&lt;LINK REL=&quot;stylesheet&quot; TYPE=&quot;text/css&quot; HREF=&quot;([\./]*)stylesheet.css&quot; TITLE=&quot;Style&quot;&gt;)"
+ replace="&lt;LINK REL=&quot;stylesheet&quot; TYPE=&quot;text/css&quot; HREF=&quot;\2../html/book.css&quot; TITLE=&quot;Style&quot;&gt;${line.separator}\1">
+ <fileset refid="desthtml" />
+ </replaceregexp>
+ <replaceregexp match="(&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;([\./]*)stylesheet.css&quot; title=&quot;style&quot;&gt;)"
+ replace="&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;\2../html/book.css&quot; title=&quot;style&quot;&gt;${line.separator}\1">
+ <fileset refid="desthtml" />
</replaceregexp>
<!-- Remove malicious PRE blocks -->
<replaceregexp match="&lt;HR&gt;\s+?&lt;DL&gt;\s+?&lt;DT&gt;&lt;PRE&gt;(.*?)&lt;/DL&gt;\s+?&lt;/PRE&gt;"
replace="&lt;HR&gt;${line.separator}&lt;DL&gt;${line.separator} &lt;DT&gt;\1${line.separator}&lt;/DL&gt;${line.separator}${line.separator}">
- <fileset refid="desthtml" />
+ <fileset refid="desthtml" />
+ </replaceregexp>
+ <replaceregexp match="&lt;hr&gt;\s+?&lt;dl&gt;\s+?&lt;dt&gt;&lt;pre&gt;(.*?)&lt;/dl&gt;\s+?&lt;/pre&gt;"
+ replace="&lt;hr&gt;${line.separator}&lt;dl&gt;${line.separator} &lt;dt&gt;\1${line.separator}&lt;/dl&gt;${line.separator}${line.separator}">
+ <fileset refid="desthtml" />
</replaceregexp>
<!-- Change DT to DD -->
<replaceregexp match="&lt;DT&gt;extends " replace="${line.separator} &lt;DD&gt;extends ">
<fileset refid="desthtml" />
</replaceregexp>
+ <replaceregexp match="&lt;dt&gt;extends " replace="${line.separator} &lt;dd&gt;extends ">
+ <fileset refid="desthtml" />
+ </replaceregexp>
<replaceregexp match="&lt;DT&gt;implements " replace="${line.separator} &lt;DD&gt;implements ">
<fileset refid="desthtml" />
</replaceregexp>
+ <replaceregexp match="&lt;dt&gt;implements " replace="${line.separator} &lt;dd&gt;implements ">
+ <fileset refid="desthtml" />
+ </replaceregexp>
<java classname="org.eclipse.emf.cdo.releng.doc.java.MakeHrefsRelative"
dir="${basedir}"

Back to the top