pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] merlimat closed pull request #3023: Moved broker aspectj to zk-utils
Date Thu, 22 Nov 2018 03:47:45 GMT
merlimat closed pull request #3023: Moved broker aspectj to zk-utils
URL: https://github.com/apache/pulsar/pull/3023
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 9fed26b7c5..1d04733c72 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>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message