Author: simoneg
Date: Wed Oct 21 08:58:31 2009
New Revision: 827929

URL: http://svn.apache.org/viewvc?rev=827929&view=rev
Log:
LABS-409: using proper pointcut now that AspectJ fixed those bugs

Modified:
    
labs/magma/trunk/database-jpa/src/main/java/org/apache/magma/database/openjpa/InstallVersionByDefault.aj
    
labs/magma/trunk/foundation-database/src/main/java/org/apache/magma/database/InstallIdByDefault.aj

Modified: 
labs/magma/trunk/database-jpa/src/main/java/org/apache/magma/database/openjpa/InstallVersionByDefault.aj
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/database-jpa/src/main/java/org/apache/magma/database/openjpa/InstallVersionByDefault.aj?rev=827929&r1=827928&r2=827929&view=diff
==============================================================================
--- 
labs/magma/trunk/database-jpa/src/main/java/org/apache/magma/database/openjpa/InstallVersionByDefault.aj
 (original)
+++ 
labs/magma/trunk/database-jpa/src/main/java/org/apache/magma/database/openjpa/InstallVersionByDefault.aj
 Wed Oct 21 08:58:31 2009
@@ -40,9 +40,8 @@
                
        }
        
-       // TODO commented to avoid AspectJ bug
-       //declare parents : ((@Entity *) && !(@NoVersion *) && 
!hasmethod(@Version public * get*()) && !hasfield(@Version * *)) implements 
WithDefaultVersion;
-       declare parents : ((@Entity *) && !(@NoVersion *)) implements 
WithDefaultVersion;
+       declare parents : ((@Entity *) && !(@NoVersion *) && 
!hasmethod(@Version public * get*()) && !hasfield(@Version * *)) implements 
WithDefaultVersion;
+       //declare parents : ((@Entity *) && !(@NoVersion *)) implements 
WithDefaultVersion;
        
        /**
         * The default version field.

Modified: 
labs/magma/trunk/foundation-database/src/main/java/org/apache/magma/database/InstallIdByDefault.aj
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-database/src/main/java/org/apache/magma/database/InstallIdByDefault.aj?rev=827929&r1=827928&r2=827929&view=diff
==============================================================================
--- 
labs/magma/trunk/foundation-database/src/main/java/org/apache/magma/database/InstallIdByDefault.aj
 (original)
+++ 
labs/magma/trunk/foundation-database/src/main/java/org/apache/magma/database/InstallIdByDefault.aj
 Wed Oct 21 08:58:31 2009
@@ -40,9 +40,8 @@
                
        }
        
-       // TODO commented to avoid AspectJ bug
-       //declare parents : ((@Entity *) && !(@NoId *) && 
!hasmethod(@(Id||EmbeddedId) public * get*()) && !hasfield(@(Id||EmbeddedId) * 
*)) implements WithDefaultId;
-       declare parents : ((@Entity *) && !(@NoId *)) implements WithDefaultId;
+       declare parents : ((@Entity *) && !(@NoId *) && 
!hasmethod(@(Id||EmbeddedId) public * get*()) && !hasfield(@(Id||EmbeddedId) * 
*)) implements WithDefaultId;
+       //declare parents : ((@Entity *) && !(@NoId *)) implements 
WithDefaultId;
        
        /**
         * The default provided id field.



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to