You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/16 01:41:42 UTC
svn commit: r1446826 - in /archiva/redback/redback-core/trunk: ./
redback-keys/redback-keys-providers/redback-keys-jdo/
redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/
redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/...
Author: olamy
Date: Sat Feb 16 00:41:41 2013
New Revision: 1446826
URL: http://svn.apache.org/r1446826
Log:
[MRM-1747] upgrade to last modello.
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
Modified: archiva/redback/redback-core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Sat Feb 16 00:41:41 2013
@@ -669,7 +669,11 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-15</version>
+ <version>1.7-SNAPSHOT</version>
+ <configuration>
+ <!-- cause issue with datamanagement module -->
+ <useJava5>false</useJava5>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/pom.xml Sat Feb 16 00:41:41 2013
@@ -110,18 +110,39 @@
<configuration>
<version>1.0.1</version>
<packageWithVersion>false</packageWithVersion>
- <model>src/main/mdo/keys.mdo</model>
+ <models>
+ <model>src/main/mdo/keys.mdo</model>
+ </models>
</configuration>
<executions>
<execution>
<id>modello-java</id>
<goals>
<goal>java</goal>
- <goal>jpox-metadata-class</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
</goals>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.archiva.redback.components.modello</groupId>
+ <artifactId>jpox-modello-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <version>1.0.1</version>
+ <packageWithVersion>false</packageWithVersion>
+ <models>
+ <model>src/main/mdo/keys.mdo</model>
+ </models>
+ </configuration>
+ <executions>
+ <execution>
+ <id>modello-jpox</id>
+ <goals>
+ <goal>jpox-metadata-class</goal>
+ </goals>
+ </execution>
<execution>
<id>jpox-jdo-mapping</id>
<goals>
Modified: archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo (original)
+++ archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/main/mdo/keys.mdo Sat Feb 16 00:41:41 2013
@@ -73,12 +73,12 @@
<version>1.0.0+</version>
<type>String</type>
</field>
- <field>
+ <field xml.format="long">
<name>dateCreated</name>
<version>1.0.0+</version>
<type>Date</type>
</field>
- <field>
+ <field xml.format="long">
<name>dateExpires</name>
<version>1.0.0+</version>
<type>Date</type>
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRole.java Sat Feb 16 00:41:41 2013
@@ -30,4 +30,30 @@ public abstract class AbstractRole
{
return ( getChildRoleNames() != null ) && !getChildRoleNames().isEmpty();
}
+
+ /**
+ * Method equals.
+ *
+ * @param other
+ * @return boolean
+ */
+ public boolean equals( Object other )
+ {
+ if ( this == other )
+ {
+ return true;
+ }
+
+ if ( !( other instanceof AbstractRole ) )
+ {
+ return false;
+ }
+
+ AbstractRole that = (AbstractRole) other;
+ boolean result = true;
+
+ result = result && ( getName() == null ? that.getName() == null : getName().equals( that.getName() ) );
+
+ return result;
+ }
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/pom.xml Sat Feb 16 00:41:41 2013
@@ -103,15 +103,15 @@
<configuration>
<version>1.0.1</version>
<packageWithVersion>false</packageWithVersion>
- <model>src/main/mdo/rbac-jdo.mdo</model>
+ <models>
+ <model>src/main/mdo/rbac-jdo.mdo</model>
+ </models>
</configuration>
<executions>
<execution>
<id>modello-java</id>
<goals>
<goal>java</goal>
- <goal>jpox-metadata-class</goal>
- <goal>jpox-jdo-mapping</goal>
<!-- TODO: Move these to plexus-security-authorization-rbac-model -->
<goal>stax-reader</goal>
<goal>stax-writer</goal>
@@ -120,6 +120,27 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.archiva.redback.components.modello</groupId>
+ <artifactId>jpox-modello-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <version>1.0.1</version>
+ <packageWithVersion>false</packageWithVersion>
+ <models>
+ <model>src/main/mdo/rbac-jdo.mdo</model>
+ </models>
+ </configuration>
+ <executions>
+ <execution>
+ <id>modello-jpox</id>
+ <goals>
+ <goal>jpox-metadata-class</goal>
+ <goal>jpox-jdo-mapping</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jpox-maven-plugin</artifactId>
<executions>
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo Sat Feb 16 00:41:41 2013
@@ -80,8 +80,7 @@
</class>
<class jpox.stashable="true"
- jpox.table="ROLES"
- jpox.not-persisted-fields="modelEncoding">
+ jpox.table="ROLES">
<name>JdoRole</name>
<version>1.0.0+</version>
<interfaces>
@@ -155,8 +154,7 @@
</class>
<class jpox.stashable="true"
- jpox.table="PERMISSIONS"
- jpox.not-persisted-fields="modelEncoding">
+ jpox.table="PERMISSIONS">
<name>JdoPermission</name>
<version>1.0.0+</version>
<interfaces>
@@ -212,8 +210,7 @@
</class>
<class jpox.stashable="true"
- jpox.table="OPERATIONS"
- jpox.not-persisted-fields="modelEncoding">
+ jpox.table="OPERATIONS">
<name>JdoOperation</name>
<version>1.0.0+</version>
<interfaces>
@@ -251,8 +248,7 @@
</class>
<class jpox.stashable="true"
- jpox.table="RESOURCES"
- jpox.not-persisted-fields="modelEncoding">
+ jpox.table="RESOURCES">
<name>JdoResource</name>
<version>1.0.0+</version>
<description>
@@ -292,8 +288,7 @@
</class>
<class jpox.stashable="true"
- jpox.table="USER_ASSIGNMENTS"
- jpox.not-persisted-fields="modelEncoding">
+ jpox.table="USER_ASSIGNMENTS">
<name>JdoUserAssignment</name>
<description>binding of a principal to a role</description>
<version>1.0.0+</version>
@@ -308,7 +303,7 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field jpox.column="LAST_UPDATED">
+ <field jpox.column="LAST_UPDATED" xml.format="long">
<name>timestamp</name>
<version>1.0.0+</version>
<type>Date</type>
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/RbacJdoModelStaxTest.java Sat Feb 16 00:41:41 2013
@@ -32,6 +32,7 @@ import javax.xml.stream.XMLStreamExcepti
import junit.framework.TestCase;
import org.apache.archiva.redback.rbac.Operation;
+import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.jdo.io.stax.RbacJdoModelStaxReader;
import org.apache.archiva.redback.rbac.jdo.io.stax.RbacJdoModelStaxWriter;
@@ -155,13 +156,13 @@ public class RbacJdoModelStaxTest
assertEquals( expectedAssignment.getRoleNames(), assignment.getRoleNames() );
}
- private void assertPermissions( List<JdoPermission> expectedPermissions, List<JdoPermission> permissions )
+ private void assertPermissions( List<Permission> expectedPermissions, List<Permission> permissions )
{
assertEquals( expectedPermissions.size(), permissions.size() );
- for ( JdoPermission permission : permissions )
+ for ( Permission permission : permissions )
{
boolean found = false;
- for ( JdoPermission expectedPermission : expectedPermissions )
+ for ( Permission expectedPermission : expectedPermissions )
{
if ( expectedPermission.getName().equals( permission.getName() ) )
{
@@ -177,7 +178,7 @@ public class RbacJdoModelStaxTest
}
}
- private void assertPermission( JdoPermission expectedPermission, JdoPermission permission )
+ private void assertPermission( Permission expectedPermission, Permission permission )
{
assertEquals( expectedPermission.getDescription(), permission.getDescription() );
assertOperation( expectedPermission.getOperation(), permission.getOperation() );
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java Sat Feb 16 00:41:41 2013
@@ -260,7 +260,8 @@ public abstract class AbstractRbacManage
Role actualAdmin = rbacManager.getRole( adminRole.getName() );
Role actualDevel = rbacManager.getRole( develRole.getName() );
- assertEquals( adminRole, actualAdmin );
+ assertEquals( adminRole.getName(), actualAdmin.getName() );
+ assertEquals( adminRole.getChildRoleNames(), actualAdmin.getChildRoleNames() );
assertEquals( develRole, actualDevel );
/* Assert some event tracker stuff */
@@ -287,7 +288,8 @@ public abstract class AbstractRbacManage
Role actualRole = rbacManager.getRole( rolename );
- assertEquals( testRole, actualRole );
+ assertEquals( testRole.getName(), actualRole.getName() );
+ assertEquals( testRole.getChildRoleNames(), actualRole.getChildRoleNames() );
assertEquals( 1, rbacManager.getAllRoles().size() );
assertEquals( 0, rbacManager.getAllPermissions().size() );
@@ -329,7 +331,8 @@ public abstract class AbstractRbacManage
Role actualAdmin = manager.getRole( adminRole.getName() );
Role actualDevel = manager.getRole( develRole.getName() );
- assertEquals( adminRole, actualAdmin );
+ assertEquals( adminRole.getName(), actualAdmin.getName() );
+ assertEquals( adminRole.getChildRoleNames(), actualAdmin.getChildRoleNames() );
assertEquals( develRole, actualDevel );
// Now add a child role.
@@ -360,7 +363,8 @@ public abstract class AbstractRbacManage
Role actualAdmin = manager.getRole( adminRole.getName() );
Role actualDevel = manager.getRole( develRole.getName() );
- assertEquals( adminRole, actualAdmin );
+ assertEquals( adminRole.getName(), actualAdmin.getName() );
+ assertEquals( adminRole.getChildRoleNames(), actualAdmin.getChildRoleNames() );
assertEquals( develRole, actualDevel );
// Now do a child role.
@@ -769,7 +773,8 @@ public abstract class AbstractRbacManage
Role actualAdmin = rbacManager.getRole( adminRole.getName() );
Role actualDevel = rbacManager.getRole( develRole.getName() );
- assertEquals( adminRole, actualAdmin );
+ assertEquals( adminRole.getName(), actualAdmin.getName() );
+ assertEquals( adminRole.getChildRoleNames(), actualAdmin.getChildRoleNames() );
assertEquals( develRole, actualDevel );
// Attempt to remove perm now.
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/pom.xml Sat Feb 16 00:41:41 2013
@@ -116,18 +116,39 @@
<configuration>
<version>1.0.1</version>
<packageWithVersion>false</packageWithVersion>
- <model>src/main/mdo/user.mdo</model>
+ <models>
+ <model>src/main/mdo/user.mdo</model>
+ </models>
</configuration>
<executions>
<execution>
<id>modello-java</id>
<goals>
<goal>java</goal>
- <goal>jpox-metadata-class</goal>
<goal>stax-reader</goal>
<goal>stax-writer</goal>
</goals>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.archiva.redback.components.modello</groupId>
+ <artifactId>jpox-modello-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <version>1.0.1</version>
+ <packageWithVersion>false</packageWithVersion>
+ <models>
+ <model>src/main/mdo/user.mdo</model>
+ </models>
+ </configuration>
+ <executions>
+ <execution>
+ <id>modello-jpox</id>
+ <goals>
+ <goal>jpox-metadata-class</goal>
+ </goals>
+ </execution>
<execution>
<id>jpox-jdo-mapping</id>
<goals>
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo?rev=1446826&r1=1446825&r2=1446826&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/mdo/user.mdo Sat Feb 16 00:41:41 2013
@@ -83,12 +83,12 @@
<type>String</type>
<identifier>true</identifier>
</field>
- <field>
+ <field xml.format="long">
<name>lastPasswordChange</name>
<version>1.0.0+</version>
<type>Date</type>
</field>
- <field>
+ <field xml.format="long">
<name>lastLoginDate</name>
<version>1.0.0+</version>
<type>Date</type>
@@ -134,7 +134,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field xml.format="long">
<name>accountCreationDate</name>
<version>1.0.0+</version>
<type>Date</type>