[Archive-access-cvs] SF.net SVN: archive-access:[3489] trunk/archive-access/projects/ access-control

[<ikr...@us...>]

Revision: 3489
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3489&view=rev
Author:   ikreymer
Date:     2011-07-08 22:13:00 +0000 (Fri, 08 Jul 2011)

Log Message:
-----------
Access Control - Exclusion Oracle:
UPDATE: Added support for jetty run for oracle
Updated to latest hsqldb
FIX: Rule.compareTo includes a compare by access group name
so that rules that differ only by access group are distinct

Modified Paths:
--------------
    trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/Rule.java
    trunk/archive-access/projects/access-control/oracle/pom.xml

Modified: trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/Rule.java
===================================================================
--- trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/Rule.java	2011-07-08 05:13:03 UTC (rev 3488)
+++ trunk/archive-access/projects/access-control/access-control/src/main/java/org/archive/accesscontrol/model/Rule.java	2011-07-08 22:13:00 UTC (rev 3489)
@@ -277,6 +277,8 @@
                 i = -1;
             } else if (getWho() == null && o.getWho() != null) {
                 i = 1;
+            } else if (getWho() != null && o.getWho() != null) {
+            	i = getWho().compareTo(o.getWho());
             } else {
                 i = getPolicyId().compareTo(o.getPolicyId());                
             }

Modified: trunk/archive-access/projects/access-control/oracle/pom.xml
===================================================================
--- trunk/archive-access/projects/access-control/oracle/pom.xml	2011-07-08 05:13:03 UTC (rev 3488)
+++ trunk/archive-access/projects/access-control/oracle/pom.xml	2011-07-08 22:13:00 UTC (rev 3489)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>access-control</artifactId>
     <groupId>org.archive</groupId>
@@ -14,9 +14,9 @@
   <build>
     <extensions>
       <extension>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>1.8.0.7</version>
+       <groupId>org.hsqldb</groupId>
+       <artifactId>hsqldb</artifactId>
+       <version>2.2.4</version>
       </extension>
     </extensions>
     <plugins>
@@ -48,6 +48,24 @@
           </componentProperties>
         </configuration>
       </plugin>
+      
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <systemProperty>
+              <name>jetty.port</name>
+              <value>8080</value>
+            </systemProperty>
+          </systemProperties>
+          <scanIntervalSeconds>5</scanIntervalSeconds>
+          <contextPath>oracle</contextPath>
+          <stopKey>foo</stopKey>
+          <stopPort>9995</stopPort>
+        </configuration>
+      </plugin>
+      
     </plugins>
   </build>
   <repositories>
@@ -115,9 +133,9 @@
       <version>8.2-504.jdbc3</version>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
+     <groupId>org.hsqldb</groupId>
+     <artifactId>hsqldb</artifactId>
+     <version>2.2.4</version>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.