From fc13a7e4abf87c92d63cb7b13561119b6414651e Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sat, 25 Jan 2014 02:27:47 -0300
Subject: fix include directives in aop.xml files

---
 kamon-core/src/main/resources/META-INF/aop.xml  | 42 +++++++++++--------------
 kamon-spray/src/main/resources/META-INF/aop.xml | 10 ++++--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml
index 1448f22f..e7c5836a 100644
--- a/kamon-core/src/main/resources/META-INF/aop.xml
+++ b/kamon-core/src/main/resources/META-INF/aop.xml
@@ -1,31 +1,27 @@
 <!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
 
 <aspectj>
-    <weaver options="-verbose -showWeaveInfo">
-        <!-- In case you want to see the weaved classes -->
-        <!--<dump within="*"/>-->
-    </weaver>
+  <aspects>
+    <!-- Actors -->
+    <aspect name="akka.instrumentation.RepointableActorRefTraceContextMixin"/>
+    <aspect name="akka.instrumentation.SystemMessageTraceContextMixin"/>
+    <aspect name="akka.instrumentation.ActorSystemMessagePassingTracing"/>
+    <aspect name="akka.instrumentation.EnvelopeTraceContextMixin"/>
+    <aspect name="akka.instrumentation.BehaviourInvokeTracing"/>
+    <aspect name="kamon.instrumentation.ActorLoggingTracing"/>
 
-    <aspects>
-        <!-- Actors -->
-        <aspect name="akka.instrumentation.RepointableActorRefTraceContextMixin"/>
-        <aspect name="akka.instrumentation.SystemMessageTraceContextMixin"/>
-        <aspect name="akka.instrumentation.ActorSystemMessagePassingTracing"/>
-        <aspect name="akka.instrumentation.EnvelopeTraceContextMixin"/>
-        <aspect name="akka.instrumentation.BehaviourInvokeTracing"/>
-        <aspect name="kamon.instrumentation.ActorLoggingTracing"/>
+    <!-- Futures -->
+    <aspect name="kamon.instrumentation.FutureTracing"/>
 
-        <!-- Futures -->
-        <aspect name="kamon.instrumentation.FutureTracing"/>
+    <!-- Patterns -->
+    <aspect name="akka.instrumentation.AskPatternTracing"/>
+  </aspects>
 
-        <!-- Patterns -->
-        <aspect name="akka.instrumentation.AskPatternTracing"/>
-
-
-        <include within="scala.concurrent..*"/>
-        <include within="akka..*"/>
-        <include within="spray..*"/>
-        <include within="kamon..*"/>
-    </aspects>
+  <weaver options="-verbose -showWeaveInfo">
+    <include within="scala.concurrent..*"/>
+    <include within="akka..*"/>
+    <include within="spray..*"/>
+    <include within="kamon..*"/>
+  </weaver>
 
 </aspectj>
\ No newline at end of file
diff --git a/kamon-spray/src/main/resources/META-INF/aop.xml b/kamon-spray/src/main/resources/META-INF/aop.xml
index 8324617b..0e83f7e3 100644
--- a/kamon-spray/src/main/resources/META-INF/aop.xml
+++ b/kamon-spray/src/main/resources/META-INF/aop.xml
@@ -1,11 +1,15 @@
 <!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
 
 <aspectj>
-  <weaver options="-verbose -showWeaveInfo"/>
-
   <aspects>
+    <!-- Spray Server -->
     <aspect name="spray.can.server.ServerRequestTracing"/>
+
+    <!-- Spray Client -->
     <aspect name="spray.can.client.ClientRequestTracing"/>
-    <include within="spray..*"/>
   </aspects>
+
+  <weaver options="-verbose -showWeaveInfo">
+    <include within="spray.can..*"/>
+  </weaver>
 </aspectj>
-- 
cgit v1.2.3