Moved broker aspectj to zk-utils (apache#3023)

amaliujia · Nov 22, 2018 · 26b91bb · 26b91bb
1 parent a77b760
commit 26b91bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...r/zookeeper/aspectj/ClientCnxnAspect.java → ...r/zookeeper/aspectj/ClientCnxnAspect.java b/...r/zookeeper/aspectj/ClientCnxnAspect.java → ...r/zookeeper/aspectj/ClientCnxnAspect.java
diff --git a/...roker/src/main/resources/META-INF/aop.xml → ...utils/src/main/resources/META-INF/aop.xml b/...roker/src/main/resources/META-INF/aop.xml → ...utils/src/main/resources/META-INF/aop.xml
@@ -18,14 +18,18 @@
     under the License.
 
 -->
+<!DOCTYPE aspectj PUBLIC
+        "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
 <aspectj>
 
-  <aspects>
-    <aspect name="org.apache.pulsar.broker.zookeeper.aspectj.ClientCnxnAspect" />
-  </aspects>
-
   <weaver options="-verbose -Xset:weaveJavaxPackages=true -Xset:weaveJavaPackages=true">
     <include within="org.apache.zookeeper.ClientCnxn" />
+    <include within="org.apache.zookeeper.server.util.SerializeUtils" />
   </weaver>
 
-</aspectj>
+  <aspects>
+    <aspect
+      name="org.apache.pulsar.zookeeper.SerializeUtilsAspect" />
+    <aspect name="org.apache.pulsar.broker.zookeeper.aspectj.ClientCnxnAspect" />
+  </aspects>
+</aspectj>