Skip to content

Commit a9b98f5

Browse files
authored
manage javadoc content with ee9 (#88)
Signed-off-by: Olivier Lamy <[email protected]>
1 parent 05aa2f7 commit a9b98f5

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

src/main/java/org/eclipse/jetty/toolchain/modifysources/ModifyEE9ToEE8.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,9 @@ public Visitable visit(JavadocComment n, Void arg) {
473473
if (StringUtils.contains(n.getContent(), "Jakarta")) {
474474
n.setContent(StringUtils.replace(n.getContent(),"Jakarta", "Javax"));
475475
}
476+
if (StringUtils.contains(n.getContent(), "ee9")) {
477+
n.setContent(StringUtils.replace(n.getContent(),"ee9", "ee8"));
478+
}
476479
return super.visit(n, arg);
477480
}
478481

src/test/resources/project-modify/src/main/java/org/eclipse/jetty/ee9/jakarta/nested/JakartaScanner.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ public synchronized int getScanInterval()
192192

193193
/**
194194
* Set the scan interval
195+
*
195196
* @param scanInterval pause between scans in seconds, or 0 for no scan after the initial scan.
197+
*
196198
*/
197199
public synchronized void setScanInterval(int scanInterval)
198200
{
@@ -204,6 +206,21 @@ public synchronized void setScanInterval(int scanInterval)
204206

205207
}
206208

209+
/**
210+
* Check to see if there have been any bundle symbolic names added of bundles that should be
211+
* regarded as being on the container classpath, and scanned for fragments, tlds etc etc.
212+
* This can be defined in:
213+
* <ol>
214+
* <li>SystemProperty SYS_PROP_TLD_BUNDLES</li>
215+
* <li>DeployerManager.setContextAttribute CONTAINER_BUNDLE_PATTERN</li>
216+
* </ol>
217+
*
218+
* We also allow individual bundles to specify particular bundles that might include TLDs via the Require-Tlds
219+
* MANIFEST.MF header.
220+
*
221+
* @see org.eclipse.jetty.ee9.webapp.WebInfConfiguration#preConfigure(org.eclipse.jetty.ee9.webapp.WebAppContext)
222+
*/
223+
@Override
207224
public void setScanDirs (List<File> dirs)
208225
{
209226
_scanDirs.clear();

0 commit comments

Comments
 (0)