[virgil] r162 committed - Made aspects more specific.

[virgil.apach...@codespot.com]

Revision: 162
Author: boneill42
Date: Tue Jan 31 09:05:50 2012
Log: Made aspects more specific.

http://code.google.com/a/apache-extras.org/p/virgil/source/detail?r=162

Added:
/trunk/server/src/test/resources/META-INF
Deleted:
/trunk/server/src/main/resources/META-INF
Modified:
/trunk/server/pom.xml

/trunk/server/src/main/java/org/apache/virgil/pool/ConnectionPoolAspect.java

/trunk/server/src/main/java/org/apache/virgil/triggers/CassandraServerTriggerAspect.java
/trunk/server/src/main/java/org/apache/virgil/triggers/TestTrigger.java
/trunk/server/src/test/resources/META-INF/aop.xml

=======================================
--- /trunk/server/pom.xml Fri Jan 27 13:50:54 2012
+++ /trunk/server/pom.xml Tue Jan 31 09:05:50 2012
@@ -42,6 +42,12 @@
<artifactId>uuid</artifactId>
<version>3.2</version>
</dependency>
+<dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>3.4.0</version>
+</dependency>
+

</dependencies>

=======================================
---
/trunk/server/src/main/java/org/apache/virgil/pool/ConnectionPoolAspect.java
Tue Jan 31 06:23:41 2012
+++
/trunk/server/src/main/java/org/apache/virgil/pool/ConnectionPoolAspect.java
Tue Jan 31 09:05:50 2012
@@ -23,9 +23,9 @@
}
}

- @Pointcut("execution(@PooledConnection * *.*(..))")
+ @Pointcut("execution(@PooledConnection * org.apache.virgil..*.*(..))")
public void methodAnnotatedWithPooledConnection() {}
-
+
@Around("methodAnnotatedWithPooledConnection()")
public Object handleStorage(ProceedingJoinPoint thisJoinPoint) throws
Throwable {
logger.debug("AOP:STORAGE connection for [" +
thisJoinPoint.getSignature() + "]");
=======================================
---
/trunk/server/src/main/java/org/apache/virgil/triggers/CassandraServerTriggerAspect.java
Tue Jan 31 06:23:41 2012
+++
/trunk/server/src/main/java/org/apache/virgil/triggers/CassandraServerTriggerAspect.java
Tue Jan 31 09:05:50 2012
@@ -15,7 +15,7 @@
public class CassandraServerTriggerAspect {
private static Logger logger =
LoggerFactory.getLogger(CassandraServerTriggerAspect.class);

- @AfterReturning("call(*
org.apache.cassandra.thrift.CassandraServer.doInsert(..))")
+ @AfterReturning("execution(*
org.apache.cassandra.thrift.CassandraServer.doInsert(..))")
public void writeToCommitLog(JoinPoint thisJoinPoint) {
try {
ConsistencyLevel consistencyLevel = (ConsistencyLevel)
thisJoinPoint.getArgs()[0];
=======================================
--- /trunk/server/src/main/java/org/apache/virgil/triggers/TestTrigger.java
Tue Jan 31 06:23:41 2012
+++ /trunk/server/src/main/java/org/apache/virgil/triggers/TestTrigger.java
Tue Jan 31 09:05:50 2012
@@ -4,10 +4,8 @@

public class TestTrigger implements Trigger {

- @Override
public void process(RowMutation rowMutation) {
- // TODO Auto-generated method stub
-
+ // TODO Auto-generated method stub
}

}
=======================================
--- /trunk/server/src/main/resources/META-INF/aop.xml Tue Jan 31 06:23:41
2012
+++ /trunk/server/src/test/resources/META-INF/aop.xml Tue Jan 31 09:05:50
2012
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<aspectj>
<aspects>
- <aspect name="org.apache.virgil.aop.CassandraServerAspect" />
- <aspect name="org.apache.virgil.aop.ConnectionPoolAspect" />
+ <aspect name="org.apache.virgil.triggers.CassandraServerTriggerAspect" />
+ <aspect name="org.apache.virgil.pool.ConnectionPoolAspect" />
</aspects>
<weaver options="-showWeaveInfo">
<include within="org.apache.cassandra.thrift.*" />