Remove noise from aspectj_1_5_0.dtd

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

1 files changed, 47 insertions, 68 deletions

diff --git a/weaver/src/main/resources/aspectj_1_5_0.dtd b/weaver/src/main/resources/aspectj_1_5_0.dtd
index 1e9fb8a91..12693f7e0 100644
--- a/weaver/src/main/resources/aspectj_1_5_0.dtd
+++ b/weaver/src/main/resources/aspectj_1_5_0.dtd
@@ -1,5 +1,5 @@
-<!--*****************************************************************************************************************************
-/*******************************************************************************
+<!--
+ ****************************************************************
  * Copyright (c) 2005 Contributors.
  * All rights reserved.
  * This program and the accompanying materials are made available
@@ -9,99 +9,84 @@
  *
  * Contributors:
  *   Alexandre Vasseur         initial implementation
- *******************************************************************************/
+ ****************************************************************
+
 AspectJ 5 DTD
 
-To use this DTD, start your defintion file with
-	<!DOCTYPE aspectj PUBLIC
-	    "-//AspectJ//DTD 1.5.0//EN"
-	    "http://.../dtd/aspectj_1_5_0.dtd">
+To use this DTD, start your definition file with
+  <!DOCTYPE aspectj PUBLIC
+    "-//AspectJ//DTD 1.5.0//EN"
+    "https://eclipse.dev/aspectj/dtd/aspectj_1_5_0.dtd">
 
-You can also use the "aliasing DTD" that matchs always the latest release of AspectJ
-<!DOCTYPE aspectj PUBLIC
+You can also use the "aliasing DTD" that matches always the latest release of AspectJ
+  <!DOCTYPE aspectj PUBLIC
     "-//AspectJ//DTD//EN"
-    "http://.../dtd/aspectj.dtd">
+    "https://eclipse.dev/aspectj/dtd/aspectj.dtd">
 
 To not use this DTD, start your definition file with
-	<?xml version="1.0"?>
-
-******************************************************************************************************************************-->
+  <?xml version="1.0"?>
+-->
 
-
-<!--*****************************************************************************************************************************
-aspectj
-*********************************************************************************************************************************
+<!--
 [aspectj] defines the root element
-******************************************************************************************************************************-->
+-->
 <!ELEMENT aspectj (
     weaver?,
     aspects?
 )>
-<!--*****************************************************************************************************************************
-weaver
-*********************************************************************************************************************************
+<!--
 [weaver] defines the weaver configuration
 @options defines a command like line of option
-    When multiple aspectj DD are found, the options are simply toggled
-    TODO: Note: the scope of the options can be ClassLoader aware but should be assumed JVM wide
-******************************************************************************************************************************-->
+  When multiple aspectj DD are found, the options are simply toggled
+  TODO: Note: the scope of the options can be ClassLoader aware but should be assumed JVM wide
+-->
 <!ELEMENT weaver (
     (include | exclude | dump)*
 )>
 <!ATTLIST weaver
     options CDATA #IMPLIED
 >
-<!--*****************************************************************************************************************************
-include
-*********************************************************************************************************************************
+<!--
 [include] narrows the scope of the weaver
 A class must be matched by ALL the include elements to be exposed to the weaver
 @within defines a type pattern
-    (it is not a startWith)
-******************************************************************************************************************************-->
+  (it is not a startWith)
+-->
 <!ELEMENT include EMPTY>
 <!ATTLIST include
     within CDATA #REQUIRED
 >
-<!--*****************************************************************************************************************************
-exclude
-*********************************************************************************************************************************
+<!--
 [exclude] narrows the scope of the weaver
 A class must be matched by NONE of the exclude elements to be exposed to the weaver
 @within defines a type pattern
