[pulsar] branch master updated: Moved broker aspectj to zk-utils (#3023)

[mmerli]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 26b91bb  Moved broker aspectj to zk-utils (#3023)
26b91bb is described below

commit 26b91bba871e6f416ba477eafe668ec70363f242
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Wed Nov 21 19:47:43 2018 -0800

    Moved broker aspectj to zk-utils (#3023)
---
 .../pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java  |  0
 .../src/main/resources/META-INF/aop.xml                    | 14 +++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java
 
b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java
similarity index 100%
rename from 
pulsar-broker/src/main/java/org/apache/pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java
rename to 
pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/broker/zookeeper/aspectj/ClientCnxnAspect.java
diff --git a/pulsar-broker/src/main/resources/META-INF/aop.xml 
b/pulsar-zookeeper-utils/src/main/resources/META-INF/aop.xml
similarity index 80%
rename from pulsar-broker/src/main/resources/META-INF/aop.xml
rename to pulsar-zookeeper-utils/src/main/resources/META-INF/aop.xml
index 9fed26b..1d04733 100644
--- a/pulsar-broker/src/main/resources/META-INF/aop.xml
+++ b/pulsar-zookeeper-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>
\ No newline at end of file
+  <aspects>
+    <aspect
+      name="org.apache.pulsar.zookeeper.SerializeUtilsAspect" />
+    <aspect name="org.apache.pulsar.broker.zookeeper.aspectj.ClientCnxnAspect" 
/>
+  </aspects>
+</aspectj>