-    (it is not a startWith)
-    TODO should it be called @from: "<exclude from=..>  instead of <exclude within=..>
-    TODO: AND must be written that way and not with the "&&" symbol. Thus NOT and OR exists as well.
-******************************************************************************************************************************-->
+  (it is not a startWith)
+  TODO should it be called @from: "<exclude from=..>  instead of <exclude within=..>
+  TODO: AND must be written that way and not with the "&&" symbol. Thus NOT and OR exists as well.
+-->
 <!ELEMENT exclude EMPTY>
 <!ATTLIST exclude
     within CDATA #REQUIRED
 >
-<!--*****************************************************************************************************************************
-dump
-*********************************************************************************************************************************
+<!--
 [dump] control post-weaving dump to the "./_dump" folder (debugging purpose only)
 @within defines a type pattern
     (it is not a startWith)
-******************************************************************************************************************************-->
+-->
 <!ELEMENT dump EMPTY>
 <!ATTLIST dump
     within CDATA #REQUIRED
 >
-<!--*****************************************************************************************************************************
-aspects
-*********************************************************************************************************************************
+<!--
 [aspects] defines a set of aspects
 Note: include only include among Union{aspect, concrete-aspect} WITHIN THIS SOLE aop.xml
-******************************************************************************************************************************-->
+-->
 <!ELEMENT aspects (
     (aspect | exclude | include | concrete-aspect)*
 )>
-<!--*****************************************************************************************************************************
-aspect
-*********************************************************************************************************************************
+<!--
 [aspect] defines an aspect to include
-    @name   FQN of the aspect, nested class must use $
+  @name   FQN of the aspect, nested class must use $
 ******************************************************************************************************************************-->
 <!ELEMENT aspect EMPTY>
 <!ATTLIST aspect
@@ -109,20 +94,16 @@ aspect
     scope CDATA #IMPLIED
     requires CDATA #IMPLIED
 >
-<!--*****************************************************************************************************************************
-exclude
-*********************************************************************************************************************************
+<!--
 [exclude] defines a set of aspect to exclude
-    @within within pattern (even from other systems / parent classloader)
+  @within within pattern (even from other systems / parent classloader)
 SAME AS FOR weaver/exclude
-******************************************************************************************************************************-->
-<!--*****************************************************************************************************************************
-concrete-aspect
-*********************************************************************************************************************************
+-->
+<!--
 [concrete-aspect] defines a concrete aspect from an abstract one
-    @name   FQN of the concrete aspect (use $ for nested class) [will be jit generated]
-    @extends FQN of the abstract aspect (use $ for nested class)
-******************************************************************************************************************************-->
+  @name   FQN of the concrete aspect (use $ for nested class) [will be jit generated]
+  @extends FQN of the abstract aspect (use $ for nested class)
+-->
 <!ELEMENT concrete-aspect (
     pointcut+
 )>
@@ -132,16 +113,14 @@ concrete-aspect
     precedence CDATA #IMPLIED
     perclause CDATA #IMPLIED
 >
-<!--*****************************************************************************************************************************
-pointcut
-*********************************************************************************************************************************
+<!--
 [pointcut] defines a concrete pointcut within a concrete aspect from an abstract one
-    @name   name of the abstract pointcut (method name, unique in aspect class hierarchy)
-    @expression pointcut expression
-        Note: for argument binding, the bounded arguments must be present and bounded:
-        <pointcut name="myAdvice(int i)" expression="... AND args(i)"/>
-        TODO: AND must be written that way and not with the "&&" symbol. Thus NOT and OR exists as well.
-******************************************************************************************************************************-->
+  @name   name of the abstract pointcut (method name, unique in aspect class hierarchy)
+  @expression pointcut expression
+    Note: for argument binding, the bounded arguments must be present and bounded:
+    <pointcut name="myAdvice(int i)" expression="... AND args(i)"/>
+    TODO: AND must be written that way and not with the "&&" symbol. Thus NOT and OR exists as well.
+-->
 <!ELEMENT pointcut EMPTY>
 <!ATTLIST pointcut
     name CDATA #REQUIRED